Merge pull request #3580 from lochiiconnectivity/bump-rse-deps

samples/react-script-editor/.devcontainer/devcontainer.json

@@ -1,7 +1,7 @@
 // For more information on how to run this SPFx project in a VS Code Remote Container, please visit https://aka.ms/spfx-devcontainer
 {
-	"name": "SPFx 1.10.0",
+	"name": "SPFx 1.16.1",
-	"image": "docker.io/m365pnp/spfx:1.10.0",
+	"image": "docker.io/m365pnp/spfx:1.16.1",
 	// Set *default* container specific settings.json values on container create.
 	"settings": {},
 	// Add the IDs of extensions you want installed when the container is created.
@@ -12,8 +12,7 @@
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	"forwardPorts": [
 		4321,
-		35729,
+		35729
-		5432
 	],
 	"portsAttributes": {
 		"4321": {
@@ -22,11 +21,12 @@
 			"onAutoForward": "silent",
 			"requireLocalPort": true
 		},
-		"5432": {
+		// Not needed for SPFx>= 1.12.1 
-			"protocol": "https",
+		// "5432": {
-			"label": "Workbench",
+		// 	"protocol": "https",
-			"onAutoForward": "silent"
+		// 	"label": "Workbench",
-		},
+		// 	"onAutoForward": "silent"
+		// },
 		"35729": {
 			"protocol": "https",
 			"label": "LiveReload",

samples/react-script-editor/.devcontainer/spfx-startup.sh

@@ -7,9 +7,11 @@ echo
 echo -e "\e[1;94mGenerating dev certificate\e[0m"
 gulp trust-dev-cert
 
+# Convert the generated PEM certificate to a  CER certificate
+openssl x509 -inform PEM -in ~/.rushstack/rushstack-serve.pem -outform DER -out ./spfx-dev-cert.cer
 
-cp ~/.gcb-serve-data/gcb-serve.cer ./spfx-dev-cert.cer
+# Copy the PEM ecrtificate for non-Windows hosts
-cp ~/.gcb-serve-data/gcb-serve.cer ./spfx-dev-cert.pem
+cp ~/.rushstack/rushstack-serve.pem ./spfx-dev-cert.pem
 
 ## add *.cer to .gitignore to prevent certificates from being saved in repo
 if ! grep -Fxq '*.cer' ./.gitignore

samples/react-script-editor/README.md

@@ -1,18 +1,4 @@
----
+
-page_type: sample
-products:
-- office-sp
-languages:
-- javascript
-- typescript
-extensions:
-  contentType: samples
-  technologies:
-  - SharePoint Framework
-  platforms:
-  - react
-  createdDate: 3/1/2017 12:00:00 AM
----
 # Script editor web part for modern pages built in React
 
 This version works only for SharePoint Online. If you want a version for Sharepoint on-premises go to [react-script-editor-onprem](../react-script-editor-onprem).
@@ -162,11 +148,13 @@ In order to make it available to absolutely all sites you need apply the *Deploy
 
 | :warning: Important          |
 |:---------------------------|
-| Every SPFx version is only compatible with specific version(s) of Node.js. In order to be able to build this sample, please ensure that the version of Node on your workstation matches one of the versions listed in this section. This sample will not work on a different version of Node.|
+| Every SPFx version is optimally compatible with specific versions of Node.js. In order to be able to build this sample, you need to ensure that the version of Node on your workstation matches one of the versions listed in this section. This sample will not work on a different version of Node.|
 |Refer to <https://aka.ms/spfx-matrix> for more information on SPFx compatibility.   |
 
-![SPFx 1.13.1](https://img.shields.io/badge/SPFx-1.13.1-green.svg)
+This sample is optimally compatible with the following environment configuration:
-![Node.js v14 | v12](https://img.shields.io/badge/Node.js-v14%20%7C%20v12-green.svg)
+
+![SPFx 1.16.1](https://img.shields.io/badge/SPFx-1.16.1-green.svg)
+![Node.js v16 | v14 | v12](https://img.shields.io/badge/Node.js-v16%20%7C%20v14%20%7C%20v12-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)-Incompatible-red.svg "SharePoint Server 2016 Feature Pack 2 requires SPFx 1.1")
@@ -184,7 +172,6 @@ In order to make it available to absolutely all sites you need apply the *Deploy
 * [Mikael Svenson](https://github.com/wobba) ([@mikaelsvenson](http://www.twitter.com/mikaelsvenson), [techmikael.com](techmikael.com))
 * [Felix Bohnacker](https://github.com/felixbohnackerfelixbohnacker)
 
-
 ## Version history
 
 Version|Date|Comments
@@ -210,6 +197,8 @@ Version|Date|Comments
 1.0.18.0|June 14, 2022|Upgrade to SPFx v1.13.1
 1.0.19.0|August 31, 2022|Added support for section background color
 1.0.20.0|October 10, 2022|Added sample html/script with self-executing function
+1.0.21.0|March 11, 2023|Bump dependencies to allow react-script-editor to build under SPFx 1.16.1
+
 
 ## Minimal Path to Awesome
 

samples/react-script-editor/assets/sample.json

@@ -9,7 +9,7 @@
       "Coming from old classic SharePoint pages you might have existing script solutions you want to re-use on a modern page without having to repackage it as a new SharePoint Framework web part."
     ],
     "creationDateTime": "2019-10-13",
-    "updateDateTime": "2022-08-31",
+    "updateDateTime": "2023-03-11",
     "products": [
       "SharePoint"
     ],
@@ -20,7 +20,7 @@
       },
       {
         "key": "SPFX-VERSION",
-        "value": "1.13.1"
+        "value": "1.16.1"
       },
       {
         "key": "SPFX-FULLPAGEAPP",

samples/react-script-editor/config/package-solution.json

@@ -3,7 +3,7 @@
     "solution": {
         "name": "Modern Script Editor web part by mikaelsvenson",
         "id": "1425175f-3ed8-44d2-8fc4-dd1497191294",
-        "version": "1.0.20.0",
+        "version": "1.0.21.0",
         "includeClientSideAssets": true,
         "skipFeatureDeployment": false,
         "isDomainIsolated": false,
@@ -18,4 +18,4 @@
     "paths": {
         "zippedPackage": "solution/pnp-script-editor.sppkg"
     }
-}
+}

samples/react-script-editor/package.json

@@ -1,37 +1,38 @@
 {
     "name": "pnp-script-editor",
-    "version": "1.0.20",
+    "version": "1.0.21",
     "private": true,
     "main": "lib/index.js",
     "resolutions": {
         "@types/react": "16.8.8"
     },
     "dependencies": {
-        "@microsoft/sp-core-library": "1.13.1",
+        "@microsoft/sp-core-library": "1.16.1",
-        "@microsoft/sp-loader": "1.13.1",
+        "@microsoft/sp-loader": "1.16.1",
-        "@microsoft/sp-lodash-subset": "1.13.1",
+        "@microsoft/sp-lodash-subset": "1.16.1",
-        "@microsoft/sp-property-pane": "1.13.1",
+        "@microsoft/sp-property-pane": "1.16.1",
-        "@microsoft/sp-webpart-base": "1.13.1",
+        "@microsoft/sp-webpart-base": "1.16.1",
-        "@pnp/spfx-controls-react": "2.4.0",
+        "@pnp/spfx-controls-react": "3.13.0",
-        "@pnp/spfx-property-controls": "2.3.0",
+        "@pnp/spfx-property-controls": "3.12.0",
         "office-ui-fabric-react": "7.174.1",
         "react": "16.13.1",
         "react-dom": "16.13.1"
     },
     "devDependencies": {
-        "@microsoft/rush-stack-compiler-3.2": "^0.6.3",
+        "@microsoft/rush-stack-compiler-3.2": "0.11.0",
-        "@microsoft/rush-stack-compiler-3.3": "0.3.5",
+        "@microsoft/rush-stack-compiler-3.3": "0.10.0",
-        "@microsoft/rush-stack-compiler-3.7": "0.2.3",
+        "@microsoft/rush-stack-compiler-3.7": "0.7.0",
-        "@microsoft/rush-stack-compiler-3.9": "0.4.47",
+        "@microsoft/rush-stack-compiler-3.9": "0.5.0",
-        "@microsoft/sp-build-web": "1.13.1",
+        "@microsoft/rush-stack-compiler-4.5": "0.4.0",
-        "@microsoft/sp-module-interfaces": "1.13.1",
+        "@microsoft/sp-build-web": "1.16.1",
-        "@microsoft/sp-tslint-rules": "1.13.1",
+        "@microsoft/sp-module-interfaces": "1.16.1",
+        "@microsoft/sp-tslint-rules": "1.16.1",
         "@types/chai": "3.4.34",
         "@types/mocha": "2.2.38",
-        "@types/react": "16.9.36",
+        "@types/react": "16.9.51",
         "@types/react-dom": "16.9.15",
         "@types/webpack-env": "1.13.1",
-        "ajv": "~5.2.2",
+        "ajv": "~8.2.0",
         "gulp": "4.0.2",
         "tslint-microsoft-contrib": "5.0.0",
         "webpack-bundle-analyzer": "^4.4.0"
@@ -41,4 +42,4 @@
         "clean": "gulp clean",
         "test": "gulp test"
     }
-}
+}

samples/react-script-editor/tslint.json

@@ -1,30 +0,0 @@
-{
-    "extends": "./node_modules/@microsoft/sp-tslint-rules/base-tslint.json",
-    "rules": {
-      "class-name": false,
-      "export-name": false,
-      "forin": false,
-      "label-position": false,
-      "member-access": true,
-      "no-arg": false,
-      "no-console": false,
-      "no-construct": false,
-      "no-duplicate-variable": true,
-      "no-eval": false,
-      "no-function-expression": true,
-      "no-internal-module": true,
-      "no-shadowed-variable": true,
-      "no-switch-case-fall-through": true,
-      "no-unnecessary-semicolons": true,
-      "no-unused-expression": true,
-      "no-use-before-declare": true,
-      "no-with-statement": true,
-      "semicolon": true,
-      "trailing-comma": false,
-      "typedef": false,
-      "typedef-whitespace": false,
-      "use-named-parameter": true,
-      "variable-name": false,
-      "whitespace": false
-    }
-  }