Merge pull request #2878 from patrick-rodgers/version-4

commonjs work
pnp · Dec 27, 2023 · 67e87e9 · 67e87e9
2 parents 973e2d0 + 66d8f24
commit 67e87e9
Show file tree

Hide file tree

Showing 26 changed files with 333 additions and 107 deletions.
diff --git a/buildsystem-config.ts b/buildsystem-config.ts
@@ -33,24 +33,7 @@ function PnPBuild(buildFlags?: string[]): (b: BuildTimeline) => BuildTimeline {
     return (instance: BuildTimeline) => {
 
         Build(buildFlags)(instance);
-        ReplaceVersion(["sp/behaviors/telemetry.js", "graph/behaviors/telemetry.js"])(instance);
-
-        return instance;
-    }
-}
-
-function PnPBuildCommonJS(buildFlags?: string[]): (b: BuildTimeline) => BuildTimeline {
-
-    if (!buildFlags) {
-        buildFlags = [];
-    }
-
-    buildFlags.push("--module", "commonjs", "--outDir", "./buildcjs")
-
-    return (instance: BuildTimeline) => {
-
-        Build(buildFlags)(instance);
-        ReplaceVersion([resolve("./buildcjs/packages/sp/behaviors/telemetry.js"), resolve("./buildcjs/packages/graph/behaviors/telemetry.js")], { pathsResolved: true })(instance);
+        ReplaceVersion(["sp/behaviors/telemetry.js", "graph/behaviors/telemetry.js"], {})(instance);
 
         return instance;
     }
@@ -66,13 +49,11 @@ function PnPPackage(): (b: BuildTimeline) => BuildTimeline {
         CopyPackageFiles("built", ["**/*.d.ts", "**/*.js", "**/*.js.map", "**/*.d.ts.map"])(instance);
         WritePackageJSON((p) => {
             return Object.assign({}, p, {
-                funding: {
-                    type: "individual",
-                    url: "https://github.com/sponsors/patrick-rodgers/",
-                },
                 type: "module",
+                main: "./esm/index.js",
+                typings: "./esm/index",
                 engines: {
-                    node: ">=14.15.1"
+                    node: ">=18.12.0"
                 },
                 author: {
                     name: "Microsoft and other contributors"
@@ -85,7 +66,24 @@ function PnPPackage(): (b: BuildTimeline) => BuildTimeline {
                 repository: {
                     type: "git",
                     url: "git:github.com/pnp/pnpjs"
-                }
+                },
+                exports: {
+                    ".": {
+                        "import": {
+                            "types": "./esm/index",
+                            "default": "./esm/index.js"
+                        },
+                        "require": {
+                            "types": "./commonjs/index",
+                            "default": "./commonjs/index.js"
+                        },
+                        "default": "./esm/index.js"
+                    }
+                },
+                funding: {
+                    type: "individual",
+                    url: "https://github.com/sponsors/patrick-rodgers/",
+                },
             });
         })(instance);
 
@@ -112,6 +110,7 @@ export default <BuildSchema[]>[{
     distFolder,
     targets: [
         resolve("./packages/tsconfig.json"),
+        resolve("./packages/tsconfig-commonjs.json"),
     ],
     behaviors: [PnPBuild(), ...commonBehaviors],
 },
@@ -121,31 +120,32 @@ export default <BuildSchema[]>[{
     targets: [
         resolve("./debug/launch/tsconfig.json"),
     ],
-    behaviors: [Build(), ReplaceVersion(["packages/sp/behaviors/telemetry.js", "packages/graph/behaviors/telemetry.js"]), ...commonBehaviors],
+    behaviors: [Build(), ReplaceVersion(["packages/sp/behaviors/telemetry.js", "packages/graph/behaviors/telemetry.js"], {}), ...commonBehaviors],
 },
 {
     name: "package",
     distFolder,
     targets: [
         resolve("./packages/tsconfig.json"),
+        resolve("./packages/tsconfig-commonjs.json"),
     ],
-    behaviors: [PnPBuild(), PnPBuildCommonJS(), PnPPackage(), ...commonBehaviors],
+    behaviors: [PnPBuild(), PnPPackage(), ...commonBehaviors],
 },
 {
     name: "publish",
     distFolder,
     targets: [
         resolve("./packages/tsconfig.json"),
     ],
-    behaviors: [PnPBuild(), PnPBuildCommonJS(), PnPPackage(), PnPPublish(commonPublishTags), ...commonBehaviors],
+    behaviors: [PnPBuild(), PnPPackage(), PnPPublish(commonPublishTags), ...commonBehaviors],
 },
 {
     name: "publish-beta",
     distFolder,
     targets: [
         resolve("./packages/tsconfig.json"),
     ],
-    behaviors: [PnPBuild(), PnPBuildCommonJS(), PnPPackage(), PnPPublish([...commonPublishTags, "--tag", "beta"]), ...commonBehaviors],
+    behaviors: [PnPBuild(), PnPPackage(), PnPPublish([...commonPublishTags, "--tag", "beta"]), ...commonBehaviors],
 },
 {
     name: "publish-v3nightly",
@@ -161,5 +161,5 @@ export default <BuildSchema[]>[{
     targets: [
         resolve("./packages/tsconfig.json"),
     ],
-    behaviors: [PnPBuild(), PnPBuildCommonJS(), PnPPackage(), PublishNightly([...commonPublishTags], "v4nightly"), ...commonBehaviors],
+    behaviors: [PnPBuild(), PnPPackage(), PublishNightly([...commonPublishTags], "v4nightly"), ...commonBehaviors],
 }];
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
         "@azure/identity": "3.3.0",
         "@azure/msal-node": "1.18.3",
         "@microsoft/microsoft-graph-types": "2.38.0",
-        "@pnp/buildsystem": "^4.0.0-beta5",
+        "@pnp/buildsystem": "^4.0.0-beta7",
         "@pnp/logging": "^3.21.0",
         "@types/chai": "4.3.6",
         "@types/chai-as-promised": "7.1.6",
@@ -26,6 +26,7 @@
         "del-cli": "5.1.0",
         "eslint": "8.49.0",
         "findup-sync": "5.0.0",
+        "globby": "^14.0.0",
         "mocha": "10.2.0",
         "msal": "1.4.18",
         "node-fetch": "3.3.2",

diff --git a/packages/azidjsclient/tsconfig-commonjs.json b/packages/azidjsclient/tsconfig-commonjs.json
@@ -0,0 +1,12 @@
+{
+    "extends": "../tsconfig-commonjs.json",
+    "include": [
+        "./**/*.ts",
+        "../queryable/**/*.ts"
+    ],
+    "references": [
+        {
+            "path": "../queryable/tsconfig-commonjs.json"
+        }
+    ]
+}
diff --git a/packages/core/tsconfig-commonjs.json b/packages/core/tsconfig-commonjs.json
@@ -0,0 +1,10 @@
+{
+    "extends": "../tsconfig-commonjs.json",
+    "include": [
+        "./**/*.ts"
+    ],
+    "compilerOptions": {
+        "esModuleInterop": true
+    },
+    "references": []
+}
diff --git a/packages/graph/tsconfig-commonjs.json b/packages/graph/tsconfig-commonjs.json
@@ -0,0 +1,16 @@
+{
+    "extends": "../tsconfig-commonjs.json",
+    "include": [
+        "./**/*.ts",
+        "../core/**/*.ts",
+        "../queryable/**/*.ts"
+    ],
+    "references": [
+        {
+            "path": "../core/tsconfig-commonjs.json"
+        },
+        {
+            "path": "../queryable/tsconfig-commonjs.json"
+        }
+    ]
+}
diff --git a/packages/logging/tsconfig-commonjs.json b/packages/logging/tsconfig-commonjs.json
@@ -0,0 +1,7 @@
+{
+    "extends": "../tsconfig-commonjs.json",
+    "include": [
+        "./**/*.ts"
+    ],
+    "references": []
+}