@nx/js 20.2.1 → 20.3.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "20.2.1",
+  "version": "20.3.0-beta.0",
   "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": "20.2.1",
-    "@nx/workspace": "20.2.1",
+    "@nx/devkit": "20.3.0-beta.0",
+    "@nx/workspace": "20.3.0-beta.0",
     "@zkochan/js-yaml": "0.0.7",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^2.8.0",
@@ -49,7 +49,6 @@
     "columnify": "^1.6.0",
     "detect-port": "^1.5.1",
     "enquirer": "~2.3.6",
-    "fast-glob": "3.2.7",
     "ignore": "^5.0.4",
     "js-tokens": "^4.0.0",
     "jsonc-parser": "3.2.0",
@@ -59,6 +58,7 @@
     "ora": "5.3.0",
     "semver": "^7.5.3",
     "source-map-support": "0.5.19",
+    "tinyglobby": "^0.2.10",
     "ts-node": "10.9.1",
     "tsconfig-paths": "^4.1.2",
     "tslib": "^2.3.0"

package/src/executors/swc/swc.impl.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.swcExecutor = swcExecutor;
 const devkit_1 = require("@nx/devkit");
-const fast_glob_1 = require("fast-glob");
+const tinyglobby_1 = require("tinyglobby");
 const node_fs_1 = require("node:fs");
 const path_1 = require("path");
 const assets_1 = require("../../utils/assets");
@@ -29,7 +29,7 @@ function normalizeOptions(options, root, sourceRoot, projectRoot) {
         }
     }
     const outputPath = (0, path_1.join)(root, options.outputPath);
-    if (options.skipTypeCheck == null) {
+    if (options.skipTypeCheck == null && !isTsSolutionSetup) {
         options.skipTypeCheck = false;
     }
     if (options.watch == null) {
@@ -158,8 +158,9 @@ function removeTmpSwcrc(swcrcPath) {
 function createEntryPoints(options, context) {
     if (!options.additionalEntryPoints?.length)
         return [];
-    return (0, fast_glob_1.sync)(options.additionalEntryPoints, {
+    return (0, tinyglobby_1.globSync)(options.additionalEntryPoints, {
         cwd: context.root,
+        expandDirectories: false,
     });
 }
 exports.default = swcExecutor;

package/src/generators/library/library.js

@@ -182,7 +182,8 @@ async function configureProject(tree, options) {
         if (options.bundler === 'esbuild') {
             projectConfiguration.targets.build.options.format = ['cjs'];
         }
-        if (options.bundler === 'swc' && options.skipTypeCheck) {
+        if (options.bundler === 'swc' &&
+            (options.skipTypeCheck || options.isUsingTsSolutionConfig)) {
             projectConfiguration.targets.build.options.skipTypeCheck = true;
         }
         if (options.isUsingTsSolutionConfig) {
@@ -548,7 +549,7 @@ async function normalizeOptions(tree, options) {
         options.bundler = 'none';
     }
     if ((options.bundler === 'swc' || options.bundler === 'rollup') &&
-        options.skipTypeCheck == null) {
+        (options.skipTypeCheck == null || !isUsingTsSolutionConfig)) {
         options.skipTypeCheck = false;
     }
     const { projectName, names: projectNames, projectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {

package/src/generators/release-version/release-version.js

@@ -20,6 +20,12 @@ const npm_config_1 = require("../../utils/npm-config");
 const resolve_local_package_dependencies_1 = require("./utils/resolve-local-package-dependencies");
 const sort_projects_topologically_1 = require("./utils/sort-projects-topologically");
 const update_lock_file_1 = require("./utils/update-lock-file");
+function resolvePreIdSpecifier(currentSpecifier, preid) {
+    if (!currentSpecifier.startsWith('pre') && preid) {
+        return `pre${currentSpecifier}`;
+    }
+    return currentSpecifier;
+}
 async function releaseVersionGenerator(tree, options) {
     let logger;
     try {
@@ -46,7 +52,7 @@ Valid values are: ${version_1.validReleaseVersionPrefixes
         }
         // Set default for updateDependents
         const updateDependents = options.updateDependents ?? 'auto';
-        const updateDependentsBump = 'patch';
+        const updateDependentsBump = resolvePreIdSpecifier('patch', options.preid);
         // Sort the projects topologically if update dependents is enabled
         // TODO: maybe move this sorting to the command level?
         const projects = updateDependents === 'never' ||
@@ -291,8 +297,9 @@ To fix this you will either need to add a package.json file at that location, or
                         }
                         else {
                             let extraText = '';
-                            if (options.preid && !specifier.startsWith('pre')) {
-                                specifier = `pre${specifier}`;
+                            const prereleaseSpecifier = resolvePreIdSpecifier(specifier, options.preid);
+                            if (prereleaseSpecifier !== specifier) {
+                                specifier = prereleaseSpecifier;
                                 extraText = `, combined with your given preid "${options.preid}"`;
                             }
                             logger.buffer(`📄 Resolved the specifier as "${specifier}" using git history and the conventional commits standard${extraText}.`);
@@ -393,6 +400,7 @@ To fix this you will either need to add a package.json file at that location, or
             const localPackageDependencies = (0, resolve_local_package_dependencies_1.resolveLocalPackageDependencies)(tree, options.projectGraph, projects, projectNameToPackageRootMap, resolvePackageRoot, 
             // includeAll when the release group is independent, as we may be filtering to a specific subset of projects, but we still want to update their dependents
             options.releaseGroup.projectsRelationship === 'independent');
+            // list of projects that depend on the current package
             const allDependentProjects = Object.values(localPackageDependencies)
                 .flat()
                 .filter((localPackageDependency) => {

package/src/plugins/jest/start-local-registry.d.ts

@@ -4,11 +4,13 @@
  * @param storage the storage location for the local registry
  * @param verbose whether to log verbose output
  * @param clearStorage whether to clear the verdaccio storage before running the registry
+ * @param listenAddress the address that verdaccio should listen to (default to `localhost`)
  */
-export declare function startLocalRegistry({ localRegistryTarget, storage, verbose, clearStorage, }: {
+export declare function startLocalRegistry({ localRegistryTarget, storage, verbose, clearStorage, listenAddress, }: {
     localRegistryTarget: string;
     storage?: string;
     verbose?: boolean;
     clearStorage?: boolean;
+    listenAddress?: string;
 }): Promise<() => void>;
 export default startLocalRegistry;

package/src/plugins/jest/start-local-registry.js

@@ -8,8 +8,10 @@ const child_process_1 = require("child_process");
  * @param storage the storage location for the local registry
  * @param verbose whether to log verbose output
  * @param clearStorage whether to clear the verdaccio storage before running the registry
+ * @param listenAddress the address that verdaccio should listen to (default to `localhost`)
  */
-function startLocalRegistry({ localRegistryTarget, storage, verbose, clearStorage, }) {
+function startLocalRegistry({ localRegistryTarget, storage, verbose, clearStorage, listenAddress, }) {
+    listenAddress ??= 'localhost';
     if (!localRegistryTarget) {
         throw new Error(`localRegistryTarget is required`);
     }
@@ -21,24 +23,26 @@ function startLocalRegistry({ localRegistryTarget, storage, verbose, clearStorag
         const listener = (data) => {
             if (verbose) {
                 process.stdout.write(data);
+                console.log('Waiting for local registry to start...');
             }
-            if (data.toString().includes('http://localhost:')) {
-                const port = parseInt(data.toString().match(/localhost:(?<port>\d+)/)?.groups?.port);
-                console.log('Local registry started on port ' + port);
-                const registry = `http://localhost:${port}`;
+            if (data.toString().includes(`http://${listenAddress}:`)) {
+                const port = parseInt(data.toString().match(new RegExp(`${listenAddress}:(?<port>\\d+)`))
+                    ?.groups?.port);
+                const registry = `http://${listenAddress}:${port}`;
+                console.log(`Local registry started on ${registry}`);
                 process.env.npm_config_registry = registry;
-                (0, child_process_1.execSync)(`npm config set //localhost:${port}/:_authToken "secretVerdaccioToken"`, {
+                (0, child_process_1.execSync)(`npm config set //${listenAddress}:${port}/:_authToken "secretVerdaccioToken"`, {
                     windowsHide: false,
                 });
                 // yarnv1
                 process.env.YARN_REGISTRY = registry;
                 // yarnv2
                 process.env.YARN_NPM_REGISTRY_SERVER = registry;
-                process.env.YARN_UNSAFE_HTTP_WHITELIST = 'localhost';
+                process.env.YARN_UNSAFE_HTTP_WHITELIST = listenAddress;
                 console.log('Set npm and yarn config registry to ' + registry);
                 resolve(() => {
                     childProcess.kill();
-                    (0, child_process_1.execSync)(`npm config delete //localhost:${port}/:_authToken`, {
+                    (0, child_process_1.execSync)(`npm config delete //${listenAddress}:${port}/:_authToken`, {
                         windowsHide: false,
                     });
                 });

package/src/utils/assets/assets.js

@@ -1,15 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assetGlobsToFiles = assetGlobsToFiles;
-const fastGlob = require("fast-glob");
+const tinyglobby_1 = require("tinyglobby");
 const path_1 = require("path");
 function assetGlobsToFiles(assets, rootDir, outDir) {
     const files = [];
     const globbedFiles = (pattern, input = '', ignore = [], dot = false) => {
-        return fastGlob.sync(pattern, {
+        return (0, tinyglobby_1.globSync)(pattern, {
             cwd: input,
             onlyFiles: true,
             dot,
+            expandDirectories: false,
             ignore,
         });
     };

package/src/utils/assets/copy-assets-handler.js

@@ -6,7 +6,7 @@ const node_fs_1 = require("node:fs");
 const pathPosix = require("node:path/posix");
 const path = require("node:path");
 const ignore_1 = require("ignore");
-const fg = require("fast-glob");
+const tinyglobby_1 = require("tinyglobby");
 const devkit_1 = require("@nx/devkit");
 const client_1 = require("nx/src/daemon/client/client");
 const defaultFileEventHandler = (events) => {
@@ -73,10 +73,11 @@ class CopyAssetsHandler {
     async processAllAssetsOnce() {
         await Promise.all(this.assetGlobs.map(async (ag) => {
             const pattern = this.normalizeAssetPattern(ag);
-            // fast-glob only supports Unix paths
-            const files = await fg(pattern.replace(/\\/g, '/'), {
+            // globbing only supports Unix paths
+            const files = await (0, tinyglobby_1.globSync)(pattern.replace(/\\/g, '/'), {
                 cwd: this.rootDir,
                 dot: true, // enable hidden files
+                expandDirectories: false,
             });
             this.callback(this.filesToEvent(files, ag));
         }));
@@ -84,10 +85,11 @@ class CopyAssetsHandler {
     processAllAssetsOnceSync() {
         this.assetGlobs.forEach((ag) => {
             const pattern = this.normalizeAssetPattern(ag);
-            // fast-glob only supports Unix paths
-            const files = fg.sync(pattern.replace(/\\/g, '/'), {
+            // globbing only supports Unix paths
+            const files = (0, tinyglobby_1.globSync)(pattern.replace(/\\/g, '/'), {
                 cwd: this.rootDir,
                 dot: true, // enable hidden files
+                expandDirectories: false,
             });
             this.callback(this.filesToEvent(files, ag));
         });

package/src/utils/package-json/create-entry-points.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createEntryPoints = createEntryPoints;
-const fast_glob_1 = require("fast-glob");
+const tinyglobby_1 = require("tinyglobby");
 const devkit_1 = require("@nx/devkit");
 function createEntryPoints(additionalEntryPoints, root) {
     if (!additionalEntryPoints?.length)
@@ -13,7 +13,10 @@ function createEntryPoints(additionalEntryPoints, root) {
     // Performance impact should be negligible since there shouldn't be that many entry points.
     // Benchmarks show only 1-3% difference in execution time.
     for (const pattern of additionalEntryPoints) {
-        const matched = (0, fast_glob_1.sync)([pattern], { cwd: root });
+        const matched = (0, tinyglobby_1.globSync)([pattern], {
+            cwd: root,
+            expandDirectories: false,
+        });
         if (!matched.length)
             devkit_1.logger.warn(`The pattern ${pattern} did not match any files.`);
         files.push(...matched);

package/src/utils/package-manager-workspaces.js

@@ -29,8 +29,11 @@ function isWorkspacesEnabled(tree
         return tree.exists('pnpm-workspace.yaml');
     }
     // yarn and npm both use the same 'workspaces' property in package.json
-    const packageJson = (0, devkit_1.readJson)(tree, 'package.json');
-    return !!packageJson?.workspaces;
+    if (tree.exists('package.json')) {
+        const packageJson = (0, devkit_1.readJson)(tree, 'package.json');
+        return !!packageJson?.workspaces;
+    }
+    return false;
 }
 function getProjectPackageManagerWorkspaceStateWarningTask(projectPackageManagerWorkspaceState, workspaceRoot) {
     return () => {

package/src/utils/swc/compile-swc.js

@@ -66,7 +66,7 @@ async function compileSwc(context, normalizedOptions, postCompilationCallback) {
     });
     devkit_1.logger.log(swcCmdLog.replace(/\n/, ''));
     const isCompileSuccess = swcCmdLog.includes('Successfully compiled');
-    if (normalizedOptions.skipTypeCheck) {
+    if (normalizedOptions.skipTypeCheck || normalizedOptions.isTsSolutionSetup) {
         await postCompilationCallback();
         return { success: isCompileSuccess };
     }
@@ -116,7 +116,8 @@ async function* compileSwcWatch(context, normalizedOptions, postCompilationCallb
                     await postCompilationCallback();
                     initialPostCompile = false;
                 }
-                if (normalizedOptions.skipTypeCheck) {
+                if (normalizedOptions.skipTypeCheck ||
+                    normalizedOptions.isTsSolutionSetup) {
                     next(getResult(swcStatus));
                     return;
                 }