From abb0a173c76b3d16613fea14a1900556f16e40a8 Mon Sep 17 00:00:00 2001 From: Patrick Rodgers Date: Tue, 27 Feb 2024 11:44:52 -0500 Subject: [PATCH] small fixes to build system --- package-lock.json | 38 ++++++++++++------- package.json | 2 +- tools/buildsystem/package.json | 2 +- .../src/behaviors/copy-package-files.ts | 2 +- 4 files changed, 28 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index a05ee063a..6039c9783 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@azure/msal-browser": "3.5.0", "@azure/msal-node": "1.18.4", "@microsoft/microsoft-graph-types": "2.40.0", - "@pnp/buildsystem": "^4.0.0-beta10", + "@pnp/buildsystem": "^4.0.0", "@pnp/logging": "^3.22.0", "@types/chai": "4.3.11", "@types/chai-as-promised": "7.1.8", @@ -217,9 +217,9 @@ } }, "node_modules/@azure/identity/node_modules/@azure/msal-common": { - "version": "14.6.0", - "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.6.0.tgz", - "integrity": "sha512-AGusT/JvxdzJIYi5u0n97cmhd3pUT6UuI6rEkT5iDeT2FGcV0/EB8pk+dy6GLPpYg9vhDCuyoYrEZGd+2UeCCQ==", + "version": "14.7.1", + "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.7.1.tgz", + "integrity": "sha512-v96btzjM7KrAu4NSEdOkhQSTGOuNUIIsUdB8wlyB9cdgl5KqEKnTonHUZ8+khvZ6Ap542FCErbnTyDWl8lZ2rA==", "dev": true, "engines": { "node": ">=0.8.0" @@ -678,9 +678,9 @@ } }, "node_modules/@pnp/buildsystem": { - "version": "4.0.0-beta10", - "resolved": "https://registry.npmjs.org/@pnp/buildsystem/-/buildsystem-4.0.0-beta10.tgz", - "integrity": "sha512-9x0xL3CmJRZYrVMhECmj4PSARStr4O+4ZtJO/vQsLpEhtitHtfvciXSH8wIY24OfKSG/FBgffRNBu475TMtvSw==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@pnp/buildsystem/-/buildsystem-4.0.0.tgz", + "integrity": "sha512-xzPoUVqZY5Ds7fDAhXy0FAAL+EAGh7vYhx62vN8mpraYvuDIf2qDOMtRoWDHWRkMOILayt5ettAV0hz8Nn0yrw==", "dev": true, "dependencies": { "@pnp/core": "^4.0.0-alpha0-v4nightly.20240105", @@ -1971,9 +1971,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001578", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001578.tgz", - "integrity": "sha512-J/jkFgsQ3NEl4w2lCoM9ZPxrD+FoBNJ7uJUpGVjIg/j0OwJosWM36EPDv+Yyi0V4twBk9pPmlFS+PLykgEvUmg==", + "version": "1.0.30001591", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001591.tgz", + "integrity": "sha512-PCzRMei/vXjJyL5mJtzNiUCKP59dm8Apqc3PH8gJkMnMXZGox93RbE76jHsmLwmIo6/3nsYIpJtx0O7u5PqFuQ==", "dev": true, "funding": [ { @@ -2614,9 +2614,9 @@ "dev": true }, "node_modules/electron-to-chromium": { - "version": "1.4.635", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.635.tgz", - "integrity": "sha512-iu/2D0zolKU3iDGXXxdOzNf72Jnokn+K1IN6Kk4iV6l1Tr2g/qy+mvmtfAiBwZe5S3aB5r92vp+zSZ69scYRrg==", + "version": "1.4.682", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.682.tgz", + "integrity": "sha512-oCglfs8yYKs9RQjJFOHonSnhikPK3y+0SvSYc/YpYJV//6rqc0/hbwd0c7vgK4vrl6y2gJAwjkhkSGWK+z4KRA==", "dev": true }, "node_modules/emoji-regex": { @@ -4864,6 +4864,18 @@ "wrap-ansi": "^7.0.0" } }, + "node_modules/mocha/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/mocha/node_modules/minimatch": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz", diff --git a/package.json b/package.json index a82a53b6a..6bda8ceec 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "@azure/msal-browser": "3.5.0", "@azure/msal-node": "1.18.4", "@microsoft/microsoft-graph-types": "2.40.0", - "@pnp/buildsystem": "^4.0.0-beta10", + "@pnp/buildsystem": "^4.0.0", "@pnp/logging":"^3.22.0", "@types/chai": "4.3.11", "@types/chai-as-promised": "7.1.8", diff --git a/tools/buildsystem/package.json b/tools/buildsystem/package.json index fd057e00c..4f1214930 100644 --- a/tools/buildsystem/package.json +++ b/tools/buildsystem/package.json @@ -1,6 +1,6 @@ { "name": "@pnp/buildsystem", - "version": "4.0.0", + "version": "4.0.1", "bin": { "pnpbuild": "bin/buildsystem.js" }, diff --git a/tools/buildsystem/src/behaviors/copy-package-files.ts b/tools/buildsystem/src/behaviors/copy-package-files.ts index a1bf4801d..d92aec3cc 100644 --- a/tools/buildsystem/src/behaviors/copy-package-files.ts +++ b/tools/buildsystem/src/behaviors/copy-package-files.ts @@ -50,7 +50,7 @@ export function CopyPackageFiles(source: "src" | "built", pattern: string[]): Ti this.log(`CopyPackageFiles found ${files.length} files for pattern ${stringPattern} in target '${target.tsconfigPath}'`); for (let i = 0; i < files.length; i++) { - this.log(`CopyPackageFiles found ${files[i]}`, 0); + this.log(`CopyPackageFiles found ${files[i].src}`, 0); } await Promise.all(files.map(f => buildCopyFile(f.src, f.dest)));