v3 launch prep, updates to esm fully done, all debugging works, all n…

…pm commands work, tests passing, deps updated
smolattack · Dec 17, 2021 · 3fb799e · 3fb799e
1 parent 448310a
commit 3fb799e
Show file tree

Hide file tree

Showing 26 changed files with 1,733 additions and 2,504 deletions.
diff --git a/.eslintrc.js → .eslintrc.cjs b/.eslintrc.js → .eslintrc.cjs
@@ -1,6 +1,6 @@
 module.exports = {
     root: true,
-    parser: '@typescript-eslint/parser',
+    parser: "@typescript-eslint/parser",
     parserOptions: {
         project: [
             "./tsconfig.json",
@@ -9,11 +9,11 @@ module.exports = {
         sourceType: "module",
     },
     plugins: [
-        '@typescript-eslint',
+        "@typescript-eslint",
     ],
     extends: [
-        'eslint:recommended',
-        'plugin:@typescript-eslint/recommended',
+        "eslint:recommended",
+        "plugin:@typescript-eslint/recommended",
     ],
     rules: {
         // updated to address conflicts with code base / typescript such as interface redeclare, etc.

diff --git a/debug/launch/v3-patrick.ts b/debug/launch/v3-patrick.ts
@@ -55,7 +55,9 @@ export async function Example(settings: ITestingSettings) {
             },
         })).using(PnPLogging(LogLevel.Verbose)); //.using(RequestRecorderCache(recordingPath, "record", () => false));
 
-        const i = await sp.web();
+        const i = await sp.web({
+            headers: {}
+        });
 
         console.log(i);
 

diff --git a/debug/serve/plumbing/run.ts b/debug/serve/plumbing/run.ts
@@ -1,6 +1,10 @@
 import { spawn } from "child_process";
 import { dirname, resolve } from "path";
 import findup from "findup-sync";
+import { fileURLToPath } from "url";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
 
 // give outselves a single reference to the projectRoot
 const projectRoot = resolve(dirname(findup("package.json")));

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -5,57 +5,49 @@
     "version": "3.0.0",
     "description": "A JavaScript library for SharePoint & Graph development.",
     "devDependencies": {
-        "@azure/msal-node": "^1.0.1",
-        "@microsoft/microsoft-graph-types": "^1.32.0",
+        "@azure/msal-node": "^1.4.0",
+        "@microsoft/microsoft-graph-types": "^2.11.0",
         "@pnp/buildsystem": "^3.0.2",
-        "@types/chai": "^4.2.22",
+        "@types/chai": "^4.3.0",
         "@types/chai-as-promised": "^7.1.4",
-        "@types/core-js": "^2.5.4",
-        "@types/es6-promise": "^3.3.0",
-        "@types/findup-sync": "^2.0.2",
-        "@types/gulp": "^4.0.8",
-        "@types/gulp-replace": "^0.0.31",
-        "@types/jsonwebtoken": "^8.5.0",
+        "@types/core-js": "^2.5.5",
+        "@types/findup-sync": "^4.0.2",
+        "@types/gulp": "^4.0.9",
+        "@types/jsonwebtoken": "^8.5.6",
         "@types/mocha": "^9.0.0",
-        "@types/node": "^14.14.34",
-        "@types/pump": "^1.1.1",
-        "@types/sharepoint": "^2016.1.9",
-        "@types/through2": "^2.0.36",
-        "@types/webpack": "^4.41.26",
-        "@types/whatwg-fetch": "^0.0.33",
-        "@types/yargs": "^16.0.0",
+        "@types/node": "^14.17.3",
+        "@types/webpack": "^5.28.0",
+        "@types/yargs": "^17.0.7",
         "@typescript-eslint/eslint-plugin": "^4.32.0",
         "@typescript-eslint/parser": "^4.32.0",
         "chai": "^4.3.4",
         "chai-as-promised": "^7.1.1",
-        "del-cli": "^3.0.1",
+        "del-cli": "^4.0.1",
         "eslint": "^7.32.0",
-        "findup-sync": "^4.0.0",
+        "findup-sync": "^5.0.0",
         "jsonwebtoken": "^8.5.1",
-        "mocha": "^9.1.2",
-        "msal": "^1.4.6",
+        "mocha": "^9.1.3",
+        "msal": "^1.4.15",
         "node-abort-controller": "^3.0.1",
         "node-fetch": "^2.6.1",
         "prettyjson": "^1.2.1",
         "stacktrace-js": "^2.0.2",
-        "string-replace-loader": "^3.0.1",
+        "string-replace-loader": "^3.1.0",
         "tslib": "^2.1.0",
         "typescript": "^4.2.3",
-        "webpack": "^5.26.0",
-        "webpack-cli": "^4.5.0",
-        "webpack-dev-server": "v4.0.0-beta.0",
+        "webpack": "^5.65.0",
+        "webpack-cli": "^4.9.1",
+        "webpack-dev-server": "v4.6.0",
         "yargs": "^16.2.0"
     },
     "scripts": {
         "build": "npm run pnp-buildsystem-init && pnpbuild -n build",
         "buildDebug": "npm run clean && npm run pnp-buildsystem-init && pnpbuild -n build-debug",
         "clean": "del-cli \"./?(dist|site|build|buildsystem-config.js)\"",
-        "clean-build": "npm run clean && npm run build",
-        "just-publish": "npm run pnp-buildsystem-init && pnpbuild -n publish",
         "lint": "eslint ./packages ./test --ext .ts",
+        "just-publish": "npm run pnp-buildsystem-init && pnpbuild -n publish",
         "package": "npm run build && pnpbuild -n package",
         "pnp-buildsystem-init": "tsc -p tsconfig.buildsystem.json",
-        "pnp-publish": "cd tools/publish && publish-win.bat",
         "pnp-publish-beta": "npm run clean && npm run package && pnpbuild -n publish-beta",
         "pnp-publish-v3nightly": "npm run clean && npm run package && pnpbuild -n publish-v3nightly",
         "serve": "tsc -p ./debug/serve/tsconfig.json && node ./build/server/debug/serve/plumbing/run.js",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -5,7 +5,7 @@
   "main": "./index.js",
   "typings": "./index",
   "dependencies": {
-    "tslib": "2.1.0"
+    "tslib": "2.3.1"
   },
   "author": {
     "name": "Microsoft and other contributors"

diff --git a/packages/graph/behaviors/telemetry.ts b/packages/graph/behaviors/telemetry.ts
@@ -9,6 +9,7 @@ export function Telemetry(): TimelinePipe<Queryable> {
 
             init.headers = { ...init.headers, ["SdkVersion"]: "PnPCoreJS/$$Version$$" };
 
+            // eslint-disable-next-line @typescript-eslint/dot-notation
             this.log(`Request Tag: ${init.headers["SdkVersion"]}`, 0);
 
             return [url, init, result];

diff --git a/packages/graph/package.json b/packages/graph/package.json
@@ -6,7 +6,7 @@
     "typings": "./index",
     "dependencies": {
         "@microsoft/microsoft-graph-types": "^1.32.0",
-        "tslib": "2.1.0",
+        "tslib": "2.3.1",
         "@pnp/core": "0.0.0-PLACEHOLDER",
         "@pnp/queryable": "0.0.0-PLACEHOLDER"
     },

diff --git a/packages/logging/package.json b/packages/logging/package.json
@@ -5,7 +5,7 @@
   "main": "./index.js",
   "typings": "./index",
   "dependencies": {
-    "tslib": "2.1.0"
+    "tslib": "2.3.1"
   },
   "author": {
     "name": "Microsoft and other contributors"

diff --git a/packages/msaljsclient/package.json b/packages/msaljsclient/package.json
@@ -6,8 +6,8 @@
     "typings": "./index",
     "dependencies": {
         "@pnp/queryable": "0.0.0-PLACEHOLDER",
-        "msal": "1.4.6",
-        "tslib": "2.1.0"
+        "msal": "1.4.15",
+        "tslib": "2.3.1"
     },
     "author": {
         "name": "Microsoft and other contributors"

diff --git a/packages/nodejs/behaviors/fetch.ts b/packages/nodejs/behaviors/fetch.ts
@@ -11,7 +11,7 @@ export function NodeFetch(): TimelinePipe<Queryable> {
 
             this.log(`Fetch: ${init.method} ${url.toString()}`, LogLevel.Verbose);
 
-            return nodeFetch(url.toString(), init);
+            return <any>nodeFetch(url.toString(), <any>init);
         });
 
         return instance;
@@ -63,7 +63,7 @@ export function NodeFetchWithRetry(retries = 3, interval = 200): TimelinePipe<Qu
 
                         this.log(`Fetch: ${init.method} ${url.toString()}`, LogLevel.Verbose);
 
-                        response = await nodeFetch(url.toString(), init);
+                        response = await <any>nodeFetch(url.toString(), <any>init);
 
                         // if we got a good response, return it, otherwise see if we can retry
                         return response.ok ? response : retry();

diff --git a/packages/nodejs/package.json b/packages/nodejs/package.json
@@ -5,14 +5,14 @@
     "main": "./index.js",
     "typings": "./index",
     "dependencies": {
-        "@azure/msal-node": "^1.0.1",
+        "@azure/msal-node": "^1.4.0",
         "@pnp/core": "0.0.0-PLACEHOLDER",
         "@pnp/logging": "0.0.0-PLACEHOLDER",
         "@pnp/queryable": "0.0.0-PLACEHOLDER",
         "@pnp/sp": "0.0.0-PLACEHOLDER",
         "@pnp/graph": "0.0.0-PLACEHOLDER",
-        "node-fetch": "2.6.1",
-        "tslib": "2.1.0"
+        "node-fetch": "3.1.0",
+        "tslib": "2.3.1"
     },
     "author": {
         "name": "Microsoft and other contributors"

diff --git a/packages/queryable/package.json b/packages/queryable/package.json
@@ -5,7 +5,7 @@
   "main": "./index.js",
   "typings": "./index",
   "dependencies": {
-    "tslib": "2.1.0",
+    "tslib": "2.3.1",
     "@pnp/core": "0.0.0-PLACEHOLDER"
   },
   "author": {

diff --git a/packages/sp/package.json b/packages/sp/package.json
@@ -5,7 +5,7 @@
   "main": "./index.js",
   "typings": "./index",
   "dependencies": {
-    "tslib": "2.1.0",
+    "tslib": "2.3.1",
     "@pnp/core": "0.0.0-PLACEHOLDER",
     "@pnp/queryable": "0.0.0-PLACEHOLDER"
   },

diff --git a/samples/nodejs-app/package-lock.json b/samples/nodejs-app/package-lock.json
diff --git a/test/core/util.ts b/test/core/util.ts
@@ -191,10 +191,15 @@ describe("hOP", function () {
         // eslint-disable-next-line @typescript-eslint/no-unused-expressions
         expect(hOP({ test: true }, "test")).to.be.true;
     });
+    it("Fail", function () {
+        // eslint-disable-next-line @typescript-eslint/no-unused-expressions
+        expect(hOP({ test: true }, "nope")).to.be.false;
+    });
 });
 
 describe("getHashCode", function () {
     it("Success", function () {
         expect(getHashCode("test string value")).to.be.a("number");
+        expect(getHashCode("test string value !@#$%^&*()_+{}<>,.?/'\"")).to.be.a("number");
     });
 });
diff --git a/test/graph/calendars.ts b/test/graph/calendars.ts
@@ -24,7 +24,7 @@ describe("Calendar", function () {
 
         _graphfi = getGraph();
 
-        const userInfo = await getValidUser();
+        const userInfo = await getValidUser(this.settings.testUser);
         testUserName = userInfo.userPrincipalName;
 
         // Get default calendar

diff --git a/test/graph/directoryobjects.ts b/test/graph/directoryobjects.ts
@@ -26,7 +26,7 @@ describe("Directory Objects", function () {
         _graphfi = getGraph();
 
         // Get a sample user
-        userInfo = await getValidUser();
+        userInfo = await getValidUser(this.settings.testUser);
         testUserName = userInfo.userPrincipalName;
 
         // Create a test group to ensure we have a directory object

diff --git a/test/graph/outlook.ts b/test/graph/outlook.ts
@@ -22,7 +22,7 @@ describe("Outlook", function () {
         }
 
         _graphfi = getGraph();
-        const userInfo = await getValidUser();
+        const userInfo = await getValidUser(this.settings.testUser);
         testUserName = userInfo.userPrincipalName;
     });
 

diff --git a/test/graph/teams.ts b/test/graph/teams.ts
@@ -21,7 +21,7 @@ describe("Teams", function () {
         }
 
         _graphfi = getGraph();
-        const userInfo = await getValidUser();
+        const userInfo = await getValidUser(this.settings.testUser);
         testUserId = userInfo.id;
         teamBody = {
             "[email protected]": "https://graph.microsoft.com/v1.0/teamsTemplates('standard')",

diff --git a/test/graph/utilities/getValidUser.ts b/test/graph/utilities/getValidUser.ts
@@ -7,13 +7,13 @@ import { getGraph } from "../../main.js";
 let cachedValidUser = null;
 const usersToCheck = 20;
 
-export default async function getValidUser(ignoreCache = false): Promise<IUser> {
+export default async function getValidUser(userName: string, ignoreCache = false): Promise<IUser> {
 
     if (!ignoreCache && cachedValidUser !== null) {
         return cachedValidUser;
     }
 
-    const testUserName = this.settings.testUser.substring(this.settings.testUser.lastIndexOf("|") + 1);
+    const testUserName = userName.substring(userName.lastIndexOf("|") + 1);
 
     try {
         const _graphFI: GraphFI = getGraph();

diff --git a/test/main.ts b/test/main.ts
@@ -88,11 +88,13 @@ function readEnvVar(key: string, parse = false): any {
 
 async function loadSettings(md: typeof mode): Promise<ITestingSettings> {
 
+    let settings: ITestingSettings = null;
+
     switch (md) {
 
         case "online":
 
-            return {
+            settings = {
                 testing: {
                     testUser: readEnvVar("PNPTESTING_TESTUSER") || null,
                     enableWebTests: true,
@@ -112,25 +114,27 @@ async function loadSettings(md: typeof mode): Promise<ITestingSettings> {
                     },
                 },
             };
+            break;
 
         case "online-noweb":
 
-            return {
+            settings = {
                 testing: {
                     enableWebTests: false,
                 },
             };
+            break;
 
         default:
 
-            const settings = await import(findup("settings.js")).then(s => s.settings);
+            settings = await import(findup("settings.js")).then(s => s.settings);
 
             if (skipWeb) {
                 settings.testing.enableWebTests = false;
             }
-
-            return settings;
     }
+
+    return settings;
 }
 
 

diff --git a/test/queryable/behaviors.ts b/test/queryable/behaviors.ts
@@ -182,7 +182,7 @@ describe("Behaviors", function () {
         query.using(Timeout(controller.signal));
         query.using(ResolveOnData(), RejectOnError());
 
-        query.on.send.replace(async (url, init) => nodeFetch(url, init));
+        query.on.send.replace(async (url, init) => <any>nodeFetch(url.toString(), <any>init));
 
         try {