@nx/workspace 22.7.7 → 22.7.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "22.7.7",
+  "version": "22.7.8",
   "private": false,
   "description": "The Workspace plugin contains executors and generators that are useful for any Nx workspace. It should be present in every Nx workspace and other plugins build on it.",
   "repository": {
@@ -39,7 +39,7 @@
     }
   },
   "dependencies": {
-    "@nx/devkit": "22.7.7",
+    "@nx/devkit": "22.7.8",
     "@zkochan/js-yaml": "0.0.7",
     "chalk": "^4.1.0",
     "enquirer": "~2.3.6",
@@ -47,10 +47,10 @@
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "nx": "22.7.7"
+    "nx": "22.7.8"
   },
   "devDependencies": {
-    "nx": "22.7.7"
+    "nx": "22.7.8"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/new/generate-workspace-files.js

@@ -146,7 +146,7 @@ async function generateWorkspaceFiles(tree, options) {
     const [packageMajor] = packageManagerVersion.split('.');
     if (options.packageManager === 'pnpm' && +packageMajor >= 7) {
         if ((0, semver_1.gte)(packageManagerVersion, '10.6.0')) {
-            addPnpmSettings(tree, options);
+            addPnpmSettings(tree, options, packageManagerVersion);
         }
         else {
             createNpmrc(tree, options);
@@ -262,10 +262,13 @@ async function createReadme(tree, { name, appName, directory, preset, nxCloud, w
         nxCloudOnboardingUrl,
     });
 }
-// ensure that pnpm install add all the missing peer deps
-function addPnpmSettings(tree, options) {
-    tree.write((0, path_1.join)(options.directory, 'pnpm-workspace.yaml'), `autoInstallPeers: true
-`);
+function addPnpmSettings(tree, options, packageManagerVersion) {
+    // @swc/core is acknowledged (false) so pnpm 10.6+ doesn't fail the install on its
+    // ignored build script — its postinstall only checks the optional native binary.
+    const buildAllowlist = (0, semver_1.gte)(packageManagerVersion, '11.0.0')
+        ? `allowBuilds:\n  nx: true\n  '@swc/core': false`
+        : `onlyBuiltDependencies:\n  - nx`;
+    tree.write((0, path_1.join)(options.directory, 'pnpm-workspace.yaml'), `autoInstallPeers: true\n${buildAllowlist}\n`);
 }
 function createNpmrc(tree, options) {
     tree.write((0, path_1.join)(options.directory, '.npmrc'), 'strict-peer-dependencies=false\nauto-install-peers=true\n');

package/src/utils/output.d.ts

@@ -1,4 +1,4 @@
-import * as chalk from 'chalk';
+import chalk from 'chalk';
 export interface CLIErrorMessageConfig {
     title: string;
     bodyLines?: string[];

package/src/utils/output.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"output.d.ts","sourceRoot":"","sources":["../../../../../packages/workspace/src/utils/output.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,MAAM,WAAW,qBAAqB;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB;AAED,MAAM,WAAW,uBAAuB;IACtC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB;AASD,cAAM,SAAS;IACb,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAyC;IACnE;;;OAGG;IACH,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CACiB;IAEpD;;;;OAIG;IACH,MAAM;;MAEJ;IACF,IAAI,cAAc;IAClB,SAAS,cAAmB;IAE5B,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,gBAAgB;IAgBxB,OAAO,CAAC,uBAAuB;IAQ/B,UAAU;IAIV,oBAAoB;IAIpB,mCAAmC;IAInC,KAAK,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,qBAAqB;IAyBvD,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,oBAAoB;IAyBrD,IAAI,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,oBAAoB;IAa/C,OAAO,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,uBAAuB;IAarD,aAAa,CAAC,OAAO,EAAE,MAAM;IAU7B,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,GAAE,OAAe;IAYrD,GAAG,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,oBAAoB;CAW/C;AAED,eAAO,MAAM,MAAM,WAAkB,CAAC"}
+{"version":3,"file":"output.d.ts","sourceRoot":"","sources":["../../../../../packages/workspace/src/utils/output.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,WAAW,qBAAqB;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB;AAED,MAAM,WAAW,uBAAuB;IACtC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB;AASD,cAAM,SAAS;IACb,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAyC;IACnE;;;OAGG;IACH,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CACiB;IAEpD;;;;OAIG;IACH,MAAM;;MAEJ;IACF,IAAI,cAAc;IAClB,SAAS,cAAmB;IAE5B,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,gBAAgB;IAgBxB,OAAO,CAAC,uBAAuB;IAQ/B,UAAU;IAIV,oBAAoB;IAIpB,mCAAmC;IAInC,KAAK,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,qBAAqB;IAyBvD,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,oBAAoB;IAyBrD,IAAI,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,oBAAoB;IAa/C,OAAO,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,uBAAuB;IAarD,aAAa,CAAC,OAAO,EAAE,MAAM;IAU7B,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,GAAE,OAAe;IAYrD,GAAG,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,oBAAoB;CAW/C;AAED,eAAO,MAAM,MAAM,WAAkB,CAAC"}

package/src/utils/output.js

@@ -2,16 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.output = void 0;
 const tslib_1 = require("tslib");
-const chalk = tslib_1.__importStar(require("chalk"));
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
 /**
  * Automatically disable styling applied by chalk if CI=true
  */
 if (process.env.CI === 'true') {
-    chalk.level = 0;
+    chalk_1.default.level = 0;
 }
 class CLIOutput {
     constructor() {
-        this.NX_PREFIX = chalk.reset.inverse.bold.cyan(' NX ');
+        this.NX_PREFIX = chalk_1.default.reset.inverse.bold.cyan(' NX ');
         /**
          * Longer dash character which forms more of a continuous line when place side to side
          * with itself, unlike the standard dash character
@@ -23,10 +23,10 @@ class CLIOutput {
          * implementation.
          */
         this.colors = {
-            gray: chalk.gray,
+            gray: chalk_1.default.gray,
         };
-        this.bold = chalk.bold;
-        this.underline = chalk.underline;
+        this.bold = chalk_1.default.bold;
+        this.underline = chalk_1.default.underline;
     }
     writeToStdOut(str) {
         process.stdout.write(str);
@@ -52,16 +52,16 @@ class CLIOutput {
         this.writeToStdOut('\n');
     }
     addVerticalSeparator() {
-        this.writeToStdOut(`\n${chalk.gray(this.VERTICAL_SEPARATOR)}\n\n`);
+        this.writeToStdOut(`\n${chalk_1.default.gray(this.VERTICAL_SEPARATOR)}\n\n`);
     }
     addVerticalSeparatorWithoutNewLines() {
-        this.writeToStdOut(`${chalk.gray(this.VERTICAL_SEPARATOR)}\n`);
+        this.writeToStdOut(`${chalk_1.default.gray(this.VERTICAL_SEPARATOR)}\n`);
     }
     error({ title, slug, bodyLines }) {
         this.addNewline();
         this.writeOutputTitle({
-            label: chalk.reset.inverse.bold.red(' ERROR '),
-            title: chalk.bold.red(title),
+            label: chalk_1.default.reset.inverse.bold.red(' ERROR '),
+            title: chalk_1.default.bold.red(title),
         });
         this.writeOptionalOutputBody(bodyLines);
         /**
@@ -69,15 +69,15 @@ class CLIOutput {
          */
         if (slug && typeof slug === 'string') {
             this.addNewline();
-            this.writeToStdOut(`${chalk.grey('  Learn more about this error: ')}https://errors.nx.dev/${slug}\n`);
+            this.writeToStdOut(`${chalk_1.default.grey('  Learn more about this error: ')}https://errors.nx.dev/${slug}\n`);
         }
         this.addNewline();
     }
     warn({ title, slug, bodyLines }) {
         this.addNewline();
         this.writeOutputTitle({
-            label: chalk.reset.inverse.bold.yellow(' WARNING '),
-            title: chalk.bold.yellow(title),
+            label: chalk_1.default.reset.inverse.bold.yellow(' WARNING '),
+            title: chalk_1.default.bold.yellow(title),
         });
         this.writeOptionalOutputBody(bodyLines);
         /**
@@ -85,15 +85,15 @@ class CLIOutput {
          */
         if (slug && typeof slug === 'string') {
             this.addNewline();
-            this.writeToStdOut(`${chalk.grey('  Learn more about this warning: ')}https://errors.nx.dev/${slug}\n`);
+            this.writeToStdOut(`${chalk_1.default.grey('  Learn more about this warning: ')}https://errors.nx.dev/${slug}\n`);
         }
         this.addNewline();
     }
     note({ title, bodyLines }) {
         this.addNewline();
         this.writeOutputTitle({
-            label: chalk.reset.inverse.bold.keyword('orange')(' NOTE '),
-            title: chalk.bold.keyword('orange')(title),
+            label: chalk_1.default.reset.inverse.bold.keyword('orange')(' NOTE '),
+            title: chalk_1.default.bold.keyword('orange')(title),
         });
         this.writeOptionalOutputBody(bodyLines);
         this.addNewline();
@@ -101,8 +101,8 @@ class CLIOutput {
     success({ title, bodyLines }) {
         this.addNewline();
         this.writeOutputTitle({
-            label: chalk.reset.inverse.bold.green(' SUCCESS '),
-            title: chalk.bold.green(title),
+            label: chalk_1.default.reset.inverse.bold.green(' SUCCESS '),
+            title: chalk_1.default.bold.green(title),
         });
         this.writeOptionalOutputBody(bodyLines);
         this.addNewline();
@@ -116,16 +116,16 @@ class CLIOutput {
     }
     logCommand(message, isCached = false) {
         this.addNewline();
-        this.writeToStdOut(chalk.bold(`> ${message} `));
+        this.writeToStdOut(chalk_1.default.bold(`> ${message} `));
         if (isCached) {
-            this.writeToStdOut(chalk.bold.grey(`[retrieved from cache]`));
+            this.writeToStdOut(chalk_1.default.bold.grey(`[retrieved from cache]`));
         }
         this.addNewline();
     }
     log({ title, bodyLines }) {
         this.addNewline();
         this.writeOutputTitle({
-            title: chalk.white(title),
+            title: chalk_1.default.white(title),
         });
         this.writeOptionalOutputBody(bodyLines);
         this.addNewline();