Merge pull request #2064 from AriGunawan/features/update_multiscreen_spfx_version

react-multiscreen: Update SPFx version

samples/react-multiscreen-webpart/.editorconfig

@@ -1,25 +0,0 @@
-# EditorConfig helps developers define and maintain consistent
-# coding styles between different editors and IDEs
-# editorconfig.org
-
-root = true
-
-
-[*]
-
-# change these settings to your own preference
-indent_style = space
-indent_size = 2
-
-# we recommend you to keep these unchanged
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[*.md]
-trim_trailing_whitespace = false
-
-[{package,bower}.json]
-indent_style = space
-indent_size = 2

samples/react-multiscreen-webpart/.gitignore

@@ -11,6 +11,7 @@ dist
 lib
 solution
 temp
+release
 *.sppkg
 
 # Coverage directory used by tools like istanbul

samples/react-multiscreen-webpart/.yo-rc.json

@@ -2,7 +2,7 @@
   "@microsoft/generator-sharepoint": {
     "isCreatingSolution": true,
     "environment": "spo",
-    "version": "1.8.2",
+    "version": "1.12.1",
     "libraryName": "react-router-dom",
     "libraryId": "8aae1dc4-d74b-4ec4-ae2f-ebfd1e9ee7d0",
     "packageManager": "npm",

samples/react-multiscreen-webpart/README.md

@@ -13,35 +13,40 @@ This sample uses the popular [React Router](https://github.com/ReactTraining/rea
 
 The web part utilizes the usage of hashes in the URL so different screen will be displayed based on hash in the URL. That way the browser history is also used so it could provide similar experience as in a single page application.
 
-## Used SharePoint Framework Version 
+## Compatibility
-![drop](https://img.shields.io/badge/drop-1.8.2-green.svg)
+
+![SPFx 1.12.1](https://img.shields.io/badge/SPFx-1.12.1-green.svg)
+![Node.js LTS v14 | LTS v12 | LTS v10](https://img.shields.io/badge/Node.js-LTS%20v14%20%7C%20LTS%20v12%20%7C%20LTS%20v10-green.svg) 
+![Compatible with SharePoint Online](https://img.shields.io/badge/SharePoint%20Online-Compatible-green.svg)
+![Does not work with SharePoint 2019](https://img.shields.io/badge/SharePoint%20Server%202019-Incompatible-red.svg "SharePoint Server 2019 requires SPFx 1.4.1 or lower")
+![Does not work with SharePoint 2016 (Feature Pack 2)](https://img.shields.io/badge/SharePoint%20Server%202016%20(Feature%20Pack%202))
+![Teams N/A: Untested with Microsoft Teams](https://img.shields.io/badge/Teams-N%2FA-lightgrey.svg "Untested with Microsoft Teams") 
+![Local Workbench Compatible](https://img.shields.io/badge/Local%20Workbench-Compatible-green.svg)
+![Hosted Workbench Compatible](https://img.shields.io/badge/Hosted%20Workbench-Compatible-green.svg)
 
 ## Applies to
 
 * [SharePoint Framework](https://docs.microsoft.com/sharepoint/dev/spfx/sharepoint-framework-overview)
-* [Office 365 developer tenant](https://docs.microsoft.com/sharepoint/dev/spfx/set-up-your-developer-tenant)
+* [Microsoft 365 tenant](https://docs.microsoft.com/sharepoint/dev/spfx/set-up-your-development-environment)
-
-## Prerequisites
-
-- Office 365 subscription with SharePoint Online.
-- SharePoint Framework [development environment](https://docs.microsoft.com/sharepoint/dev/spfx/set-up-your-development-environment) already set up.
 
 ## Solution
 
 Solution|Author(s)
 --------|---------
 react-multiscreen-webpart | Velin Georgiev ([@VelinGeorgiev](https://twitter.com/velingeorgiev)), Stefan Bauer ([@StfBauer](https://twitter.com/stfbauer))
+react-multiscreen-webpart | [Ari Gunawan](https://github.com/AriGunawan) ([@arigunawan3023](https://twitter.com/arigunawan3023))
 
 ## Version history
 
 Version|Date|Comments
 -------|----|--------
-0.0.1|July 3, 2019 | Initial commit
+1.0.0|July 3, 2019 | Initial commit
+1.1.0|October 3, 2021 | Update SPFx version to 1.12.1
 
-## Disclaimer
+## Prerequisites
-**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
 
----
+- Office 365 subscription with SharePoint Online.
+- SharePoint Framework [development environment](https://docs.microsoft.com/sharepoint/dev/spfx/set-up-your-development-environment) already set up.
 
 ## Minimal Path to Awesome
 
@@ -54,5 +59,18 @@ Version|Date|Comments
 
 - [React Router](https://github.com/ReactTraining/react-router#readme)
 
+## Disclaimer
+
+**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
+
+## Help
+
+We do not support samples, but we this community is always willing to help, and we want to improve these samples. We use GitHub to track issues, which makes it easy for  community members to volunteer their time and help resolve issues.
+
+If you encounter any issues while using this sample, [create a new issue](https://github.com/pnp/sp-dev-fx-webparts/issues/new?assignees=&labels=Needs%3A+Triage+%3Amag%3A%2Ctype%3Abug-suspected&template=bug-report.yml&sample=react-multiscreen&authors=@VelinGeorgiev%20@StfBauer%20@AriGunawan&title=react-multiscreen%20-%20).
+
+For questions regarding this sample, [create a new question](https://github.com/pnp/sp-dev-fx-webparts/issues/new?assignees=&labels=Needs%3A+Triage+%3Amag%3A%2Ctype%3Abug-suspected&template=question.yml&sample=react-multiscreen&authors=@VelinGeorgiev%20@StfBauer%20@AriGunawan&title=react-multiscreen%20-%20).
+
+Finally, if you have an idea for improvement, [make a suggestion](https://github.com/pnp/sp-dev-fx-webparts/issues/new?assignees=&labels=Needs%3A+Triage+%3Amag%3A%2Ctype%3Abug-suspected&template=suggestion.yml&sample=react-multiscreen&authors=@VelinGeorgiev%20@StfBauer%20@AriGunawan&title=react-multiscreen%20-%20).
 
 <img src="https://telemetry.sharepointpnp.com/sp-dev-fx-webparts/samples/react-multiscreen-webpart" />

samples/react-multiscreen-webpart/assets/sample.json

@@ -9,7 +9,7 @@
       "This sample uses the popular React Router library to create tab, multi-screen or single page app (spa) experience in React SPFx web part. This is useful when the web part is more complex and to simplify the user experience multiple screens or tabs are needed. The same approach can be taken when a single page app (SPA) has to be migrated to modern SharePoint sites."
     ],
     "creationDateTime": "2019-07-03",
-    "updateDateTime": "2019-07-03",
+    "updateDateTime": "2021-10-03",
     "products": [
       "SharePoint",
       "Office"

samples/react-multiscreen-webpart/config/copy-assets.json

@@ -1,4 +1,4 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/spfx-build/copy-assets.schema.json",
-  "deployCdnPath": "temp/deploy"
+  "deployCdnPath": "./release/assets"
 }

samples/react-multiscreen-webpart/config/deploy-azure-storage.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/spfx-build/deploy-azure-storage.schema.json",
-  "workingDir": "./temp/deploy/",
+  "workingDir": "./release/assets/",
   "account": "<!-- STORAGE ACCOUNT NAME -->",
   "container": "react-router-dom",
   "accessKey": "<!-- ACCESS KEY -->"

samples/react-multiscreen-webpart/config/package-solution.json

@@ -3,9 +3,16 @@
   "solution": {
     "name": "react-router-dom-client-side-solution",
     "id": "8aae1dc4-d74b-4ec4-ae2f-ebfd1e9ee7d0",
-    "version": "1.0.0.0",
+    "version": "1.1.0.0",
     "includeClientSideAssets": true,
-    "skipFeatureDeployment": true
+    "skipFeatureDeployment": true,
+    "developer": {
+      "name": "Contoso",
+      "privacyUrl": "https://contoso.com/privacy",
+      "termsOfUseUrl": "https://contoso.com/terms-of-use",
+      "websiteUrl": "https://contoso.com/my-app",
+      "mpnId": "000000"
+    }
   },
   "paths": {
     "zippedPackage": "solution/react-router-dom.sppkg"

samples/react-multiscreen-webpart/gulpfile.js

@@ -4,4 +4,13 @@ const gulp = require('gulp');
 const build = require('@microsoft/sp-build-web');
 build.addSuppression(`Warning - [sass] The local CSS class 'ms-Grid' is not camelCase and will not be type-safe.`);
 
+var getTasks = build.rig.getTasks;
+build.rig.getTasks = function () {
+  var result = getTasks.call(build.rig);
+
+  result.set('serve', result.get('serve-deprecated'));
+
+  return result;
+};
+
 build.initialize(gulp);

samples/react-multiscreen-webpart/package.json

@@ -2,42 +2,39 @@
   "name": "react-multiscreen-webpart",
   "version": "0.0.1",
   "private": true,
-  "engines": {
-    "node": ">=0.10.0"
-  },
   "scripts": {
     "build": "gulp bundle",
     "clean": "gulp clean",
     "test": "gulp test"
   },
   "dependencies": {
-    "react": "16.7.0",
+    "@microsoft/sp-core-library": "1.12.1",
-    "react-dom": "16.7.0",
+    "@microsoft/sp-lodash-subset": "1.12.1",
-    "@types/react": "16.7.22",
+    "@microsoft/sp-office-ui-fabric-core": "1.12.1",
-    "@types/react-dom": "16.8.0",
+    "@microsoft/sp-property-pane": "1.12.1",
-    "office-ui-fabric-react": "6.143.0",
+    "@microsoft/sp-webpart-base": "1.12.1",
-    "@microsoft/sp-core-library": "1.8.2",
-    "@microsoft/sp-property-pane": "1.8.2",
-    "@microsoft/sp-webpart-base": "1.8.2",
-    "@microsoft/sp-lodash-subset": "1.8.2",
-    "@microsoft/sp-office-ui-fabric-core": "1.8.2",
-    "@types/webpack-env": "1.13.1",
-    "@types/es6-promise": "0.0.33",
     "@types/react-router-dom": "4.3.4",
+    "office-ui-fabric-react": "7.156.0",
+    "react": "16.9.0",
+    "react-dom": "16.9.0",
     "react-router-dom": "4.3.1"
   },
   "resolutions": {
-    "@types/react": "16.7.22"
+    "@types/react": "16.8.8"
   },
   "devDependencies": {
-    "@microsoft/sp-build-web": "1.8.2",
-    "@microsoft/sp-tslint-rules": "1.8.2",
-    "@microsoft/sp-module-interfaces": "1.8.2",
-    "@microsoft/sp-webpart-workbench": "1.8.2",
     "@microsoft/rush-stack-compiler-2.9": "0.7.7",
-    "gulp": "~3.9.1",
+    "@microsoft/rush-stack-compiler-3.7": "0.2.3",
-    "@types/chai": "3.4.34",
+    "@microsoft/sp-build-web": "1.12.1",
-    "@types/mocha": "2.2.38",
+    "@microsoft/sp-module-interfaces": "1.12.1",
-    "ajv": "~5.2.2"
+    "@microsoft/sp-tslint-rules": "1.12.1",
-  }
+    "@microsoft/sp-webpart-workbench": "1.12.1",
+    "@types/es6-promise": "0.0.33",
+    "@types/react": "16.9.36",
+    "@types/react-dom": "16.9.8",
+    "@types/webpack-env": "1.13.1",
+    "ajv": "~5.2.2",
+    "gulp": "4.0.2"
+  },
+  "main": "lib/index.js"
 }

samples/react-multiscreen-webpart/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.7/includes/tsconfig-web.json",
   "compilerOptions": {
     "target": "es5",
     "forceConsistentCasingInFileNames": true,
@@ -19,20 +19,17 @@
       "./node_modules/@microsoft"
     ],
     "types": [
-      "es6-promise",
       "webpack-env"
     ],
     "lib": [
       "es5",
       "dom",
-      "es2015.collection"
+      "es2015.collection",
+      "es2015.promise"
     ]
   },
   "include": [
-    "src/**/*.ts"
+    "src/**/*.ts",
+    "src/**/*.tsx"
   ],
-  "exclude": [
-    "node_modules",
-    "lib"
-  ]
 }

samples/react-multiscreen-webpart/tslint.json

@@ -1,5 +1,5 @@
 {
-  "extends": "@microsoft/sp-tslint-rules/base-tslint.json",
+  "extends": "./node_modules/@microsoft/sp-tslint-rules/base-tslint.json",
   "rules": {
     "class-name": false,
     "export-name": false,