nx 13.10.3 → 14.0.0-beta.2

package/README.md

@@ -77,6 +77,6 @@ A few links to help you get started:
 - [Official Nx YouTube Channel](https://www.youtube.com/c/Nrwl_io)
 - [Blog Posts About Nx](https://blog.nrwl.io/nx/home)
 
-<p style="text-align: center;"><a href="https://nx.dev/#learning-materials" target="_blank"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-courses-and-videos.svg" 
+<p style="text-align: center;"><a href="https://nx.dev/#learning-materials" target="_blank" rel="noreferrer"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-courses-and-videos.svg" 
 width="100%" alt="Nx - Smart, Fast and Extensible Build System"></a></p>
 

package/executors.json

@@ -0,0 +1,9 @@
+{
+  "executors": {
+    "run-script": {
+      "implementation": "./src/executors/run-script/run-script.impl",
+      "schema": "./src/executors/run-script/schema.json",
+      "description": "Run an NPM script using Nx."
+    }
+  }
+}

package/migrations.json

@@ -0,0 +1,3 @@
+{
+  "migrations": {}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "13.10.3",
+  "version": "14.0.0-beta.2",
   "description": "Smart, Fast and Extensible Build System",
   "repository": {
     "type": "git",
@@ -60,9 +60,38 @@
     "minimatch": "3.0.4",
     "enquirer": "~2.3.6",
     "tslib": "^2.3.0",
-    "@nrwl/cli": "13.10.3",
-    "@nrwl/tao": "13.10.3"
+    "@nrwl/cli": "14.0.0-beta.2",
+    "@nrwl/tao": "14.0.0-beta.2"
   },
+  "nx-migrations": {
+    "migrations": "./migrations.json",
+    "packageGroup": [
+      "@nrwl/workspace",
+      "@nrwl/angular",
+      "@nrwl/cypress",
+      "@nrwl/devkit",
+      "@nrwl/eslint-plugin-nx",
+      "@nrwl/express",
+      "@nrwl/jest",
+      "@nrwl/linter",
+      "@nrwl/nest",
+      "@nrwl/next",
+      "@nrwl/node",
+      "@nrwl/nx-plugin",
+      "@nrwl/react",
+      "@nrwl/storybook",
+      "@nrwl/web",
+      "@nrwl/js",
+      "@nrwl/cli",
+      {
+        "package": "@nrwl/nx-cloud",
+        "version": "latest"
+      },
+      "@nrwl/react-native",
+      "@nrwl/detox"
+    ]
+  },
+  "executors": "./executors.json",
   "main": "./bin/nx.js",
   "typings": "./bin/nx.d.ts"
 }

package/presets/core.json

@@ -0,0 +1,21 @@
+{
+  "implicitDependencies": {
+    "package.json": {
+      "dependencies": "*",
+      "devDependencies": "*"
+    },
+    ".eslintrc.json": "*"
+  },
+  "targetDependencies": {
+    "build": [
+      {
+        "target": "build",
+        "projects": "dependencies"
+      }
+    ]
+  },
+  "workspaceLayout": {
+    "appsDir": "packages",
+    "libsDir": "packages"
+  }
+}

package/presets/npm.json

@@ -0,0 +1,20 @@
+{
+  "implicitDependencies": {
+    "package.json": {
+      "dependencies": "*",
+      "devDependencies": "*"
+    },
+    ".eslintrc.json": "*"
+  },
+  "targetDependencies": {
+    "build": [
+      {
+        "target": "build",
+        "projects": "dependencies"
+      }
+    ]
+  },
+  "workspaceLayout": {
+    "libsDir": "packages"
+  }
+}

package/src/command-line/connect-to-nx-cloud.d.ts

@@ -1,2 +1,2 @@
 export declare function connectToNxCloudUsingScan(scan: boolean): Promise<void>;
-export declare function connectToNxCloudCommand(): Promise<void>;
+export declare function connectToNxCloudCommand(promptOverride?: string): Promise<void>;

package/src/command-line/connect-to-nx-cloud.js

@@ -32,7 +32,7 @@ function connectToNxCloudUsingScan(scan) {
     });
 }
 exports.connectToNxCloudUsingScan = connectToNxCloudUsingScan;
-function connectToNxCloudCommand() {
+function connectToNxCloudCommand(promptOverride) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const nxJson = (0, file_utils_1.readNxJson)();
         const nxCloudUsed = Object.values(nxJson.tasksRunnerOptions).find((r) => r.runner == '@nrwl/nx-cloud');
@@ -42,7 +42,7 @@ function connectToNxCloudCommand() {
             });
             return;
         }
-        const res = yield connectToNxCloudPrompt();
+        const res = yield connectToNxCloudPrompt(promptOverride);
         if (!res)
             return;
         const pmc = (0, package_manager_1.getPackageManagerCommand)();
@@ -53,13 +53,13 @@ function connectToNxCloudCommand() {
     });
 }
 exports.connectToNxCloudCommand = connectToNxCloudCommand;
-function connectToNxCloudPrompt() {
+function connectToNxCloudPrompt(prompt) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         return yield (yield Promise.resolve().then(() => require('enquirer')))
             .prompt([
             {
                 name: 'NxCloud',
-                message: `Connect to Nx Cloud? (It's free and doesn't require registration.)`,
+                message: prompt !== null && prompt !== void 0 ? prompt : `Connect to Nx Cloud? (It's free and doesn't require registration.)`,
                 type: 'select',
                 choices: [
                     {

package/src/command-line/connect-to-nx-cloud.js.map

@@ -1 +1 @@
-{"version":3,"file":"connect-to-nx-cloud.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/connect-to-nx-cloud.ts"],"names":[],"mappings":";;;;AAAA,4DAAyD;AACzD,4CAAyC;AACzC,8DAAoE;AACpE,iDAAyC;AAEzC,SAAsB,yBAAyB,CAAC,IAAa;;QAC3D,IAAI,CAAC,IAAI;YAAE,OAAO;QAElB,MAAM,MAAM,GAAG,IAAA,uBAAU,GAAE,CAAC;QAC5B,MAAM,mBAAmB,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,IAAI,CACvE,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,MAAM,IAAI,uCAAuC;YACnD,CAAC,CAAC,MAAM,IAAI,0BAA0B,CACzC,CAAC;QACF,IAAI,CAAC,mBAAmB;YAAE,OAAO;QAEjC,eAAM,CAAC,GAAG,CAAC;YACT,KAAK,EAAE,4DAA4D;SACpE,CAAC,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,sBAAsB,EAAE,CAAC;QAC3C,IAAI,GAAG,EAAE;YACP,MAAM,GAAG,GAAG,IAAA,0CAAwB,GAAE,CAAC;YACvC,IAAA,wBAAQ,EAAC,GAAG,GAAG,CAAC,MAAM,wBAAwB,CAAC,CAAC;YAChD,IAAA,wBAAQ,EAAC,GAAG,GAAG,CAAC,IAAI,2BAA2B,EAAE;gBAC/C,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;aACjB,CAAC,CAAC;SACJ;aAAM;YACL,eAAM,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,sCAAsC,EAAE,CAAC,CAAC;SAC/D;IACH,CAAC;CAAA;AAxBD,8DAwBC;AAED,SAAsB,uBAAuB;;QAC3C,MAAM,MAAM,GAAG,IAAA,uBAAU,GAAE,CAAC;QAC5B,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAC/D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,gBAAgB,CACpC,CAAC;QACF,IAAI,WAAW,EAAE;YACf,eAAM,CAAC,GAAG,CAAC;gBACT,KAAK,EAAE,kDAAkD;aAC1D,CAAC,CAAC;YACH,OAAO;SACR;QAED,MAAM,GAAG,GAAG,MAAM,sBAAsB,EAAE,CAAC;QAC3C,IAAI,CAAC,GAAG;YAAE,OAAO;QACjB,MAAM,GAAG,GAAG,IAAA,0CAAwB,GAAE,CAAC;QACvC,IAAA,wBAAQ,EAAC,GAAG,GAAG,CAAC,MAAM,wBAAwB,CAAC,CAAC;QAChD,IAAA,wBAAQ,EAAC,GAAG,GAAG,CAAC,IAAI,2BAA2B,EAAE;YAC/C,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;SACjB,CAAC,CAAC;IACL,CAAC;CAAA;AAnBD,0DAmBC;AAED,SAAe,sBAAsB;;QACnC,OAAO,MAAM,CACX,2CAAa,UAAU,EAAC,CACzB;aACE,MAAM,CAAC;YACN;gBACE,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,oEAAoE;gBAC7E,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE;oBACP;wBACE,IAAI,EAAE,KAAK;wBACX,IAAI,EAAE,8EAA8E;qBACrF;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"}
+{"version":3,"file":"connect-to-nx-cloud.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/connect-to-nx-cloud.ts"],"names":[],"mappings":";;;;AAAA,4DAAyD;AACzD,4CAAyC;AACzC,8DAAoE;AACpE,iDAAyC;AAEzC,SAAsB,yBAAyB,CAAC,IAAa;;QAC3D,IAAI,CAAC,IAAI;YAAE,OAAO;QAElB,MAAM,MAAM,GAAG,IAAA,uBAAU,GAAE,CAAC;QAC5B,MAAM,mBAAmB,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,IAAI,CACvE,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,MAAM,IAAI,uCAAuC;YACnD,CAAC,CAAC,MAAM,IAAI,0BAA0B,CACzC,CAAC;QACF,IAAI,CAAC,mBAAmB;YAAE,OAAO;QAEjC,eAAM,CAAC,GAAG,CAAC;YACT,KAAK,EAAE,4DAA4D;SACpE,CAAC,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,sBAAsB,EAAE,CAAC;QAC3C,IAAI,GAAG,EAAE;YACP,MAAM,GAAG,GAAG,IAAA,0CAAwB,GAAE,CAAC;YACvC,IAAA,wBAAQ,EAAC,GAAG,GAAG,CAAC,MAAM,wBAAwB,CAAC,CAAC;YAChD,IAAA,wBAAQ,EAAC,GAAG,GAAG,CAAC,IAAI,2BAA2B,EAAE;gBAC/C,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;aACjB,CAAC,CAAC;SACJ;aAAM;YACL,eAAM,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,sCAAsC,EAAE,CAAC,CAAC;SAC/D;IACH,CAAC;CAAA;AAxBD,8DAwBC;AAED,SAAsB,uBAAuB,CAC3C,cAAuB;;QAEvB,MAAM,MAAM,GAAG,IAAA,uBAAU,GAAE,CAAC;QAC5B,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAC/D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,gBAAgB,CACpC,CAAC;QACF,IAAI,WAAW,EAAE;YACf,eAAM,CAAC,GAAG,CAAC;gBACT,KAAK,EAAE,kDAAkD;aAC1D,CAAC,CAAC;YACH,OAAO;SACR;QAED,MAAM,GAAG,GAAG,MAAM,sBAAsB,CAAC,cAAc,CAAC,CAAC;QACzD,IAAI,CAAC,GAAG;YAAE,OAAO;QACjB,MAAM,GAAG,GAAG,IAAA,0CAAwB,GAAE,CAAC;QACvC,IAAA,wBAAQ,EAAC,GAAG,GAAG,CAAC,MAAM,wBAAwB,CAAC,CAAC;QAChD,IAAA,wBAAQ,EAAC,GAAG,GAAG,CAAC,IAAI,2BAA2B,EAAE;YAC/C,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;SACjB,CAAC,CAAC;IACL,CAAC;CAAA;AArBD,0DAqBC;AAED,SAAe,sBAAsB,CAAC,MAAe;;QACnD,OAAO,MAAM,CACX,2CAAa,UAAU,EAAC,CACzB;aACE,MAAM,CAAC;YACN;gBACE,IAAI,EAAE,SAAS;gBACf,OAAO,EACL,MAAM,aAAN,MAAM,cAAN,MAAM,GACN,oEAAoE;gBACtE,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE;oBACP;wBACE,IAAI,EAAE,KAAK;wBACX,IAAI,EAAE,8EAA8E;qBACrF;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

@@ -276,7 +276,11 @@ exports.examples = {
         },
         {
             command: 'migrate --run-migrations=migrations.json',
-            description: 'Run migrations from the migrations.json file. You can modify migrations.json and run this command many times',
+            description: 'Run migrations from the provided migrations.json file. You can modify migrations.json and run this command many times',
+        },
+        {
+            command: 'migrate --run-migrations --create-commits',
+            description: 'Create a dedicated commit for each successfully completed migration. You can customize the prefix used for each commit by additionally setting --commit-prefix="PREFIX_HERE "',
         },
     ],
 };

package/src/command-line/examples.js.map

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

package/src/command-line/generate.d.ts

@@ -8,7 +8,7 @@ export interface GenerateOptions {
     interactive: boolean;
     defaults: boolean;
 }
-export declare function printGenHelp(opts: GenerateOptions, schema: Schema): void;
+export declare function printGenHelp(opts: GenerateOptions, schema: Schema, normalizedGeneratorName: string, aliases: string[]): void;
 export declare function newWorkspace(cwd: string, args: {
     [k: string]: any;
 }): Promise<any>;

package/src/command-line/generate.js

@@ -70,11 +70,12 @@ function throwInvalidInvocation() {
 function readDefaultCollection(nxConfig) {
     return nxConfig.cli ? nxConfig.cli.defaultCollection : null;
 }
-function printGenHelp(opts, schema) {
-    (0, print_help_1.printHelp)(`nx generate ${opts.collectionName}:${opts.generatorName}`, Object.assign(Object.assign({}, schema), { properties: schema.properties }), {
+function printGenHelp(opts, schema, normalizedGeneratorName, aliases) {
+    (0, print_help_1.printHelp)(`generate ${opts.collectionName}:${normalizedGeneratorName}`, Object.assign(Object.assign({}, schema), { properties: schema.properties }), {
         mode: 'generate',
         plugin: opts.collectionName,
-        entity: opts.generatorName,
+        entity: normalizedGeneratorName,
+        aliases,
     });
 }
 exports.printGenHelp = printGenHelp;
@@ -116,9 +117,9 @@ function generate(cwd, args) {
         return (0, params_1.handleErrors)(isVerbose, () => tslib_1.__awaiter(this, void 0, void 0, function* () {
             const workspaceDefinition = ws.readWorkspaceConfiguration();
             const opts = convertToGenerateOptions(args, readDefaultCollection(workspaceDefinition), 'generate');
-            const { normalizedGeneratorName, schema, implementationFactory } = ws.readGenerator(opts.collectionName, opts.generatorName);
+            const { normalizedGeneratorName, schema, implementationFactory, aliases } = ws.readGenerator(opts.collectionName, opts.generatorName);
             if (opts.help) {
-                printGenHelp(opts, schema);
+                printGenHelp(opts, schema, normalizedGeneratorName, aliases);
                 return 0;
             }
             const combinedOpts = yield (0, params_1.combineOptionsForGenerator)(opts.generatorOptions, opts.collectionName, normalizedGeneratorName, workspaceDefinition, schema, opts.interactive, ws.calculateDefaultProjectName(cwd, workspaceDefinition), ws.relativeCwd(cwd), isVerbose);

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

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

package/src/command-line/migrate.d.ts

@@ -1,57 +1,37 @@
-declare type Dependencies = 'dependencies' | 'devDependencies';
-export declare type MigrationsJson = {
-    version: string;
-    collection?: string;
-    generators?: {
-        [name: string]: {
-            version: string;
-            description?: string;
-            cli?: string;
-        };
-    };
-    packageJsonUpdates?: {
-        [name: string]: {
-            version: string;
-            packages: {
-                [p: string]: {
-                    version: string;
-                    ifPackageInstalled?: string;
-                    alwaysAddToPackageJson?: boolean;
-                    addToPackageJson?: Dependencies;
-                };
-            };
-        };
-    };
-};
+import { MigrationsJson, PackageJsonUpdateForPackage } from '../config/misc-interfaces';
+import { NxMigrationsConfiguration, PackageJson } from '../utils/package-json';
+export interface ResolvedMigrationConfiguration extends MigrationsJson {
+    packageGroup?: NxMigrationsConfiguration['packageGroup'];
+}
 export declare function normalizeVersion(version: string): string;
+export interface MigratorOptions {
+    packageJson: PackageJson;
+    versions: (pkg: string) => string;
+    fetch: (pkg: string, version: string) => Promise<ResolvedMigrationConfiguration>;
+    to: {
+        [pkg: string]: string;
+    };
+}
 export declare class Migrator {
     private readonly packageJson;
     private readonly versions;
     private readonly fetch;
-    private readonly from;
     private readonly to;
-    constructor(opts: {
-        packageJson: any;
-        versions: (p: string) => string;
-        fetch: (p: string, v: string) => Promise<MigrationsJson>;
-        from: {
-            [p: string]: string;
-        };
-        to: {
-            [p: string]: string;
-        };
-    });
+    constructor(opts: MigratorOptions);
     updatePackageJson(targetPackage: string, targetVersion: string): Promise<{
-        packageJson: any;
+        packageJson: Record<string, PackageJsonUpdateForPackage>;
         migrations: {
             package: string;
             name: string;
             version: string;
             description?: string;
             cli?: string;
+            implementation?: string;
+            factory?: string;
         }[];
     }>;
     private _createMigrateJson;
+    private collectedVersions;
     private _updatePackageJson;
     private collapsePackages;
     private gt;