@nrwl/workspace 13.10.0-beta.1 → 13.10.0-beta.4

package/index.d.ts

@@ -3,13 +3,11 @@ export { ProjectType, projectRootDir } from './src/utils/project-type';
 export { renameSync, updateJsonFile, copyFile, createDirectory, } from './src/utilities/fileutils';
 export { ExistingPrettierConfig, resolveUserExistingPrettierConfig, } from './src/utilities/prettier';
 export { output } from './src/utilities/output';
-export { commandsObject } from './src/command-line/nx-commands';
-export { supportedNxCommands } from './src/command-line/supported-nx-commands';
-export { readWorkspaceJson, readNxJson, readWorkspaceConfig, readPackageJson, } from './src/core/file-utils';
-export { ProjectGraphCache } from './src/core/nx-deps/nx-deps-cache';
+export { readWorkspaceJson, readNxJson, readWorkspaceConfig, readPackageJson, } from 'nx/src/core/file-utils';
+export { ProjectGraphCache } from 'nx/src/core/nx-deps/nx-deps-cache';
 export { readJsonInTree, updateJsonInTree, updateWorkspaceInTree, insert, replaceNodeValue, addDepsToPackageJson, addMethod, addIncludeToTsConfig, addGlobal, getProjectConfig, addParameterToConstructor, createOrUpdate, findNodes, updatePackageJsonDependencies, readWorkspace, renameSyncInTree, renameDirSyncInTree, updateNxJsonInTree, addProjectToNxJsonInTree, readNxJsonInTree, InsertChange, ReplaceChange, RemoveChange, } from './src/utils/ast-utils';
 export { getNpmScope, getWorkspacePath, replaceAppNameWithPath, editTarget, parseTarget, serializeTarget, } from './src/utils/cli-config-utils';
-export { unparse } from './src/tasks-runner/utils';
+export { unparse } from 'nx/src/tasks-runner/utils';
 export { getWorkspace, updateWorkspace, updateBuilderConfig, } from './src/utils/workspace';
 export { addUpdateTask } from './src/utils/update-task';
 export { addLintFiles, generateProjectLint, Linter } from './src/utils/lint';

package/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addLintFiles = exports.addUpdateTask = exports.updateBuilderConfig = exports.updateWorkspace = exports.getWorkspace = exports.unparse = exports.serializeTarget = exports.parseTarget = exports.editTarget = exports.replaceAppNameWithPath = exports.getWorkspacePath = exports.getNpmScope = exports.RemoveChange = exports.ReplaceChange = exports.InsertChange = exports.readNxJsonInTree = exports.addProjectToNxJsonInTree = exports.updateNxJsonInTree = exports.renameDirSyncInTree = exports.renameSyncInTree = exports.readWorkspace = exports.updatePackageJsonDependencies = exports.findNodes = exports.createOrUpdate = exports.addParameterToConstructor = exports.getProjectConfig = exports.addGlobal = exports.addIncludeToTsConfig = exports.addMethod = exports.addDepsToPackageJson = exports.replaceNodeValue = exports.insert = exports.updateWorkspaceInTree = exports.updateJsonInTree = exports.readJsonInTree = exports.readPackageJson = exports.readWorkspaceConfig = exports.readNxJson = exports.readWorkspaceJson = exports.supportedNxCommands = exports.commandsObject = exports.output = exports.resolveUserExistingPrettierConfig = exports.createDirectory = exports.copyFile = exports.updateJsonFile = exports.renameSync = exports.projectRootDir = exports.ProjectType = exports.readTsConfig = void 0;
-exports.stringUtils = exports.convertToNxProjectSchematic = exports.convertToNxProjectGenerator = exports.runCommandsGenerator = exports.removeGenerator = exports.moveGenerator = exports.libraryGenerator = exports.updatePackagesInPackageJson = exports.checkAndCleanWithSemver = exports.renameNpmPackages = exports.renamePackageImports = exports.setDefaultCollection = exports.visitNotIgnoredFiles = exports.updateKarmaConf = exports.deleteFile = exports.formatFiles = exports.addInstallTask = exports.generateProjectLint = void 0;
+exports.addInstallTask = exports.generateProjectLint = exports.addLintFiles = exports.addUpdateTask = exports.updateBuilderConfig = exports.updateWorkspace = exports.getWorkspace = exports.unparse = exports.serializeTarget = exports.parseTarget = exports.editTarget = exports.replaceAppNameWithPath = exports.getWorkspacePath = exports.getNpmScope = exports.RemoveChange = exports.ReplaceChange = exports.InsertChange = exports.readNxJsonInTree = exports.addProjectToNxJsonInTree = exports.updateNxJsonInTree = exports.renameDirSyncInTree = exports.renameSyncInTree = exports.readWorkspace = exports.updatePackageJsonDependencies = exports.findNodes = exports.createOrUpdate = exports.addParameterToConstructor = exports.getProjectConfig = exports.addGlobal = exports.addIncludeToTsConfig = exports.addMethod = exports.addDepsToPackageJson = exports.replaceNodeValue = exports.insert = exports.updateWorkspaceInTree = exports.updateJsonInTree = exports.readJsonInTree = exports.readPackageJson = exports.readWorkspaceConfig = exports.readNxJson = exports.readWorkspaceJson = exports.output = exports.resolveUserExistingPrettierConfig = exports.createDirectory = exports.copyFile = exports.updateJsonFile = exports.renameSync = exports.projectRootDir = exports.ProjectType = exports.readTsConfig = void 0;
+exports.stringUtils = exports.convertToNxProjectSchematic = exports.convertToNxProjectGenerator = exports.runCommandsGenerator = exports.removeGenerator = exports.moveGenerator = exports.libraryGenerator = exports.updatePackagesInPackageJson = exports.checkAndCleanWithSemver = exports.renameNpmPackages = exports.renamePackageImports = exports.setDefaultCollection = exports.visitNotIgnoredFiles = exports.updateKarmaConf = exports.deleteFile = exports.formatFiles = void 0;
 const tslib_1 = require("tslib");
 var typescript_1 = require("./src/utilities/typescript");
 Object.defineProperty(exports, "readTsConfig", { enumerable: true, get: function () { return typescript_1.readTsConfig; } });
@@ -17,11 +17,7 @@ var prettier_1 = require("./src/utilities/prettier");
 Object.defineProperty(exports, "resolveUserExistingPrettierConfig", { enumerable: true, get: function () { return prettier_1.resolveUserExistingPrettierConfig; } });
 var output_1 = require("./src/utilities/output");
 Object.defineProperty(exports, "output", { enumerable: true, get: function () { return output_1.output; } });
-var nx_commands_1 = require("./src/command-line/nx-commands");
-Object.defineProperty(exports, "commandsObject", { enumerable: true, get: function () { return nx_commands_1.commandsObject; } });
-var supported_nx_commands_1 = require("./src/command-line/supported-nx-commands");
-Object.defineProperty(exports, "supportedNxCommands", { enumerable: true, get: function () { return supported_nx_commands_1.supportedNxCommands; } });
-var file_utils_1 = require("./src/core/file-utils");
+var file_utils_1 = require("nx/src/core/file-utils");
 Object.defineProperty(exports, "readWorkspaceJson", { enumerable: true, get: function () { return file_utils_1.readWorkspaceJson; } });
 Object.defineProperty(exports, "readNxJson", { enumerable: true, get: function () { return file_utils_1.readNxJson; } });
 Object.defineProperty(exports, "readWorkspaceConfig", { enumerable: true, get: function () { return file_utils_1.readWorkspaceConfig; } });
@@ -57,7 +53,7 @@ Object.defineProperty(exports, "replaceAppNameWithPath", { enumerable: true, get
 Object.defineProperty(exports, "editTarget", { enumerable: true, get: function () { return cli_config_utils_1.editTarget; } });
 Object.defineProperty(exports, "parseTarget", { enumerable: true, get: function () { return cli_config_utils_1.parseTarget; } });
 Object.defineProperty(exports, "serializeTarget", { enumerable: true, get: function () { return cli_config_utils_1.serializeTarget; } });
-var utils_1 = require("./src/tasks-runner/utils");
+var utils_1 = require("nx/src/tasks-runner/utils");
 Object.defineProperty(exports, "unparse", { enumerable: true, get: function () { return utils_1.unparse; } });
 var workspace_1 = require("./src/utils/workspace");
 Object.defineProperty(exports, "getWorkspace", { enumerable: true, get: function () { return workspace_1.getWorkspace; } });

package/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../packages/workspace/index.ts"],"names":[],"mappings":";;;;;AAAA,yDAA0D;AAAjD,0GAAA,YAAY,OAAA;AACrB,yDAAuE;AAA9D,2GAAA,WAAW,OAAA;AAAE,8GAAA,cAAc,OAAA;AACpC,uDAKmC;AAJjC,uGAAA,UAAU,OAAA;AACV,2GAAA,cAAc,OAAA;AACd,qGAAA,QAAQ,OAAA;AACR,4GAAA,eAAe,OAAA;AAGjB,qDAGkC;AADhC,6HAAA,iCAAiC,OAAA;AAGnC,iDAAgD;AAAvC,gGAAA,MAAM,OAAA;AACf,8DAAgE;AAAvD,6GAAA,cAAc,OAAA;AACvB,kFAA+E;AAAtE,4HAAA,mBAAmB,OAAA;AAE5B,oDAK+B;AAJ7B,+GAAA,iBAAiB,OAAA;AACjB,wGAAA,UAAU,OAAA;AACV,iHAAA,mBAAmB,OAAA;AACnB,6GAAA,eAAe,OAAA;AAGjB,mDAwB+B;AAvB7B,2GAAA,cAAc,OAAA;AACd,6GAAA,gBAAgB,OAAA;AAChB,kHAAA,qBAAqB,OAAA;AACrB,mGAAA,MAAM,OAAA;AACN,6GAAA,gBAAgB,OAAA;AAChB,iHAAA,oBAAoB,OAAA;AACpB,sGAAA,SAAS,OAAA;AACT,iHAAA,oBAAoB,OAAA;AACpB,sGAAA,SAAS,OAAA;AACT,6GAAA,gBAAgB,OAAA;AAChB,sHAAA,yBAAyB,OAAA;AACzB,2GAAA,cAAc,OAAA;AACd,sGAAA,SAAS,OAAA;AACT,0HAAA,6BAA6B,OAAA;AAC7B,0GAAA,aAAa,OAAA;AACb,6GAAA,gBAAgB,OAAA;AAChB,gHAAA,mBAAmB,OAAA;AACnB,+GAAA,kBAAkB,OAAA;AAClB,qHAAA,wBAAwB,OAAA;AACxB,6GAAA,gBAAgB,OAAA;AAChB,yGAAA,YAAY,OAAA;AACZ,0GAAA,aAAa,OAAA;AACb,yGAAA,YAAY,OAAA;AAGd,iEAOsC;AANpC,+GAAA,WAAW,OAAA;AACX,oHAAA,gBAAgB,OAAA;AAChB,0HAAA,sBAAsB,OAAA;AACtB,8GAAA,UAAU,OAAA;AACV,+GAAA,WAAW,OAAA;AACX,mHAAA,eAAe,OAAA;AAGjB,kDAAmD;AAA1C,gGAAA,OAAO,OAAA;AAEhB,mDAI+B;AAH7B,yGAAA,YAAY,OAAA;AACZ,4GAAA,eAAe,OAAA;AACf,gHAAA,mBAAmB,OAAA;AAErB,uDAAwD;AAA/C,4GAAA,aAAa,OAAA;AACtB,yCAA6E;AAApE,oGAAA,YAAY,OAAA;AAAE,2GAAA,mBAAmB,OAAA;AAE1C,uEAAoE;AAA3D,kHAAA,cAAc,OAAA;AACvB,+DAA6D;AAApD,2GAAA,WAAW,OAAA;AACpB,2DAA0D;AAAjD,wGAAA,UAAU,OAAA;AACnB,mEAAyC;AACzC,yEAAsE;AAA7D,oHAAA,eAAe,OAAA;AACxB,qFAAiF;AAAxE,+HAAA,oBAAoB,OAAA;AAC7B,yDAAmE;AAA1D,iHAAA,oBAAoB,OAAA;AAC7B,mFAAgF;AAAvE,8HAAA,oBAAoB,OAAA;AAC7B,6EAA0E;AAAjE,wHAAA,iBAAiB,OAAA;AAC1B,+CAA+C;AAC/C,2DAAoE;AAA3D,wHAAA,uBAAuB,OAAA;AAChC,+FAA0F;AAAjF,8IAAA,2BAA2B,OAAA;AAEpC,4DAAoE;AAA3D,2GAAA,gBAAgB,OAAA;AACzB,mDAA2D;AAAlD,qGAAA,aAAa,OAAA;AACtB,yDAAiE;AAAxD,yGAAA,eAAe,OAAA;AACxB,2EAAkF;AAAzE,oHAAA,oBAAoB,OAAA;AAC7B,sGAGsE;AAFpE,oIAAA,2BAA2B,OAAA;AAC3B,oIAAA,2BAA2B,OAAA;AAGhB,QAAA,WAAW,GAAG,OAAO,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../packages/workspace/index.ts"],"names":[],"mappings":";;;;;AAAA,yDAA0D;AAAjD,0GAAA,YAAY,OAAA;AACrB,yDAAuE;AAA9D,2GAAA,WAAW,OAAA;AAAE,8GAAA,cAAc,OAAA;AACpC,uDAKmC;AAJjC,uGAAA,UAAU,OAAA;AACV,2GAAA,cAAc,OAAA;AACd,qGAAA,QAAQ,OAAA;AACR,4GAAA,eAAe,OAAA;AAGjB,qDAGkC;AADhC,6HAAA,iCAAiC,OAAA;AAGnC,iDAAgD;AAAvC,gGAAA,MAAM,OAAA;AAEf,qDAKgC;AAJ9B,+GAAA,iBAAiB,OAAA;AACjB,wGAAA,UAAU,OAAA;AACV,iHAAA,mBAAmB,OAAA;AACnB,6GAAA,eAAe,OAAA;AAGjB,mDAwB+B;AAvB7B,2GAAA,cAAc,OAAA;AACd,6GAAA,gBAAgB,OAAA;AAChB,kHAAA,qBAAqB,OAAA;AACrB,mGAAA,MAAM,OAAA;AACN,6GAAA,gBAAgB,OAAA;AAChB,iHAAA,oBAAoB,OAAA;AACpB,sGAAA,SAAS,OAAA;AACT,iHAAA,oBAAoB,OAAA;AACpB,sGAAA,SAAS,OAAA;AACT,6GAAA,gBAAgB,OAAA;AAChB,sHAAA,yBAAyB,OAAA;AACzB,2GAAA,cAAc,OAAA;AACd,sGAAA,SAAS,OAAA;AACT,0HAAA,6BAA6B,OAAA;AAC7B,0GAAA,aAAa,OAAA;AACb,6GAAA,gBAAgB,OAAA;AAChB,gHAAA,mBAAmB,OAAA;AACnB,+GAAA,kBAAkB,OAAA;AAClB,qHAAA,wBAAwB,OAAA;AACxB,6GAAA,gBAAgB,OAAA;AAChB,yGAAA,YAAY,OAAA;AACZ,0GAAA,aAAa,OAAA;AACb,yGAAA,YAAY,OAAA;AAGd,iEAOsC;AANpC,+GAAA,WAAW,OAAA;AACX,oHAAA,gBAAgB,OAAA;AAChB,0HAAA,sBAAsB,OAAA;AACtB,8GAAA,UAAU,OAAA;AACV,+GAAA,WAAW,OAAA;AACX,mHAAA,eAAe,OAAA;AAGjB,mDAAoD;AAA3C,gGAAA,OAAO,OAAA;AAEhB,mDAI+B;AAH7B,yGAAA,YAAY,OAAA;AACZ,4GAAA,eAAe,OAAA;AACf,gHAAA,mBAAmB,OAAA;AAErB,uDAAwD;AAA/C,4GAAA,aAAa,OAAA;AACtB,yCAA6E;AAApE,oGAAA,YAAY,OAAA;AAAE,2GAAA,mBAAmB,OAAA;AAE1C,uEAAoE;AAA3D,kHAAA,cAAc,OAAA;AACvB,+DAA6D;AAApD,2GAAA,WAAW,OAAA;AACpB,2DAA0D;AAAjD,wGAAA,UAAU,OAAA;AACnB,mEAAyC;AACzC,yEAAsE;AAA7D,oHAAA,eAAe,OAAA;AACxB,qFAAiF;AAAxE,+HAAA,oBAAoB,OAAA;AAC7B,yDAAmE;AAA1D,iHAAA,oBAAoB,OAAA;AAC7B,mFAAgF;AAAvE,8HAAA,oBAAoB,OAAA;AAC7B,6EAA0E;AAAjE,wHAAA,iBAAiB,OAAA;AAC1B,+CAA+C;AAC/C,2DAAoE;AAA3D,wHAAA,uBAAuB,OAAA;AAChC,+FAA0F;AAAjF,8IAAA,2BAA2B,OAAA;AAEpC,4DAAoE;AAA3D,2GAAA,gBAAgB,OAAA;AACzB,mDAA2D;AAAlD,qGAAA,aAAa,OAAA;AACtB,yDAAiE;AAAxD,yGAAA,eAAe,OAAA;AACxB,2EAAkF;AAAzE,oHAAA,oBAAoB,OAAA;AAC7B,sGAGsE;AAFpE,oIAAA,2BAA2B,OAAA;AAC3B,oIAAA,2BAA2B,OAAA;AAGhB,QAAA,WAAW,GAAG,OAAO,CAAC"}

package/migrations.json

@@ -36,17 +36,23 @@
       "cli": "nx",
       "implementation": "./src/migrations/update-13-6-0/remove-old-task-runner-options"
     },
-    "13-9-0-update-decorate-cli": {
-      "version": "13.9.0-beta.0",
-      "description": "Update the decorate-angular-cli script to require nx instead of @nrwl/cli",
-      "cli": "nx",
-      "implementation": "./src/migrations/update-13-9-0/update-decorate-cli"
-    },
     "13-9-0-replace-tao-with-nx": {
       "version": "13.9.0-beta.0",
       "description": "Replace @nrwl/tao with nx",
       "cli": "nx",
       "implementation": "./src/migrations/update-13-9-0/replace-tao-with-nx"
+    },
+    "13-10-0-update-decorate-cli": {
+      "version": "13.10.0-beta.0",
+      "description": "Update the decorate-angular-cli script to require nx instead of @nrwl/cli",
+      "cli": "nx",
+      "implementation": "./src/migrations/update-13-10-0/update-decorate-cli"
+    },
+    "13-10-0-update-tasks-runner": {
+      "version": "13.10.0-beta.0",
+      "description": "Update the tasks runner property to import it from the nx package instead of @nrwl/worksapce",
+      "cli": "nx",
+      "implementation": "./src/migrations/update-13-10-0/update-tasks-runner"
     }
   },
   "packageJsonUpdates": {

package/package.json

@@ -1,10 +1,7 @@
 {
   "name": "@nrwl/workspace",
-  "version": "13.10.0-beta.1",
+  "version": "13.10.0-beta.4",
   "description": "Smart, Fast and Extensible Build System",
-  "scripts": {
-    "postinstall": "node ./src/init/init"
-  },
   "repository": {
     "type": "git",
     "url": "https://github.com/nrwl/nx.git",
@@ -83,10 +80,10 @@
     "minimatch": "3.0.4",
     "enquirer": "~2.3.6",
     "tslib": "^2.3.0",
-    "nx": "13.10.0-beta.1",
-    "@nrwl/devkit": "13.10.0-beta.1",
-    "@nrwl/jest": "13.10.0-beta.1",
-    "@nrwl/linter": "13.10.0-beta.1"
+    "nx": "13.10.0-beta.4",
+    "@nrwl/devkit": "13.10.0-beta.4",
+    "@nrwl/jest": "13.10.0-beta.4",
+    "@nrwl/linter": "13.10.0-beta.4"
   },
   "nx-migrations": {
     "migrations": "./migrations.json"

package/src/generators/move/lib/update-cypress-json.d.ts

@@ -1,5 +1,4 @@
-import { Tree } from '@nrwl/devkit';
-import { ProjectConfiguration } from 'nx/src/shared/workspace';
+import { ProjectConfiguration, Tree } from '@nrwl/devkit';
 import { NormalizedSchema } from '../schema';
 /**
  * Updates the videos and screenshots folders in the cypress.json if it exists (i.e. we're moving an e2e project)

package/src/generators/move/lib/update-cypress-json.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-cypress-json.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-cypress-json.ts"],"names":[],"mappings":";;;AAEA,6BAA6B;AAQ7B;;;;;;GAMG;AACH,SAAgB,iBAAiB,CAC/B,IAAU,EACV,MAAwB,EACxB,OAA6B;IAE7B,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAC/B,MAAM,CAAC,yBAAyB,EAChC,cAAc,CACf,CAAC;IAEF,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;QACjC,gBAAgB;QAChB,OAAO,IAAI,CAAC;KACb;IAED,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAC5B,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CACvB,CAAC;IACxB,WAAW,CAAC,YAAY,GAAG,WAAW,CAAC,YAAY,CAAC,OAAO,CACzD,OAAO,CAAC,IAAI,EACZ,MAAM,CAAC,yBAAyB,CACjC,CAAC;IACF,WAAW,CAAC,iBAAiB,GAAG,WAAW,CAAC,iBAAiB,CAAC,OAAO,CACnE,OAAO,CAAC,IAAI,EACZ,MAAM,CAAC,yBAAyB,CACjC,CAAC;IAEF,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC;AAC3D,CAAC;AA5BD,8CA4BC"}
+{"version":3,"file":"update-cypress-json.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-cypress-json.ts"],"names":[],"mappings":";;;AACA,6BAA6B;AAQ7B;;;;;;GAMG;AACH,SAAgB,iBAAiB,CAC/B,IAAU,EACV,MAAwB,EACxB,OAA6B;IAE7B,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAC/B,MAAM,CAAC,yBAAyB,EAChC,cAAc,CACf,CAAC;IAEF,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;QACjC,gBAAgB;QAChB,OAAO,IAAI,CAAC;KACb;IAED,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAC5B,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CACvB,CAAC;IACxB,WAAW,CAAC,YAAY,GAAG,WAAW,CAAC,YAAY,CAAC,OAAO,CACzD,OAAO,CAAC,IAAI,EACZ,MAAM,CAAC,yBAAyB,CACjC,CAAC;IACF,WAAW,CAAC,iBAAiB,GAAG,WAAW,CAAC,iBAAiB,CAAC,OAAO,CACnE,OAAO,CAAC,IAAI,EACZ,MAAM,CAAC,yBAAyB,CACjC,CAAC;IAEF,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC;AAC3D,CAAC;AA5BD,8CA4BC"}

package/src/generators/move/lib/update-project-root-files.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateProjectRootFiles = void 0;
-const app_root_1 = require("nx/src/utils/app-root");
+const devkit_1 = require("@nrwl/devkit");
 const path = require("path");
 const path_1 = require("path");
 /**
@@ -13,11 +13,11 @@ const path_1 = require("path");
  */
 function updateProjectRootFiles(tree, schema, project) {
     const newRelativeRoot = path
-        .relative(path.join(app_root_1.appRootPath, schema.relativeToRootDestination), app_root_1.appRootPath)
+        .relative(path.join(devkit_1.appRootPath, schema.relativeToRootDestination), devkit_1.appRootPath)
         .split(path.sep)
         .join('/');
     const oldRelativeRoot = path
-        .relative(path.join(app_root_1.appRootPath, project.root), app_root_1.appRootPath)
+        .relative(path.join(devkit_1.appRootPath, project.root), devkit_1.appRootPath)
         .split(path.sep)
         .join('/');
     if (newRelativeRoot === oldRelativeRoot) {

package/src/generators/move/lib/update-project-root-files.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-project-root-files.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-project-root-files.ts"],"names":[],"mappings":";;;AACA,oDAAoD;AACpD,6BAA6B;AAC7B,+BAAqC;AAGrC;;;;;;GAMG;AACH,SAAgB,sBAAsB,CACpC,IAAU,EACV,MAAwB,EACxB,OAA6B;IAE7B,MAAM,eAAe,GAAG,IAAI;SACzB,QAAQ,CACP,IAAI,CAAC,IAAI,CAAC,sBAAW,EAAE,MAAM,CAAC,yBAAyB,CAAC,EACxD,sBAAW,CACZ;SACA,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;SACf,IAAI,CAAC,GAAG,CAAC,CAAC;IACb,MAAM,eAAe,GAAG,IAAI;SACzB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAW,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,sBAAW,CAAC;SAC3D,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;SACf,IAAI,CAAC,GAAG,CAAC,CAAC;IAEb,IAAI,eAAe,KAAK,eAAe,EAAE;QACvC,gBAAgB;QAChB,OAAO;KACR;IAED,MAAM,IAAI,GAAG,KAAK,CAAC;IACnB,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC;IAEpE,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,yBAAyB,CAAC,EAAE;QAClE,IAAI,CAAC,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;YACpC,SAAS;SACV;QACD,IAAI,IAAI,KAAK,gBAAgB,EAAE;YAC7B,SAAS;SACV;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAC1B,IAAA,WAAI,EAAC,MAAM,CAAC,yBAAyB,EAAE,IAAI,CAAC,EAC5C,OAAO,CACR,CAAC;QACF,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;QAC9D,IAAI,CAAC,KAAK,CAAC,IAAA,WAAI,EAAC,MAAM,CAAC,yBAAyB,EAAE,IAAI,CAAC,EAAE,UAAU,CAAC,CAAC;KACtE;AACH,CAAC;AAxCD,wDAwCC"}
+{"version":3,"file":"update-project-root-files.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-project-root-files.ts"],"names":[],"mappings":";;;AACA,yCAA2C;AAC3C,6BAA6B;AAC7B,+BAAqC;AAGrC;;;;;;GAMG;AACH,SAAgB,sBAAsB,CACpC,IAAU,EACV,MAAwB,EACxB,OAA6B;IAE7B,MAAM,eAAe,GAAG,IAAI;SACzB,QAAQ,CACP,IAAI,CAAC,IAAI,CAAC,oBAAW,EAAE,MAAM,CAAC,yBAAyB,CAAC,EACxD,oBAAW,CACZ;SACA,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;SACf,IAAI,CAAC,GAAG,CAAC,CAAC;IACb,MAAM,eAAe,GAAG,IAAI;SACzB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAW,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,oBAAW,CAAC;SAC3D,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;SACf,IAAI,CAAC,GAAG,CAAC,CAAC;IAEb,IAAI,eAAe,KAAK,eAAe,EAAE;QACvC,gBAAgB;QAChB,OAAO;KACR;IAED,MAAM,IAAI,GAAG,KAAK,CAAC;IACnB,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC;IAEpE,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,yBAAyB,CAAC,EAAE;QAClE,IAAI,CAAC,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;YACpC,SAAS;SACV;QACD,IAAI,IAAI,KAAK,gBAAgB,EAAE;YAC7B,SAAS;SACV;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAC1B,IAAA,WAAI,EAAC,MAAM,CAAC,yBAAyB,EAAE,IAAI,CAAC,EAC5C,OAAO,CACR,CAAC;QACF,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;QAC9D,IAAI,CAAC,KAAK,CAAC,IAAA,WAAI,EAAC,MAAM,CAAC,yBAAyB,EAAE,IAAI,CAAC,EAAE,UAAU,CAAC,CAAC;KACtE;AACH,CAAC;AAxCD,wDAwCC"}

package/src/generators/move/lib/update-storybook-config.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateStorybookConfig = void 0;
-const app_root_1 = require("nx/src/utils/app-root");
+const devkit_1 = require("@nrwl/devkit");
 const path = require("path");
 const path_1 = require("path");
 /**
@@ -11,11 +11,11 @@ const path_1 = require("path");
  */
 function updateStorybookConfig(tree, schema, project) {
     const oldRelativeRoot = path
-        .relative(path.join(app_root_1.appRootPath, `${project.root}/.storybook`), app_root_1.appRootPath)
+        .relative(path.join(devkit_1.appRootPath, `${project.root}/.storybook`), devkit_1.appRootPath)
         .split(path.sep)
         .join('/');
     const newRelativeRoot = path
-        .relative(path.join(app_root_1.appRootPath, `${schema.relativeToRootDestination}/.storybook`), app_root_1.appRootPath)
+        .relative(path.join(devkit_1.appRootPath, `${schema.relativeToRootDestination}/.storybook`), devkit_1.appRootPath)
         .split(path.sep)
         .join('/');
     const storybookDir = path.join(schema.relativeToRootDestination, '.storybook');

package/src/generators/move/lib/update-storybook-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-storybook-config.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-storybook-config.ts"],"names":[],"mappings":";;;AACA,oDAAoD;AACpD,6BAA6B;AAC7B,+BAA4B;AAG5B;;;;GAIG;AACH,SAAgB,qBAAqB,CACnC,IAAU,EACV,MAAwB,EACxB,OAA6B;IAE7B,MAAM,eAAe,GAAG,IAAI;SACzB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAW,EAAE,GAAG,OAAO,CAAC,IAAI,aAAa,CAAC,EAAE,sBAAW,CAAC;SAC3E,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;SACf,IAAI,CAAC,GAAG,CAAC,CAAC;IACb,MAAM,eAAe,GAAG,IAAI;SACzB,QAAQ,CACP,IAAI,CAAC,IAAI,CAAC,sBAAW,EAAE,GAAG,MAAM,CAAC,yBAAyB,aAAa,CAAC,EACxE,sBAAW,CACZ;SACA,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;SACf,IAAI,CAAC,GAAG,CAAC,CAAC;IAEb,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAC5B,MAAM,CAAC,yBAAyB,EAChC,YAAY,CACb,CAAC;IAEF,IAAI,CAAC,YAAY,EAAE;QACjB,OAAO;KACR;IAED,8FAA8F;IAC9F,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;QAC9C,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,IAAA,WAAI,EAAC,YAAY,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;QAChE,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;QAExE,IAAI,CAAC,KAAK,CAAC,IAAA,WAAI,EAAC,YAAY,EAAE,IAAI,CAAC,EAAE,UAAU,CAAC,CAAC;KAClD;AACH,CAAC;AAjCD,sDAiCC"}
+{"version":3,"file":"update-storybook-config.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-storybook-config.ts"],"names":[],"mappings":";;;AACA,yCAA2C;AAC3C,6BAA6B;AAC7B,+BAA4B;AAG5B;;;;GAIG;AACH,SAAgB,qBAAqB,CACnC,IAAU,EACV,MAAwB,EACxB,OAA6B;IAE7B,MAAM,eAAe,GAAG,IAAI;SACzB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAW,EAAE,GAAG,OAAO,CAAC,IAAI,aAAa,CAAC,EAAE,oBAAW,CAAC;SAC3E,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;SACf,IAAI,CAAC,GAAG,CAAC,CAAC;IACb,MAAM,eAAe,GAAG,IAAI;SACzB,QAAQ,CACP,IAAI,CAAC,IAAI,CAAC,oBAAW,EAAE,GAAG,MAAM,CAAC,yBAAyB,aAAa,CAAC,EACxE,oBAAW,CACZ;SACA,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;SACf,IAAI,CAAC,GAAG,CAAC,CAAC;IAEb,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAC5B,MAAM,CAAC,yBAAyB,EAChC,YAAY,CACb,CAAC;IAEF,IAAI,CAAC,YAAY,EAAE;QACjB,OAAO;KACR;IAED,8FAA8F;IAC9F,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;QAC9C,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,IAAA,WAAI,EAAC,YAAY,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;QAChE,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;QAExE,IAAI,CAAC,KAAK,CAAC,IAAA,WAAI,EAAC,YAAY,EAAE,IAAI,CAAC,EAAE,UAAU,CAAC,CAAC;KAClD;AACH,CAAC;AAjCD,sDAiCC"}

package/src/generators/remove/lib/check-dependencies.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkDependencies = void 0;
 const tslib_1 = require("tslib");
-const project_graph_1 = require("../../../core/project-graph");
+const devkit_1 = require("@nrwl/devkit");
 /**
  * Check whether the project to be removed is depended on by another project
  *
@@ -13,8 +13,8 @@ function checkDependencies(_, schema) {
         if (schema.forceRemove) {
             return;
         }
-        const graph = yield (0, project_graph_1.createProjectGraphAsync)();
-        const reverseGraph = (0, project_graph_1.reverse)(graph);
+        const graph = yield (0, devkit_1.createProjectGraphAsync)();
+        const reverseGraph = (0, devkit_1.reverse)(graph);
         const deps = reverseGraph.dependencies[schema.projectName] || [];
         if (deps.length > 0) {
             throw new Error(`${schema.projectName} is still depended on by the following projects:\n${deps

package/src/generators/remove/lib/check-dependencies.js.map

@@ -1 +1 @@
-{"version":3,"file":"check-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/check-dependencies.ts"],"names":[],"mappings":";;;;AAAA,+DAA+E;AAI/E;;;;GAIG;AACH,SAAsB,iBAAiB,CAAC,CAAC,EAAE,MAAc;;QACvD,IAAI,MAAM,CAAC,WAAW,EAAE;YACtB,OAAO;SACR;QAED,MAAM,KAAK,GAAiB,MAAM,IAAA,uCAAuB,GAAE,CAAC;QAE5D,MAAM,YAAY,GAAG,IAAA,uBAAO,EAAC,KAAK,CAAC,CAAC;QAEpC,MAAM,IAAI,GAAG,YAAY,CAAC,YAAY,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;QAEjE,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;YACnB,MAAM,IAAI,KAAK,CACb,GACE,MAAM,CAAC,WACT,qDAAqD,IAAI;iBACtD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;iBACpB,IAAI,CAAC,IAAI,CAAC,EAAE,CAChB,CAAC;SACH;IACH,CAAC;CAAA;AApBD,8CAoBC"}
+{"version":3,"file":"check-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/check-dependencies.ts"],"names":[],"mappings":";;;;AAAA,yCAA8E;AAG9E;;;;GAIG;AACH,SAAsB,iBAAiB,CAAC,CAAC,EAAE,MAAc;;QACvD,IAAI,MAAM,CAAC,WAAW,EAAE;YACtB,OAAO;SACR;QAED,MAAM,KAAK,GAAiB,MAAM,IAAA,gCAAuB,GAAE,CAAC;QAE5D,MAAM,YAAY,GAAG,IAAA,gBAAO,EAAC,KAAK,CAAC,CAAC;QAEpC,MAAM,IAAI,GAAG,YAAY,CAAC,YAAY,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;QAEjE,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;YACnB,MAAM,IAAI,KAAK,CACb,GACE,MAAM,CAAC,WACT,qDAAqD,IAAI;iBACtD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;iBACpB,IAAI,CAAC,IAAI,CAAC,EAAE,CAChB,CAAC;SACH;IACH,CAAC;CAAA;AApBD,8CAoBC"}

package/src/generators/utils/decorate-angular-cli.js__tmpl__

@@ -62,7 +62,7 @@ function symlinkNgCLItoNxCLI() {
 
 try {
   symlinkNgCLItoNxCLI();
-  require('nx/src/cli/decorate-cli').decorateCli();
+  require('nx/src/adapter/decorate-cli').decorateCli();
   output.log({ title: 'Angular CLI has been decorated to enable computation caching.' });
 } catch(e) {
   output.error({ title: 'Decoration of the Angular CLI did not complete successfully' });

package/src/generators/workspace/files/nx.json__tmpl__

@@ -16,7 +16,7 @@
   },
   "tasksRunnerOptions": {
     "default": {
-      "runner": "@nrwl/workspace/tasks-runners/default",
+      "runner": "nx/tasks-runners/default",
       "options": {
         "cacheableOperations": ["build", "lint", "test", "e2e"]
       }

package/src/migrations/update-13-10-0/update-decorate-cli.d.ts

@@ -0,0 +1,3 @@
+import { Tree } from '@nrwl/devkit';
+export declare function updateDecorateAngularCLI(host: Tree): void;
+export default updateDecorateAngularCLI;

package/src/migrations/update-13-10-0/update-decorate-cli.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateDecorateAngularCLI = void 0;
+function updateDecorateAngularCLI(host) {
+    var _a;
+    const decorate = (_a = host.read('decorate-angular-cli.js')) === null || _a === void 0 ? void 0 : _a.toString();
+    if (decorate) {
+        host.write('decorate-angular-cli.js', decorate.replace('@nrwl/cli/lib/decorate-cli', 'nx/src/adapter/decorate-cli'));
+        host.write('decorate-angular-cli.js', decorate.replace('nx/src/cli/decorate-cli', 'nx/src/adapter/decorate-cli'));
+    }
+}
+exports.updateDecorateAngularCLI = updateDecorateAngularCLI;
+exports.default = updateDecorateAngularCLI;
+//# sourceMappingURL=update-decorate-cli.js.map

package/src/migrations/update-13-10-0/update-decorate-cli.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-decorate-cli.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-13-10-0/update-decorate-cli.ts"],"names":[],"mappings":";;;AAEA,SAAgB,wBAAwB,CAAC,IAAU;;IACjD,MAAM,QAAQ,GAAG,MAAA,IAAI,CAAC,IAAI,CAAC,yBAAyB,CAAC,0CAAE,QAAQ,EAAE,CAAC;IAClE,IAAI,QAAQ,EAAE;QACZ,IAAI,CAAC,KAAK,CACR,yBAAyB,EACzB,QAAQ,CAAC,OAAO,CACd,4BAA4B,EAC5B,6BAA6B,CAC9B,CACF,CAAC;QACF,IAAI,CAAC,KAAK,CACR,yBAAyB,EACzB,QAAQ,CAAC,OAAO,CAAC,yBAAyB,EAAE,6BAA6B,CAAC,CAC3E,CAAC;KACH;AACH,CAAC;AAfD,4DAeC;AAED,kBAAe,wBAAwB,CAAC"}

package/src/migrations/update-13-10-0/update-tasks-runner.d.ts

@@ -0,0 +1,3 @@
+import { Tree } from '@nrwl/devkit';
+export declare function updateTasksRunner(host: Tree): void;
+export default updateTasksRunner;

package/src/migrations/update-13-10-0/update-tasks-runner.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateTasksRunner = void 0;
+const devkit_1 = require("@nrwl/devkit");
+function updateTasksRunner(host) {
+    const config = (0, devkit_1.readWorkspaceConfiguration)(host);
+    if ((config === null || config === void 0 ? void 0 : config.tasksRunnerOptions['default']) &&
+        (config === null || config === void 0 ? void 0 : config.tasksRunnerOptions['default'].runner) ==
+            '@nrwl/workspace/tasks-runner/default') {
+        config.tasksRunnerOptions['default'].runner = 'nx/tasks-runner/default';
+    }
+    (0, devkit_1.updateWorkspaceConfiguration)(host, config);
+}
+exports.updateTasksRunner = updateTasksRunner;
+exports.default = updateTasksRunner;
+//# sourceMappingURL=update-tasks-runner.js.map

package/src/migrations/update-13-10-0/update-tasks-runner.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-tasks-runner.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-13-10-0/update-tasks-runner.ts"],"names":[],"mappings":";;;AAAA,yCAIsB;AAEtB,SAAgB,iBAAiB,CAAC,IAAU;IAC1C,MAAM,MAAM,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;IAChD,IACE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,kBAAkB,CAAC,SAAS,CAAC;QACrC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,kBAAkB,CAAC,SAAS,EAAE,MAAM;YAC1C,sCAAsC,EACxC;QACA,MAAM,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,MAAM,GAAG,yBAAyB,CAAC;KACzE;IACD,IAAA,qCAA4B,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC7C,CAAC;AAVD,8CAUC;AAED,kBAAe,iBAAiB,CAAC"}

package/src/tasks-runner/cache.d.ts

@@ -1,40 +1 @@
-import { Task } from '@nrwl/devkit';
-import { DefaultTasksRunnerOptions } from './default-tasks-runner';
-export declare type CachedResult = {
-    terminalOutput: string;
-    outputsPath: string;
-    code: number;
-    remote: boolean;
-};
-export declare type TaskWithCachedResult = {
-    task: Task;
-    cachedResult: CachedResult;
-};
-export declare class Cache {
-    private readonly options;
-    root: string;
-    cachePath: string;
-    terminalOutputsDir: string;
-    latestOutputsHashesDir: string;
-    useFsExtraToCopyAndRemove: boolean;
-    constructor(options: DefaultTasksRunnerOptions);
-    removeOldCacheRecords(): void;
-    get(task: Task): Promise<CachedResult | null>;
-    put(task: Task, terminalOutput: string | null, outputs: string[], code: number): Promise<void>;
-    copyFilesFromCache(hash: string, cachedResult: CachedResult, outputs: string[]): Promise<void>;
-    temporaryOutputPath(task: Task): string;
-    removeRecordedOutputsHashes(outputs: string[]): Promise<void>;
-    shouldCopyOutputsFromCache(taskWithCachedResult: TaskWithCachedResult, outputs: string[]): Promise<boolean>;
-    private copy;
-    private remove;
-    private recordOutputsHash;
-    private areLatestOutputsHashesDifferentThanTaskHash;
-    private getLatestRecordedHashForTask;
-    private isAnyOutputMissing;
-    private getFileNameWithLatestRecordedHashForOutput;
-    private getFromLocalDir;
-    private createCacheDir;
-    private createTerminalOutputsDir;
-    private ensureLatestOutputsHashesDir;
-    private tryAndRetry;
-}
+export { CachedResult, TaskWithCachedResult, Cache, } from 'nx/src/tasks-runner/cache';