npm - nx - Versions diffs - 16.0.0-beta.0 → 16.0.0-beta.2 - Mend

nx 16.0.0-beta.0 → 16.0.0-beta.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (119) hide show

package/bin/nx.js +2 -5
package/bin/nx.js.map +1 -1
package/migrations.json +6 -0
package/package.json +40 -13
package/presets/npm.json +1 -1
package/schemas/nx-schema.json +0 -39
package/src/adapter/angular-json.js +11 -5
package/src/adapter/angular-json.js.map +1 -1
package/src/adapter/ngcli-adapter.js +26 -2
package/src/adapter/ngcli-adapter.js.map +1 -1
package/src/command-line/connect.js +3 -3
package/src/command-line/connect.js.map +1 -1
package/src/command-line/examples.js +1 -1
package/src/command-line/generate.js +3 -4
package/src/command-line/generate.js.map +1 -1
package/src/command-line/init.d.ts +4 -1
package/src/command-line/init.js +3 -3
package/src/command-line/init.js.map +1 -1
package/src/command-line/migrate.js +103 -30
package/src/command-line/migrate.js.map +1 -1
package/src/command-line/new.js +2 -2
package/src/command-line/new.js.map +1 -1
package/src/command-line/nx-commands.js +14 -4
package/src/command-line/nx-commands.js.map +1 -1
package/src/command-line/report.d.ts +2 -0
package/src/command-line/report.js +8 -4
package/src/command-line/report.js.map +1 -1
package/src/command-line/view-logs.js +3 -3
package/src/command-line/view-logs.js.map +1 -1
package/src/config/misc-interfaces.d.ts +1 -0
package/src/config/nx-json.d.ts +2 -7
package/src/config/workspace-json-project-json.d.ts +2 -2
package/src/config/workspaces.d.ts +1 -2
package/src/config/workspaces.js +4 -24
package/src/config/workspaces.js.map +1 -1
package/src/core/graph/main.js +0 -1
package/src/daemon/server/watcher.js +1 -1
package/src/devkit-exports.d.ts +1 -1
package/src/devkit-exports.js +1 -1
package/src/executors/utils/convert-nx-executor.d.ts +1 -1
package/src/executors/utils/convert-nx-executor.js +1 -1
package/src/generators/utils/deprecated.js +1 -2
package/src/generators/utils/deprecated.js.map +1 -1
package/src/hasher/file-hasher.js +5 -21
package/src/hasher/file-hasher.js.map +1 -1
package/src/hasher/hasher.js +2 -2
package/src/hasher/hasher.js.map +1 -1
package/src/migrations/update-14-3-4/create-target-defaults.js.map +1 -1
package/src/migrations/update-15-0-0/migrate-to-inputs.js +1 -1
package/src/migrations/update-15-0-0/migrate-to-inputs.js.map +1 -1
package/src/migrations/update-16-0-0/update-nx-cloud-runner.d.ts +2 -0
package/src/migrations/update-16-0-0/update-nx-cloud-runner.js +31 -0
package/src/migrations/update-16-0-0/update-nx-cloud-runner.js.map +1 -0
package/src/native/index.js +14 -14
package/src/nx-init/add-nx-to-monorepo.js +19 -30
package/src/nx-init/add-nx-to-monorepo.js.map +1 -1
package/src/nx-init/add-nx-to-nest.js +23 -30
package/src/nx-init/add-nx-to-nest.js.map +1 -1
package/src/nx-init/add-nx-to-npm-repo.d.ts +0 -4
package/src/nx-init/add-nx-to-npm-repo.js +17 -51
package/src/nx-init/add-nx-to-npm-repo.js.map +1 -1
package/src/nx-init/angular/index.d.ts +1 -1
package/src/nx-init/angular/index.js +19 -158
package/src/nx-init/angular/index.js.map +1 -1
package/src/nx-init/angular/integrated-workspace.d.ts +1 -0
package/src/nx-init/angular/integrated-workspace.js +11 -0
package/src/nx-init/angular/integrated-workspace.js.map +1 -0
package/src/nx-init/angular/legacy-angular-versions.d.ts +1 -1
package/src/nx-init/angular/legacy-angular-versions.js +14 -9
package/src/nx-init/angular/legacy-angular-versions.js.map +1 -1
package/src/nx-init/angular/standalone-workspace.d.ts +1 -0
package/src/nx-init/angular/standalone-workspace.js +161 -0
package/src/nx-init/angular/standalone-workspace.js.map +1 -0
package/src/nx-init/angular/types.d.ts +18 -0
package/src/nx-init/angular/types.js +3 -0
package/src/nx-init/angular/types.js.map +1 -0
package/src/nx-init/dot-nx/nxw.js +1 -1
package/src/nx-init/dot-nx/nxw.js.map +1 -1
package/src/nx-init/react/index.d.ts +2 -1
package/src/nx-init/react/index.js +61 -52
package/src/nx-init/react/index.js.map +1 -1
package/src/nx-init/react/setup-e2e-project.js +1 -1
package/src/nx-init/react/setup-e2e-project.js.map +1 -1
package/src/nx-init/react/tsconfig-setup.js +4 -4
package/src/nx-init/react/tsconfig-setup.js.map +1 -1
package/src/nx-init/react/write-craco-config.js +1 -1
package/src/nx-init/utils.d.ts +7 -0
package/src/nx-init/utils.js +66 -23
package/src/nx-init/utils.js.map +1 -1
package/src/plugins/js/index.js +14 -4
package/src/plugins/js/index.js.map +1 -1
package/src/project-graph/nx-deps-cache.js +3 -2
package/src/project-graph/nx-deps-cache.js.map +1 -1
package/src/tasks-runner/run-command.js +1 -1
package/src/tasks-runner/run-command.js.map +1 -1
package/src/tasks-runner/tasks-runner-v2.js +1 -1
package/src/tasks-runner/tasks-runner-v2.js.map +1 -1
package/src/utils/get-hashing-implementation.d.ts +6 -0
package/src/utils/get-hashing-implementation.js +39 -0
package/src/utils/get-hashing-implementation.js.map +1 -0
package/src/utils/nx-cloud-utils.js +3 -3
package/src/utils/nx-cloud-utils.js.map +1 -1
package/src/utils/nx-plugin.js +9 -2
package/src/utils/nx-plugin.js.map +1 -1
package/src/utils/package-manager.js +0 -3
package/src/utils/package-manager.js.map +1 -1
package/src/utils/plugins/core-plugins.js +24 -20
package/src/utils/plugins/core-plugins.js.map +1 -1
package/src/utils/print-help.js +7 -3
package/src/utils/print-help.js.map +1 -1
package/src/utils/register.js +8 -1
package/src/utils/register.js.map +1 -1
package/src/utils/versions.d.ts +1 -1
package/src/utils/versions.js +1 -1
package/src/utils/workspace-configuration-check.js +3 -3
package/src/utils/workspace-configuration-check.js.map +1 -1
package/src/utils/workspace-root.js +1 -1
package/src/utils/workspace-root.js.map +1 -1
package/src/core/graph/main.js.LICENSE.txt +0 -83

package/bin/nx.js CHANGED Viewed

@@ -36,11 +36,8 @@ function main() {
                     `To create a workspace run:`,
                     chalk.bold.white(`npx create-nx-workspace@latest <workspace name>`),
                     '',
-                    `To add Nx to existing workspace run with a workspace-specific nx.json:`,
-                    chalk.bold.white(`npx add-nx-to-monorepo@latest`),
-                    '',
-                    `To add the default nx.json file run:`,
-                    chalk.bold.white(`nx init`),
+                    `To add Nx to an existing workspace with a workspace-specific nx.json, run:`,
+                    chalk.bold.white(`npx nx@latest init`),
                 ],
             });
             output_1.output.note({

package/bin/nx.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"nx.js","sourceRoot":"","sources":["../../../../packages/nx/bin/nx.ts"],"names":[],"mappings":";;;AACA,0EAG0C;AAC1C,+BAA+B;AAC/B,6CAAyC;AACzC,gDAA6C;AAC7C,gFAG6C;AAC7C,mCAA+B;AAC/B,8DAA0D;AAC1D,4DAAkE;AAClE,iDAAyC;AAEzC,SAAS,IAAI;;IACX,MAAM,SAAS,GAAG,IAAA,uCAAiB,EAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IACnD,oEAAoE;IACpE,IACE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,KAAK;QACzB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,UAAU;QAC9B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,MAAM;QAC1B,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,OAAO,IAAI,CAAC,SAAS,CAAC,EAC3C;QACA,OAAO,CAAC,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC;QAChC,OAAO,CAAC,iCAAiC,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC;KAChE;SAAM;QACL,IAAI,SAAS,IAAI,SAAS,CAAC,IAAI,KAAK,IAAI,EAAE;YACxC,OAAO,CAAC,kBAAkB,CAAC,CAAC;SAC7B;QACD,yGAAyG;QACzG,8DAA8D;QAC9D,IAAI,CAAE,MAAc,CAAC,UAAU;YAC5B,MAAc,CAAC,UAAU,GAAG,MAAM,CAAC,qBAAqB,CAAC,CAAC;QAE7D,IAAI,CAAC,SAAS,EAAE;YACd,eAAM,CAAC,GAAG,CAAC;gBACT,KAAK,EAAE,sDAAsD;gBAC7D,SAAS,EAAE;oBACT,4BAA4B;oBAC5B,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,iDAAiD,CAAC;oBACnE,EAAE;oBACF,~~wEAAwE~~;~~oBACxE~~,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC~~,+BAA+B~~,~~CAAC;oBACjD~~,~~EAAE;oBACF,sCAAsC;oBACtC,KAAK,~~CAAC~~,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC~~;~~iBAC5B~~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"}
1	+ {"version":3,"file":"nx.js","sourceRoot":"","sources":["../../../../packages/nx/bin/nx.ts"],"names":[],"mappings":"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"}

package/migrations.json CHANGED Viewed

@@ -65,6 +65,12 @@
       "version": "16.0.0-beta.0",
       "description": "Replace `dependsOn.projects` with {self} or {dependencies} tokens so that it matches the new expected formatting.",
       "implementation": "./src/migrations/update-16-0-0/update-depends-on-to-tokens"
+    },
+    "16.0.0-update-nx-cloud-runner": {
+      "cli": "nx",
+      "version": "16.0.0-beta.0",
+      "description": "Replace @nrwl/nx-cloud with nx-cloud",
+      "implementation": "./src/migrations/update-16-0-0/update-nx-cloud-runner"
     }
   }
 }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "16.0.0-beta.0",
+  "version": "16.0.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": {
@@ -32,7 +32,7 @@
   },
   "homepage": "https://nx.dev",
   "dependencies": {
-    "@nrwl/tao": "16.0.0-beta.0",
+    "@nrwl/tao": "16.0.0-beta.2",
     "@parcel/watcher": "2.0.4",
     "@yarnpkg/lockfile": "^1.1.0",
     "@yarnpkg/parsers": "^3.0.0-rc.18",
@@ -80,46 +80,73 @@
     }
   },
   "optionalDependencies": {
-    "@nrwl/nx-darwin-arm64": "16.0.0-beta.0",
-    "@nrwl/nx-darwin-x64": "16.0.0-beta.0",
-    "@nrwl/nx-linux-arm-gnueabihf": "16.0.0-beta.0",
-    "@nrwl/nx-linux-arm64-gnu": "16.0.0-beta.0",
-    "@nrwl/nx-linux-arm64-musl": "16.0.0-beta.0",
-    "@nrwl/nx-linux-x64-gnu": "16.0.0-beta.0",
-    "@nrwl/nx-linux-x64-musl": "16.0.0-beta.0",
-    "@nrwl/nx-win32-arm64-msvc": "16.0.0-beta.0",
-    "@nrwl/nx-win32-x64-msvc": "16.0.0-beta.0"
+    "@nx/nx-darwin-arm64": "16.0.0-beta.2",
+    "@nx/nx-darwin-x64": "16.0.0-beta.2",
+    "@nx/nx-linux-arm-gnueabihf": "16.0.0-beta.2",
+    "@nx/nx-linux-arm64-gnu": "16.0.0-beta.2",
+    "@nx/nx-linux-arm64-musl": "16.0.0-beta.2",
+    "@nx/nx-linux-x64-gnu": "16.0.0-beta.2",
+    "@nx/nx-linux-x64-musl": "16.0.0-beta.2",
+    "@nx/nx-win32-arm64-msvc": "16.0.0-beta.2",
+    "@nx/nx-win32-x64-msvc": "16.0.0-beta.2"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",
     "packageGroup": [
+      "@nx/js",
       "@nrwl/js",
+      "@nx/jest",
       "@nrwl/jest",
+      "@nx/linter",
       "@nrwl/linter",
+      "@nx/workspace",
       "@nrwl/workspace",
+      "@nx/angular",
       "@nrwl/angular",
+      "@nx/cypress",
       "@nrwl/cypress",
+      "@nx/detox",
       "@nrwl/detox",
+      "@nx/devkit",
       "@nrwl/devkit",
+      "@nx/esbuild",
       "@nrwl/esbuild",
+      "@nx/eslint-plugin-nx",
       "@nrwl/eslint-plugin-nx",
+      "@nx/expo",
       "@nrwl/expo",
+      "@nx/express",
       "@nrwl/express",
+      "@nx/nest",
       "@nrwl/nest",
+      "@nx/next",
       "@nrwl/next",
+      "@nx/node",
       "@nrwl/node",
+      "@nx/nx-plugin",
       "@nrwl/nx-plugin",
+      "@nx/react",
       "@nrwl/react",
+      "@nx/react-native",
       "@nrwl/react-native",
+      "@nx/rollup",
       "@nrwl/rollup",
+      "@nx/storybook",
       "@nrwl/storybook",
       "@nrwl/tao",
+      "@nx/vite",
       "@nrwl/vite",
+      "@nx/web",
       "@nrwl/web",
+      "@nx/webpack",
       "@nrwl/webpack",
       {
         "package": "@nrwl/nx-cloud",
         "version": "latest"
+      },
+      {
+        "package": "nx-cloud",
+        "version": "latest"
       }
     ]
   },
@@ -131,7 +158,7 @@
   "napi": {
     "name": "nx",
     "package": {
-      "name": "@nrwl/nx"
+      "name": "@nx/nx"
     },
     "triples": {
       "additional": [
@@ -146,5 +173,5 @@
   },
   "main": "./bin/nx.js",
   "types": "./bin/nx.d.ts",
-  "gitHead": "1e31d4726f2c623ede0c515429aa842e943dba47"
+  "gitHead": "0d7dbbc5254390f53a28d94de536da916ed06a70"
 }

package/presets/npm.json CHANGED Viewed

@@ -8,7 +8,7 @@
     }
   },
   "pluginsConfig": {
-    "@nrwl/js": {
+    "@nx/js": {
       "analyzeSourceFiles": false
     }
   }

package/schemas/nx-schema.json CHANGED Viewed

@@ -43,13 +43,6 @@
         "$ref": "#/definitions/targetDefaultsConfig"
       }
     },
-    "targetDependencies": {
-      "type": "object",
-      "description": "Dependencies between different target names across all projects.",
-      "additionalProperties": {
-        "$ref": "#/definitions/targetDependencyConfig"
-      }
-    },
     "workspaceLayout": {
       "type": "object",
       "description": "Where new apps + libs should be placed.",
@@ -173,38 +166,6 @@
       },
       "additionalProperties": false
     },
-    "targetDependencyConfig": {
-      "type": "array",
-      "items": {
-        "oneOf": [
-          {
-            "type": "string"
-          },
-          {
-            "type": "object",
-            "properties": {
-              "projects": {
-                "type": "string",
-                "description": "The projects that the targets belong to.",
-                "enum": ["self", "dependencies"]
-              },
-              "target": {
-                "type": "string",
-                "description": "The name of the target."
-              },
-              "params": {
-                "type": "string",
-                "description": "Configuration for params handling.",
-                "enum": ["ignore", "forward"],
-                "default": "ignore"
-              }
-            },
-            "additionalProperties": false,
-            "required": ["projects", "target"]
-          }
-        ]
-      }
-    },
     "targetDefaultsConfig": {
       "type": "object",
       "description": "Target defaults",

package/src/adapter/angular-json.js CHANGED Viewed

@@ -11,8 +11,8 @@ function shouldMergeAngularProjects(root, includeProjectsFromAngularJson) {
         // Include projects from angular.json if explicitly required.
         // e.g. when invoked from `packages/devkit/src/utils/convert-nx-executor.ts`
         (includeProjectsFromAngularJson ||
-            // Or if a workspace has `@nrwl/angular` installed then projects from `angular.json` to be considered by Nx.
-            isNrwlAngularInstalled())) {
+            // Or if a workspace has `@nrwl/angular`/`@nx/angular` installed then projects from `angular.json` to be considered by Nx.
+            isAngularPluginInstalled())) {
         return true;
     }
     else {
@@ -20,13 +20,19 @@ function shouldMergeAngularProjects(root, includeProjectsFromAngularJson) {
     }
 }
 exports.shouldMergeAngularProjects = shouldMergeAngularProjects;
-function isNrwlAngularInstalled() {
+function isAngularPluginInstalled() {
     try {
-        require.resolve('@nrwl/angular');
+        require.resolve('@nx/angular');
         return true;
     }
     catch (_a) {
-        return false;
+        try {
+            require.resolve('@nrwl/angular');
+            return true;
+        }
+        catch (_b) {
+            return false;
+        }
     }
 }
 function readAngularJson() {

package/src/adapter/angular-json.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"angular-json.js","sourceRoot":"","sources":["../../../../../packages/nx/src/adapter/angular-json.ts"],"names":[],"mappings":";;;AAAA,2BAAgC;AAChC,6BAA6B;AAC7B,kDAAkD;AAKlD,qDAAoE;AACpE,4DAAwD;AAExD,SAAgB,0BAA0B,CACxC,IAAY,EACZ,8BAAuC;IAEvC,IACE,IAAA,eAAU,EAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAC3C,6DAA6D;QAC7D,4EAA4E;QAC5E,CAAC,8BAA8B;YAC7B,~~4GAA4G~~;~~YAC5G~~,~~sBAAsB~~,EAAE,CAAC,~~EAC3B~~;QACA,OAAO,IAAI,CAAC;KACb;SAAM;QACL,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAhBD,gEAgBC;AAED,SAAS,~~sBAAsB~~;~~IAC7B~~,IAAI;QACF,OAAO,CAAC,OAAO,CAAC,~~eAAe~~,CAAC,CAAC;~~QACjC~~,OAAO,IAAI,CAAC;KACb;IAAC,WAAM;QACN,OAAO,KAAK,CAAC;~~KACd~~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"}
1	+ {"version":3,"file":"angular-json.js","sourceRoot":"","sources":["../../../../../packages/nx/src/adapter/angular-json.ts"],"names":[],"mappings":"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"}

package/src/adapter/ngcli-adapter.js CHANGED Viewed

@@ -4,6 +4,7 @@ exports.getLogger = exports.wrapAngularDevkitSchematic = exports.mockSchematicsF
 const tslib_1 = require("tslib");
 const core_1 = require("@angular-devkit/core");
 const node_1 = require("@angular-devkit/core/node");
+const node_2 = require("@angular-devkit/architect/node");
 const chalk = require("chalk");
 const path_1 = require("path");
 const rxjs_1 = require("rxjs");
@@ -19,10 +20,33 @@ const logger_1 = require("../utils/logger");
 const package_json_1 = require("../utils/package-json");
 const package_manager_1 = require("../utils/package-manager");
 const angular_json_1 = require("./angular-json");
+const workspaces_1 = require("../config/workspaces");
+class WrappedWorkspaceNodeModulesArchitectHost extends node_2.WorkspaceNodeModulesArchitectHost {
+    constructor(workspace, root) {
+        super(workspace, root);
+        this.workspace = workspace;
+        this.root = root;
+        this.workspaces = new workspaces_1.Workspaces(this.root);
+    }
+    resolveBuilder(builderStr) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const [packageName, builderName] = builderStr.split(':');
+            const { executorsFilePath, executorConfig } = this.workspaces['readExecutorsJson'](packageName, builderName);
+            const builderInfo = this.workspaces.readExecutor(packageName, builderName);
+            return {
+                name: builderStr,
+                builderName,
+                description: (0, fileutils_1.readJsonFile)(executorsFilePath).builders[builderName]
+                    .description,
+                optionSchema: builderInfo.schema,
+                import: this.workspaces['resolveImplementation'](executorConfig.implementation, (0, path_1.dirname)(executorsFilePath)),
+            };
+        });
+    }
+}
 function scheduleTarget(root, opts, verbose) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const { Architect } = require('@angular-devkit/architect');
-        const { WorkspaceNodeModulesArchitectHost, } = require('@angular-devkit/architect/node');
         const logger = (0, exports.getLogger)(verbose);
         const fsHost = new NxScopedHost(root);
         const { workspace } = yield core_1.workspaces.readWorkspace('angular.json', core_1.workspaces.createWorkspaceHost(fsHost));
@@ -32,7 +56,7 @@ function scheduleTarget(root, opts, verbose) {
             // This happens when context.scheduleTarget is used to run a target using nx:run-commands
             return [];
         });
-        const architectHost = new WorkspaceNodeModulesArchitectHost(workspace, root);
+        const architectHost = new WrappedWorkspaceNodeModulesArchitectHost(workspace, root);
         const architect = new Architect(architectHost, registry);
         const run = yield architect.scheduleTarget({
             project: opts.project,

package/src/adapter/ngcli-adapter.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ngcli-adapter.js","sourceRoot":"","sources":["../../../../../packages/nx/src/adapter/ngcli-adapter.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"ngcli-adapter.js","sourceRoot":"","sources":["../../../../../packages/nx/src/adapter/ngcli-adapter.ts"],"names":[],"mappings":"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"}

package/src/command-line/connect.js CHANGED Viewed

@@ -52,16 +52,16 @@ function connectToNxCloudCommand(promptOverride) {
             return false;
         const pmc = (0, package_manager_1.getPackageManagerCommand)();
         if (pmc) {
-            (0, child_process_1.execSync)(`${pmc.addDev} @nrwl/nx-cloud@latest`);
+            (0, child_process_1.execSync)(`${pmc.addDev} nx-cloud@latest`);
         }
         else {
             const nxJson = (0, configuration_1.readNxJson)();
             if (nxJson.installation) {
                 (_a = (_b = nxJson.installation).plugins) !== null && _a !== void 0 ? _a : (_b.plugins = {});
-                nxJson.installation.plugins['@nrwl/nx-cloud'] = (0, child_process_1.execSync)(`npm view @nrwl/nx-cloud@latest version`).toString();
+                nxJson.installation.plugins['nx-cloud'] = (0, child_process_1.execSync)(`npm view nx-cloud@latest version`).toString();
             }
         }
-        (0, child_process_2.runNxSync)(`g @nrwl/nx-cloud:init`, {
+        (0, child_process_2.runNxSync)(`g nx-cloud:init`, {
             stdio: [0, 1, 2],
         });
         return true;

package/src/command-line/connect.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"connect.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/connect.ts"],"names":[],"mappings":";;;;AAAA,4CAAyC;AACzC,8DAAoE;AACpE,iDAAyC;AACzC,2DAAqD;AACrD,4DAIiC;AAIjC,0DAAmD;AAEnD,SAAsB,iCAAiC,CAAC,IAEvD;;QACC,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE;YAC1B,MAAM,MAAM,GAAG,IAAA,0BAAU,GAAE,CAAC;YAC5B,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;YACzD,MAAM,uBAAuB,GAC3B,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,0BAA0B,CAAC;YAC3E,IAAI,CAAC,uBAAuB;gBAAE,OAAO;YAErC,eAAM,CAAC,GAAG,CAAC;gBACT,KAAK,EAAE,6DAA6D;aACrE,CAAC,CAAC;YACH,IAAA,yBAAS,EAAC,qBAAqB,EAAE;gBAC/B,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;aACjB,CAAC,CAAC;YACH,eAAM,CAAC,OAAO,CAAC;gBACb,KAAK,EAAE,6DAA6D;aACrE,CAAC,CAAC;YACH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;IACH,CAAC;CAAA;AArBD,8EAqBC;AAED,SAAsB,uBAAuB,CAC3C,cAAuB;;;;QAEvB,IAAI,IAAA,8BAAa,GAAE,EAAE;YACnB,eAAM,CAAC,GAAG,CAAC;gBACT,KAAK,EAAE,oDAAoD;gBAC3D,SAAS,EAAE;oBACT,gHAAgH;oBAChH,qCAAqC;oBACrC,GAAG;oBACH,+DAA+D;oBAC/D,GAAG,IAAA,8BAAa,GAAE,qCAAqC,IAAA,gCAAe,GAAE,EAAE;iBAC3E;aACF,CAAC,CAAC;YACH,OAAO,KAAK,CAAC;SACd;QAED,MAAM,GAAG,GAAG,MAAM,sBAAsB,CAAC,cAAc,CAAC,CAAC;QACzD,IAAI,CAAC,GAAG;YAAE,OAAO,KAAK,CAAC;QACvB,MAAM,GAAG,GAAG,IAAA,0CAAwB,GAAE,CAAC;QACvC,IAAI,GAAG,EAAE;YACP,IAAA,wBAAQ,EAAC,GAAG,GAAG,CAAC,MAAM,~~wBAAwB~~,CAAC,CAAC;~~SACjD~~;aAAM;YACL,MAAM,MAAM,GAAG,IAAA,0BAAU,GAAE,CAAC;YAC5B,IAAI,MAAM,CAAC,YAAY,EAAE;gBACvB,YAAA,MAAM,CAAC,YAAY,EAAC,OAAO,uCAAP,OAAO,GAAK,EAAE,EAAC;gBACnC,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,~~gBAAgB~~,CAAC,GAAG,IAAA,wBAAQ,~~EACtD~~,~~wCAAwC~~,~~CACzC~~,CAAC,QAAQ,EAAE,CAAC;aACd;SACF;QACD,IAAA,yBAAS,EAAC,~~uBAAuB~~,EAAE;~~YACjC~~,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;SACjB,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;;CACb;AAnCD,0DAmCC;AAED,SAAe,sBAAsB,CAAC,MAAe;;QACnD,OAAO,MAAM,CACX,2CAAa,UAAU,EAAC,CACzB;aACE,MAAM,CAAC;YACN;gBACE,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,mDAAmD;gBACtE,IAAI,EAAE,cAAc;gBACpB,OAAO,EAAE;oBACP;wBACE,IAAI,EAAE,KAAK;wBACX,IAAI,EAAE,sBAAsB;qBAC7B;oBACD;wBACE,IAAI,EAAE,IAAI;qBACX;iBACF;gBACD,OAAO,EAAE,KAAY;aACtB;SACF,CAAC;aACD,IAAI,CAAC,CAAC,CAA4B,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,KAAK,CAAC,CAAC;IACjE,CAAC;CAAA"}
1	+ {"version":3,"file":"connect.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/connect.ts"],"names":[],"mappings":";;;;AAAA,4CAAyC;AACzC,8DAAoE;AACpE,iDAAyC;AACzC,2DAAqD;AACrD,4DAIiC;AAIjC,0DAAmD;AAEnD,SAAsB,iCAAiC,CAAC,IAEvD;;QACC,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE;YAC1B,MAAM,MAAM,GAAG,IAAA,0BAAU,GAAE,CAAC;YAC5B,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;YACzD,MAAM,uBAAuB,GAC3B,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,0BAA0B,CAAC;YAC3E,IAAI,CAAC,uBAAuB;gBAAE,OAAO;YAErC,eAAM,CAAC,GAAG,CAAC;gBACT,KAAK,EAAE,6DAA6D;aACrE,CAAC,CAAC;YACH,IAAA,yBAAS,EAAC,qBAAqB,EAAE;gBAC/B,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;aACjB,CAAC,CAAC;YACH,eAAM,CAAC,OAAO,CAAC;gBACb,KAAK,EAAE,6DAA6D;aACrE,CAAC,CAAC;YACH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;IACH,CAAC;CAAA;AArBD,8EAqBC;AAED,SAAsB,uBAAuB,CAC3C,cAAuB;;;;QAEvB,IAAI,IAAA,8BAAa,GAAE,EAAE;YACnB,eAAM,CAAC,GAAG,CAAC;gBACT,KAAK,EAAE,oDAAoD;gBAC3D,SAAS,EAAE;oBACT,gHAAgH;oBAChH,qCAAqC;oBACrC,GAAG;oBACH,+DAA+D;oBAC/D,GAAG,IAAA,8BAAa,GAAE,qCAAqC,IAAA,gCAAe,GAAE,EAAE;iBAC3E;aACF,CAAC,CAAC;YACH,OAAO,KAAK,CAAC;SACd;QAED,MAAM,GAAG,GAAG,MAAM,sBAAsB,CAAC,cAAc,CAAC,CAAC;QACzD,IAAI,CAAC,GAAG;YAAE,OAAO,KAAK,CAAC;QACvB,MAAM,GAAG,GAAG,IAAA,0CAAwB,GAAE,CAAC;QACvC,IAAI,GAAG,EAAE;YACP,IAAA,wBAAQ,EAAC,GAAG,GAAG,CAAC,MAAM,kBAAkB,CAAC,CAAC;SAC3C;aAAM;YACL,MAAM,MAAM,GAAG,IAAA,0BAAU,GAAE,CAAC;YAC5B,IAAI,MAAM,CAAC,YAAY,EAAE;gBACvB,YAAA,MAAM,CAAC,YAAY,EAAC,OAAO,uCAAP,OAAO,GAAK,EAAE,EAAC;gBACnC,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,IAAA,wBAAQ,EAChD,kCAAkC,CACnC,CAAC,QAAQ,EAAE,CAAC;aACd;SACF;QACD,IAAA,yBAAS,EAAC,iBAAiB,EAAE;YAC3B,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;SACjB,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;;CACb;AAnCD,0DAmCC;AAED,SAAe,sBAAsB,CAAC,MAAe;;QACnD,OAAO,MAAM,CACX,2CAAa,UAAU,EAAC,CACzB;aACE,MAAM,CAAC;YACN;gBACE,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,mDAAmD;gBACtE,IAAI,EAAE,cAAc;gBACpB,OAAO,EAAE;oBACP;wBACE,IAAI,EAAE,KAAK;wBACX,IAAI,EAAE,sBAAsB;qBAC7B;oBACD;wBACE,IAAI,EAAE,IAAI;qBACX;iBACF;gBACD,OAAO,EAAE,KAAY;aACtB;SACF,CAAC;aACD,IAAI,CAAC,CAAC,CAA4B,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,KAAK,CAAC,CAAC;IACjE,CAAC;CAAA"}

package/src/command-line/examples.js CHANGED Viewed

@@ -54,7 +54,7 @@ exports.examples = {
             description: 'Run tests for all the projects affected by the last commit on main',
         },
         {
-            command: 'affected -t build --tag=$NX_TARGET_TASK_PROJECT:latest',
+            command: 'affected -t build --tag=$NX_TASK_TARGET_PROJECT:latest',
             description: 'Use the currently executing project name in your command.',
         },
     ],

package/src/command-line/generate.js CHANGED Viewed

@@ -172,9 +172,6 @@ function convertToGenerateOptions(generatorOptions, ws, defaultCollectionName, m
             collectionName = generatorOptions.collection;
             generatorName = 'new';
         }
-        if (!collectionName) {
-            throwInvalidInvocation(['@nrwl/workspace:library']);
-        }
         const res = {
             collectionName,
             generatorName,
@@ -233,7 +230,9 @@ function generate(cwd, args) {
                     `${deprecated}`,
                 ].join('/n'));
             }
-            logger_1.logger.info(`NX Generating ${opts.collectionName}:${normalizedGeneratorName}`);
+            if (!opts.quiet) {
+                logger_1.logger.info(`NX Generating ${opts.collectionName}:${normalizedGeneratorName}`);
+            }
             if (opts.help) {
                 printGenHelp(opts, schema, normalizedGeneratorName, aliases);
                 return 0;

package/src/command-line/generate.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/generate.ts"],"names":[],"mappings":";;;;AAAA,+BAA+B;AAC/B,uCAAkC;~~AAGlC~~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~~IAAI,CAAC,cAAc,EAAE;YACnB,sBAAsB,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC;SACrD;QAED,~~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~~YAEF~~,IAAI,IAAI,CAAC,IAAI,EAAE;gBACb,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,uBAAuB,EAAE,OAAO,CAAC,CAAC;gBAC7D,OAAO,CAAC,CAAC;aACV;YAED,MAAM,YAAY,GAAG,MAAM,IAAA,mCAA0B,EACnD,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,cAAc,EACnB,uBAAuB,EACvB,sBAAsB,EACtB,mBAAmB,EACnB,MAAM,EACN,IAAI,CAAC,WAAW,EAChB,EAAE,CAAC,2BAA2B,CAC5B,GAAG,EACH,sBAAsB,EACtB,mBAAmB,CACpB,EACD,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,EACnB,OAAO,CACR,CAAC;YAEF,IAAI,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,cAAc,EAAE,uBAAuB,CAAC,EAAE;gBAClE,MAAM,IAAI,GAAG,IAAI,aAAM,CAAC,8BAAa,EAAE,OAAO,CAAC,CAAC;gBAChD,MAAM,cAAc,GAAG,qBAAqB,EAAE,CAAC;gBAE/C,mEAAmE;gBACnE,IAAI,uBAAuB,KAAK,QAAQ,IAAI,CAAC,kBAAkB,EAAE;oBAC/D,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;oBAChC,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;iBACjC;gBAED,MAAM,IAAI,GAAG,MAAM,cAAc,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;gBACtD,IAAI,CAAC,IAAI,EAAE,CAAC;gBAEZ,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;gBAEnC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;oBACf,YAAY,CAAC,OAAO,CAAC,CAAC;iBACvB;gBACD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;oBAChB,IAAA,mBAAY,EAAC,8BAAa,EAAE,OAAO,CAAC,CAAC;oBACrC,IAAI,IAAI,EAAE;wBACR,MAAM,IAAI,EAAE,CAAC;qBACd;iBACF;qBAAM;oBACL,eAAM,CAAC,IAAI,CAAC,uDAAuD,CAAC,CAAC;iBACtE;aACF;iBAAM;gBACL,OAAO,CAAC,mBAAmB,CAAC,CAAC;gBAC7B,OAAO,CAAC,2CAAa,0BAA0B,EAAC,CAAC,CAAC,QAAQ,CACxD,8BAAa,kCAER,IAAI,KACP,gBAAgB,EAAE,YAAY,KAEhC,OAAO,CACR,CAAC;aACH;QACH,CAAC,CAAA,CAAC,CAAC;IACL,CAAC;CAAA;~~AAzGD~~,~~4BAyGC~~"}
1	+ {"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/generate.ts"],"names":[],"mappings":";;;;AAAA,+BAA+B;AAC/B,uCAAkC;AAElC,2DAAqD;AAErD,qDAAkD;AAClD,6CAAsE;AACtE,kEAGwC;AACxC,4CAAoD;AACpD,4CAKyB;AACzB,kEAA0E;AAC1E,oDAAgD;AAChD,4DAAwD;AAExD,0EAA0E;AAa1E,SAAgB,YAAY,CAAC,WAAyB;IACpD,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACxB,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE;YACvB,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;SACnD;aAAM,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE;YAC9B,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;SACnD;aAAM,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE;YAC9B,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;SACpD;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAVD,oCAUC;AAED,SAAe,mBAAmB,CAChC,aAAqB,EACrB,EAAc,EACd,WAAoB,EACpB,qBAA6C;;QAE7C,MAAM,YAAY,GAAG,MAAM,IAAA,wCAAwB,EAAC,qBAAqB,CAAC,CAAC;QAE3E,MAAM,oBAAoB,GAAG,KAAK,CAAC,IAAI,CACrC,IAAI,GAAG,CAAC,IAAA,wCAAoB,GAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CACnD,CAAC;QAEF,MAAM,UAAU,GAAG,IAAI,GAAG,EAAU,CAAC;QAErC,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAU,CAAC;QAE5C,KAAK,MAAM,cAAc,IAAI,oBAAoB,EAAE;YACjD,IAAI;gBACF,MAAM,EACJ,sBAAsB,EACtB,uBAAuB,EACvB,sBAAsB,EAAE,EAAE,CAAC,cAAc,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,GACjE,GAAG,EAAE,CAAC,aAAa,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC;gBACpD,IAAI,MAAM,EAAE;oBACV,SAAS;iBACV;gBACD,IAAI,UAAU,EAAE;oBACd,iBAAiB,CAAC,GAAG,CACnB,GAAG,sBAAsB,IAAI,uBAAuB,EAAE,CACvD,CAAC;iBACH;qBAAM;oBACL,UAAU,CAAC,GAAG,CAAC,GAAG,sBAAsB,IAAI,uBAAuB,EAAE,CAAC,CAAC;iBACxE;aACF;YAAC,WAAM,GAAE;SACX;QAED,MAAM,uBAAuB,GAIvB,EAAE,CAAC;QACT,KAAK,MAAM,CAAC,IAAI,CAAC,IAAI,YAAY,EAAE;YACjC,IAAI;gBACF,MAAM,EACJ,sBAAsB,EACtB,uBAAuB,EACvB,sBAAsB,EAAE,EAAE,CAAC,cAAc,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,GACjE,GAAG,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;gBAC1C,IAAI,MAAM,EAAE;oBACV,SAAS;iBACV;gBACD,MAAM,KAAK,GAAG,GAAG,sBAAsB,IAAI,uBAAuB,EAAE,CAAC;gBACrE,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;oBAC1B,IAAI,UAAU,EAAE;wBACd,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;qBAC9B;yBAAM;wBACL,uBAAuB,CAAC,IAAI,CAAC;4BAC3B,IAAI,EAAE,KAAK;4BACX,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC;4BAC1B,KAAK;yBACN,CAAC,CAAC;qBACJ;iBACF;aACF;YAAC,WAAM,GAAE;SACX;QACD,IAAI,uBAAuB,CAAC,MAAM,EAAE;YAClC,uBAAuB,CAAC,uBAAuB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,OAAO,IAAI,IAAI,CAAC;SAC7E;QACD,MAAM,OAAO,GACX,uBAQD,CAAC,MAAM,CAAC,GAAG,UAAU,CAAC,CAAC;QACxB,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;YACxB,OAAO,OAAO,OAAO,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;SACvE;aAAM,IAAI,CAAC,WAAW,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;YAC7C,sBAAsB,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;SAChD;aAAM,IAAI,WAAW,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;YAC5C,MAAM,cAAc,GAAG,qBAAqB,CAAC;YAC7C,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YAC7B,IAAI,EAAE,SAAS,EAAE,gBAAgB,EAAE,GAAG,MAAM,IAAA,iBAAM,EAG/C;gBACD;oBACE,IAAI,EAAE,WAAW;oBACjB,OAAO,EAAE,wCAAwC;oBACjD,IAAI,EAAE,cAAc;oBACpB,kHAAkH;oBAClH,OAAO,EAAE,OAAmB;iBAC7B;gBACD;oBACE,IAAI,EAAE,kBAAkB;oBACxB,IAAI,EAAE,OAAO;oBACb,OAAO,EAAE,yCAAyC;oBAClD,IAAI,EAAE;wBACJ,kEAAkE;wBAClE,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,KAAK,cAAc,CAAC;oBACzD,CAAC;oBACD,QAAQ,EAAE,UAAU,KAAK;wBACvB,IAAI,IAAI,CAAC,OAAO,EAAE;4BAChB,OAAO,IAAI,CAAC;yBACb;wBACD,IAAI;4BACF,EAAE,CAAC,aAAa,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;4BACvC,OAAO,IAAI,CAAC;yBACb;wBAAC,WAAM;4BACN,eAAM,CAAC,KAAK,CAAC,oBAAoB,KAAK,IAAI,aAAa,EAAE,CAAC,CAAC;4BAC3D,OAAO,KAAK,CAAC;yBACd;oBACH,CAAC;iBACF;aACF,CAAC,CAAC;YACH,OAAO,gBAAgB;gBACrB,CAAC,CAAC,GAAG,gBAAgB,IAAI,aAAa,EAAE;gBACxC,CAAC,CAAC,SAAS,CAAC;SACf;aAAM,IAAI,iBAAiB,CAAC,IAAI,GAAG,CAAC,EAAE;YACrC,MAAM,IAAI,KAAK,CACb;gBACE,mCAAmC,aAAa,6EAA6E;gBAC7H,CAAC,GAAG,iBAAiB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;aAC9C,CAAC,IAAI,CAAC,IAAI,CAAC,CACb,CAAC;SACH;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,wCAAwC,aAAa,GAAG,CAAC,CAAC;SAC3E;IACH,CAAC;CAAA;AAED,SAAS,oBAAoB,CAAC,KAAa;IAIzC,MAAM,cAAc,GAAG,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAE9C,IAAI,cAAc,GAAG,CAAC,EAAE;QACtB,OAAO;YACL,UAAU,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,cAAc,CAAC;YAC1C,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,cAAc,GAAG,CAAC,CAAC;SAC3C,CAAC;KACH;SAAM;QACL,OAAO;YACL,SAAS,EAAE,KAAK;SACjB,CAAC;KACH;AACH,CAAC;AAED,SAAe,wBAAwB,CACrC,gBAAsC,EACtC,EAAc,EACd,qBAA6B,EAC7B,IAAwB,EACxB,qBAA8C;;QAE9C,IAAI,cAAc,GAAkB,IAAI,CAAC;QACzC,IAAI,aAAa,GAAkB,IAAI,CAAC;QACxC,MAAM,WAAW,GAAG,gBAAgB,CAAC,WAAsB,CAAC;QAE5D,IAAI,IAAI,KAAK,UAAU,EAAE;YACvB,MAAM,mBAAmB,GAAG,gBAAgB,CAAC,WAAW,CAAW,CAAC;YACpE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,oBAAoB,CAAC,mBAAmB,CAAC,CAAC;YAE5E,IAAI,UAAU,EAAE;gBACd,cAAc,GAAG,UAAU,CAAC;gBAC5B,aAAa,GAAG,SAAS,CAAC;aAC3B;iBAAM,IAAI,CAAC,qBAAqB,EAAE;gBACjC,MAAM,eAAe,GAAG,MAAM,mBAAmB,CAC/C,mBAAmB,EACnB,EAAE,EACF,WAAW,EACX,qBAAqB,CACtB,CAAC;gBACF,MAAM,qBAAqB,GAAG,oBAAoB,CAAC,eAAe,CAAC,CAAC;gBACpE,cAAc,GAAG,qBAAqB,CAAC,UAAU,CAAC;gBAClD,aAAa,GAAG,qBAAqB,CAAC,SAAS,CAAC;aACjD;iBAAM;gBACL,cAAc,GAAG,qBAAqB,CAAC;gBACvC,aAAa,GAAG,mBAAmB,CAAC;aACrC;SACF;aAAM;YACL,cAAc,GAAG,gBAAgB,CAAC,UAAoB,CAAC;YACvD,aAAa,GAAG,KAAK,CAAC;SACvB;QAED,MAAM,GAAG,GAAG;YACV,cAAc;YACd,aAAa;YACb,gBAAgB;YAChB,IAAI,EAAE,gBAAgB,CAAC,IAAe;YACtC,MAAM,EAAE,gBAAgB,CAAC,MAAiB;YAC1C,WAAW;YACX,QAAQ,EAAE,gBAAgB,CAAC,QAAmB;YAC9C,KAAK,EAAE,gBAAgB,CAAC,KAAK;SAC9B,CAAC;QAEF,OAAO,gBAAgB,CAAC,CAAC,CAAC;QAC1B,OAAO,gBAAgB,CAAC,MAAM,CAAC;QAC/B,OAAO,gBAAgB,CAAC,SAAS,CAAC,CAAC;QACnC,OAAO,gBAAgB,CAAC,WAAW,CAAC;QACpC,OAAO,gBAAgB,CAAC,IAAI,CAAC;QAC7B,OAAO,gBAAgB,CAAC,UAAU,CAAC;QACnC,OAAO,gBAAgB,CAAC,OAAO,CAAC;QAChC,OAAO,gBAAgB,CAAC,SAAS,CAAC;QAClC,OAAO,gBAAgB,CAAC,IAAI,CAAC,CAAC;QAC9B,OAAO,gBAAgB,CAAC,IAAI,CAAC,CAAC;QAC9B,OAAO,gBAAgB,CAAC,KAAK,CAAC;QAE9B,OAAO,GAAG,CAAC;IACb,CAAC;CAAA;AAED,SAAS,sBAAsB,CAAC,mBAA6B;IAC3D,MAAM,IAAI,KAAK,CACb,iDAAiD,mBAAmB,CAAC,IAAI,CACvE,IAAI,CACL,GAAG,CACL,CAAC;AACJ,CAAC;AAED,SAAS,qBAAqB,CAAC,QAA6B;IAC1D,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC;AAC9D,CAAC;AAED,SAAgB,YAAY,CAC1B,IAAqB,EACrB,MAAc,EACd,uBAA+B,EAC/B,OAAiB;IAEjB,IAAA,sBAAS,EACP,YAAY,IAAI,CAAC,cAAc,IAAI,uBAAuB,EAAE,kCAEvD,MAAM,KACT,UAAU,EAAE,MAAM,CAAC,UAAU,KAE/B;QACE,IAAI,EAAE,UAAU;QAChB,MAAM,EAAE,IAAI,CAAC,cAAc;QAC3B,MAAM,EAAE,uBAAuB;QAC/B,OAAO;KACR,CACF,CAAC;AACJ,CAAC;AAnBD,oCAmBC;AAED,SAAsB,QAAQ,CAAC,GAAW,EAAE,IAA0B;;QACpE,IAAI,IAAI,CAAC,SAAS,CAAC,EAAE;YACnB,OAAO,CAAC,GAAG,CAAC,kBAAkB,GAAG,MAAM,CAAC;SACzC;QACD,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,KAAK,MAAM,CAAC;QAE1D,MAAM,EAAE,GAAG,IAAI,uBAAU,CAAC,8BAAa,CAAC,CAAC;QACzC,MAAM,mBAAmB,GAAG,IAAA,0BAAU,GAAE,CAAC;QACzC,MAAM,YAAY,GAAG,MAAM,IAAA,uCAAuB,EAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1E,MAAM,sBAAsB,GAC1B,IAAA,yDAAyC,EAAC,YAAY,CAAC,CAAC;QAE1D,OAAO,IAAA,qBAAY,EAAC,OAAO,EAAE,GAAS,EAAE;YACtC,MAAM,IAAI,GAAG,MAAM,wBAAwB,CACzC,IAAI,EACJ,EAAE,EACF,qBAAqB,CAAC,mBAAmB,CAAC,EAC1C,UAAU,EACV,sBAAsB,CACvB,CAAC;YAEF,MAAM,EACJ,uBAAuB,EACvB,MAAM,EACN,qBAAqB,EACrB,sBAAsB,EAAE,EACtB,OAAO,EACP,MAAM,EACN,CAAC,cAAc,CAAC,EAAE,UAAU,EAC5B,CAAC,yBAAyB,CAAC,EAAE,kBAAkB,GAChD,GACF,GAAG,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;YAE9D,IAAI,UAAU,EAAE;gBACd,eAAM,CAAC,IAAI,CACT;oBACE,GAAG,kBAAS,KAAK,IAAI,CAAC,cAAc,IAAI,uBAAuB,gBAAgB;oBAC/E,GAAG,UAAU,EAAE;iBAChB,CAAC,IAAI,CAAC,IAAI,CAAC,CACb,CAAC;aACH;YACD,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;gBACf,eAAM,CAAC,IAAI,CACT,iBAAiB,IAAI,CAAC,cAAc,IAAI,uBAAuB,EAAE,CAClE,CAAC;aACH;YAED,IAAI,IAAI,CAAC,IAAI,EAAE;gBACb,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,uBAAuB,EAAE,OAAO,CAAC,CAAC;gBAC7D,OAAO,CAAC,CAAC;aACV;YAED,MAAM,YAAY,GAAG,MAAM,IAAA,mCAA0B,EACnD,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,cAAc,EACnB,uBAAuB,EACvB,sBAAsB,EACtB,mBAAmB,EACnB,MAAM,EACN,IAAI,CAAC,WAAW,EAChB,EAAE,CAAC,2BAA2B,CAC5B,GAAG,EACH,sBAAsB,EACtB,mBAAmB,CACpB,EACD,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,EACnB,OAAO,CACR,CAAC;YAEF,IAAI,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,cAAc,EAAE,uBAAuB,CAAC,EAAE;gBAClE,MAAM,IAAI,GAAG,IAAI,aAAM,CAAC,8BAAa,EAAE,OAAO,CAAC,CAAC;gBAChD,MAAM,cAAc,GAAG,qBAAqB,EAAE,CAAC;gBAE/C,mEAAmE;gBACnE,IAAI,uBAAuB,KAAK,QAAQ,IAAI,CAAC,kBAAkB,EAAE;oBAC/D,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;oBAChC,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;iBACjC;gBAED,MAAM,IAAI,GAAG,MAAM,cAAc,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;gBACtD,IAAI,CAAC,IAAI,EAAE,CAAC;gBAEZ,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;gBAEnC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;oBACf,YAAY,CAAC,OAAO,CAAC,CAAC;iBACvB;gBACD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;oBAChB,IAAA,mBAAY,EAAC,8BAAa,EAAE,OAAO,CAAC,CAAC;oBACrC,IAAI,IAAI,EAAE;wBACR,MAAM,IAAI,EAAE,CAAC;qBACd;iBACF;qBAAM;oBACL,eAAM,CAAC,IAAI,CAAC,uDAAuD,CAAC,CAAC;iBACtE;aACF;iBAAM;gBACL,OAAO,CAAC,mBAAmB,CAAC,CAAC;gBAC7B,OAAO,CAAC,2CAAa,0BAA0B,EAAC,CAAC,CAAC,QAAQ,CACxD,8BAAa,kCAER,IAAI,KACP,gBAAgB,EAAE,YAAY,KAEhC,OAAO,CACR,CAAC;aACH;QACH,CAAC,CAAA,CAAC,CAAC;IACL,CAAC;CAAA;AA3GD,4BA2GC"}

package/src/command-line/init.d.ts CHANGED Viewed

@@ -1 +1,4 @@
-export declare function initHandler(): Promise<void>;
+export interface InitArgs {
+    integrated: boolean;
+}
+export declare function initHandler(options: InitArgs): Promise<void>;

package/src/command-line/init.js CHANGED Viewed

@@ -15,7 +15,7 @@ const add_nx_scripts_1 = require("../nx-init/dot-nx/add-nx-scripts");
 const react_1 = require("../nx-init/react");
 const child_process_2 = require("../utils/child-process");
 const fileutils_1 = require("../utils/fileutils");
-function initHandler() {
+function initHandler(options) {
     var _a;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const args = process.argv.slice(2).join(' ');
@@ -38,10 +38,10 @@ function initHandler() {
         else if ((0, fs_1.existsSync)('package.json')) {
             const packageJson = (0, fileutils_1.readJsonFile)('package.json');
             if ((0, fs_1.existsSync)('angular.json')) {
-                yield (0, angular_1.addNxToAngularCliRepo)();
+                yield (0, angular_1.addNxToAngularCliRepo)(options.integrated);
             }
             else if (isCRA(packageJson)) {
-                yield (0, react_1.addNxToCraRepo)();
+                yield (0, react_1.addNxToCraRepo)(options.integrated);
             }
             else if (isNestCLI(packageJson)) {
                 yield (0, add_nx_to_nest_1.addNxToNest)(packageJson);

package/src/command-line/init.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/init.ts"],"names":[],"mappings":";;;;AAAA,iDAAyC;AACzC,uCAAkC;AAClC,2BAAgC;AAChC,mCAAoC;AACpC,uCAAuC;AACvC,sEAAgE;AAChE,8DAAwD;AACxD,sEAA+D;AAC/D,gDAA2D;AAC3D,qEAAsE;AACtE,4CAAkD;AAClD,0DAAmD;AACnD,kDAAmE;~~AAGnE~~,SAAsB,WAAW;;;~~QAC/B~~,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC7C,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,EAAE;YACzB,OAAO,EAAE,CAAC,sBAAsB,CAAC;YACjC,KAAK,EAAE;gBACL,oBAAoB,EAAE,CAAC,cAAc,CAAC;aACvC;YACD,OAAO,EAAE;gBACP,oBAAoB,EAAE,KAAK;aAC5B;SACF,CAA6C,CAAC;QAE/C,MAAM,OAAO,GACX,MAAA,OAAO,CAAC,GAAG,CAAC,UAAU,mCACtB,CAAC,IAAA,mBAAU,EAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QAC1E,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE;YAC1B,OAAO,CAAC,GAAG,CAAC,iBAAiB,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC;SACxD;QACD,IAAI,KAAK,CAAC,oBAAoB,KAAK,IAAI,EAAE;YACvC,sBAAsB,CAAC,OAAO,CAAC,CAAC;SACjC;aAAM,IAAI,IAAA,eAAU,EAAC,cAAc,CAAC,EAAE;YACrC,MAAM,WAAW,GAAgB,IAAA,wBAAY,EAAC,cAAc,CAAC,CAAC;YAC9D,IAAI,IAAA,eAAU,EAAC,cAAc,CAAC,EAAE;gBAC9B,MAAM,IAAA,+BAAqB,~~GAAE~~,CAAC;~~aAC/B~~;iBAAM,IAAI,KAAK,CAAC,WAAW,CAAC,EAAE;gBAC7B,MAAM,IAAA,sBAAc,~~GAAE~~,CAAC;~~aACxB~~;iBAAM,IAAI,SAAS,CAAC,WAAW,CAAC,EAAE;gBACjC,MAAM,IAAA,4BAAW,EAAC,WAAW,CAAC,CAAC;aAChC;iBAAM,IAAI,UAAU,CAAC,WAAW,CAAC,EAAE;gBAClC,MAAM,IAAA,oCAAe,GAAE,CAAC;aACzB;iBAAM;gBACL,MAAM,IAAA,mCAAc,GAAE,CAAC;aACxB;SACF;aAAM;YACL,MAAM,cAAc,GAAG,MAAM,IAAA,iBAAM,EAA6B;gBAC9D;oBACE,IAAI,EAAE,gBAAgB;oBACtB,IAAI,EAAE,cAAc;oBACpB,OAAO,EAAE,yCAAyC;oBAClD,OAAO,EAAE;wBACP;4BACE,IAAI,EAAE,sCAAsC;4BAC5C,KAAK,EAAE,OAAO;yBACf;wBACD;4BACE,IAAI,EAAE,mBAAmB;4BACzB,KAAK,EAAE,MAAM;yBACd;qBACF;iBACF;aACF,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,KAAK,MAAM,CAAC,CAAC;YAC5C,IAAI,cAAc,EAAE;gBAClB,sBAAsB,CAAC,OAAO,CAAC,CAAC;aACjC;iBAAM;gBACL,IAAA,wBAAQ,EAAC,iCAAiC,OAAO,IAAI,IAAI,EAAE,EAAE;oBAC3D,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;iBACjB,CAAC,CAAC;aACJ;SACF;;CACF;AA3DD,kCA2DC;AAED,SAAS,KAAK,CAAC,WAAwB;IACrC,MAAM,oBAAoB,mCACrB,WAAW,CAAC,YAAY,GACxB,WAAW,CAAC,eAAe,CAC/B,CAAC;IACF,OAAO;IACL,yCAAyC;IACzC,oBAAoB,CAAC,OAAO,CAAC;QAC7B,oBAAoB,CAAC,WAAW,CAAC;QACjC,oBAAoB,CAAC,eAAe,CAAC;QACrC,2CAA2C;QAC3C,CAAC,oBAAoB,CAAC,mBAAmB,CAAC;QAC1C,CAAC,oBAAoB,CAAC,cAAc,CAAC;QACrC,IAAA,2BAAe,EAAC,KAAK,CAAC;QACtB,IAAA,2BAAe,EAAC,QAAQ,CAAC,CAC1B,CAAC;AACJ,CAAC;AAED,SAAS,SAAS,CAAC,WAAwB;IACzC,MAAM,oBAAoB,mCACrB,WAAW,CAAC,YAAY,GACxB,WAAW,CAAC,eAAe,CAC/B,CAAC;IACF,OAAO,CACL,IAAA,eAAU,EAAC,eAAe,CAAC;QAC3B,oBAAoB,CAAC,cAAc,CAAC;QACpC,oBAAoB,CAAC,aAAa,CAAC,CACpC,CAAC;AACJ,CAAC;AAED,SAAS,UAAU,CAAC,WAAwB;IAC1C,IAAI,CAAC,CAAC,WAAW,CAAC,UAAU;QAAE,OAAO,IAAI,CAAC;IAE1C,IAAI,IAAA,eAAU,EAAC,qBAAqB,CAAC,IAAI,IAAA,eAAU,EAAC,oBAAoB,CAAC;QACvE,OAAO,IAAI,CAAC;IAEd,IAAI,IAAA,eAAU,EAAC,YAAY,CAAC;QAAE,OAAO,IAAI,CAAC;IAE1C,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,sBAAsB,CAAC,OAAe;IAC7C,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE;QAChC,OAAO,CAAC,GAAG,CACT,kFAAkF,CACnF,CAAC;KACH;SAAM;QACL,OAAO,CAAC,GAAG,CACT,sFAAsF,CACvF,CAAC;KACH;IACD,IAAA,mCAAkB,EAAC,OAAO,CAAC,CAAC;IAC5B,sEAAsE;IACtE,IAAA,yBAAS,EAAC,EAAE,CAAC,CAAC;AAChB,CAAC"}
1	+ {"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/init.ts"],"names":[],"mappings":"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"}