Merge branch 'main' into upgraded-to-spfx-issue-5240-v1.20.0

pnp · Oct 28, 2024 · cda5db9 · cda5db9
2 parents c57544b + c7a4d95
commit cda5db9
Show file tree

Hide file tree

Showing 36 changed files with 78,187 additions and 75,483 deletions.
diff --git a/.metadata/samples.json b/.metadata/samples.json
@@ -14123,7 +14123,7 @@
       "This web part provides easy way to render SharePoint custom list in data table view with all the necessary features."
     ],
     "creationDateTime": "2021-03-01",
-    "updateDateTime": "2022-11-01",
+    "updateDateTime": "2024-10-20",
     "products": [
       "SharePoint"
     ],
@@ -14134,7 +14134,7 @@
       },
       {
         "key": "SPFX-VERSION",
-        "value": "1.14.0"
+        "value": "1.20.0"
       },
       {
         "key": "PNPCONTROLS",
@@ -24186,7 +24186,7 @@
       "Shows how to use PnPjs in a React web part"
     ],
     "creationDateTime": "2023-02-18",
-    "updateDateTime": "2023-02-18",
+    "updateDateTime": "2024-10-23",
     "products": [
       "SharePoint"
     ],
@@ -24197,7 +24197,7 @@
       },
       {
         "key": "SPFX-VERSION",
-        "value": "1.15.2"
+        "value": "1.20.0"
       }
     ],
     "thumbnails": [
@@ -24218,6 +24218,11 @@
         "gitHubAccount": "bcameron1231",
         "name": "Beau Cameron",
         "pictureUrl": "https://github.com/bcameron1231.png"
+      },
+      {
+        "gitHubAccount": "gretchunkim",
+        "name": "Gretchun Kim",
+        "pictureUrl": "https://github.com/gretchunkim.png"
       }
     ],
     "references": [

diff --git a/samples/angularelements-helloworld/package-lock.json b/samples/angularelements-helloworld/package-lock.json
diff --git a/samples/react-datatable/.devcontainer/devcontainer.json b/samples/react-datatable/.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.14.0",
-	"image": "docker.io/m365pnp/spfx:1.14.0",
+	"name": "SPFx 1.20.0",
+	"image": "docker.io/m365pnp/spfx:1.20.0",
 	// Set *default* container specific settings.json values on container create.
 	"settings": {},
 	// Add the IDs of extensions you want installed when the container is created.

diff --git a/samples/react-datatable/.eslintrc.js b/samples/react-datatable/.eslintrc.js
@@ -0,0 +1,5 @@
+require('@rushstack/eslint-config/patch/modern-module-resolution');
+module.exports = {
+  extends: ['@microsoft/eslint-config-spfx/lib/profiles/react'],
+  parserOptions: { tsconfigRootDir: __dirname }
+};
diff --git a/samples/react-datatable/.gitignore b/samples/react-datatable/.gitignore
@@ -13,6 +13,7 @@ release
 solution
 temp
 *.sppkg
+.heft
 
 # Coverage directory used by tools like istanbul
 coverage

diff --git a/samples/react-datatable/.nvmrc b/samples/react-datatable/.nvmrc
@@ -0,0 +1 @@
+18.19.1
diff --git a/samples/react-datatable/.yo-rc.json b/samples/react-datatable/.yo-rc.json
@@ -1,9 +1,16 @@
 {
-  "@microsoft/generator-sharepoint": {
+    "@microsoft/generator-sharepoint": {
+      "@microsoft/generator-sharepoint": {
+        "nodeVersion": "18.19.1"
+      },
+      "sdksVersions": {
+        "@microsoft/microsoft-graph-client": "3.0.2",
+        "@microsoft/teams-js": "2.24.0"
+      },
     "plusBeta": false,
     "isCreatingSolution": true,
     "environment": "spo",
-    "version": "1.14.0",
+    "version": "1.20.0",
     "libraryName": "react-datatable",
     "libraryId": "35299377-f8c8-4721-bd53-05602fc0c4ee",
     "packageManager": "npm",

diff --git a/samples/react-datatable/README.md b/samples/react-datatable/README.md
@@ -22,8 +22,8 @@ This web part provides easy way to render SharePoint custom list in datatable vi
 | 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.|
 |Refer to <https://aka.ms/spfx-matrix> for more information on SPFx compatibility.   |
 
-![SPFx 1.14](https://img.shields.io/badge/SPFx-1.14-green.svg)
-![Node.js v14 | v12](https://img.shields.io/badge/Node.js-v14%20%7C%20v12-green.svg)
+![SPFx 1.20.0](https://img.shields.io/badge/SPFx-1.20.0-green.svg)
+![Node.js v18 ](https://img.shields.io/badge/Node.js-v18-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")
@@ -40,6 +40,7 @@ This web part provides easy way to render SharePoint custom list in datatable vi
 
 - [Chandani Prajapati](https://github.com/chandaniprajapati) 
 - [Abderahman Moujahid](https://github.com/Abderahman88)
+- [Mohammad Amer](https://github.com/mohammadamer)
 
 ## Version history
 
@@ -54,6 +55,7 @@ Version|Date|Comments
 1.6|July 16, 2021|Changed library export-to-csv with react-csv
 1.7|Feb 22, 2022|Upgrade to SPFx v1.14.0
 1.8|November 01, 2022|Added support for list attachments
+1.9|October 20, 2024|Upgraded to SPFx v1.20.0
 
 ## Minimal Path to Awesome
 

diff --git a/samples/react-datatable/assets/sample.json b/samples/react-datatable/assets/sample.json
@@ -9,7 +9,7 @@
       "This web part provides easy way to render SharePoint custom list in data table view with all the necessary features."
     ],
     "creationDateTime": "2021-03-01",
-    "updateDateTime": "2022-11-01",
+    "updateDateTime": "2024-10-20",
     "products": [
       "SharePoint"
     ],
@@ -20,7 +20,7 @@
       },
       {
         "key": "SPFX-VERSION",
-        "value": "1.14.0"
+        "value": "1.20.0"
       },
       {
         "key": "PNPCONTROLS",

diff --git a/samples/react-datatable/config/package-solution.json b/samples/react-datatable/config/package-solution.json
@@ -3,7 +3,7 @@
   "solution": {
     "name": "react-datatable-client-side-solution",
     "id": "35299377-f8c8-4721-bd53-05602fc0c4ee",
-    "version": "1.5.0.0",
+    "version": "1.9.0.0",
     "includeClientSideAssets": true,
     "isDomainIsolated": false,
     "developer": {

diff --git a/samples/react-datatable/config/sass.json b/samples/react-datatable/config/sass.json
@@ -0,0 +1,3 @@
+{
+    "$schema": "https://developer.microsoft.com/json-schemas/core-build/sass.schema.json"
+}
diff --git a/samples/react-datatable/config/serve.json b/samples/react-datatable/config/serve.json
@@ -1,6 +1,6 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/core-build/serve.schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/spfx-build/spfx-serve.schema.json",
   "port": 4321,
   "https": true,
-  "initialPage": "https://enter-your-SharePoint-site/_layouts/workbench.aspx"
-}
+  "initialPage": "https://contoso.sharepoint.com/_layouts/workbench.aspx"
+}