@nx/js 18.1.0-beta.2 → 18.1.0-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "18.1.0-beta.2",
+  "version": "18.1.0-beta.3",
   "private": false,
   "description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
   "repository": {
@@ -57,9 +57,9 @@
     "semver": "^7.5.3",
     "source-map-support": "0.5.19",
     "tslib": "^2.3.0",
-    "@nx/devkit": "18.1.0-beta.2",
-    "@nx/workspace": "18.1.0-beta.2",
-    "@nrwl/js": "18.1.0-beta.2"
+    "@nx/devkit": "18.1.0-beta.3",
+    "@nx/workspace": "18.1.0-beta.3",
+    "@nrwl/js": "18.1.0-beta.3"
   },
   "peerDependencies": {
     "verdaccio": "^5.0.4"

package/src/generators/library/library.js

@@ -25,7 +25,6 @@ async function libraryGenerator(tree, schema) {
 }
 exports.libraryGenerator = libraryGenerator;
 async function libraryGeneratorInternal(tree, schema) {
-    const filesDir = (0, path_1.join)(__dirname, './files');
     const tasks = [];
     tasks.push(await (0, init_1.default)(tree, {
         ...schema,
@@ -33,7 +32,7 @@ async function libraryGeneratorInternal(tree, schema) {
         tsConfigName: schema.rootProject ? 'tsconfig.json' : 'tsconfig.base.json',
     }));
     const options = await normalizeOptions(tree, schema);
-    createFiles(tree, options, `${filesDir}/lib`);
+    createFiles(tree, options);
     addProject(tree, options);
     if (!options.skipPackageJson) {
         tasks.push(addProjectDependencies(tree, options));
@@ -69,7 +68,7 @@ async function libraryGeneratorInternal(tree, schema) {
         const jestCallback = await addJest(tree, options);
         tasks.push(jestCallback);
         if (options.bundler === 'swc' || options.bundler === 'rollup') {
-            replaceJestConfig(tree, options, `${filesDir}/jest-config`);
+            replaceJestConfig(tree, options);
         }
     }
     else if (options.unitTestRunner === 'vitest' &&
@@ -284,10 +283,10 @@ function addBabelRc(tree, options) {
     };
     (0, devkit_1.writeJson)(tree, (0, path_1.join)(options.projectRoot, filename), babelrc);
 }
-function createFiles(tree, options, filesDir) {
+function createFiles(tree, options) {
     const { className, name, propertyName } = (0, devkit_1.names)(options.projectNames.projectFileName);
     createProjectTsConfigJson(tree, options);
-    (0, devkit_1.generateFiles)(tree, filesDir, options.projectRoot, {
+    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files/lib'), options.projectRoot, {
         ...options,
         dot: '.',
         className,
@@ -301,6 +300,22 @@ function createFiles(tree, options, filesDir) {
         buildable: options.bundler && options.bundler !== 'none',
         hasUnitTestRunner: options.unitTestRunner !== 'none',
     });
+    if (!options.rootProject) {
+        (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files/readme'), options.projectRoot, {
+            ...options,
+            dot: '.',
+            className,
+            name,
+            propertyName,
+            js: !!options.js,
+            cliCommand: 'nx',
+            strict: undefined,
+            tmpl: '',
+            offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot),
+            buildable: options.bundler && options.bundler !== 'none',
+            hasUnitTestRunner: options.unitTestRunner !== 'none',
+        });
+    }
     if (options.bundler === 'swc' || options.bundler === 'rollup') {
         (0, add_swc_dependencies_1.addSwcDependencies)(tree);
         (0, add_swc_config_1.addSwcConfig)(tree, options.projectRoot, options.bundler === 'swc' ? 'commonjs' : 'es6');
@@ -377,7 +392,8 @@ async function addJest(tree, options) {
                 : undefined,
     });
 }
-function replaceJestConfig(tree, options, filesDir) {
+function replaceJestConfig(tree, options) {
+    const filesDir = (0, path_1.join)(__dirname, './files/jest-config');
     // the existing config has to be deleted otherwise the new config won't overwrite it
     const existingJestConfig = (0, devkit_1.joinPathFragments)(filesDir, `jest.config.${options.js ? 'js' : 'ts'}`);
     if (tree.exists(existingJestConfig)) {
@@ -394,7 +410,10 @@ function replaceJestConfig(tree, options, filesDir) {
     });
 }
 async function normalizeOptions(tree, options) {
-    options.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
+        nxJson.useInferencePlugins !== false;
+    options.addPlugin ??= addPlugin;
     /**
      * We are deprecating the compiler and the buildable options.
      * However, we want to keep the existing behavior for now.

package/src/generators/release-version/utils/update-lock-file.js

@@ -23,6 +23,13 @@ async function updateLockFile(cwd, { dryRun, verbose, generatorOptions, }) {
         }
         return [];
     }
+    const workspacesEnabled = (0, devkit_1.isWorkspacesEnabled)(packageManager, cwd);
+    if (!workspacesEnabled) {
+        if (verbose) {
+            console.log(`\nSkipped lock file update because ${packageManager} workspaces are not enabled.`);
+        }
+        return [];
+    }
     const isDaemonEnabled = client_1.daemonClient.enabled();
     if (!dryRun && isDaemonEnabled) {
         // if not in dry-run temporarily stop the daemon, as it will error if the lock file is updated

package/src/utils/buildable-libs-utils.js

@@ -127,7 +127,7 @@ function calculateDependenciesFromTaskGraph(taskGraph, projectGraph, root, proje
         const depTask = taskGraph.tasks[taskName];
         const depProjectNode = projectGraph.nodes?.[depTask.target.project];
         if (depProjectNode?.type !== 'lib') {
-            return null;
+            continue;
         }
         let outputs = (0, devkit_1.getOutputsForTargetAndConfiguration)(depTask.target, depTask.overrides, depProjectNode);
         if (outputs.length === 0) {