removing commonjs builds

.vscode/settings.json

@@ -6,8 +6,8 @@
         "**/node_modules": true,
         "coverage": true,
         ".nyc_output": true,
-        "build": true,
-        "dist": true,
+        "build": false,
+        "dist": false,
         "site": true,
         "buildsystem-config.js": true
     },

buildsystem-config.ts

@@ -14,8 +14,7 @@ export default <ConfigCollection>[
 
         // these tsconfig files will all be transpiled per the settings in the file
         buildTargets: [
-            resolve("./packages/tsconfig.esm.json"),
-            resolve("./packages/tsconfig.cjs.json"),
+            resolve("./packages/tsconfig.json"),
         ],
 
         postBuildTasks: [
@@ -36,8 +35,8 @@ export default <ConfigCollection>[
 
         packageTargets: [
             {
-                outDir: resolve("./dist/packages/esm"),
-                target: resolve("./packages/tsconfig.esm.json"),
+                outDir: resolve("./dist/packages"),
+                target: resolve("./packages/tsconfig.json"),
                 tasks: [
                     Tasks.Package.createCopyTargetFiles(),
                     Tasks.Package.copyStaticAssets,
@@ -67,61 +66,6 @@ export default <ConfigCollection>[
                     }),
                 ],
             },
-            {
-                outDir: resolve("./dist/packages/commonjs"),
-                target: resolve("./packages/tsconfig.cjs.json"),
-                tasks: [
-                    Tasks.Package.createCopyTargetFiles("", "", [function (file, _enconding, cb) {
-                        // we need to rewrite all the requires that use @pnp/something to be @pnp/something-commonjs
-
-                        if (/\.js$|\.d\.ts$/i.test(file.path)) {
-
-                            const content: string = file.contents.toString("utf8");
-                            file.contents = Buffer.from(content.replace(/"\@pnp\/(\w*?)([\/|"])/ig, `"@pnp/$1-commonjs$2`));
-                        }
-
-                        cb(null, file);
-                    }]),
-                    Tasks.Package.copyStaticAssets,
-                    Tasks.Package.createWritePackageFiles(p => {
-
-                        const newP = Object.assign({}, p, {
-                            funding: {
-                                "type": "individual",
-                                "url": "https://github.com/sponsors/patrick-rodgers/",
-                            },
-                            type: "commonjs",
-                        });
-
-                        // selective imports don't work in commonjs or matter for nodejs
-                        // so we retarget main to the preset for these libraries (and update typings pointer)
-                        if (newP.name.match(/\/sp$|\/graph$/)) {
-                            newP.main = "./presets/all.js";
-                            newP.typings = "./presets/all";
-                        }
-
-                        // update name field to include -commonjs
-                        newP.name = `${newP.name}-commonjs`;
-
-                        // and we need to rewrite the dependencies to point to the commonjs ones
-                        if (newP.dependencies) {
-                            const newDeps = {};
-                            for (const key in newP.dependencies) {
-
-                                if (key.startsWith("@pnp/")) {
-                                    newDeps[`${key}-commonjs`] = newP.dependencies[key];
-                                } else {
-                                    newDeps[key] = newP.dependencies[key];
-                                }
-                            }
-
-                            newP.dependencies = newDeps;
-                        }
-
-                        return newP;
-                    }),
-                ],
-            },
         ],
 
         postPackageTasks: [],
@@ -133,8 +77,7 @@ export default <ConfigCollection>[
         role: "publish",
 
         packageRoots: [
-            resolve("./dist/packages/esm"),
-            resolve("./dist/packages/commonjs"),
+            resolve("./dist/packages"),
         ],
 
         prePublishTasks: [],
@@ -174,8 +117,7 @@ export default <ConfigCollection>[
         role: "publish",
 
         packageRoots: [
-            resolve("./dist/packages/esm"),
-            resolve("./dist/packages/commonjs"),
+            resolve("./dist/packages"),
         ],
 
         prePublishTasks: [],
@@ -191,8 +133,7 @@ export default <ConfigCollection>[
         role: "publish",
 
         packageRoots: [
-            resolve("./dist/packages/esm"),
-            resolve("./dist/packages/commonjs"),
+            resolve("./dist/packages"),
         ],
 
         prePublishTasks: [Tasks.Publish.updateV3NightlyVersion],

packages/core/tsconfig.json

@@ -1,3 +1,10 @@
 {
-    "extends": "./tsconfig.esm.json"
+    "extends": "../tsconfig.json",
+    "include": [
+        "./**/*.ts"
+    ],
+    "compilerOptions": {
+        "esModuleInterop": true
+    },
+    "references": []
 }

packages/graph/tsconfig.json

@@ -1,3 +1,20 @@
 {
-    "extends": "./tsconfig.esm.json"
-}
+    "extends": "../tsconfig.json",
+    "include": [
+        "./**/*.ts",
+        "../core/**/*.ts",
+        "../logging/**/*.ts",
+        "../queryable/**/*.ts"
+    ],
+    "references": [
+        {
+            "path": "../core/tsconfig.json"
+        },
+        {
+            "path": "../logging/tsconfig.json"
+        },
+        {
+            "path": "../queryable/tsconfig.json"
+        }
+    ]
+}

packages/logging/tsconfig.json

@@ -1,3 +1,7 @@
 {
-    "extends": "./tsconfig.esm.json"
-}
+    "extends": "../tsconfig.json",
+    "include": [
+        "./**/*.ts"
+    ],
+    "references": []
+}

packages/msaljsclient/tsconfig.json

@@ -1,3 +1,12 @@
 {
-    "extends": "./tsconfig.esm.json"
-}
+    "extends": "../tsconfig.json",
+    "include": [
+        "./**/*.ts",
+        "../queryable/**/*.ts"
+    ],
+    "references": [
+        {
+            "path": "../queryable/tsconfig.json"
+        }
+    ]
+}

packages/nodejs/tsconfig.json

@@ -1,3 +1,28 @@
 {
-    "extends": "./tsconfig.esm.json"
-}
+    "extends": "../tsconfig.json",
+    "include": [
+        "./**/*.ts",
+        "../core/**/*.ts",
+        "../graph/**/*.ts",
+        "../queryable/**/*.ts",
+        "../logging/**/*.ts",
+        "../sp/**/*.ts"
+    ],
+    "references": [
+        {
+            "path": "../core/tsconfig.json"
+        },
+        {
+            "path": "../graph/tsconfig.json"
+        },
+        {
+            "path": "../logging/tsconfig.json"
+        },
+        {
+            "path": "../queryable/tsconfig.json"
+        },
+        {
+            "path": "../sp/tsconfig.json"
+        }
+    ]
+}