nx 20.4.3 → 20.4.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "20.4.3",
+  "version": "20.4.4",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -82,16 +82,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "20.4.3",
-    "@nx/nx-darwin-x64": "20.4.3",
-    "@nx/nx-freebsd-x64": "20.4.3",
-    "@nx/nx-linux-arm-gnueabihf": "20.4.3",
-    "@nx/nx-linux-arm64-gnu": "20.4.3",
-    "@nx/nx-linux-arm64-musl": "20.4.3",
-    "@nx/nx-linux-x64-gnu": "20.4.3",
-    "@nx/nx-linux-x64-musl": "20.4.3",
-    "@nx/nx-win32-arm64-msvc": "20.4.3",
-    "@nx/nx-win32-x64-msvc": "20.4.3"
+    "@nx/nx-darwin-arm64": "20.4.4",
+    "@nx/nx-darwin-x64": "20.4.4",
+    "@nx/nx-freebsd-x64": "20.4.4",
+    "@nx/nx-linux-arm-gnueabihf": "20.4.4",
+    "@nx/nx-linux-arm64-gnu": "20.4.4",
+    "@nx/nx-linux-arm64-musl": "20.4.4",
+    "@nx/nx-linux-x64-gnu": "20.4.4",
+    "@nx/nx-linux-x64-musl": "20.4.4",
+    "@nx/nx-win32-arm64-msvc": "20.4.4",
+    "@nx/nx-win32-x64-msvc": "20.4.4"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/command-line/add/add.js

@@ -5,7 +5,6 @@ exports.addHandler = addHandler;
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const ora = require("ora");
-const yargsParser = require("yargs-parser");
 const nx_json_1 = require("../../config/nx-json");
 const child_process_2 = require("../../utils/child-process");
 const fileutils_1 = require("../../utils/fileutils");
@@ -79,27 +78,18 @@ async function installPackage(pkgName, version, nxJson) {
     spinner.succeed();
 }
 async function initializePlugin(pkgName, options, nxJson) {
-    const parsedCommandArgs = yargsParser(options.__overrides_unparsed__, {
-        configuration: {
-            'parse-numbers': false,
-            'parse-positional-numbers': false,
-            'dot-notation': false,
-            'camel-case-expansion': false,
-        },
-    });
-    if (exports.coreNxPluginVersions.has(pkgName)) {
-        parsedCommandArgs.keepExistingVersions = true;
-        if (options.updatePackageScripts ||
+    let updatePackageScripts = false;
+    if (exports.coreNxPluginVersions.has(pkgName) &&
+        (options.updatePackageScripts ||
             (options.updatePackageScripts === undefined &&
                 nxJson.useInferencePlugins !== false &&
-                process.env.NX_ADD_PLUGINS !== 'false')) {
-            parsedCommandArgs.updatePackageScripts = true;
-        }
+                process.env.NX_ADD_PLUGINS !== 'false'))) {
+        updatePackageScripts = true;
     }
     const spinner = ora(`Initializing ${pkgName}...`);
     spinner.start();
     try {
-        await (0, configure_plugins_1.installPlugin)(pkgName, workspace_root_1.workspaceRoot, options.verbose, parsedCommandArgs);
+        await (0, configure_plugins_1.installPlugin)(pkgName, workspace_root_1.workspaceRoot, updatePackageScripts, options.verbose);
     }
     catch (e) {
         spinner.fail();

package/src/command-line/init/configure-plugins.d.ts

@@ -4,19 +4,18 @@ export declare function runPackageManagerInstallPlugins(repoRoot: string, pmc: P
  * Installs a plugin by running its init generator. It will change the file system tree passed in.
  * @param plugin The name of the plugin to install
  * @param repoRoot repo root
- * @param verbose verbose
- * @param options options passed to init generator
+ * @param pmc package manager commands
+ * @param updatePackageScripts whether to update package scripts
+ * @param verbose whether to run in verbose mode
  * @returns void
  */
-export declare function installPlugin(plugin: string, repoRoot: string, verbose: boolean, options: {
-    [k: string]: any;
-}): Promise<void>;
+export declare function installPlugin(plugin: string, repoRoot?: string, updatePackageScripts?: boolean, verbose?: boolean, pmc?: PackageManagerCommands): Promise<void>;
 /**
  * Install plugins
  * Get the implementation of the plugin's init generator and run it
  * @returns a list of succeeded plugins and a map of failed plugins to errors
  */
-export declare function installPlugins(plugins: string[], updatePackageScripts: boolean, repoRoot?: string, verbose?: boolean): Promise<{
+export declare function installPlugins(plugins: string[], updatePackageScripts: boolean, pmc: PackageManagerCommands, repoRoot?: string, verbose?: boolean): Promise<{
     succeededPlugins: string[];
     failedPlugins: {
         [plugin: string]: Error;

package/src/command-line/init/configure-plugins.js

@@ -7,10 +7,9 @@ exports.configurePlugins = configurePlugins;
 exports.getFailedToInstallPluginErrorMessages = getFailedToInstallPluginErrorMessages;
 const createSpinner = require("ora");
 const chalk_1 = require("chalk");
+const child_process_1 = require("child_process");
 const package_manager_1 = require("../../utils/package-manager");
 const output_1 = require("../../utils/output");
-const tree_1 = require("../../generators/tree");
-const generator_utils_1 = require("../generate/generator-utils");
 const workspace_root_1 = require("../../utils/workspace-root");
 const utils_1 = require("./implementation/utils");
 const plugins_1 = require("../../utils/plugins");
@@ -27,12 +26,12 @@ function runPackageManagerInstallPlugins(repoRoot, pmc = (0, package_manager_1.g
  * Installs a plugin by running its init generator. It will change the file system tree passed in.
  * @param plugin The name of the plugin to install
  * @param repoRoot repo root
- * @param verbose verbose
- * @param options options passed to init generator
+ * @param pmc package manager commands
+ * @param updatePackageScripts whether to update package scripts
+ * @param verbose whether to run in verbose mode
  * @returns void
  */
-async function installPlugin(plugin, repoRoot = workspace_root_1.workspaceRoot, verbose = false, options) {
-    const host = new tree_1.FsTree(repoRoot, verbose, `install ${plugin}`);
+async function installPlugin(plugin, repoRoot = workspace_root_1.workspaceRoot, updatePackageScripts = false, verbose = false, pmc = (0, package_manager_1.getPackageManagerCommand)()) {
     const capabilities = await (0, plugins_1.getPluginCapabilities)(repoRoot, plugin, {});
     const generators = capabilities?.generators;
     if (!generators) {
@@ -45,20 +44,18 @@ async function installPlugin(plugin, repoRoot = workspace_root_1.workspaceRoot,
         });
         return;
     }
-    const { implementationFactory } = (0, generator_utils_1.getGeneratorInformation)(plugin, initGenerator, repoRoot, {});
-    const implementation = implementationFactory();
-    const task = await implementation(host, options);
-    (0, tree_1.flushChanges)(repoRoot, host.listChanges());
-    if (task) {
-        await task();
-    }
+    (0, child_process_1.execSync)(`${pmc.exec} nx g ${plugin}:init --keepExistingVersions ${updatePackageScripts ? '--updatePackageScripts' : ''} ${verbose ? '--verbose' : ''}`, {
+        stdio: [0, 1, 2],
+        cwd: repoRoot,
+        windowsHide: false,
+    });
 }
 /**
  * Install plugins
  * Get the implementation of the plugin's init generator and run it
  * @returns a list of succeeded plugins and a map of failed plugins to errors
  */
-async function installPlugins(plugins, updatePackageScripts, repoRoot = workspace_root_1.workspaceRoot, verbose = false) {
+async function installPlugins(plugins, updatePackageScripts, pmc, repoRoot = workspace_root_1.workspaceRoot, verbose = false) {
     if (plugins.length === 0) {
         return {
             succeededPlugins: [],
@@ -71,13 +68,7 @@ async function installPlugins(plugins, updatePackageScripts, repoRoot = workspac
     for (const plugin of plugins) {
         try {
             spinner.start('Installing plugin ' + plugin);
-            await installPlugin(plugin, repoRoot, verbose, {
-                keepExistingVersions: true,
-                updatePackageScripts,
-                addPlugin: true,
-                skipFormat: false,
-                skipPackageJson: false,
-            });
+            await installPlugin(plugin, repoRoot, updatePackageScripts, verbose, pmc);
             succeededPlugins.push(plugin);
             spinner.succeed('Installed plugin ' + plugin);
         }
@@ -103,7 +94,7 @@ async function configurePlugins(plugins, updatePackageScripts, pmc, repoRoot = w
         };
     }
     output_1.output.log({ title: '🔨 Configuring plugins' });
-    let { succeededPlugins, failedPlugins } = await installPlugins(plugins, updatePackageScripts, repoRoot, verbose);
+    let { succeededPlugins, failedPlugins } = await installPlugins(plugins, updatePackageScripts, pmc, repoRoot, verbose);
     if (succeededPlugins.length > 0) {
         output_1.output.success({
             title: 'Installed Plugins',