Merge pull request #5270 from mohammadamer/react-calendar-department-…

…filter
pnp · Oct 12, 2024 · cb63f09 · cb63f09
2 parents ad43081 + e8822bb
commit cb63f09
Show file tree

Hide file tree

Showing 15 changed files with 62,461 additions and 24,173 deletions.
diff --git a/samples/react-calendar/.devcontainer/devcontainer.json b/samples/react-calendar/.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.12.1",
-	"image": "docker.io/m365pnp/spfx:1.12.1",
+	"name": "SPFx 1.16.1",
+	"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.

diff --git a/samples/react-calendar/.nvmrc b/samples/react-calendar/.nvmrc
@@ -1 +1,2 @@
-v12.13.0
+v16.20.2
+npm 
diff --git a/samples/react-calendar/.yo-rc.json b/samples/react-calendar/.yo-rc.json
@@ -1,28 +1,16 @@
 {
-  "@pnp/generator-spfx": {
-    "framework": "react",
-    "pnpFramework": "reactjs.plus",
-    "pnp-libraries": [
-      "jquery@3",
-      "@pnp/pnpjs",
-      "@pnp/spfx-property-controls",
-      "@pnp/spfx-controls-react"
-    ],
-    "pnp-ci": [
-      "azure"
-    ],
-    "pnp-vetting": [
-      "webpack-analyzer",
-      "stylelint"
-    ],
-    "spfxenv": "spo"
-  },
   "@microsoft/generator-sharepoint": {
-    "environment": "spo",
-    "framework": "react",
-    "plusBeta": true,
+    "@microsoft/generator-sharepoint": {
+      "nodeVersion": "16.20.2"
+    },
+    "sdksVersions": {
+      "@microsoft/microsoft-graph-client": "3.0.2",
+      "@microsoft/teams-js": "2.4.1"
+    },
+    "plusBeta": false,
     "isCreatingSolution": true,
-    "version": "1.12.1",
+    "environment": "spo",
+    "version": "1.16.1",
     "libraryName": "react-calendar",
     "libraryId": "3a13208b-3874-4036-9262-4edd22e88187",
     "packageManager": "npm",

diff --git a/samples/react-calendar/README.md b/samples/react-calendar/README.md
@@ -57,8 +57,8 @@ The Web Part checks the user's permissions for the View, Add, Edit, and Delete e
 | 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.12.1](https://img.shields.io/badge/SPFx-1.12.1-green.svg)
-![Node.js v14 | v12 | v10](https://img.shields.io/badge/Node.js-v14%20%7C%20v12%20%7C%20v10-green.svg)
+![SPFx 1.16.1](https://img.shields.io/badge/SPFx-1.16.1-green.svg)
+![Node.js v16](https://img.shields.io/badge/Node.js-v16-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")
@@ -116,6 +116,7 @@ Version|Date|Comments
 1.0.17|October 25, 2022|Fixed issue deleting events (#2693)
 1.0.18|December 29, 2022|Fixed stylelint issue (#4029)| Cleaned up old Type script versions and Upgraded Type script version
 1.0.19|June 28, 2024| added filter by category | fixed the packages.json issues which prevent solution to build successfully.
+1.0.20|October 1, 2024| upgraded to SPFx 1.16.1
 
 ## Minimal Path to Awesome
 

diff --git a/samples/react-calendar/assets/sample.json b/samples/react-calendar/assets/sample.json
@@ -9,7 +9,7 @@
       "This Web Part allows you to manage events in a calendar. Uses a list of existing calendars on any website. The location and name of the list and the dates of the events to be displayed are defined in the properties of the web part."
     ],
     "creationDateTime": "2020-12-04",
-    "updateDateTime": "2024-06-28",
+    "updateDateTime": "2024-10-01",
     "products": [
       "SharePoint"
     ],
@@ -20,7 +20,7 @@
       },
       {
         "key": "SPFX-VERSION",
-        "value": "1.12.1"
+        "value": "1.16.1"
       },
       {
         "key": "SPFX-TEAMSTAB",

diff --git a/samples/react-calendar/config/package-solution.json b/samples/react-calendar/config/package-solution.json
@@ -3,12 +3,12 @@
   "solution": {
     "name": "react-calendar-client-side-solution",
     "id": "3a13208b-3874-4036-9262-4edd22e88187",
-    "version": "1.0.19.0",
+    "version": "1.0.20.0",
     "includeClientSideAssets": true,
     "skipFeatureDeployment": true,
     "isDomainIsolated": false
   },
   "paths": {
     "zippedPackage": "solution/react-calendar.sppkg"
   }
-}
+}
diff --git a/samples/react-calendar/config/sass.json b/samples/react-calendar/config/sass.json
@@ -0,0 +1,3 @@
+{
+    "$schema": "https://developer.microsoft.com/json-schemas/core-build/sass.schema.json"
+}  
diff --git a/samples/react-calendar/config/serve.json b/samples/react-calendar/config/serve.json
@@ -2,5 +2,5 @@
   "$schema": "https://developer.microsoft.com/json-schemas/spfx-build/spfx-serve.schema.json",
   "port": 4321,
   "https": true,
-  "initialPage": "https://cotoso.sharepoint.com/_layouts/workbench.aspx"
+  "initialPage": "https://contoso.sharepoint.com/_layouts/workbench.aspx"
 }