@nrwl/workspace 13.9.3 → 13.10.0-beta.2

package/generators.json

@@ -9,13 +9,6 @@
       "hidden": true
     },
 
-    "ng-add": {
-      "factory": "./src/generators/init/init#initSchematic",
-      "schema": "./src/generators/init/schema.json",
-      "description": "Convert an existing Angular CLI project into an Nx Workspace",
-      "hidden": true
-    },
-
     "preset": {
       "factory": "./src/generators/preset/preset#presetSchematic",
       "schema": "./src/generators/preset/schema.json",
@@ -87,13 +80,6 @@
       "hidden": true
     },
 
-    "ng-add": {
-      "factory": "./src/generators/init/init#initGenerator",
-      "schema": "./src/generators/init/schema.json",
-      "description": "Convert an existing Angular CLI project into an Nx Workspace",
-      "hidden": true
-    },
-
     "preset": {
       "factory": "./src/generators/preset/preset#presetGenerator",
       "schema": "./src/generators/preset/schema.json",

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,wEAAyC;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,wEAAyC;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.9.3",
+  "version": "13.10.0-beta.2",
   "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.9.3",
-    "@nrwl/devkit": "13.9.3",
-    "@nrwl/jest": "13.9.3",
-    "@nrwl/linter": "13.9.3"
+    "nx": "13.10.0-beta.2",
+    "@nrwl/devkit": "13.10.0-beta.2",
+    "@nrwl/jest": "13.10.0-beta.2",
+    "@nrwl/linter": "13.10.0-beta.2"
   },
   "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/tslint/nxEnforceModuleBoundariesRule.d.ts

@@ -3,7 +3,7 @@ import { IOptions } from 'tslint';
 import * as ts from 'typescript';
 import type { NxJsonConfiguration } from '@nrwl/devkit';
 import { MappedProjectGraph } from '../utils/runtime-lint-utils';
-import { TargetProjectLocator } from '../core/target-project-locator';
+import { TargetProjectLocator } from 'nx/src/core/target-project-locator';
 export declare class Rule extends Lint.Rules.AbstractRule {
     private readonly projectPath?;
     private readonly npmScope?;

package/src/tslint/nxEnforceModuleBoundariesRule.js

@@ -2,14 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Rule = void 0;
 const Lint = require("tslint");
-const project_graph_1 = require("../core/project-graph");
-const app_root_1 = require("nx/src/utils/app-root");
+const devkit_1 = require("@nrwl/devkit");
 const runtime_lint_utils_1 = require("../utils/runtime-lint-utils");
 const path_1 = require("path");
-const file_utils_1 = require("../core/file-utils");
-const target_project_locator_1 = require("../core/target-project-locator");
+const target_project_locator_1 = require("nx/src/core/target-project-locator");
 const graph_utils_1 = require("../utils/graph-utils");
 const fileutils_1 = require("../utilities/fileutils");
+const devkit_2 = require("@nrwl/devkit");
 class Rule extends Lint.Rules.AbstractRule {
     constructor(options, projectPath, npmScope, projectGraph, targetProjectLocator, workspaceLayout) {
         super(options);
@@ -19,9 +18,9 @@ class Rule extends Lint.Rules.AbstractRule {
         this.targetProjectLocator = targetProjectLocator;
         this.workspaceLayout = workspaceLayout;
         if (!projectPath) {
-            this.projectPath = (0, path_1.normalize)(app_root_1.appRootPath);
+            this.projectPath = (0, path_1.normalize)(devkit_1.appRootPath);
             if (!global.projectGraph) {
-                const nxJson = (0, file_utils_1.readNxJson)();
+                const nxJson = (0, devkit_2.readNxJson)();
                 global.npmScope = nxJson.npmScope;
                 global.workspaceLayout = nxJson.workspaceLayout;
                 /**
@@ -29,7 +28,7 @@ class Rule extends Lint.Rules.AbstractRule {
                  * the ProjectGraph may or may not exist by the time the lint rule is invoked for the first time.
                  */
                 try {
-                    global.projectGraph = (0, runtime_lint_utils_1.mapProjectGraphFiles)((0, project_graph_1.readCachedProjectGraph)());
+                    global.projectGraph = (0, runtime_lint_utils_1.mapProjectGraphFiles)((0, devkit_2.readCachedProjectGraph)());
                 }
                 catch (_a) { }
             }
@@ -126,19 +125,19 @@ class EnforceModuleBoundariesWalker extends Lint.RuleWalker {
             return;
         }
         // cannot import apps
-        if (targetProject.type === project_graph_1.ProjectType.app) {
+        if (targetProject.type === 'app') {
             this.addFailureAt(node.getStart(), node.getWidth(), 'imports of apps are forbidden');
             return;
         }
         // cannot import e2e projects
-        if (targetProject.type === project_graph_1.ProjectType.e2e) {
+        if (targetProject.type === 'e2e') {
             this.addFailureAt(node.getStart(), node.getWidth(), 'imports of e2e projects are forbidden');
             return;
         }
         // buildable-lib is not allowed to import non-buildable-lib
         if (this.enforceBuildableLibDependency === true &&
-            sourceProject.type === project_graph_1.ProjectType.lib &&
-            targetProject.type === project_graph_1.ProjectType.lib) {
+            sourceProject.type === 'lib' &&
+            targetProject.type === 'lib') {
             if ((0, runtime_lint_utils_1.hasBuildExecutor)(sourceProject) && !(0, runtime_lint_utils_1.hasBuildExecutor)(targetProject)) {
                 this.addFailureAt(node.getStart(), node.getWidth(), 'buildable libraries cannot import non-buildable libraries');
                 return;

package/src/tslint/nxEnforceModuleBoundariesRule.js.map

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

package/src/utilities/assets.d.ts

@@ -8,11 +8,3 @@ export declare type AssetGlob = FileInputOutput & {
     dot?: boolean;
 };
 export declare function assetGlobsToFiles(assets: Array<AssetGlob | string>, rootDir: string, outDir: string): FileInputOutput[];
-export declare function copyAssets(assets: Array<AssetGlob | string>, rootDir: string, outDir: string): Promise<{
-    success: boolean;
-    error?: string;
-}>;
-export declare function copyAssetFiles(files: FileInputOutput[]): Promise<{
-    success: boolean;
-    error?: string;
-}>;

package/src/utilities/assets.js

@@ -1,9 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.copyAssetFiles = exports.copyAssets = exports.assetGlobsToFiles = void 0;
-const tslib_1 = require("tslib");
-const devkit_1 = require("@nrwl/devkit");
-const fs_extra_1 = require("fs-extra");
+exports.assetGlobsToFiles = void 0;
 const glob = require("glob");
 const path_1 = require("path");
 function assetGlobsToFiles(assets, rootDir, outDir) {
@@ -38,23 +35,4 @@ function assetGlobsToFiles(assets, rootDir, outDir) {
     return files;
 }
 exports.assetGlobsToFiles = assetGlobsToFiles;
-function copyAssets(assets, rootDir, outDir) {
-    const files = assetGlobsToFiles(assets, rootDir, outDir);
-    return copyAssetFiles(files);
-}
-exports.copyAssets = copyAssets;
-function copyAssetFiles(files) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
-        devkit_1.logger.info('Copying asset files...');
-        try {
-            yield Promise.all(files.map((file) => (0, fs_extra_1.copy)(file.input, file.output)));
-            devkit_1.logger.info('Done copying asset files.');
-            return { success: true };
-        }
-        catch (err) {
-            return { error: err.message, success: false };
-        }
-    });
-}
-exports.copyAssetFiles = copyAssetFiles;
 //# sourceMappingURL=assets.js.map

package/src/utilities/assets.js.map

@@ -1 +1 @@
-{"version":3,"file":"assets.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/assets.ts"],"names":[],"mappings":";;;;AAAA,yCAAsC;AACtC,uCAAgC;AAChC,6BAA6B;AAC7B,+BAAsC;AAYtC,SAAgB,iBAAiB,CAC/B,MAAiC,EACjC,OAAe,EACf,MAAc;IAEd,MAAM,KAAK,GAAsB,EAAE,CAAC;IAEpC,MAAM,YAAY,GAAG,CACnB,OAAe,EACf,KAAK,GAAG,EAAE,EACV,SAAmB,EAAE,EACrB,MAAe,KAAK,EACpB,EAAE;QACF,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACxB,GAAG,EAAE,KAAK;YACV,KAAK,EAAE,IAAI;YACX,GAAG;YACH,MAAM;SACP,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;;QACvB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,YAAY,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;gBACnD,KAAK,CAAC,IAAI,CAAC;oBACT,KAAK,EAAE,IAAA,WAAI,EAAC,OAAO,EAAE,WAAW,CAAC;oBACjC,MAAM,EAAE,IAAA,WAAI,EAAC,MAAM,EAAE,IAAA,eAAQ,EAAC,WAAW,CAAC,CAAC;iBAC5C,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;SACJ;aAAM;YACL,YAAY,CACV,KAAK,CAAC,IAAI,EACV,IAAA,WAAI,EAAC,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,EAC1B,KAAK,CAAC,MAAM,EACZ,MAAA,KAAK,CAAC,GAAG,mCAAI,KAAK,CACnB,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;gBACxB,KAAK,CAAC,IAAI,CAAC;oBACT,KAAK,EAAE,IAAA,WAAI,EAAC,OAAO,EAAE,KAAK,CAAC,KAAK,EAAE,WAAW,CAAC;oBAC9C,MAAM,EAAE,IAAA,WAAI,EAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,WAAW,CAAC;iBAChD,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;SACJ;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,KAAK,CAAC;AACf,CAAC;AA7CD,8CA6CC;AAED,SAAgB,UAAU,CACxB,MAAiC,EACjC,OAAe,EACf,MAAc;IAEd,MAAM,KAAK,GAAG,iBAAiB,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IACzD,OAAO,cAAc,CAAC,KAAK,CAAC,CAAC;AAC/B,CAAC;AAPD,gCAOC;AAED,SAAsB,cAAc,CAClC,KAAwB;;QAExB,eAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;QACtC,IAAI;YACF,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,eAAI,EAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YACtE,eAAM,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;YACzC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;SAC1B;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,EAAE,KAAK,EAAE,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;SAC/C;IACH,CAAC;CAAA;AAXD,wCAWC"}
+{"version":3,"file":"assets.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/assets.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAC7B,+BAAsC;AAYtC,SAAgB,iBAAiB,CAC/B,MAAiC,EACjC,OAAe,EACf,MAAc;IAEd,MAAM,KAAK,GAAsB,EAAE,CAAC;IAEpC,MAAM,YAAY,GAAG,CACnB,OAAe,EACf,KAAK,GAAG,EAAE,EACV,SAAmB,EAAE,EACrB,MAAe,KAAK,EACpB,EAAE;QACF,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACxB,GAAG,EAAE,KAAK;YACV,KAAK,EAAE,IAAI;YACX,GAAG;YACH,MAAM;SACP,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;;QACvB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,YAAY,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;gBACnD,KAAK,CAAC,IAAI,CAAC;oBACT,KAAK,EAAE,IAAA,WAAI,EAAC,OAAO,EAAE,WAAW,CAAC;oBACjC,MAAM,EAAE,IAAA,WAAI,EAAC,MAAM,EAAE,IAAA,eAAQ,EAAC,WAAW,CAAC,CAAC;iBAC5C,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;SACJ;aAAM;YACL,YAAY,CACV,KAAK,CAAC,IAAI,EACV,IAAA,WAAI,EAAC,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,EAC1B,KAAK,CAAC,MAAM,EACZ,MAAA,KAAK,CAAC,GAAG,mCAAI,KAAK,CACnB,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;gBACxB,KAAK,CAAC,IAAI,CAAC;oBACT,KAAK,EAAE,IAAA,WAAI,EAAC,OAAO,EAAE,KAAK,CAAC,KAAK,EAAE,WAAW,CAAC;oBAC9C,MAAM,EAAE,IAAA,WAAI,EAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,WAAW,CAAC;iBAChD,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;SACJ;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,KAAK,CAAC;AACf,CAAC;AA7CD,8CA6CC"}

package/src/utilities/buildable-libs-utils.d.ts

@@ -9,6 +9,7 @@ export declare function calculateProjectDependencies(projGraph: ProjectGraph, ro
     target: ProjectGraphProjectNode;
     dependencies: DependentBuildableProjectNode[];
     nonBuildableDependencies: string[];
+    topLevelDependencies: DependentBuildableProjectNode[];
 };
 export declare function computeCompilerOptionsPaths(tsConfig: string, dependencies: DependentBuildableProjectNode[]): any;
 export declare function createTmpTsConfig(tsconfigPath: string, workspaceRoot: string, projectRoot: string, dependencies: DependentBuildableProjectNode[]): string;