@nx/js 18.0.0-beta.1 → 18.0.0-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "18.0.0-beta.1",
+  "version": "18.0.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.0.0-beta.1",
-    "@nx/workspace": "18.0.0-beta.1",
-    "@nrwl/js": "18.0.0-beta.1"
+    "@nx/devkit": "18.0.0-beta.3",
+    "@nx/workspace": "18.0.0-beta.3",
+    "@nrwl/js": "18.0.0-beta.3"
   },
   "peerDependencies": {
     "verdaccio": "^5.0.4"

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

@@ -11,6 +11,6 @@ export interface NormalizedSchema extends LibraryGeneratorSchema {
     parsedTags: string[];
     importPath?: string;
 }
-export type AddLintOptions = Pick<NormalizedSchema, 'name' | 'linter' | 'projectRoot' | 'unitTestRunner' | 'js' | 'setParserOptionsProject' | 'rootProject' | 'bundler'>;
+export type AddLintOptions = Pick<NormalizedSchema, 'name' | 'linter' | 'projectRoot' | 'unitTestRunner' | 'js' | 'setParserOptionsProject' | 'rootProject' | 'bundler' | 'addPlugin'>;
 export declare function addLint(tree: Tree, options: AddLintOptions): Promise<GeneratorCallback>;
 export default libraryGenerator;

package/src/generators/library/library.js

@@ -13,8 +13,10 @@ const init_1 = require("../init/init");
 const generator_1 = require("../setup-verdaccio/generator");
 const create_ts_config_1 = require("../../utils/typescript/create-ts-config");
 const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
+const add_build_target_defaults_1 = require("@nx/devkit/src/generators/add-build-target-defaults");
 async function libraryGenerator(tree, schema) {
     return await libraryGeneratorInternal(tree, {
+        addPlugin: false,
         // provide a default projectNameAndRootFormat to avoid breaking changes
         // to external generators invoking this one
         projectNameAndRootFormat: 'derived',
@@ -49,6 +51,7 @@ async function libraryGeneratorInternal(tree, schema) {
             includeLib: true,
             skipFormat: true,
             testEnvironment: options.testEnvironment,
+            addPlugin: options.addPlugin,
         });
         tasks.push(viteTask);
         createOrEditViteConfig(tree, {
@@ -117,8 +120,10 @@ function addProject(tree, options) {
         options.bundler !== 'none' &&
         options.config !== 'npm-scripts') {
         const outputPath = getOutputPath(options);
+        const executor = getBuildExecutor(options.bundler);
+        (0, add_build_target_defaults_1.addBuildTargetDefaults)(tree, executor);
         projectConfiguration.targets.build = {
-            executor: getBuildExecutor(options.bundler),
+            executor,
             outputs: ['{options.outputPath}'],
             options: {
                 outputPath,
@@ -177,6 +182,7 @@ async function addLint(tree, options) {
         unitTestRunner: options.unitTestRunner,
         setParserOptionsProject: options.setParserOptionsProject,
         rootProject: options.rootProject,
+        addPlugin: options.addPlugin,
     });
     const { addOverrideToLintConfig, lintConfigHasOverride, isEslintConfigSupported, updateOverrideInLintConfig,
     // nx-ignore-next-line
@@ -388,6 +394,7 @@ function replaceJestConfig(tree, options, filesDir) {
     });
 }
 async function normalizeOptions(tree, options) {
+    options.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
     /**
      * 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

@@ -14,23 +14,30 @@ async function updateLockFile(cwd, { dryRun, verbose, generatorOptions, }) {
         }
         return [];
     }
+    const packageManager = (0, devkit_1.detectPackageManager)(cwd);
+    if (packageManager === 'yarn' &&
+        !(0, semver_1.gte)((0, devkit_1.getPackageManagerVersion)(packageManager), '2.0.0')) {
+        // yarn classic does not store workspace data in the lock file, so we don't need to update it
+        if (verbose) {
+            console.log('\nSkipped lock file update because it is not necessary for Yarn Classic.');
+        }
+        return [];
+    }
     const isDaemonEnabled = client_1.daemonClient.enabled();
     if (isDaemonEnabled) {
         // temporarily stop the daemon, as it will error if the lock file is updated
         await client_1.daemonClient.stop();
     }
-    const packageManager = (0, devkit_1.detectPackageManager)(cwd);
     const packageManagerCommands = (0, devkit_1.getPackageManagerCommand)(packageManager);
     let installArgs = generatorOptions?.installArgs || '';
     devkit_1.output.logSingleLine(`Updating ${packageManager} lock file`);
     let env = {};
     if (generatorOptions?.installIgnoreScripts) {
-        if (packageManager === 'yarn' &&
-            (0, semver_1.gte)((0, devkit_1.getPackageManagerVersion)(packageManager), '2.0.0')) {
+        if (packageManager === 'yarn') {
             env = { YARN_ENABLE_SCRIPTS: 'false' };
         }
         else {
-            // npm, pnpm, and yarn classic all use the same --ignore-scripts option
+            // npm and pnpm use the same --ignore-scripts option
             installArgs = `${installArgs} --ignore-scripts`.trim();
         }
     }

package/src/utils/find-npm-dependencies.d.ts

@@ -1,8 +1,9 @@
-import { type ProjectGraph, type ProjectGraphProjectNode, type ProjectFileMap } from '@nx/devkit';
+import { type ProjectFileMap, type ProjectGraph, type ProjectGraphProjectNode } from '@nx/devkit';
 /**
  * Finds all npm dependencies and their expected versions for a given project.
  */
 export declare function findNpmDependencies(workspaceRoot: string, sourceProject: ProjectGraphProjectNode, projectGraph: ProjectGraph, projectFileMap: ProjectFileMap, buildTarget: string, options?: {
     includeTransitiveDependencies?: boolean;
     ignoredFiles?: string[];
+    useLocalPathsForWorkspaceDependencies?: boolean;
 }): Record<string, string>;

package/src/utils/find-npm-dependencies.js

@@ -21,7 +21,7 @@ function findNpmDependencies(workspaceRoot, sourceProject, projectGraph, project
         if (seen?.has(currentProject.name))
             return;
         seen?.add(currentProject.name);
-        collectDependenciesFromFileMap(workspaceRoot, currentProject, projectGraph, projectFileMap, buildTarget, options.ignoredFiles, collectedDeps);
+        collectDependenciesFromFileMap(workspaceRoot, currentProject, projectGraph, projectFileMap, buildTarget, options.ignoredFiles, options.useLocalPathsForWorkspaceDependencies, collectedDeps);
         collectHelperDependencies(workspaceRoot, currentProject, projectGraph, buildTarget, collectedDeps);
         if (options.includeTransitiveDependencies) {
             const projectDeps = projectGraph.dependencies[currentProject.name];
@@ -38,7 +38,7 @@ function findNpmDependencies(workspaceRoot, sourceProject, projectGraph, project
 exports.findNpmDependencies = findNpmDependencies;
 // Keep track of workspace libs we already read package.json for so we don't read from disk again.
 const seenWorkspaceDeps = {};
-function collectDependenciesFromFileMap(workspaceRoot, sourceProject, projectGraph, projectFileMap, buildTarget, ignoredFiles, npmDeps) {
+function collectDependenciesFromFileMap(workspaceRoot, sourceProject, projectGraph, projectFileMap, buildTarget, ignoredFiles, useLocalPathsForWorkspaceDependencies, npmDeps) {
     const rawFiles = projectFileMap[sourceProject.name];
     if (!rawFiles)
         return;
@@ -82,12 +82,27 @@ function collectDependenciesFromFileMap(workspaceRoot, sourceProject, projectGra
                 workspaceDep.data.targets[buildTarget] &&
                     // Make sure package.json exists and has a valid name.
                     packageJson?.name) {
-                    // This is a workspace lib so we can't reliably read in a specific version since it depends on how the workspace is set up.
-                    // ASSUMPTION: Most users will use '*' for workspace lib versions. Otherwise, they can manually update it.
-                    npmDeps[packageJson.name] = '*';
+                    let version;
+                    if (useLocalPathsForWorkspaceDependencies) {
+                        // Find the relative `file:...` path and use that as the version value.
+                        // This is useful for monorepos like Nx where the release will handle setting the correct version in dist.
+                        const depRoot = (0, path_1.join)(workspaceRoot, workspaceDep.data.root);
+                        const ownRoot = (0, path_1.join)(workspaceRoot, sourceProject.data.root);
+                        const relativePath = (0, path_1.relative)(ownRoot, depRoot);
+                        const filePath = (0, devkit_1.normalizePath)(relativePath); // normalize slashes for windows
+                        version = `file:${filePath}`;
+                    }
+                    else {
+                        // Otherwise, read the version from the dependencies `package.json` file.
+                        // This is useful for monorepos that commit release versions.
+                        // Users can also set version as "*" in source `package.json` files, which will be the value set here.
+                        // This is useful if they use custom scripts to update them in dist.
+                        version = packageJson.version ?? '*'; // fallback in case version is missing
+                    }
+                    npmDeps[packageJson.name] = version;
                     seenWorkspaceDeps[workspaceDep.name] = {
                         name: packageJson.name,
-                        version: '*',
+                        version,
                     };
                 }
             }

package/src/utils/schema.d.ts

@@ -33,6 +33,7 @@ export interface LibraryGeneratorSchema {
   minimal?: boolean;
   rootProject?: boolean;
   simpleName?: boolean;
+  addPlugin?: boolean;
 }
 
 export interface ExecutorOptions {