nx 18.3.0-beta.1 → 18.3.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "18.3.0-beta.1",
+  "version": "18.3.0-beta.2",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -66,7 +66,7 @@
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
     "ora": "5.3.0",
-    "@nrwl/tao": "18.3.0-beta.1"
+    "@nrwl/tao": "18.3.0-beta.2"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -81,16 +81,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "18.3.0-beta.1",
-    "@nx/nx-darwin-arm64": "18.3.0-beta.1",
-    "@nx/nx-linux-x64-gnu": "18.3.0-beta.1",
-    "@nx/nx-linux-x64-musl": "18.3.0-beta.1",
-    "@nx/nx-win32-x64-msvc": "18.3.0-beta.1",
-    "@nx/nx-linux-arm64-gnu": "18.3.0-beta.1",
-    "@nx/nx-linux-arm64-musl": "18.3.0-beta.1",
-    "@nx/nx-linux-arm-gnueabihf": "18.3.0-beta.1",
-    "@nx/nx-win32-arm64-msvc": "18.3.0-beta.1",
-    "@nx/nx-freebsd-x64": "18.3.0-beta.1"
+    "@nx/nx-darwin-x64": "18.3.0-beta.2",
+    "@nx/nx-darwin-arm64": "18.3.0-beta.2",
+    "@nx/nx-linux-x64-gnu": "18.3.0-beta.2",
+    "@nx/nx-linux-x64-musl": "18.3.0-beta.2",
+    "@nx/nx-win32-x64-msvc": "18.3.0-beta.2",
+    "@nx/nx-linux-arm64-gnu": "18.3.0-beta.2",
+    "@nx/nx-linux-arm64-musl": "18.3.0-beta.2",
+    "@nx/nx-linux-arm-gnueabihf": "18.3.0-beta.2",
+    "@nx/nx-win32-arm64-msvc": "18.3.0-beta.2",
+    "@nx/nx-freebsd-x64": "18.3.0-beta.2"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/adapter/ngcli-adapter.d.ts

@@ -4,7 +4,7 @@ import { Observable } from 'rxjs';
 import type { GenerateOptions } from '../command-line/generate/generate';
 import { ProjectConfiguration } from '../config/workspace-json-project-json';
 import { Tree } from '../generators/tree';
-import { ExecutorContext } from '../config/misc-interfaces';
+import { ExecutorContext, GeneratorCallback } from '../config/misc-interfaces';
 export declare function createBuilderContext(builderInfo: {
     builderName: string;
     description: string;
@@ -85,6 +85,6 @@ export declare function mockSchematicsForTesting(schematics: {
 }): void;
 export declare function wrapAngularDevkitSchematic(collectionName: string, generatorName: string): (host: Tree, generatorOptions: {
     [k: string]: any;
-}) => Promise<any>;
+}) => Promise<GeneratorCallback>;
 export declare const getLogger: (isVerbose?: boolean) => logging.Logger;
 export {};

package/src/adapter/ngcli-adapter.js

@@ -655,15 +655,6 @@ function wrapAngularDevkitSchematic(collectionName, generatorName) {
             mockedSchematics[`${collectionName}:${generatorName}`]) {
             return await mockedSchematics[`${collectionName}:${generatorName}`](host, generatorOptions);
         }
-        const emptyLogger = {
-            log: (e) => { },
-            info: (e) => { },
-            warn: (e) => { },
-            debug: () => { },
-            error: (e) => { },
-            fatal: (e) => { },
-        };
-        emptyLogger.createChild = () => emptyLogger;
         const recorder = (event) => {
             let eventPath = event.path.startsWith('/')
                 ? event.path.slice(1)
@@ -690,6 +681,7 @@ function wrapAngularDevkitSchematic(collectionName, generatorName) {
             }
         };
         const fsHost = new NxScopeHostUsedForWrappedSchematics(host.root, host);
+        const logger = (0, exports.getLogger)(generatorOptions.verbose);
         const options = {
             generatorOptions,
             dryRun: true,
@@ -717,10 +709,18 @@ function wrapAngularDevkitSchematic(collectionName, generatorName) {
         }
         const collection = getCollection(workflow, collectionName);
         const schematic = collection.createSchematic(generatorName, true);
-        const res = await runSchematic(fsHost, host.root, workflow, emptyLogger, options, schematic, false, recorder);
+        const res = await runSchematic(fsHost, host.root, workflow, logger, options, schematic, false, recorder);
         if (res.status !== 0) {
             throw new Error(res.loggingQueue.join('\n'));
         }
+        const { lastValueFrom } = require('rxjs');
+        const toPromise = (obs) => lastValueFrom ? lastValueFrom(obs) : obs.toPromise();
+        return async () => {
+            // https://github.com/angular/angular-cli/blob/344193f79d880177e421cff85dd3e94338d07420/packages/angular_devkit/schematics/src/workflow/base.ts#L194-L200
+            await toPromise(workflow.engine
+                .executePostTasks()
+                .pipe((0, operators_1.defaultIfEmpty)(undefined), (0, operators_1.last)()));
+        };
     };
 }
 exports.wrapAngularDevkitSchematic = wrapAngularDevkitSchematic;

package/src/command-line/init/implementation/add-nx-to-monorepo.js

@@ -63,7 +63,7 @@ async function addNxToMonorepo(options) {
     (0, utils_1.createNxJsonFile)(repoRoot, targetDefaults, cacheableOperations, scriptOutputs);
     if (!options.legacy) {
         packageJsonFiles.forEach((packageJsonPath) => {
-            (0, utils_1.markPackageJsonAsNxProject)((0, path_1.join)(repoRoot, packageJsonPath), cacheableOperations);
+            (0, utils_1.markPackageJsonAsNxProject)((0, path_1.join)(repoRoot, packageJsonPath));
         });
     }
     (0, utils_1.updateGitIgnore)(repoRoot);

package/src/command-line/init/implementation/add-nx-to-npm-repo.js

@@ -57,7 +57,7 @@ async function addNxToNpmRepo(options) {
         (0, utils_1.markRootPackageJsonAsNxProjectLegacy)(repoRoot, cacheableOperations, pmc);
     }
     else {
-        (0, utils_1.markPackageJsonAsNxProject)((0, path_1.join)(repoRoot, 'package.json'), cacheableOperations);
+        (0, utils_1.markPackageJsonAsNxProject)((0, path_1.join)(repoRoot, 'package.json'));
     }
     output_1.output.log({ title: '📦 Installing dependencies' });
     (0, utils_1.runInstall)(repoRoot, pmc);

package/src/command-line/init/implementation/utils.d.ts

@@ -9,7 +9,7 @@ export declare function runInstall(repoRoot: string, pmc?: PackageManagerCommand
 export declare function initCloud(repoRoot: string, installationSource: 'nx-init-angular' | 'nx-init-cra' | 'nx-init-monorepo' | 'nx-init-nest' | 'nx-init-npm-repo'): void;
 export declare function addVsCodeRecommendedExtensions(repoRoot: string, extensions: string[]): void;
 export declare function markRootPackageJsonAsNxProjectLegacy(repoRoot: string, cacheableScripts: string[], pmc: PackageManagerCommands): void;
-export declare function markPackageJsonAsNxProject(packageJsonPath: string, cacheableScripts: string[]): void;
+export declare function markPackageJsonAsNxProject(packageJsonPath: string): void;
 export declare function printFinalMessage({ learnMoreLink, bodyLines, }: {
     learnMoreLink?: string;
     bodyLines?: string[];

package/src/command-line/init/implementation/utils.js

@@ -154,17 +154,12 @@ function markRootPackageJsonAsNxProjectLegacy(repoRoot, cacheableScripts, pmc) {
     (0, fileutils_1.writeJsonFile)(`package.json`, json);
 }
 exports.markRootPackageJsonAsNxProjectLegacy = markRootPackageJsonAsNxProjectLegacy;
-function markPackageJsonAsNxProject(packageJsonPath, cacheableScripts) {
+function markPackageJsonAsNxProject(packageJsonPath) {
     const json = (0, fileutils_1.readJsonFile)(packageJsonPath);
     if (!json.scripts) {
         return;
     }
-    json.nx = { includedScripts: [] };
-    for (let script of cacheableScripts) {
-        if (json.scripts[script]) {
-            json.nx.includedScripts.push(script);
-        }
-    }
+    json.nx = {};
     (0, fileutils_1.writeJsonFile)(packageJsonPath, json);
 }
 exports.markPackageJsonAsNxProject = markPackageJsonAsNxProject;

package/src/command-line/init/init-v2.js

@@ -17,7 +17,6 @@ const workspace_context_1 = require("../../utils/workspace-context");
 const connect_to_nx_cloud_1 = require("../connect/connect-to-nx-cloud");
 const add_nx_to_npm_repo_1 = require("./implementation/add-nx-to-npm-repo");
 const add_nx_to_monorepo_1 = require("./implementation/add-nx-to-monorepo");
-const path_1 = require("path");
 async function initHandler(options) {
     process.env.NX_RUNNING_NX_INIT = 'true';
     const version = process.env.NX_VERSION ?? ((0, semver_1.prerelease)(versions_1.nxVersion) ? 'next' : 'latest');
@@ -52,29 +51,29 @@ async function initHandler(options) {
     }
     output_1.output.log({ title: '🧐 Checking dependencies' });
     const { plugins, updatePackageScripts } = await detectPlugins();
-    if (!plugins.length) {
-        // If no plugins are detected/chosen, guide users to setup
-        // their targetDefaults correctly so their package scripts will work.
-        const packageJson = (0, fileutils_1.readJsonFile)('package.json');
-        if ((0, utils_1.isMonorepo)(packageJson)) {
-            await (0, add_nx_to_monorepo_1.addNxToMonorepo)({ interactive: options.interactive });
-        }
-        else {
-            await (0, add_nx_to_npm_repo_1.addNxToNpmRepo)({ interactive: options.interactive });
-        }
+    const packageJson = (0, fileutils_1.readJsonFile)('package.json');
+    if ((0, utils_1.isMonorepo)(packageJson)) {
+        await (0, add_nx_to_monorepo_1.addNxToMonorepo)({
+            interactive: options.interactive,
+            nxCloud: false,
+        });
     }
     else {
-        const useNxCloud = options.nxCloud ??
-            (options.interactive
-                ? await (0, connect_to_nx_cloud_1.connectExistingRepoToNxCloudPrompt)()
-                : false);
-        const repoRoot = process.cwd();
-        const pmc = (0, package_manager_1.getPackageManagerCommand)();
-        (0, utils_1.createNxJsonFile)(repoRoot, [], [], {});
-        (0, utils_1.updateGitIgnore)(repoRoot);
-        (0, utils_1.addDepsToPackageJson)(repoRoot, plugins);
-        output_1.output.log({ title: '📦 Installing Nx' });
-        (0, utils_1.runInstall)(repoRoot, pmc);
+        await (0, add_nx_to_npm_repo_1.addNxToNpmRepo)({
+            interactive: options.interactive,
+            nxCloud: false,
+        });
+    }
+    const useNxCloud = options.nxCloud ??
+        (options.interactive ? await (0, connect_to_nx_cloud_1.connectExistingRepoToNxCloudPrompt)() : false);
+    const repoRoot = process.cwd();
+    const pmc = (0, package_manager_1.getPackageManagerCommand)();
+    (0, utils_1.createNxJsonFile)(repoRoot, [], [], {});
+    (0, utils_1.updateGitIgnore)(repoRoot);
+    (0, utils_1.addDepsToPackageJson)(repoRoot, plugins);
+    output_1.output.log({ title: '📦 Installing Nx' });
+    (0, utils_1.runInstall)(repoRoot, pmc);
+    if (plugins.length > 0) {
         output_1.output.log({ title: '🔨 Configuring plugins' });
         for (const plugin of plugins) {
             (0, child_process_2.execSync)(`${pmc.exec} nx g ${plugin}:init --keepExistingVersions ${updatePackageScripts ? '--updatePackageScripts' : ''} --no-interactive`, {
@@ -82,19 +81,13 @@ async function initHandler(options) {
                 cwd: repoRoot,
             });
         }
-        if (!updatePackageScripts) {
-            const rootPackageJsonPath = (0, path_1.join)(repoRoot, 'package.json');
-            const json = (0, fileutils_1.readJsonFile)(rootPackageJsonPath);
-            json.nx = { includedScripts: [] };
-            (0, fileutils_1.writeJsonFile)(rootPackageJsonPath, json);
-        }
-        if (useNxCloud) {
-            output_1.output.log({ title: '🛠️ Setting up Nx Cloud' });
-            (0, child_process_2.execSync)(`${pmc.exec} nx g nx:connect-to-nx-cloud --installationSource=nx-init --quiet --hideFormatLogs --no-interactive`, {
-                stdio: [0, 1, 2],
-                cwd: repoRoot,
-            });
-        }
+    }
+    if (useNxCloud) {
+        output_1.output.log({ title: '🛠️ Setting up Nx Cloud' });
+        (0, child_process_2.execSync)(`${pmc.exec} nx g nx:connect-to-nx-cloud --installationSource=nx-init --quiet --hideFormatLogs --no-interactive`, {
+            stdio: [0, 1, 2],
+            cwd: repoRoot,
+        });
     }
     output_1.output.log({
         title: '👀 Explore Your Workspace',
@@ -170,9 +163,8 @@ async function detectPlugins() {
         {
             name: 'plugins',
             type: 'multiselect',
-            message: `Which plugins would you like to add?`,
+            message: `Which plugins would you like to add? Press <Space> to select and <Enter> to submit.`,
             choices: plugins.map((p) => ({ name: p, value: p })),
-            initial: plugins.map((_, i) => i), // casting to avoid type error due to bad d.ts file from enquirer
         },
     ]).then((r) => r.plugins);
     if (pluginsToInstall?.length === 0)

package/src/command-line/release/command-object.js

@@ -107,7 +107,7 @@ const versionCommand = {
     })
         .option('preid', {
         type: 'string',
-        describe: 'The optional prerelease identifier to apply to the version, in the case that specifier has been set to prerelease.',
+        describe: 'The optional prerelease identifier to apply to the version, in the case that the specifier argument has been set to `prerelease`.',
         default: '',
     })
         .option('stage-changes', {

package/src/core/graph/3rdpartylicenses.txt

@@ -212,6 +212,29 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
+core-js
+MIT
+Copyright (c) 2014-2024 Denis Pushkarev
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
 cytoscape
 MIT
 Copyright (c) 2016-2022, The Cytoscape Consortium.
@@ -681,32 +704,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
-tabbable
-MIT
-The MIT License (MIT)
-
-Copyright (c) 2015 David Clark
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
-
 toggle-selection
 MIT