upgrade packages

samples/js-advanced-commenting/.gitignore

@@ -12,6 +12,7 @@ lib
 solution
 temp
 *.sppkg
+release
 
 # Coverage directory used by tools like istanbul
 coverage
@@ -30,3 +31,5 @@ obj
 
 # Styles Generated Code
 *.scss.ts
+
+.heft

samples/js-advanced-commenting/.npmignore

@@ -0,0 +1,18 @@
+!dist
+config
+
+gulpfile.js
+
+release
+src
+temp
+
+tsconfig.json
+tslint.json
+
+*.log
+
+.yo-rc.json
+.vscode
+
+src

samples/js-advanced-commenting/.yo-rc.json

@@ -2,7 +2,7 @@
   "@microsoft/generator-sharepoint": {
     "isCreatingSolution": true,
     "environment": "spo",
-    "version": "1.9.1",
+    "version": "1.15.2",
     "libraryName": "modern-page-comments",
     "libraryId": "cfa8dbcf-b32d-4de0-a6ba-af486007c2f2",
     "packageManager": "npm",

samples/js-advanced-commenting/config/copy-assets.json

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

samples/js-advanced-commenting/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": "modern-page-comments",
   "accessKey": "<!-- ACCESS KEY -->"

samples/js-advanced-commenting/config/package-solution.json

@@ -3,9 +3,35 @@
   "solution": {
     "name": "Advanced Comments Box",
     "id": "cfa8dbcf-b32d-4de0-a6ba-af486007c2f2",
-    "version": "1.1.0.2",
+    "version": "1.2.0.0",
     "includeClientSideAssets": true,
-    "isDomainIsolated": false
+    "isDomainIsolated": false,
+    "developer": {
+      "name": "",
+      "privacyUrl": "",
+      "termsOfUseUrl": "",
+      "websiteUrl": "",
+      "mpnId": "Undefined-1.15.0"
+    },
+    "metadata": {
+      "shortDescription": {
+        "default": "modern-page-comments description"
+      },
+      "longDescription": {
+        "default": "modern-page-comments description"
+      },
+      "screenshotPaths": [],
+      "videoUrl": "",
+      "categories": []
+    },
+    "features": [
+      {
+        "title": "modern-page-comments Feature",
+        "description": "The feature that activates elements of the modern-page-comments solution.",
+        "id": "a12aae38-ac3f-48e9-892f-411d99d97d3c",
+        "version": "1.2.0.0"
+      }
+    ]
   },
   "paths": {
     "zippedPackage": "solution/advanced-comments-box.sppkg"

samples/js-advanced-commenting/config/serve.json

@@ -1,10 +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://localhost:5432/workbench",
+  "initialPage": "https://enter-your-SharePoint-site/_layouts/workbench.aspx"
-  "api": {
-    "port": 5432,
-    "entryPath": "node_modules/@microsoft/sp-webpart-workbench/lib/api/"
-  }
 }

samples/js-advanced-commenting/gulpfile.js

@@ -3,5 +3,12 @@
 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/js-advanced-commenting/package.json

@@ -1,38 +1,41 @@
 {
   "name": "modern-page-comments",
-  "version": "0.0.1",
+  "version": "1.2.0",
   "private": true,
   "main": "lib/index.js",
-  "engines": {
-    "node": ">=0.10.0"
-  },
   "scripts": {
     "build": "gulp bundle",
     "clean": "gulp clean",
     "test": "gulp test"
   },
   "dependencies": {
-    "@microsoft/sp-core-library": "1.9.1",
+    "@microsoft/sp-adaptive-card-extension-base": "1.15.2",
-    "@microsoft/sp-lodash-subset": "1.9.1",
+    "@microsoft/sp-core-library": "1.15.2",
-    "@microsoft/sp-office-ui-fabric-core": "1.9.1",
+    "@microsoft/sp-lodash-subset": "1.15.2",
-    "@microsoft/sp-webpart-base": "1.9.1",
+    "@microsoft/sp-office-ui-fabric-core": "1.15.2",
+    "@microsoft/sp-property-pane": "1.15.2",
+    "@microsoft/sp-webpart-base": "1.15.2",
     "@pnp/sp": "^2.0.0",
     "@pnp/spfx-property-controls": "1.16.0",
-    "@types/es6-promise": "0.0.33",
     "@types/jquery": "^2.0.54",
-    "@types/webpack-env": "1.13.1",
     "jquery": "^3.5.0",
-    "moment": "^2.29.2"
+    "moment": "^2.29.2",
+    "tslib": "2.3.1"
   },
   "devDependencies": {
-    "@microsoft/sp-build-web": "1.15.2",
+    "@microsoft/eslint-config-spfx": "1.15.2",
-    "@microsoft/sp-tslint-rules": "1.9.1",
+    "@microsoft/eslint-plugin-spfx": "1.15.2",
-    "@microsoft/sp-module-interfaces": "1.9.1",
-    "@microsoft/sp-webpart-workbench": "1.12.1",
     "@microsoft/rush-stack-compiler-2.9": "0.7.16",
-    "gulp": "~3.9.1",
+    "@microsoft/rush-stack-compiler-4.5": "0.2.2",
-    "@types/chai": "3.4.34",
+    "@microsoft/sp-build-web": "1.15.2",
-    "@types/mocha": "2.2.38",
+    "@microsoft/sp-module-interfaces": "1.15.2",
-    "ajv": "~5.2.2"
+    "@rushstack/eslint-config": "2.5.1",
+    "@types/es6-promise": "0.0.33",
+    "@types/react": "^18.0.21",
+    "@types/webpack-env": "1.15.2",
+    "ajv": "6.12.5",
+    "eslint": "8.7.0",
+    "gulp": "4.0.2",
+    "typescript": "4.5.5"
   }
 }

samples/js-advanced-commenting/src/webparts/pageComments/PageCommentsWebPart.ts

@@ -1,10 +1,6 @@
 import * as React from 'react';
 import { Version } from '@microsoft/sp-core-library';
-import {
+
-  BaseClientSideWebPart,
-  IPropertyPaneConfiguration,
-  PropertyPaneTextField
-} from '@microsoft/sp-webpart-base';
 import { SPComponentLoader } from '@microsoft/sp-loader';
 import { CalloutTriggers } from '@pnp/spfx-property-controls/lib/PropertyFieldHeader';
 import { PropertyFieldSliderWithCallout } from '@pnp/spfx-property-controls/lib/PropertyFieldSliderWithCallout';
@@ -12,7 +8,8 @@ import { PropertyFieldToggleWithCallout } from '@pnp/spfx-property-controls/lib/
 import { PropertyFieldListPicker, PropertyFieldListPickerOrderBy } from '@pnp/spfx-property-controls/lib/PropertyFieldListPicker';
 import * as _ from "lodash";
 import * as moment from 'moment';
-
+import { BaseClientSideWebPart } from "@microsoft/sp-webpart-base";
+import { IPropertyPaneConfiguration, PropertyPaneTextField } from "@microsoft/sp-property-pane";
 import styles from './PageCommentsWebPart.module.scss';
 import * as strings from 'PageCommentsWebPartStrings';
 

samples/js-advanced-commenting/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-4.5/includes/tsconfig-web.json",
   "compilerOptions": {
     "target": "es5",
     "forceConsistentCasingInFileNames": true,
@@ -11,6 +11,7 @@
     "experimentalDecorators": true,
     "skipLibCheck": true,
     "outDir": "lib",
+    "noImplicitAny": false,
     "inlineSources": false,
     "strictNullChecks": false,
     "noUnusedLocals": false,
@@ -19,20 +20,18 @@
       "./node_modules/@microsoft"
     ],
     "types": [
-      "es6-promise",
+      "webpack-env",
-      "webpack-env"
     ],
     "lib": [
       "es5",
       "dom",
-      "es2015.collection"
+      "es2015.collection",
+      "es2015.promise"
     ]
   },
   "include": [
-    "src/**/*.ts"
+    "src/**/*.ts",
+    "src/**/*.tsx"
   ],
-  "exclude": [
+  "exclude": []
-    "node_modules",
-    "lib"
-  ]
 }

samples/js-advanced-commenting/tslint.json

@@ -1,30 +0,0 @@
-{
-  "extends": "@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
-  }
-}