@nrwl/workspace 13.5.0-beta.1 → 13.5.0-beta.5

package/README.md

@@ -15,81 +15,8 @@
 
 <hr>
 
-# Workspace Nx Package
-
-# Smart, Fast and Extensible Build System
+# Nx: Smart, Fast and Extensible Build System
 
 Nx is a next generation build system with first class monorepo support and powerful integrations.
 
-
-## Getting Started
-
-### Creating an Nx Workspace
-
-**Using `npx`**
-
-```bash
-npx create-nx-workspace
-```
-
-**Using `npm init`**
-
-```bash
-npm init nx-workspace
-```
-
-**Using `yarn create`**
-
-```bash
-yarn create nx-workspace
-```
-
-The `create-nx-workspace` command will ask you to select a preset, which will configure some plugins and create your applications to help you get started.
-
-```
-? What to create in the new workspace (Use arrow keys)
-❯ apps              [an empty workspace with no plugins with a layout that works best for building apps]
-  core              [an empty workspace with no plugins set up to publish npm packages (similar to yarn workspaces)]
-  ts                [an empty workspace with the JS/TS plugin preinstalled]
-  react             [a workspace with a single React application]
-  angular           [a workspace with a single Angular application]
-  next.js           [a workspace with a single Next.js application]
-  gatsby            [a workspace with a single Gatsby application]
-  nest              [a workspace with a single Nest application]
-  express           [a workspace with a single Express application]
-  web components    [a workspace with a single app built using web components]
-  react-native      [a workspace with a single React Native application]
-  react-express     [a workspace with a full stack application (React + Express)]
-```
-
-Select the preset that works best for you.
-
-### Adding Nx to an Existing Monorepo
-
-Run:
-
-```bash
-npx add-nx-to-monorepo@latest
-```
-
-
-If it's your first Nx project, the command will recommend you to install the `nx` package globally, so you can invoke `nx` directly without going through yarn or npm.
-
-### Serving Application
-
-- Run `nx serve myapp` to serve the newly generated application!
-- Run `nx test myapp` to test it.
-- Run `nx e2e myapp-e2e` to run e2e tests for it.
-
-## Documentation & Resources
-
-A few links to help you get started:
-
-- [Nx.Dev: Documentation, Guides, Interactive Tutorials](https://nx.dev)
-- [Tutorial: Adding Nx to an Existing Monorepo](https://nx.dev/migration/adding-to-monorepo)
-- [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="./images/nx-courses-and-videos.svg" 
-width="100%" alt="Nx - Smart, Fast and Extensible Build System"></a></p>
-
+{{content}

package/migrations.json

@@ -934,6 +934,15 @@
           "version": "~10.0.0"
         }
       }
+    },
+    "13.5.0": {
+      "version": "13.5.0",
+      "packages": {
+        "prettier": {
+          "version": "^2.5.1",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/workspace",
-  "version": "13.5.0-beta.1",
+  "version": "13.5.0-beta.5",
   "description": "Smart, Fast and Extensible Build System",
   "repository": {
     "type": "git",
@@ -39,7 +39,6 @@
       "@nrwl/devkit",
       "@nrwl/eslint-plugin-nx",
       "@nrwl/express",
-      "@nrwl/gatsby",
       "@nrwl/jest",
       "@nrwl/linter",
       "@nrwl/nest",
@@ -53,7 +52,7 @@
     ]
   },
   "peerDependencies": {
-    "prettier": "^2.3.0"
+    "prettier": "^2.5.1"
   },
   "peerDependenciesMeta": {
     "prettier": {
@@ -63,6 +62,7 @@
   "dependencies": {
     "@parcel/watcher": "2.0.4",
     "chokidar": "^3.5.1",
+    "cli-cursor": "3.1.0",
     "cli-spinners": "2.6.1",
     "fs-extra": "^9.1.0",
     "dotenv": "~10.0.0",
@@ -81,10 +81,10 @@
     "minimatch": "3.0.4",
     "enquirer": "~2.3.6",
     "tslib": "^2.3.0",
-    "@nrwl/cli": "13.5.0-beta.1",
-    "@nrwl/devkit": "13.5.0-beta.1",
-    "@nrwl/jest": "13.5.0-beta.1",
-    "@nrwl/linter": "13.5.0-beta.1"
+    "@nrwl/cli": "13.5.0-beta.5",
+    "@nrwl/devkit": "13.5.0-beta.5",
+    "@nrwl/jest": "13.5.0-beta.5",
+    "@nrwl/linter": "13.5.0-beta.5"
   },
   "nx-migrations": {
     "migrations": "./migrations.json"

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

@@ -1,17 +1,7 @@
-import * as yargs from 'yargs';
-export interface YargsListArgs extends yargs.Arguments, ListArgs {
+export interface ListArgs {
+    /** The name of an installed plugin to query  */
+    plugin?: string | undefined;
 }
-interface ListArgs {
-    plugin?: string;
-}
-export declare const list: {
-    command: string;
-    describe: string;
-    builder: (yargs: yargs.Argv<{}>) => yargs.Argv<{
-        plugin: any;
-    }>;
-    handler: typeof listHandler;
-};
 /**
  * List available plugins or capabilities within a specific plugin
  *
@@ -20,5 +10,4 @@ export declare const list: {
  * Must be run within an Nx workspace
  *
  */
-declare function listHandler(args: YargsListArgs): Promise<void>;
-export {};
+export declare function listHandler(args: ListArgs): Promise<void>;

package/src/command-line/list.js

@@ -1,19 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.list = void 0;
+exports.listHandler = void 0;
 const tslib_1 = require("tslib");
 const app_root_1 = require("@nrwl/tao/src/utils/app-root");
 const output_1 = require("../utilities/output");
 const plugins_1 = require("../utilities/plugins");
-exports.list = {
-    command: 'list [plugin]',
-    describe: 'Lists installed plugins, capabilities of installed plugins and other available plugins.',
-    builder: (yargs) => yargs.positional('plugin', {
-        default: null,
-        description: 'The name of an installed plugin to query',
-    }),
-    handler: listHandler,
-};
 /**
  * List available plugins or capabilities within a specific plugin
  *
@@ -46,4 +37,5 @@ function listHandler(args) {
         }
     });
 }
+exports.listHandler = listHandler;
 //# sourceMappingURL=list.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/command-line/list.ts"],"names":[],"mappings":";;;;AACA,2DAA2D;AAC3D,gDAA6C;AAC7C,kDAQ8B;AAQjB,QAAA,IAAI,GAAG;IAClB,OAAO,EAAE,eAAe;IACxB,QAAQ,EACN,yFAAyF;IAC3F,OAAO,EAAE,CAAC,KAAiB,EAAE,EAAE,CAC7B,KAAK,CAAC,UAAU,CAAC,QAAQ,EAAE;QACzB,OAAO,EAAE,IAAI;QACb,WAAW,EAAE,0CAA0C;KACxD,CAAC;IACJ,OAAO,EAAE,WAAW;CACrB,CAAC;AAEF;;;;;;;GAOG;AACH,SAAe,WAAW,CAAC,IAAmB;;QAC5C,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,IAAA,gCAAsB,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACrC;aAAM;YACL,MAAM,WAAW,GAAG,IAAA,0BAAgB,GAAE,CAAC;YACvC,MAAM,gBAAgB,GAAG,MAAM,IAAA,+BAAqB,GAAE,CAAC,KAAK,CAAC,GAAG,EAAE;gBAChE,eAAM,CAAC,IAAI,CAAC;oBACV,KAAK,EAAE,oBAAoB;oBAC3B,SAAS,EAAE,CAAC,yBAAyB,CAAC;iBACvC,CAAC,CAAC;gBAEH,OAAO,EAAE,CAAC;YACZ,CAAC,CAAC,CAAC;YAEH,MAAM,gBAAgB,GAAG,IAAA,4CAAkC,EACzD,sBAAW,EACX,WAAW,EACX,gBAAgB,CACjB,CAAC;YACF,IAAA,8BAAoB,EAAC,gBAAgB,CAAC,CAAC;YACvC,IAAA,yBAAe,EAAC,gBAAgB,EAAE,WAAW,CAAC,CAAC;YAC/C,IAAA,8BAAoB,EAAC,gBAAgB,EAAE,gBAAgB,CAAC,CAAC;YAEzD,eAAM,CAAC,IAAI,CAAC;gBACV,KAAK,EAAE,yCAAyC;aACjD,CAAC,CAAC;SACJ;IACH,CAAC;CAAA"}
+{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/command-line/list.ts"],"names":[],"mappings":";;;;AAAA,2DAA2D;AAC3D,gDAA6C;AAC7C,kDAQ8B;AAO9B;;;;;;;GAOG;AACH,SAAsB,WAAW,CAAC,IAAc;;QAC9C,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,IAAA,gCAAsB,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACrC;aAAM;YACL,MAAM,WAAW,GAAG,IAAA,0BAAgB,GAAE,CAAC;YACvC,MAAM,gBAAgB,GAAG,MAAM,IAAA,+BAAqB,GAAE,CAAC,KAAK,CAAC,GAAG,EAAE;gBAChE,eAAM,CAAC,IAAI,CAAC;oBACV,KAAK,EAAE,oBAAoB;oBAC3B,SAAS,EAAE,CAAC,yBAAyB,CAAC;iBACvC,CAAC,CAAC;gBAEH,OAAO,EAAE,CAAC;YACZ,CAAC,CAAC,CAAC;YAEH,MAAM,gBAAgB,GAAG,IAAA,4CAAkC,EACzD,sBAAW,EACX,WAAW,EACX,gBAAgB,CACjB,CAAC;YACF,IAAA,8BAAoB,EAAC,gBAAgB,CAAC,CAAC;YACvC,IAAA,yBAAe,EAAC,gBAAgB,EAAE,WAAW,CAAC,CAAC;YAC/C,IAAA,8BAAoB,EAAC,gBAAgB,EAAE,gBAAgB,CAAC,CAAC;YAEzD,eAAM,CAAC,IAAI,CAAC;gBACV,KAAK,EAAE,yCAAyC;aACjD,CAAC,CAAC;SACJ;IACH,CAAC;CAAA;AA3BD,kCA2BC"}

package/src/command-line/nx-commands.js

@@ -132,7 +132,15 @@ npx nx daemon
     }
 })
     .command(require('./report').report)
-    .command(require('./list').list)
+    .command({
+    command: 'list [plugin]',
+    describe: 'Lists installed plugins, capabilities of installed plugins and other available plugins.',
+    builder: (yargs) => yargs.positional('plugin', {
+        type: 'string',
+        description: 'The name of an installed plugin to query',
+    }),
+    handler: (args) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () { return (yield Promise.resolve().then(() => require('./list'))).listHandler(args); }),
+})
     .command({
     command: 'reset',
     describe: 'Clears all the cached Nx artifacts and metadata about the workspace and shuts down the Nx Daemon.',

package/src/command-line/nx-commands.js.map

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

package/src/command-line/report.js

@@ -28,7 +28,6 @@ exports.packagesWeCareAbout = [
     '@nrwl/web',
     '@nrwl/workspace',
     '@nrwl/storybook',
-    '@nrwl/gatsby',
     'typescript',
     'rxjs',
 ];

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

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

package/src/command-line/utils.js

@@ -39,6 +39,7 @@ function splitArgsIntoNxArgsAndOverrides(args, mode, options = { printWarnings:
     const overrides = yargsParser(args._, {
         configuration: {
             'strip-dashed': true,
+            'dot-notation': false,
         },
     });
     // This removes the overrides from the nxArgs._

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

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/command-line/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/command-line/utils.ts"],"names":[],"mappings":";;;AAAA,4CAA4C;AAE5C,mDAAgD;AAChD,gDAA6C;AAC7C,yCAAqC;AAGrC,MAAM,MAAM,GAAa;IACvB,QAAQ;IACR,eAAe;IACf,MAAM;IACN,QAAQ;IACR,UAAU;IACV,cAAc;IACd,SAAS;IACT,aAAa;IACb,MAAM;IACN,WAAW;IACX,eAAe;IACf,MAAM;IACN,oBAAoB;CACrB,CAAC;AAEF,MAAM,OAAO,GAAa,CAAC,GAAG,MAAM,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;AAEzD,MAAM,WAAW,GAAa;IAC5B,GAAG,MAAM;IACT,WAAW;IACX,aAAa;IACb,KAAK;IACL,MAAM;IACN,MAAM;IACN,OAAO;IACP,OAAO;IACP,QAAQ;CACT,CAAC;AAmCF,MAAM,UAAU,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;AAE/B,SAAgB,+BAA+B,CAC7C,IAAqB,EACrB,IAA4D,EAC5D,OAAO,GAAG,EAAE,aAAa,EAAE,IAAI,EAAE;IAEjC,MAAM,UAAU,GACd,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC;IAE5E,MAAM,MAAM,GAAc,EAAE,CAAC;IAC7B,MAAM,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC,CAAa,EAAE;QAChD,aAAa,EAAE;YACb,cAAc,EAAE,IAAI;YACpB,cAAc,EAAE,KAAK;SACtB;KACF,CAAC,CAAC;IACH,+CAA+C;IAC/C,IAAI,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;IAErB,OAAO,SAAS,CAAC,CAAC,CAAC;IAEnB,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QAC5C,MAAM,UAAU,GAAG,IAAA,cAAK,EAAC,GAAG,CAAC,CAAC,QAAQ,CAAC;QACvC,IAAI,UAAU,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,UAAU,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;YACnE,IAAI,KAAK,KAAK,SAAS;gBAAE,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;SAC9C;aAAM,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACpC,SAAS,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;SACxB;IACH,CAAC,CAAC,CAAC;IAEH,IAAI,IAAI,KAAK,UAAU,EAAE;QACvB,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;YACpB,MAAM,CAAC,QAAQ,GAAG,EAAE,CAAC;SACtB;aAAM;YACL,MAAM,CAAC,QAAQ,GAAI,IAAI,CAAC,QAAmB;iBACxC,KAAK,CAAC,GAAG,CAAC;iBACV,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;SACjC;KACF;IAED,IAAI,MAAM,CAAC,IAAI,EAAE;QACf,OAAO,MAAM,CAAC,IAAI,CAAC;QACnB,MAAM,CAAC,aAAa,GAAG,YAAY,CAAC;KACrC;IAED,IAAI,IAAI,KAAK,UAAU,EAAE;QACvB,IAAI,OAAO,CAAC,aAAa,IAAI,MAAM,CAAC,GAAG,EAAE;YACvC,eAAM,CAAC,IAAI,CAAC;gBACV,KAAK,EAAE,wEAAwE;gBAC/E,SAAS,EAAE;oBACT,GAAG,eAAM,CAAC,IAAI,CACZ,OAAO,CACR,uEAAuE;oBACxE,EAAE;oBACF,GAAG,eAAM,CAAC,MAAM,CAAC,IAAI,CACnB,mDAAmD,CACpD,sDAAsD;iBACxD;aACF,CAAC,CAAC;SACJ;QAED,IACE,CAAC,MAAM,CAAC,KAAK;YACb,CAAC,MAAM,CAAC,WAAW;YACnB,CAAC,MAAM,CAAC,SAAS;YACjB,CAAC,MAAM,CAAC,IAAI;YACZ,CAAC,MAAM,CAAC,IAAI;YACZ,CAAC,MAAM,CAAC,GAAG;YACX,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,EAClB;YACA,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAW,CAAC;YAClC,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAW,CAAC;SACnC;QAED,uGAAuG;QACvG,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE;YACvC,MAAM,CAAC,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC;YAClC,IAAI,OAAO,CAAC,aAAa,EAAE;gBACzB,eAAM,CAAC,IAAI,CAAC;oBACV,KAAK,EAAE,yHAAyH,eAAM,CAAC,IAAI,CACzI,GAAG,MAAM,CAAC,IAAI,EAAE,CACjB,EAAE;iBACJ,CAAC,CAAC;aACJ;SACF;QACD,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE;YACvC,MAAM,CAAC,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC;YAClC,IAAI,OAAO,CAAC,aAAa,EAAE;gBACzB,eAAM,CAAC,IAAI,CAAC;oBACV,KAAK,EAAE,yHAAyH,eAAM,CAAC,IAAI,CACzI,GAAG,MAAM,CAAC,IAAI,EAAE,CACjB,EAAE;iBACJ,CAAC,CAAC;aACJ;SACF;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE;YAChB,MAAM,cAAc,GAAG,iBAAiB,EAAE,CAAC;YAC3C,MAAM,CAAC,IAAI,GAAG,cAAc,CAAC,WAAW,CAAC;YAEzC,yGAAyG;YACzG,IACE,OAAO,CAAC,aAAa;gBACrB,CAAC,MAAM,CAAC,IAAI;gBACZ,CAAC,MAAM,CAAC,KAAK;gBACb,CAAC,MAAM,CAAC,WAAW;gBACnB,CAAC,MAAM,CAAC,SAAS;gBACjB,CAAC,MAAM,CAAC,GAAG,EACX;gBACA,eAAM,CAAC,IAAI,CAAC;oBACV,KAAK,EAAE,yCAAyC,eAAM,CAAC,IAAI,CACzD,GAAG,MAAM,CAAC,IAAI,EAAE,CACjB,WAAW,eAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;iBAClC,CAAC,CAAC;aACJ;SACF;KACF;IAED,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;QACvB,MAAM,CAAC,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB,KAAK,MAAM,CAAC;KAC9D;IAED,IAAI,IAAI,CAAC,UAAU,CAAC,KAAK,OAAO,IAAI,IAAI,CAAC,UAAU,CAAC,KAAK,KAAK,EAAE;QAC9D,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;KACxB;SAAM,IACL,IAAI,CAAC,UAAU,CAAC,KAAK,MAAM;QAC3B,IAAI,CAAC,UAAU,CAAC,KAAK,IAAI;QACzB,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,EACvB;QACA,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,CACzB,MAAM,CAAC,aAAa,CAAC,IAAI,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,CACrD,CAAC;KACH;SAAM,IAAI,IAAI,CAAC,UAAU,CAAC,KAAK,SAAS,EAAE;QACzC,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;KAC/C;IAED,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;AAC/B,CAAC;AAxID,0EAwIC;AAED,SAAgB,iBAAiB;;IAC/B,MAAM,MAAM,GAAG,IAAA,uBAAU,GAAE,CAAC;IAE5B,OAAO;QACL,WAAW,EAAE,CAAA,MAAA,MAAM,CAAC,QAAQ,0CAAE,WAAW,KAAI,MAAM;KACpD,CAAC;AACJ,CAAC;AAND,8CAMC"}

package/src/core/affected-project-graph/locators/tsconfig-json-changes.js

@@ -1,16 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTouchedProjectsFromTsConfig = void 0;
-const path_1 = require("path");
 const json_diff_1 = require("../../../utilities/json-diff");
-const project_graph_1 = require("../../project-graph");
-const app_root_1 = require("@nrwl/tao/src/utils/app-root");
 const getTouchedProjectsFromTsConfig = (touchedFiles, _a, _b, _c, graph) => {
     const tsConfigJsonChanges = touchedFiles.find((change) => change.file === 'tsconfig.json' || change.file === 'tsconfig.base.json');
     if (!tsConfigJsonChanges) {
         return [];
     }
-    const sortedNodes = (0, project_graph_1.getSortedProjectNodes)(graph.nodes);
     const changes = tsConfigJsonChanges.getChanges();
     if (!allChangesArePathChanges(changes)) {
         return Object.keys(graph.nodes);
@@ -25,7 +21,7 @@ const getTouchedProjectsFromTsConfig = (touchedFiles, _a, _b, _c, graph) => {
         if (change.type === json_diff_1.DiffType.Deleted) {
             return Object.keys(graph.nodes);
         }
-        touched.push(...getProjectsAffectedByPaths(change, sortedNodes));
+        touched.push(...getProjectsAffectedByPaths(change, Object.values(graph.nodes)));
     }
     return touched;
 };
@@ -36,14 +32,16 @@ function allChangesArePathChanges(changes) {
 /**
  * Gets both previous project and current project of a particular change to tsconfig paths
  */
-function getProjectsAffectedByPaths(change, sortedNodes) {
+function getProjectsAffectedByPaths(change, nodes) {
     const result = [];
     const paths = [change.value.lhs, change.value.rhs];
     paths.forEach((path) => {
-        sortedNodes.forEach((project) => {
-            if (path &&
-                project.data.root &&
-                (0, path_1.join)(app_root_1.appRootPath, path).startsWith((0, path_1.join)(app_root_1.appRootPath, project.data.root))) {
+        nodes.forEach((project) => {
+            const normalizedPath = path && path.startsWith('./') ? path.substring(2) : path;
+            const r = project.data.root;
+            const root = r && r.endsWith('/') ? r.substring(0, r.length - 1) : r;
+            if ((normalizedPath && root && normalizedPath.startsWith(root)) ||
+                normalizedPath == root) {
                 result.push(project.name);
             }
         });

package/src/core/affected-project-graph/locators/tsconfig-json-changes.js.map

@@ -1 +1 @@
-{"version":3,"file":"tsconfig-json-changes.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/core/affected-project-graph/locators/tsconfig-json-changes.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;AAG5B,4DAIsC;AAEtC,uDAA8E;AAC9E,2DAA2D;AAEpD,MAAM,8BAA8B,GAEvC,CAAC,YAAY,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,KAAK,EAAY,EAAE;IAChD,MAAM,mBAAmB,GAAG,YAAY,CAAC,IAAI,CAC3C,CAAC,MAAM,EAAE,EAAE,CACT,MAAM,CAAC,IAAI,KAAK,eAAe,IAAI,MAAM,CAAC,IAAI,KAAK,oBAAoB,CAC1E,CAAC;IACF,IAAI,CAAC,mBAAmB,EAAE;QACxB,OAAO,EAAE,CAAC;KACX;IAED,MAAM,WAAW,GAAG,IAAA,qCAAqB,EAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAEvD,MAAM,OAAO,GAAG,mBAAmB,CAAC,UAAU,EAAE,CAAC;IAEjD,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC,EAAE;QACtC,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;KACjC;IAED,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACvC,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QAE1B,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YAC5B,SAAS;SACV;QAED,8CAA8C;QAC9C,IAAI,MAAM,CAAC,IAAI,KAAK,oBAAQ,CAAC,OAAO,EAAE;YACpC,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SACjC;QACD,OAAO,CAAC,IAAI,CAAC,GAAG,0BAA0B,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;KAClE;IACD,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAlCW,QAAA,8BAA8B,kCAkCzC;AAEF,SAAS,wBAAwB,CAC/B,OAA4C;IAE5C,OAAO,OAAO,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;AAC/C,CAAC;AAED;;GAEG;AACH,SAAS,0BAA0B,CACjC,MAAkB,EAClB,WAA+B;IAE/B,MAAM,MAAM,GAAG,EAAE,CAAC;IAElB,MAAM,KAAK,GAAa,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC7D,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACrB,WAAW,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC9B,IACE,IAAI;gBACJ,OAAO,CAAC,IAAI,CAAC,IAAI;gBACjB,IAAA,WAAI,EAAC,sBAAW,EAAE,IAAI,CAAC,CAAC,UAAU,CAAC,IAAA,WAAI,EAAC,sBAAW,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EACxE;gBACA,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;aAC3B;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;GAEG;AACH,SAAS,sBAAsB,CAC7B,MAAoC;IAEpC,OAAO,CACL,IAAA,wBAAY,EAAC,MAAM,CAAC;QACpB,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,iBAAiB;QACpC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAChD,CAAC;AACJ,CAAC"}
+{"version":3,"file":"tsconfig-json-changes.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/core/affected-project-graph/locators/tsconfig-json-changes.ts"],"names":[],"mappings":"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"}

package/src/core/file-map-utils.js

@@ -1,63 +1,53 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateProjectFileMap = exports.createProjectFileMap = void 0;
-function sortProjects(workspaceJson) {
-    // Sorting here so `apps/client-e2e` comes before `apps/client` and has
-    // a chance to match prefix first.
-    return Object.keys(workspaceJson.projects).sort((a, b) => {
-        const projectA = workspaceJson.projects[a];
-        const projectB = workspaceJson.projects[b];
-        if (!projectA.root)
-            return -1;
-        if (!projectB.root)
-            return -1;
-        return projectA.root.length > projectB.root.length ? -1 : 1;
-    });
+const path_1 = require("path");
+function createProjectRootMappings(workspaceJson, projectFileMap) {
+    const projectRootMappings = new Map();
+    for (const projectName of Object.keys(workspaceJson.projects)) {
+        if (!projectFileMap[projectName]) {
+            projectFileMap[projectName] = [];
+        }
+        const root = workspaceJson.projects[projectName].root;
+        projectRootMappings.set(root.endsWith('/') ? root.substring(0, root.length - 1) : root, projectFileMap[projectName]);
+    }
+    return projectRootMappings;
+}
+function findMatchingProjectFiles(projectRootMappings, file) {
+    for (let currentPath = (0, path_1.dirname)(file); currentPath != (0, path_1.dirname)(currentPath); currentPath = (0, path_1.dirname)(currentPath)) {
+        const p = projectRootMappings.get(currentPath);
+        if (p) {
+            return p;
+        }
+    }
+    return null;
 }
 function createProjectFileMap(workspaceJson, allWorkspaceFiles) {
     const projectFileMap = {};
-    const sortedProjects = sortProjects(workspaceJson);
-    const seen = new Set();
-    for (const projectName of sortedProjects) {
-        projectFileMap[projectName] = [];
-    }
+    const projectRootMappings = createProjectRootMappings(workspaceJson, projectFileMap);
     for (const f of allWorkspaceFiles) {
-        if (seen.has(f.file))
-            continue;
-        seen.add(f.file);
-        for (const projectName of sortedProjects) {
-            const p = workspaceJson.projects[projectName];
-            if (f.file.startsWith(p.root || p.sourceRoot)) {
-                projectFileMap[projectName].push(f);
-                break;
-            }
+        const matchingProjectFiles = findMatchingProjectFiles(projectRootMappings, f.file);
+        if (matchingProjectFiles) {
+            matchingProjectFiles.push(f);
         }
     }
     return { projectFileMap, allWorkspaceFiles };
 }
 exports.createProjectFileMap = createProjectFileMap;
 function updateProjectFileMap(workspaceJson, projectFileMap, allWorkspaceFiles, updatedFiles, deletedFiles) {
-    const sortedProjects = sortProjects(workspaceJson);
-    for (let projectName of sortedProjects) {
-        if (!projectFileMap[projectName]) {
-            projectFileMap[projectName] = [];
-        }
-    }
+    const projectRootMappings = createProjectRootMappings(workspaceJson, projectFileMap);
     for (const f of updatedFiles.keys()) {
-        for (const projectName of sortedProjects) {
-            const p = workspaceJson.projects[projectName];
-            if (f.startsWith(p.root || p.sourceRoot)) {
-                const fileData = projectFileMap[projectName].find((t) => t.file === f);
-                if (fileData) {
-                    fileData.hash = updatedFiles.get(f);
-                }
-                else {
-                    projectFileMap[projectName].push({
-                        file: f,
-                        hash: updatedFiles.get(f),
-                    });
-                }
-                break;
+        const matchingProjectFiles = findMatchingProjectFiles(projectRootMappings, f);
+        if (matchingProjectFiles) {
+            const fileData = matchingProjectFiles.find((t) => t.file === f);
+            if (fileData) {
+                fileData.hash = updatedFiles.get(f);
+            }
+            else {
+                matchingProjectFiles.push({
+                    file: f,
+                    hash: updatedFiles.get(f),
+                });
             }
         }
         const fileData = allWorkspaceFiles.find((t) => t.file === f);
@@ -72,14 +62,11 @@ function updateProjectFileMap(workspaceJson, projectFileMap, allWorkspaceFiles,
         }
     }
     for (const f of deletedFiles) {
-        for (const projectName of sortedProjects) {
-            const p = workspaceJson.projects[projectName];
-            if (f.startsWith(p.root || p.sourceRoot)) {
-                const index = projectFileMap[projectName].findIndex((t) => t.file === f);
-                if (index > -1) {
-                    projectFileMap[projectName].splice(index, 1);
-                }
-                break;
+        const matchingProjectFiles = findMatchingProjectFiles(projectRootMappings, f);
+        if (matchingProjectFiles) {
+            const index = matchingProjectFiles.findIndex((t) => t.file === f);
+            if (index > -1) {
+                matchingProjectFiles.splice(index, 1);
             }
         }
         const index = allWorkspaceFiles.findIndex((t) => t.file === f);

package/src/core/file-map-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"file-map-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/core/file-map-utils.ts"],"names":[],"mappings":";;;AAGA,SAAS,YAAY,CAAC,aAAkB;IACtC,uEAAuE;IACvE,kCAAkC;IAClC,OAAO,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACvD,MAAM,QAAQ,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC3C,MAAM,QAAQ,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC3C,IAAI,CAAC,QAAQ,CAAC,IAAI;YAAE,OAAO,CAAC,CAAC,CAAC;QAC9B,IAAI,CAAC,QAAQ,CAAC,IAAI;YAAE,OAAO,CAAC,CAAC,CAAC;QAC9B,OAAO,QAAQ,CAAC,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9D,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,oBAAoB,CAClC,aAAkB,EAClB,iBAA6B;IAE7B,MAAM,cAAc,GAAmB,EAAE,CAAC;IAC1C,MAAM,cAAc,GAAG,YAAY,CAAC,aAAa,CAAC,CAAC;IACnD,MAAM,IAAI,GAAG,IAAI,GAAG,EAAE,CAAC;IAEvB,KAAK,MAAM,WAAW,IAAI,cAAc,EAAE;QACxC,cAAc,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC;KAClC;IACD,KAAK,MAAM,CAAC,IAAI,iBAAiB,EAAE;QACjC,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;YAAE,SAAS;QAC/B,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACjB,KAAK,MAAM,WAAW,IAAI,cAAc,EAAE;YACxC,MAAM,CAAC,GAAG,aAAa,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;YAC9C,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,UAAU,CAAC,EAAE;gBAC7C,cAAc,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBACpC,MAAM;aACP;SACF;KACF;IACD,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,CAAC;AAC/C,CAAC;AAvBD,oDAuBC;AAED,SAAgB,oBAAoB,CAClC,aAAkB,EAClB,cAA8B,EAC9B,iBAA6B,EAC7B,YAAiC,EACjC,YAAsB;IAEtB,MAAM,cAAc,GAAG,YAAY,CAAC,aAAa,CAAC,CAAC;IACnD,KAAK,IAAI,WAAW,IAAI,cAAc,EAAE;QACtC,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,EAAE;YAChC,cAAc,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC;SAClC;KACF;IAED,KAAK,MAAM,CAAC,IAAI,YAAY,CAAC,IAAI,EAAE,EAAE;QACnC,KAAK,MAAM,WAAW,IAAI,cAAc,EAAE;YACxC,MAAM,CAAC,GAAG,aAAa,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;YAC9C,IAAI,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,UAAU,CAAC,EAAE;gBACxC,MAAM,QAAQ,GAAa,cAAc,CAAC,WAAW,CAAC,CAAC,IAAI,CACzD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CACpB,CAAC;gBACF,IAAI,QAAQ,EAAE;oBACZ,QAAQ,CAAC,IAAI,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;iBACrC;qBAAM;oBACL,cAAc,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC;wBAC/B,IAAI,EAAE,CAAC;wBACP,IAAI,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC;qBAC1B,CAAC,CAAC;iBACJ;gBACD,MAAM;aACP;SACF;QAED,MAAM,QAAQ,GAAa,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;QACvE,IAAI,QAAQ,EAAE;YACZ,QAAQ,CAAC,IAAI,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;SACrC;aAAM;YACL,iBAAiB,CAAC,IAAI,CAAC;gBACrB,IAAI,EAAE,CAAC;gBACP,IAAI,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC;aAC1B,CAAC,CAAC;SACJ;KACF;IAED,KAAK,MAAM,CAAC,IAAI,YAAY,EAAE;QAC5B,KAAK,MAAM,WAAW,IAAI,cAAc,EAAE;YACxC,MAAM,CAAC,GAAG,aAAa,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;YAC9C,IAAI,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,UAAU,CAAC,EAAE;gBACxC,MAAM,KAAK,GAAG,cAAc,CAAC,WAAW,CAAC,CAAC,SAAS,CACjD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CACpB,CAAC;gBACF,IAAI,KAAK,GAAG,CAAC,CAAC,EAAE;oBACd,cAAc,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;iBAC9C;gBACD,MAAM;aACP;SACF;QACD,MAAM,KAAK,GAAG,iBAAiB,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;QAC/D,IAAI,KAAK,GAAG,CAAC,CAAC,EAAE;YACd,iBAAiB,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;SACpC;KACF;IACD,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,CAAC;AAC/C,CAAC;AA/DD,oDA+DC"}
+{"version":3,"file":"file-map-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/core/file-map-utils.ts"],"names":[],"mappings":"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"}

package/src/core/file-utils.d.ts

@@ -1,5 +1,5 @@
 import { WorkspaceJsonConfiguration } from '@nrwl/tao/src/shared/workspace';
-import type { FileData, NxJsonConfiguration, ProjectGraphNode } from '@nrwl/devkit';
+import type { FileData, NxJsonConfiguration } from '@nrwl/devkit';
 import type { NxArgs } from '../command-line/utils';
 import type { Environment } from './shared-interfaces';
 export interface Change {
@@ -29,5 +29,4 @@ export declare function workspaceLayout(): {
     libsDir: string;
 };
 export declare function readEnvironment(): Environment;
-export declare function normalizedProjectRoot(p: ProjectGraphNode): string;
 export { FileData };

package/src/core/file-utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizedProjectRoot = exports.readEnvironment = exports.workspaceLayout = exports.readNxJson = exports.readPackageJson = exports.defaultFileRead = exports.workspaceFileName = exports.readWorkspaceConfig = exports.readWorkspaceJson = exports.TEN_MEGABYTES = exports.calculateFileChanges = exports.readFileIfExisting = exports.isWholeFileChange = exports.WholeFileChange = void 0;
+exports.readEnvironment = exports.workspaceLayout = exports.readNxJson = exports.readPackageJson = exports.defaultFileRead = exports.workspaceFileName = exports.readWorkspaceConfig = exports.readWorkspaceJson = exports.TEN_MEGABYTES = exports.calculateFileChanges = exports.readFileIfExisting = exports.isWholeFileChange = exports.WholeFileChange = void 0;
 const workspace_1 = require("@nrwl/tao/src/shared/workspace");
 const devkit_1 = require("@nrwl/devkit");
 const child_process_1 = require("child_process");
@@ -166,18 +166,4 @@ function readEnvironment() {
     return { nxJson, workspaceJson, workspaceResults: null };
 }
 exports.readEnvironment = readEnvironment;
-function normalizedProjectRoot(p) {
-    if (p.data && p.data.root) {
-        const path = p.data.root.split('/').filter((v) => !!v);
-        if (path.length === 1) {
-            return path[0];
-        }
-        // Remove the first part of the path, usually 'libs'
-        return path.slice(1).join('/');
-    }
-    else {
-        return '';
-    }
-}
-exports.normalizedProjectRoot = normalizedProjectRoot;
 //# sourceMappingURL=file-utils.js.map