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

more build system :)

.gitignore

@@ -55,4 +55,3 @@ settings.js
 
 # don't save the locally produced .js of the buildsystem config
 buildsystem-config.js
-buildsystem-config2.js

tools/buildsystem/bin/buildsystem.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import Liftoff from "liftoff";
+import * as Liftoff from "liftoff";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 import { dirname, join, resolve } from "path";
@@ -15,7 +15,7 @@ const context: Partial<IBuildContext> = {
     resolvedProjectRoot: join(cwd(), "package.json"),
 };
 
-const BuildSystem = new Liftoff({
+const BuildSystem = new (<any>Liftoff).default({
     configName: "buildsystem-config",
     name: "buildsystem",
 });

tools/buildsystem/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@pnp/buildsystem",
-    "version": "4.0.0-beta3",
+    "version": "4.0.0-beta4",
     "bin": {
         "pnpbuild": "bin/buildsystem.js"
     },
@@ -12,7 +12,6 @@
         "@pnp/core": "^3.21.0",
         "globby": "^14.0.0",
         "liftoff": "^4.0.0",
-        "replace-in-file": "^7.0.2",
         "webpack": "^5.89.0",
         "yargs": "^17.7.2"
     },

tools/buildsystem/src/behaviors/copy-asset-files.ts

@@ -1,6 +1,6 @@
 import { TimelinePipe } from "@pnp/core";
 import { BuildTimeline } from "../build-timeline.js";
-import globby from "globby";
+import { globby } from "globby";
 import { resolve } from "path";
 import buildCopyFile from "../lib/copy-file.js";
 

tools/buildsystem/src/behaviors/copy-package-files.ts

@@ -1,6 +1,6 @@
 import { TimelinePipe } from "@pnp/core";
 import { BuildTimeline } from "../build-timeline.js";
-import globby from "globby";
+import { globby } from "globby";
 import { resolve } from "path";
 import buildCopyFile from "../lib/copy-file.js";
 

tools/buildsystem/src/behaviors/replace-version.ts

@@ -1,7 +1,8 @@
 import { TimelinePipe } from "@pnp/core";
+import { BuildTimeline } from "../build-timeline.js";
+import { readFile  } from "fs/promises";
+import buildWriteFile from "src/lib/write-file.js";
 import { resolve } from "path";
-import { BuildTimeline } from "src/build-timeline";
-import replace from "replace-in-file";
 
 export function ReplaceVersion(paths: string[], versionMask = /\$\$Version\$\$/ig): TimelinePipe {
 
@@ -13,13 +14,16 @@ export function ReplaceVersion(paths: string[], versionMask = /\$\$Version\$\$/i
 
             this.log(`Replacing package version for target "${target.tsconfigPath}"`, 1);
 
-            const options = {
-                files: paths.map(p => resolve(target.resolvedOutDir, p)),
-                from: versionMask,
-                to: version,
-            };
-
-            return (<any>replace)(options);
+            paths.forEach(async (path) => {
+
+                const file = await readFile(resolve(path));
+
+                const txt = file.toString();
+
+                txt.replace(versionMask, version);
+
+                await buildWriteFile(path, txt);
+            });
         });
 
         return instance;

tools/buildsystem/tsconfig.json

@@ -29,8 +29,7 @@
         "strictNullChecks": false,
         "preserveConstEnums": true,
         "importHelpers": true,
-        "resolveJsonModule": true,
-        "allowSyntheticDefaultImports": true        
+        "resolveJsonModule": true
     },
     "include": [
         "./index.ts",

tools/local-module-resolver/esm.ts

@@ -3,7 +3,7 @@ import { existsSync } from "fs";
 import findup from "findup-sync";
 
 // give ourselves a single reference to the projectRoot
-const projectRoot = resolve(dirname(findup("package.json")));
+const projectRoot = resolve(dirname(findup("package.json")!));
 
 function log(_message: string) {
     // console.log(`PnP Node Local Module Loader: ${message}`);
@@ -23,7 +23,7 @@ export function createResolve(innerPath: string): ResolverFunc {
             const modulePath = specifier.substring(4);
 
             if (cache.has(modulePath)) {
-                return cache.get(modulePath);
+                return cache.get(modulePath)!;
             }
 
             let candidate = join(projectRoot, innerPath, modulePath);