@nx/js 21.4.0-beta.5 → 21.4.0-beta.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "21.4.0-beta.5",
+  "version": "21.4.0-beta.7",
   "private": false,
   "description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
   "repository": {
@@ -39,8 +39,8 @@
     "@babel/preset-env": "^7.23.2",
     "@babel/preset-typescript": "^7.22.5",
     "@babel/runtime": "^7.22.6",
-    "@nx/devkit": "21.4.0-beta.5",
-    "@nx/workspace": "21.4.0-beta.5",
+    "@nx/devkit": "21.4.0-beta.7",
+    "@nx/workspace": "21.4.0-beta.7",
     "@zkochan/js-yaml": "0.0.7",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^3.1.0",
@@ -63,7 +63,7 @@
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "21.4.0-beta.5"
+    "nx": "21.4.0-beta.7"
   },
   "peerDependencies": {
     "verdaccio": "^6.0.5"

package/src/generators/library/library.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"library.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/library/library.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,iBAAiB,EAYjB,IAAI,EAKL,MAAM,YAAY,CAAC;AAwCpB,OAAO,KAAK,EAEV,sBAAsB,EACtB,iCAAiC,EAClC,MAAM,UAAU,CAAC;AASlB,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,sBAAsB,8BAO/B;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,sBAAsB,8BAoL/B;AA4HD,MAAM,MAAM,cAAc,GAAG,IAAI,CAC/B,iCAAiC,EAC/B,MAAM,GACN,QAAQ,GACR,aAAa,GACb,gBAAgB,GAChB,IAAI,GACJ,yBAAyB,GACzB,aAAa,GACb,SAAS,GACT,WAAW,CACd,CAAC;AAEF,wBAAsB,OAAO,CAC3B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,iBAAiB,CAAC,CAqG5B;AA4vBD,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"library.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/library/library.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,iBAAiB,EAYjB,IAAI,EAKL,MAAM,YAAY,CAAC;AAyCpB,OAAO,KAAK,EAEV,sBAAsB,EACtB,iCAAiC,EAClC,MAAM,UAAU,CAAC;AASlB,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,sBAAsB,8BAO/B;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,sBAAsB,8BAsL/B;AA4HD,MAAM,MAAM,cAAc,GAAG,IAAI,CAC/B,iCAAiC,EAC/B,MAAM,GACN,QAAQ,GACR,aAAa,GACb,gBAAgB,GAChB,IAAI,GACJ,yBAAyB,GACzB,aAAa,GACb,SAAS,GACT,WAAW,CACd,CAAC;AAEF,wBAAsB,OAAO,CAC3B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,iBAAiB,CAAC,CAqG5B;AA4vBD,eAAe,gBAAgB,CAAC"}

package/src/generators/library/library.js

@@ -34,11 +34,13 @@ async function libraryGenerator(tree, schema) {
 }
 async function libraryGeneratorInternal(tree, schema) {
     const tasks = [];
+    const addTsPlugin = (0, ts_solution_setup_1.shouldConfigureTsSolutionSetup)(tree, schema.addPlugin);
     tasks.push(await (0, init_1.default)(tree, {
         ...schema,
         skipFormat: true,
         tsConfigName: schema.rootProject ? 'tsconfig.json' : 'tsconfig.base.json',
         addTsConfigBase: true,
+        addTsPlugin,
         // In the new setup, Prettier is prompted for and installed during `create-nx-workspace`.
         formatter: (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree) ? 'none' : 'prettier',
     }));

package/src/release/version-actions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version-actions.d.ts","sourceRoot":"","sources":["../../../../../packages/js/src/release/version-actions.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,YAAY,EAEZ,IAAI,EAGL,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,yBAAyB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AACvE,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,uBAAuB,CAAC;AAK3E,eAAO,MAAM,yBAAyB,EAAE,yBAmBvC,CAAC;AAKF,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,cAAc;IAC1D,sBAAsB,WAAoB;IAEpC,oCAAoC,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC;QAC9D,cAAc,EAAE,MAAM,CAAC;QACvB,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC;IAkBI,8BAA8B,CAClC,IAAI,EAAE,IAAI,EACV,8BAA8B,EAAE,6BAA6B,CAAC,gCAAgC,CAAC,GAC9F,OAAO,CAAC;QACT,cAAc,EAAE,MAAM,CAAC;QACvB,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;IA0DI,8BAA8B,CAClC,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,YAAY,EAC1B,qBAAqB,EAAE,MAAM,GAC5B,OAAO,CAAC;QACT,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;QAC9B,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;KACrC,CAAC;IA+BI,oBAAoB,CACxB,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,EAAE,CAAC;IAcd,yBAAyB,CAC7B,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,YAAY,EAC1B,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC3C,OAAO,CAAC,MAAM,EAAE,CAAC;IA+DpB,OAAO,CAAC,yBAAyB;CAyClC"}
+{"version":3,"file":"version-actions.d.ts","sourceRoot":"","sources":["../../../../../packages/js/src/release/version-actions.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,YAAY,EAEZ,IAAI,EAGL,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,yBAAyB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AACvE,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,uBAAuB,CAAC;AAK3E,eAAO,MAAM,yBAAyB,EAAE,yBAmBvC,CAAC;AAKF,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,cAAc;IAC1D,sBAAsB,WAAoB;IAEpC,oCAAoC,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC;QAC9D,cAAc,EAAE,MAAM,CAAC;QACvB,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC;IAkBI,8BAA8B,CAClC,IAAI,EAAE,IAAI,EACV,8BAA8B,EAAE,6BAA6B,CAAC,gCAAgC,CAAC,GAC9F,OAAO,CAAC;QACT,cAAc,EAAE,MAAM,CAAC;QACvB,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;IAkEI,8BAA8B,CAClC,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,YAAY,EAC1B,qBAAqB,EAAE,MAAM,GAC5B,OAAO,CAAC;QACT,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;QAC9B,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;KACrC,CAAC;IA+BI,oBAAoB,CACxB,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,EAAE,CAAC;IAcd,yBAAyB,CAC7B,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,YAAY,EAC1B,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC3C,OAAO,CAAC,MAAM,EAAE,CAAC;IA+DpB,OAAO,CAAC,yBAAyB;CAyClC"}

package/src/release/version-actions.js

@@ -66,7 +66,13 @@ class JsVersionActions extends release_1.VersionActions {
                     if (error) {
                         return reject(error);
                     }
-                    if (stderr) {
+                    // Only reject on stderr if it contains actual errors, not just npm warnings
+                    // npm 11+ writes "npm warn" messages to stderr even on successful commands
+                    if (stderr &&
+                        !stderr
+                            .trim()
+                            .split('\n')
+                            .every((line) => line.startsWith('npm warn'))) {
                         return reject(stderr);
                     }
                     return resolve(stdout.trim());

package/src/utils/typescript/ts-solution-setup.d.ts

@@ -1,5 +1,6 @@
 import { type ProjectConfiguration, type Tree } from '@nx/devkit';
 export declare function isUsingTypeScriptPlugin(tree: Tree): boolean;
+export declare function shouldConfigureTsSolutionSetup(tree: Tree, addPlugins: boolean, addTsPlugin?: boolean): boolean;
 export declare function isUsingTsSolutionSetup(tree?: Tree): boolean;
 export declare function assertNotUsingTsSolutionSetup(tree: Tree, pluginName: string, generatorName: string): void;
 export declare function findRuntimeTsConfigName(projectRoot: string, tree?: Tree): string | null;

package/src/utils/typescript/ts-solution-setup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ts-solution-setup.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/typescript/ts-solution-setup.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,oBAAoB,EAGzB,KAAK,IAAI,EAGV,MAAM,YAAY,CAAC;AAWpB,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAU3D;AAED,wBAAgB,sBAAsB,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,OAAO,CAO3D;AA4CD,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,GACpB,IAAI,CAsBN;AAED,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE,IAAI,GACV,MAAM,GAAG,IAAI,CAOf;AAED,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,uBAAuB,EAAE,MAAM,EAC/B,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,EAAE,CAAC,EAC5D,OAAO,GAAE,MAAM,EAAO,EACtB,OAAO,SAAQ,QAoFhB;AAED,wBAAsB,+BAA+B,CACnD,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,iBAqDnB;AAED,wBAAgB,cAAc,CAC5B,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,SAAS,GAAG,aAAa,GACtC,SAAS,GAAG,aAAa,CAoB3B;AAED,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,oBAAoB,EAC7B,IAAI,CAAC,EAAE,IAAI,GACV,MAAM,CAgBR"}
+{"version":3,"file":"ts-solution-setup.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/typescript/ts-solution-setup.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,oBAAoB,EAGzB,KAAK,IAAI,EAGV,MAAM,YAAY,CAAC;AAWpB,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAU3D;AAED,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,OAAO,EACnB,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAsBT;AAED,wBAAgB,sBAAsB,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,OAAO,CAO3D;AAuDD,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,GACpB,IAAI,CAsBN;AAED,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE,IAAI,GACV,MAAM,GAAG,IAAI,CAOf;AAED,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,uBAAuB,EAAE,MAAM,EAC/B,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,EAAE,CAAC,EAC5D,OAAO,GAAE,MAAM,EAAO,EACtB,OAAO,SAAQ,QAoFhB;AAED,wBAAsB,+BAA+B,CACnD,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,iBAqDnB;AAED,wBAAgB,cAAc,CAC5B,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,SAAS,GAAG,aAAa,GACtC,SAAS,GAAG,aAAa,CAoB3B;AAED,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,oBAAoB,EAC7B,IAAI,CAAC,EAAE,IAAI,GACV,MAAM,CAgBR"}

package/src/utils/typescript/ts-solution-setup.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isUsingTypeScriptPlugin = isUsingTypeScriptPlugin;
+exports.shouldConfigureTsSolutionSetup = shouldConfigureTsSolutionSetup;
 exports.isUsingTsSolutionSetup = isUsingTsSolutionSetup;
 exports.assertNotUsingTsSolutionSetup = assertNotUsingTsSolutionSetup;
 exports.findRuntimeTsConfigName = findRuntimeTsConfigName;
@@ -20,11 +21,39 @@ function isUsingTypeScriptPlugin(tree) {
         ? p === '@nx/js/typescript'
         : p.plugin === '@nx/js/typescript') ?? false);
 }
+function shouldConfigureTsSolutionSetup(tree, addPlugins, addTsPlugin) {
+    if (addTsPlugin !== undefined) {
+        return addTsPlugin;
+    }
+    if (addPlugins === undefined) {
+        const nxJson = (0, devkit_1.readNxJson)(tree);
+        addPlugins =
+            process.env.NX_ADD_PLUGINS !== 'false' &&
+                nxJson.useInferencePlugins !== false;
+    }
+    if (!addPlugins) {
+        return false;
+    }
+    if (!(0, package_manager_workspaces_1.isUsingPackageManagerWorkspaces)(tree)) {
+        return false;
+    }
+    // if there are no root tsconfig files, we should configure the TS solution setup
+    return !tree.exists('tsconfig.base.json') && !tree.exists('tsconfig.json');
+}
 function isUsingTsSolutionSetup(tree) {
     tree ??= new tree_1.FsTree(devkit_1.workspaceRoot, false);
     return ((0, package_manager_workspaces_1.isUsingPackageManagerWorkspaces)(tree) &&
         isWorkspaceSetupWithTsSolution(tree));
 }
+/**
+ * The TS solution setup requires:
+ * - `tsconfig.base.json`: TS config with common compiler options needed by the
+ *    majority of projects in the workspace. It's meant to be extended by other
+ *    tsconfig files in the workspace to reuse them.
+ * - `tsconfig.json`: TS solution config file that references all other projects
+ *    in the repo. It shouldn't include any file and it's not meant to be
+ *    extended or define any common compiler options.
+ */
 function isWorkspaceSetupWithTsSolution(tree) {
     if (!tree.exists('tsconfig.base.json') || !tree.exists('tsconfig.json')) {
         return false;
@@ -34,27 +63,30 @@ function isWorkspaceSetupWithTsSolution(tree) {
         return false;
     }
     /**
-     * New setup:
-     * - `files` is defined and set to an empty array
-     * - `references` is defined and set to an empty array
-     * - `include` is not defined or is set to an empty array
+     * TS solution setup requires:
+     * - One of `files` or `include` defined
+     * - If set, they must be empty arrays
+     *
+     * Note: while the TS solution setup uses TS project references, in the initial
+     * state of the workspace, where there are no projects, `references` is not
+     * required to be defined.
      */
-    if (!tsconfigJson.files ||
-        tsconfigJson.files.length > 0 ||
-        !tsconfigJson.references ||
-        !!tsconfigJson.include?.length) {
+    if ((!tsconfigJson.files && !tsconfigJson.include) ||
+        tsconfigJson.files?.length > 0 ||
+        tsconfigJson.include?.length > 0) {
         return false;
     }
+    /**
+     * TS solution setup requires:
+     * - `compilerOptions.composite`: true
+     * - `compilerOptions.declaration`: true or not set (default to true)
+     */
     const baseTsconfigJson = (0, devkit_1.readJson)(tree, 'tsconfig.base.json');
     if (!baseTsconfigJson.compilerOptions ||
         !baseTsconfigJson.compilerOptions.composite ||
         baseTsconfigJson.compilerOptions.declaration === false) {
         return false;
     }
-    const { compilerOptions, ...rest } = baseTsconfigJson;
-    if (Object.keys(rest).length > 0) {
-        return false;
-    }
     return true;
 }
 function assertNotUsingTsSolutionSetup(tree, pluginName, generatorName) {