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

Build System
pnp · Jan 8, 2024 · ad04910 · ad04910
2 parents 50b7a7f + be715bc
commit ad04910
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 19 deletions.
diff --git a/buildsystem-config.ts b/buildsystem-config.ts
@@ -25,7 +25,7 @@ Logger.subscribe(ConsoleListener("", {
     warning: "yellow",
 }));
 
-const logLevel = LogLevel.Info;
+const logLevel = LogLevel.Verbose;
 const distFolder = "./dist/packages";
 const commonPublishTags = ["--access", "public", "--dry-run"];
 

diff --git a/tools/buildsystem/package-lock.json b/tools/buildsystem/package-lock.json
diff --git a/tools/buildsystem/package.json b/tools/buildsystem/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@pnp/buildsystem",
-    "version": "4.0.0-beta9",
+    "version": "4.0.0-beta10",
     "bin": {
         "pnpbuild": "bin/buildsystem.js"
     },
@@ -9,7 +9,7 @@
     "type": "module",
     "typings": "./index",
     "dependencies": {
-        "@pnp/core": "^4.0.0-alpha0-v4nightly.20231229",
+        "@pnp/core": "^4.0.0-alpha0-v4nightly.20240105",
         "globby": "^14.0.0",
         "liftoff": "^4.0.0",
         "webpack": "^5.89.0",

diff --git a/tools/buildsystem/src/behaviors/copy-package-files.ts b/tools/buildsystem/src/behaviors/copy-package-files.ts
@@ -20,7 +20,7 @@ export function CopyPackageFiles(source: "src" | "built", pattern: string[]): Ti
 
             this.context.targets.forEach(async (target) => {
 
-                this.log(`Starting CopyPackageFiles with pattern ${stringPattern} on target '${target.tsconfigPath}'`);
+                this.log(`Starting CopyPackageFiles with pattern ${stringPattern} on target '${target.tsconfigPath}'`, 1);
 
                 const files = await target.packages.reduce((p, pkg) => {
 
@@ -46,7 +46,7 @@ export function CopyPackageFiles(source: "src" | "built", pattern: string[]): Ti
 
                 await Promise.all(files.map(f => buildCopyFile(f.src, f.dest)));
 
-                this.log(`Completing CopyPackageFiles with pattern ${stringPattern} on target '${target.tsconfigPath}'`);
+                this.log(`Completing CopyPackageFiles with pattern ${stringPattern} on target '${target.tsconfigPath}'`, 1);
 
             });            
         });

diff --git a/tools/buildsystem/src/behaviors/publish-nightly.ts b/tools/buildsystem/src/behaviors/publish-nightly.ts
@@ -26,7 +26,7 @@ export function PublishNightly(flags: string[], nightlyName: "v3nightly" | "v4ni
 
             const versionStr = `-${nightlyName}.${date.getFullYear()}${(date.getMonth() + 1).toString().padStart(2, "0")}${date.getDate().toString().padStart(2, "0")}`;
 
-            this.log(`Updating nightly package.json version to ${versionStr}`);
+            this.log(`Updating nightly package.json version to ${versionStr}`, 1);
 
             await Promise.all(targets[0].packages.map(pkg => {
 

diff --git a/tools/buildsystem/src/behaviors/publish.ts b/tools/buildsystem/src/behaviors/publish.ts
@@ -18,15 +18,16 @@ export function Publish(flags?: string[]): TimelinePipe {
 
                 promises.push(new Promise((resolve, reject) => {
 
-                    this.log(`Publishing ${pkg.resolvedPkgDistRoot} with flags ${stringFlags}`);
+                    this.log(`Publishing ${pkg.resolvedPkgDistRoot} with flags ${stringFlags}`, 1);
 
                     exec(`npm publish ${stringFlags}`,
                         {
                             cwd: pkg.resolvedPkgDistRoot,
-                        }, (error, _stdout, _stderr) => {
+                        }, (error, stdout, _stderr) => {
 
                             if (error === null) {
-                                this.log(`Published ${pkg.resolvedPkgDistRoot} with flags ${stringFlags}`);
+                                this.log(`Published ${pkg.resolvedPkgDistRoot} with flags ${stringFlags}`, 1);
+                                this.log(stdout);
                                 resolve();
                             } else {
                                 this.log(`${error}`, 3);

diff --git a/tools/buildsystem/src/behaviors/replace-version.ts b/tools/buildsystem/src/behaviors/replace-version.ts
@@ -29,7 +29,7 @@ export function ReplaceVersion(paths: string[], options?: IReplaceVersionOptions
                 paths.forEach(async (path) => {
 
                     const resolvedPath = options?.pathsResolved ? path : resolve(target.resolvedOutDir, path);
-                    this.log(`Resolving path '${path}' to '${resolvedPath}'.`, 0);
+                    this.log(`Resolving path '${path}' to '${resolvedPath}'.`);
                     const file = await readFile(resolve(resolvedPath));
                     await buildWriteFile(resolvedPath, file.toString().replace(options.versionMask, version));
                 });

diff --git a/tools/buildsystem/src/behaviors/write-packagejson.ts b/tools/buildsystem/src/behaviors/write-packagejson.ts
@@ -18,6 +18,8 @@ export function WritePackageJSON(transform?: (p: any) => typeof p): TimelinePipe
 
                 let pkgFile = importJSON(resolve(pkg.resolvedPkgSrcRoot, "package.json"));
 
+                this.log(`Updating package version at ${pkgFile} to ${version}`, 1);
+
                 pkgFile.version = version;
 
                 // update our peer dependencies and dependencies placeholder if needed