@nx/js 16.4.0-beta.1 → 16.4.0-beta.13

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

@@ -0,0 +1,61 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.startLocalRegistry = void 0;
+const child_process_1 = require("child_process");
+/**
+ * This function is used to start a local registry for testing purposes.
+ * @param localRegistryTarget the target to run to start the local registry e.g. workspace:local-registry
+ * @param storage the storage location for the local registry
+ * @param verbose whether to log verbose output
+ */
+function startLocalRegistry({ localRegistryTarget, storage, verbose, }) {
+    if (!localRegistryTarget) {
+        throw new Error(`localRegistryTarget is required`);
+    }
+    return new Promise((resolve, reject) => {
+        var _a, _b;
+        const childProcess = (0, child_process_1.fork)(require.resolve('nx'), [
+            ...`run ${localRegistryTarget} --location none --clear true`.split(' '),
+            ...(storage ? [`--storage`, storage] : []),
+        ], { stdio: 'pipe' });
+        const listener = (data) => {
+            var _a, _b, _c;
+            if (verbose) {
+                process.stdout.write(data);
+            }
+            if (data.toString().includes('http://localhost:')) {
+                const port = parseInt((_b = (_a = data.toString().match(/localhost:(?<port>\d+)/)) === null || _a === void 0 ? void 0 : _a.groups) === null || _b === void 0 ? void 0 : _b.port);
+                console.log('Local registry started on port ' + port);
+                const registry = `http://localhost:${port}`;
+                process.env.npm_config_registry = registry;
+                process.env.YARN_REGISTRY = registry;
+                (0, child_process_1.execSync)(`npm config set //localhost:${port}/:_authToken "secretVerdaccioToken"`);
+                console.log('Set npm and yarn config registry to ' + registry);
+                resolve(() => {
+                    childProcess.kill();
+                    (0, child_process_1.execSync)(`npm config delete //localhost:${port}/:_authToken`);
+                });
+                (_c = childProcess === null || childProcess === void 0 ? void 0 : childProcess.stdout) === null || _c === void 0 ? void 0 : _c.off('data', listener);
+            }
+        };
+        (_a = childProcess === null || childProcess === void 0 ? void 0 : childProcess.stdout) === null || _a === void 0 ? void 0 : _a.on('data', listener);
+        (_b = childProcess === null || childProcess === void 0 ? void 0 : childProcess.stderr) === null || _b === void 0 ? void 0 : _b.on('data', (data) => {
+            process.stderr.write(data);
+        });
+        childProcess.on('error', (err) => {
+            console.log('local registry error', err);
+            reject(err);
+        });
+        childProcess.on('exit', (code) => {
+            console.log('local registry exit', code);
+            if (code !== 0) {
+                reject(code);
+            }
+            else {
+                resolve(() => { });
+            }
+        });
+    });
+}
+exports.startLocalRegistry = startLocalRegistry;
+exports.default = startLocalRegistry;

package/src/utils/add-babel-inputs.d.ts

@@ -1,2 +1,3 @@
 import { Tree } from '@nx/devkit';
+/** @deprecated Do not use this function as the root babel.config.json file is no longer needed */
 export declare function addBabelInputs(tree: Tree): void;

package/src/utils/add-babel-inputs.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addBabelInputs = void 0;
 const devkit_1 = require("@nx/devkit");
+/** @deprecated Do not use this function as the root babel.config.json file is no longer needed */
+// TODO(jack): Remove This in Nx 17 once we don't need to support Nx 15 anymore. Currently this function is used in v15 migrations.
 function addBabelInputs(tree) {
     var _a;
     const nxJson = (0, devkit_1.readNxJson)(tree);

package/src/utils/add-local-registry-scripts.d.ts

@@ -0,0 +1,5 @@
+import { type Tree } from '@nx/devkit';
+export declare function addLocalRegistryScripts(tree: Tree): {
+    startLocalRegistryPath: string;
+    stopLocalRegistryPath: string;
+};

package/src/utils/add-local-registry-scripts.js

@@ -0,0 +1,57 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addLocalRegistryScripts = void 0;
+const devkit_1 = require("@nx/devkit");
+const startLocalRegistryScript = (localRegistryTarget) => `
+/**
+ * This script starts a local registry for e2e testing purposes.
+ * It is meant to be called in jest's globalSetup.
+ */
+import { startLocalRegistry } from '@nx/js/plugins/jest/local-registry';
+import { execFileSync } from 'child_process';
+
+export default async () => {
+  // local registry target to run
+  const localRegistryTarget = '${localRegistryTarget}';
+  // storage folder for the local registry
+  const storage = './tmp/local-registry/storage';
+
+  global.stopLocalRegistry = await startLocalRegistry({
+    localRegistryTarget,
+    storage,
+    verbose: false,
+  });
+  const nx = require.resolve('nx');
+  execFileSync(
+    nx,
+    ['run-many', '--targets', 'publish', '--ver', '1.0.0', '--tag', 'e2e'],
+    { env: process.env, stdio: 'inherit' }
+  );
+};
+`;
+const stopLocalRegistryScript = `
+/**
+ * This script stops the local registry for e2e testing purposes.
+ * It is meant to be called in jest's globalTeardown.
+ */
+
+export default () => {
+  if (global.stopLocalRegistry) {
+    global.stopLocalRegistry();
+  }
+};
+`;
+function addLocalRegistryScripts(tree) {
+    const startLocalRegistryPath = 'tools/scripts/start-local-registry.ts';
+    const stopLocalRegistryPath = 'tools/scripts/stop-local-registry.ts';
+    const projectConfiguration = (0, devkit_1.readJson)(tree, 'project.json');
+    const localRegistryTarget = `${projectConfiguration.name}:local-registry`;
+    if (!tree.exists(startLocalRegistryPath)) {
+        tree.write(startLocalRegistryPath, startLocalRegistryScript(localRegistryTarget));
+    }
+    if (!tree.exists(stopLocalRegistryPath)) {
+        tree.write(stopLocalRegistryPath, stopLocalRegistryScript);
+    }
+    return { startLocalRegistryPath, stopLocalRegistryPath };
+}
+exports.addLocalRegistryScripts = addLocalRegistryScripts;

package/src/utils/assets/copy-assets-handler.d.ts

@@ -1,4 +1,5 @@
 import { AssetGlob } from './assets';
+import { ChangedFile } from 'nx/src/daemon/client/client';
 export type FileEventType = 'create' | 'update' | 'delete';
 export interface FileEvent {
     type: FileEventType;
@@ -22,7 +23,10 @@ export declare class CopyAssetsHandler {
     private readonly callback;
     constructor(opts: CopyAssetHandlerOptions);
     processAllAssetsOnce(): Promise<void>;
+    processAllAssetsOnceSync(): void;
     watchAndProcessOnAssetChange(): Promise<() => void>;
-    private processEvents;
+    processWatchEvents(events: ChangedFile[]): Promise<void>;
+    private filesToEvent;
+    private normalizeAssetPattern;
 }
 export {};

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

@@ -74,35 +74,27 @@ class CopyAssetsHandler {
     processAllAssetsOnce() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             yield Promise.all(this.assetGlobs.map((ag) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                let pattern;
-                if (typeof ag === 'string') {
-                    pattern = ag;
-                }
-                else {
-                    pattern = ag.pattern;
-                }
+                const pattern = this.normalizeAssetPattern(ag);
                 // fast-glob only supports Unix paths
                 const files = yield fg(pattern.replace(/\\/g, '/'), {
                     cwd: this.rootDir,
                     dot: true, // enable hidden files
                 });
-                this.callback(files.reduce((acc, src) => {
-                    var _a;
-                    if (!((_a = ag.ignore) === null || _a === void 0 ? void 0 : _a.some((ig) => minimatch(src, ig))) &&
-                        !this.ignore.ignores(src)) {
-                        const relPath = path.relative(ag.input, src);
-                        const dest = relPath.startsWith('..') ? src : relPath;
-                        acc.push({
-                            type: 'create',
-                            src: path.join(this.rootDir, src),
-                            dest: path.join(this.rootDir, ag.output, dest),
-                        });
-                    }
-                    return acc;
-                }, []));
+                this.callback(this.filesToEvent(files, ag));
             })));
         });
     }
+    processAllAssetsOnceSync() {
+        this.assetGlobs.forEach((ag) => {
+            const pattern = this.normalizeAssetPattern(ag);
+            // fast-glob only supports Unix paths
+            const files = fg.sync(pattern.replace(/\\/g, '/'), {
+                cwd: this.rootDir,
+                dot: true, // enable hidden files
+            });
+            this.callback(this.filesToEvent(files, ag));
+        });
+    }
     watchAndProcessOnAssetChange() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const unregisterFileWatcher = yield client_1.daemonClient.registerFileWatcher({
@@ -118,13 +110,13 @@ class CopyAssetsHandler {
                     devkit_1.logger.error(`Watch error: ${(_a = err === null || err === void 0 ? void 0 : err.message) !== null && _a !== void 0 ? _a : 'Unknown'}`);
                 }
                 else {
-                    this.processEvents(data.changedFiles);
+                    this.processWatchEvents(data.changedFiles);
                 }
             });
             return () => unregisterFileWatcher();
         });
     }
-    processEvents(events) {
+    processWatchEvents(events) {
         var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const fileEvents = [];
@@ -150,5 +142,24 @@ class CopyAssetsHandler {
                 this.callback(fileEvents);
         });
     }
+    filesToEvent(files, assetGlob) {
+        return files.reduce((acc, src) => {
+            var _a;
+            if (!((_a = assetGlob.ignore) === null || _a === void 0 ? void 0 : _a.some((ig) => minimatch(src, ig))) &&
+                !this.ignore.ignores(src)) {
+                const relPath = path.relative(assetGlob.input, src);
+                const dest = relPath.startsWith('..') ? src : relPath;
+                acc.push({
+                    type: 'create',
+                    src: path.join(this.rootDir, src),
+                    dest: path.join(this.rootDir, assetGlob.output, dest),
+                });
+            }
+            return acc;
+        }, []);
+    }
+    normalizeAssetPattern(assetEntry) {
+        return typeof assetEntry === 'string' ? assetEntry : assetEntry.pattern;
+    }
 }
 exports.CopyAssetsHandler = CopyAssetsHandler;

package/src/utils/compiler-helper-dependency.d.ts

@@ -1,4 +1,4 @@
-import { ProjectGraph, ProjectGraphDependency } from '@nx/devkit';
+import { type ProjectGraph, type ProjectGraphDependency } from '@nx/devkit';
 import { DependentBuildableProjectNode } from './buildable-libs-utils';
 export declare enum HelperDependency {
     tsc = "npm:tslib",
@@ -11,6 +11,7 @@ export declare enum HelperDependency {
  * @param {HelperDependency} helperDependency
  * @param {string} configPath
  * @param {DependentBuildableProjectNode[]} dependencies
+ * @param {ProjectGraph} projectGraph
  * @param {boolean=false} returnDependencyIfFound
  */
 export declare function getHelperDependency(helperDependency: HelperDependency, configPath: string, dependencies: DependentBuildableProjectNode[], projectGraph: ProjectGraph, returnDependencyIfFound?: boolean): DependentBuildableProjectNode | null;

package/src/utils/compiler-helper-dependency.js

@@ -9,7 +9,7 @@ var HelperDependency;
 (function (HelperDependency) {
     HelperDependency["tsc"] = "npm:tslib";
     HelperDependency["swc"] = "npm:@swc/helpers";
-})(HelperDependency = exports.HelperDependency || (exports.HelperDependency = {}));
+})(HelperDependency || (exports.HelperDependency = HelperDependency = {}));
 const jsExecutors = {
     '@nx/js:tsc': {
         helperDependency: HelperDependency.tsc,
@@ -27,6 +27,7 @@ const jsExecutors = {
  * @param {HelperDependency} helperDependency
  * @param {string} configPath
  * @param {DependentBuildableProjectNode[]} dependencies
+ * @param {ProjectGraph} projectGraph
  * @param {boolean=false} returnDependencyIfFound
  */
 function getHelperDependency(helperDependency, configPath, dependencies, projectGraph, returnDependencyIfFound = false) {
@@ -50,7 +51,17 @@ function getHelperDependency(helperDependency, configPath, dependencies, project
     }
     if (!isHelperNeeded)
         return null;
-    const libNode = projectGraph.externalNodes[helperDependency];
+    let libNode = projectGraph[helperDependency];
+    // If libNode is not found due to the version suffix from pnpm lockfile, try to match it by package name.
+    if (!libNode) {
+        for (const nodeName of Object.keys(projectGraph.externalNodes)) {
+            const node = projectGraph.externalNodes[nodeName];
+            if (`npm:${node.data.packageName}` === helperDependency) {
+                libNode = node;
+                break;
+            }
+        }
+    }
     if (!libNode) {
         devkit_1.logger.warn(`Your library compilation option specifies that the compiler external helper (${helperDependency.split(':')[1]}) is needed but it is not installed.`);
         return null;

package/src/utils/inline.d.ts

@@ -13,7 +13,7 @@ export interface InlineProjectGraph {
     dependencies: Record<string, string[]>;
 }
 export declare function isInlineGraphEmpty(inlineGraph: InlineProjectGraph): boolean;
-export declare function handleInliningBuild(context: ExecutorContext, options: NormalizedExecutorOptions, tsConfigPath: string): InlineProjectGraph;
+export declare function handleInliningBuild(context: ExecutorContext, options: NormalizedExecutorOptions, tsConfigPath: string, projectName?: string): InlineProjectGraph;
 export declare function postProcessInlinedDependencies(outputPath: string, parentOutputPath: string, inlineGraph: InlineProjectGraph): void;
 export declare function getRootTsConfigPath(context: ExecutorContext): string | null;
 export {};

package/src/utils/inline.js

@@ -9,11 +9,11 @@ function isInlineGraphEmpty(inlineGraph) {
     return Object.keys(inlineGraph.nodes).length === 0;
 }
 exports.isInlineGraphEmpty = isInlineGraphEmpty;
-function handleInliningBuild(context, options, tsConfigPath) {
+function handleInliningBuild(context, options, tsConfigPath, projectName = context.projectName) {
     var _a;
     const tsConfigJson = (0, devkit_1.readJsonFile)(tsConfigPath);
     const pathAliases = ((_a = tsConfigJson['compilerOptions']) === null || _a === void 0 ? void 0 : _a['paths']) || readBasePathAliases(context);
-    const inlineGraph = createInlineGraph(context, options, pathAliases);
+    const inlineGraph = createInlineGraph(context, options, pathAliases, projectName);
     if (isInlineGraphEmpty(inlineGraph)) {
         return inlineGraph;
     }
@@ -81,7 +81,7 @@ function projectNodeToInlineProjectNode(projectNode, pathAlias = '', buildOutput
         buildOutputPath,
     };
 }
-function createInlineGraph(context, options, pathAliases, projectName = context.projectName, inlineGraph = emptyInlineGraph()) {
+function createInlineGraph(context, options, pathAliases, projectName, inlineGraph = emptyInlineGraph()) {
     var _a;
     var _b;
     if (options.external == null)

package/src/utils/minimal-publish-script.js

@@ -13,14 +13,13 @@ const publishScriptContent = `
 
 import { execSync } from 'child_process';
 import { readFileSync, writeFileSync } from 'fs';
-import chalk from 'chalk';
 
 import devkit from '@nx/devkit';
 const { readCachedProjectGraph } = devkit;
 
 function invariant(condition, message) {
   if (!condition) {
-    console.error(chalk.bold.red(message));
+    console.error(message);
     process.exit(1);
   } 
 }
@@ -59,9 +58,7 @@ try {
   json.version = version;
   writeFileSync(\`package.json\`, JSON.stringify(json, null, 2));
 } catch (e) {
-  console.error(
-    chalk.bold.red(\`Error reading package.json file from library build output.\`)
-  );
+  console.error(\`Error reading package.json file from library build output.\`);
 }
 
 // Execute "npm publish" to publish

package/src/utils/schema.d.ts

@@ -50,11 +50,12 @@ export interface ExecutorOptions {
 }
 
 export interface NormalizedExecutorOptions extends ExecutorOptions {
-  root?: string;
-  sourceRoot?: string;
+  rootDir: string;
   projectRoot: string;
   mainOutputPath: string;
   files: Array<FileInputOutput>;
+  root?: string;
+  sourceRoot?: string;
 }
 
 export interface SwcExecutorOptions extends ExecutorOptions {

package/src/utils/swc/add-swc-config.d.ts

@@ -1,3 +1,3 @@
-import { Tree } from '@nx/devkit';
+import { type Tree } from '@nx/devkit';
 export declare const defaultExclude: string[];
 export declare function addSwcConfig(tree: Tree, projectDir: string, type?: 'commonjs' | 'es6'): void;

package/src/utils/versions.d.ts

@@ -8,7 +8,7 @@ export declare const swcNodeVersion = "~1.4.2";
 export declare const tsLibVersion = "^2.3.0";
 export declare const typesNodeVersion = "18.7.1";
 export declare const verdaccioVersion = "^5.0.4";
-export declare const typescriptVersion = "~5.0.2";
+export declare const typescriptVersion = "~5.1.3";
 /**
  * The minimum version is currently determined from the lowest version
  * that's supported by the lowest Angular supported version, e.g.

package/src/utils/versions.js

@@ -12,7 +12,7 @@ exports.tsLibVersion = '^2.3.0';
 exports.typesNodeVersion = '18.7.1';
 exports.verdaccioVersion = '^5.0.4';
 // Typescript
-exports.typescriptVersion = '~5.0.2';
+exports.typescriptVersion = '~5.1.3';
 /**
  * The minimum version is currently determined from the lowest version
  * that's supported by the lowest Angular supported version, e.g.

package/src/generators/setup-verdaccio/files/htpasswd

@@ -1 +0,0 @@
-test:$6FrCaT/v0dwE:autocreated 2020-03-25T19:10:50.254Z