Merge pull request #1304 from zachroberts8668/master

samples/react-my-groups/.yo-rc.json

@@ -2,7 +2,7 @@
   "@microsoft/generator-sharepoint": {
     "isCreatingSolution": true,
     "environment": "spo",
-    "version": "1.9.1",
+    "version": "1.10.0",
     "libraryName": "react-my-groups",
     "libraryId": "da7eafe2-f2ec-486f-99d8-d36fba06a2bf",
     "packageManager": "npm",

samples/react-my-groups/README.md

@@ -1,3 +1,18 @@
+---
+page_type: sample
+products:
+- office-sp
+languages:
+- javascript
+- typescript
+extensions:
+  contentType: samples
+  technologies:
+  - SharePoint Framework
+  platforms:
+  - React
+  createdDate: 6/1/2020 12:00:00 AM
+---
 # React My Groups
 
 ## Summary
@@ -8,7 +23,7 @@ Using Microsoft Graph, this webpart grabs the Office 365 groups the current user
 
 ## Used SharePoint Framework Version
 
-![drop](https://img.shields.io/badge/drop-1.9.1-green.svg)
+![1.10.0](https://img.shields.io/badge/drop-1.10.0-green.svg)
 
 ## Applies to
 
@@ -26,6 +41,7 @@ react-my-groups | Zach Roberts
 Version|Date|Comments
 -------|----|--------
 1.0|September 13, 2019|Initial release
+1.1|June 1, 2020| Updated to SPFX 1.10.0
 
 ## Disclaimer
 

samples/react-my-groups/config/package-solution.json

@@ -5,7 +5,17 @@
     "id": "da7eafe2-f2ec-486f-99d8-d36fba06a2bf",
     "version": "1.0.0.0",
     "includeClientSideAssets": true,
-    "isDomainIsolated": false
+    "isDomainIsolated": false,
+    "webApiPermissionRequests": [
+      {
+        "resource": "Microsoft Graph",
+        "scope": "Group.Read.All"
+      },
+      {
+        "resource": "Microsoft Graph",
+        "scope": "User.Read.All"
+      }
+    ]
   },
   "paths": {
     "zippedPackage": "solution/react-my-groups.sppkg"

samples/react-my-groups/package.json

@@ -12,17 +12,18 @@
     "test": "gulp test"
   },
   "dependencies": {
-    "react": "16.8.5",
-    "react-dom": "16.8.5",
+    "@microsoft/sp-core-library": "1.10.0",
+    "@microsoft/sp-lodash-subset": "1.10.0",
+    "@microsoft/sp-office-ui-fabric-core": "1.10.0",
+    "@microsoft/sp-property-pane": "1.10.0",
+    "@microsoft/sp-webpart-base": "1.10.0",
+    "@types/es6-promise": "0.0.33",
     "@types/react": "16.8.8",
     "@types/react-dom": "16.8.3",
-    "office-ui-fabric-react": "6.189.2",
-    "@microsoft/sp-core-library": "1.9.1",
-    "@microsoft/sp-webpart-base": "1.9.1",
-    "@microsoft/sp-lodash-subset": "1.9.1",
-    "@microsoft/sp-office-ui-fabric-core": "1.9.1",
     "@types/webpack-env": "1.13.1",
-    "@types/es6-promise": "0.0.33"
+    "office-ui-fabric-react": "6.189.2",
+    "react": "16.8.5",
+    "react-dom": "16.8.5"
   },
   "resolutions": {
     "@types/react": "16.8.8"
@@ -30,10 +31,11 @@
   "devDependencies": {
     "@microsoft/microsoft-graph-types": "^1.10.0",
     "@microsoft/rush-stack-compiler-2.9": "0.7.16",
-    "@microsoft/sp-build-web": "1.9.1",
-    "@microsoft/sp-module-interfaces": "1.9.1",
-    "@microsoft/sp-tslint-rules": "1.9.1",
-    "@microsoft/sp-webpart-workbench": "1.9.1",
+    "@microsoft/rush-stack-compiler-3.3": "0.3.5",
+    "@microsoft/sp-build-web": "1.10.0",
+    "@microsoft/sp-module-interfaces": "1.10.0",
+    "@microsoft/sp-tslint-rules": "1.10.0",
+    "@microsoft/sp-webpart-workbench": "1.10.0",
     "@types/chai": "3.4.34",
     "@types/mocha": "2.2.38",
     "ajv": "~5.2.2",

samples/react-my-groups/src/webparts/reactMyGroups/ReactMyGroupsWebPart.ts

@@ -1,11 +1,8 @@
 import * as React from 'react';
 import * as ReactDom from 'react-dom';
 import { Version } from '@microsoft/sp-core-library';
-import {
-  BaseClientSideWebPart,
-  IPropertyPaneConfiguration,
-  PropertyPaneTextField
-} from '@microsoft/sp-webpart-base';
+import { BaseClientSideWebPart } from "@microsoft/sp-webpart-base";
+import { IPropertyPaneConfiguration, PropertyPaneTextField } from "@microsoft/sp-property-pane";
 import GroupService from '../../services/GroupService';
 import * as strings from 'ReactMyGroupsWebPartStrings';
 import { ReactMyGroups, IReactMyGroupsProps } from './components';

samples/react-my-groups/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "./node_modules/@microsoft/rush-stack-compiler-2.9/includes/tsconfig-web.json",
+  "extends": "./node_modules/@microsoft/rush-stack-compiler-3.3/includes/tsconfig-web.json",
   "compilerOptions": {
     "target": "es5",
     "forceConsistentCasingInFileNames": true,