@nrwl/workspace 15.6.2 → 15.7.0-beta.0

package/CHANGELOG.md

@@ -3,6 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [15.6.2](https://github.com/nrwl/nx/compare/15.6.1...15.6.2) (2023-01-24)
+# [15.7.0-beta.0](https://github.com/nrwl/nx/compare/15.6.0...15.7.0-beta.0) (2023-01-26)
 
 **Note:** Version bump only for package @nrwl/workspace

package/README.md

@@ -53,7 +53,7 @@ npx nx@latest init
 
 - [Nx.Dev: Documentation, Guides, Tutorials](https://nx.dev)
 - [Intro to Nx](https://nx.dev/getting-started/intro)
-- [Official Nx YouTube Channel](https://www.youtube.com/c/Nrwl_io)
+- [Official Nx YouTube Channel](https://www.youtube.com/@NxDevtools)
 - [Blog Posts About Nx](https://blog.nrwl.io/nx/home)
 
 <p style="text-align: center;"><a href="https://nx.dev/#learning-materials" target="_blank" rel="noreferrer"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-courses-and-videos.svg" 

package/generators.json

@@ -8,14 +8,12 @@
       "aliases": ["mv"],
       "description": "Move an application or library to another folder."
     },
-
     "remove": {
       "factory": "./src/generators/remove/remove#removeSchematic",
       "schema": "./src/generators/remove/schema.json",
       "aliases": ["rm"],
       "description": "Remove an application or library."
     },
-
     "library": {
       "factory": "./src/generators/library/library#librarySchematic",
       "schema": "./src/generators/library/schema.json",
@@ -23,27 +21,18 @@
       "x-type": "library",
       "description": "Create a library."
     },
-
     "workspace-generator": {
       "factory": "./src/generators/workspace-generator/workspace-generator",
       "schema": "./src/generators/workspace-generator/schema.json",
       "aliases": ["workspace-schematic"],
       "description": "Generates a workspace generator."
     },
-
     "run-commands": {
       "factory": "./src/generators/run-commands/run-commands#runCommandsSchematic",
       "schema": "./src/generators/run-commands/schema.json",
       "aliases": ["run-command", "target"],
       "description": "Generates a target to run any command in the terminal."
     },
-
-    "convert-to-nx-project": {
-      "factory": "./src/generators/convert-to-nx-project/convert-to-nx-project#convertToNxProjectSchematic",
-      "schema": "./src/generators/convert-to-nx-project/schema.json",
-      "description": "Moves a project's configuration outside of `workspace.json`."
-    },
-
     "npm-package": {
       "factory": "./src/generators/npm-package/npm-package#npmPackageSchematic",
       "schema": "./src/generators/npm-package/schema.json",
@@ -58,28 +47,24 @@
       "description": "Create application in an empty workspace.",
       "hidden": true
     },
-
     "move": {
       "factory": "./src/generators/move/move#moveGenerator",
       "schema": "./src/generators/move/schema.json",
       "aliases": ["mv"],
       "description": "Move an application or library to another folder."
     },
-
     "remove": {
       "factory": "./src/generators/remove/remove#removeGenerator",
       "schema": "./src/generators/remove/schema.json",
       "aliases": ["rm"],
       "description": "Remove an application or library."
     },
-
     "new": {
       "factory": "./src/generators/new/new#newGenerator",
       "schema": "./src/generators/new/schema.json",
       "description": "Create a workspace.",
       "hidden": true
     },
-
     "library": {
       "factory": "./src/generators/library/library#libraryGenerator",
       "schema": "./src/generators/library/schema.json",
@@ -87,34 +72,30 @@
       "x-type": "library",
       "description": "Create a library."
     },
-
     "workspace-generator": {
       "factory": "./src/generators/workspace-generator/workspace-generator",
       "schema": "./src/generators/workspace-generator/schema.json",
       "aliases": ["workspace-schematic"],
       "description": "Generates a workspace generator."
     },
-
     "run-commands": {
       "factory": "./src/generators/run-commands/run-commands#runCommandsGenerator",
       "schema": "./src/generators/run-commands/schema.json",
       "aliases": ["run-command", "target"],
       "description": "Generates a target to run any command in the terminal."
     },
-
-    "convert-to-nx-project": {
+    "fix-configuration": {
       "factory": "./src/generators/convert-to-nx-project/convert-to-nx-project#convertToNxProjectGenerator",
       "schema": "./src/generators/convert-to-nx-project/schema.json",
-      "description": "Moves a project's configuration outside of `workspace.json`."
+      "aliases": ["convert-to-nx-project"],
+      "description": "Fixes projects configuration"
     },
-
     "npm-package": {
       "factory": "./src/generators/npm-package/npm-package#npmPackageGenerator",
       "schema": "./src/generators/npm-package/schema.json",
       "description": "Create a minimal NPM package.",
       "x-type": "library"
     },
-
     "ci-workflow": {
       "factory": "./src/generators/ci-workflow/ci-workflow#ciWorkflowGenerator",
       "schema": "./src/generators/ci-workflow/schema.json",

package/index.d.ts

@@ -18,8 +18,6 @@ export { deleteFile } from './src/utils/rules/deleteFile';
 export * from './src/utils/rules/ng-add';
 export { updateKarmaConf } from './src/utils/rules/update-karma-conf';
 export { visitNotIgnoredFiles } from './src/utils/rules/visit-not-ignored-files';
-export { renamePackageImports } from './src/utils/rules/rename-package-imports';
-export { renameNpmPackages } from './src/utils/rules/rename-npm-packages';
 import * as strings from './src/utils/strings';
 export { checkAndCleanWithSemver } from './src/utils/version-utils';
 export { updatePackagesInPackageJson } from './src/utils/update-packages-in-package-json';

package/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateKarmaConf = exports.deleteFile = exports.formatFiles = exports.addInstallTask = exports.generateProjectLint = exports.addLintFiles = exports.addUpdateTask = exports.updateBuilderConfig = exports.updateWorkspace = exports.getWorkspace = exports.serializeTarget = exports.parseTarget = exports.editTarget = exports.replaceAppNameWithPath = exports.getWorkspacePath = exports.getNpmScope = exports.RemoveChange = exports.ReplaceChange = exports.InsertChange = exports.readNxJsonInTree = 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.output = exports.resolveUserExistingPrettierConfig = exports.names = 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.visitNotIgnoredFiles = void 0;
+exports.stringUtils = exports.convertToNxProjectSchematic = exports.convertToNxProjectGenerator = exports.runCommandsGenerator = exports.removeGenerator = exports.moveGenerator = exports.libraryGenerator = exports.updatePackagesInPackageJson = exports.checkAndCleanWithSemver = exports.visitNotIgnoredFiles = 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; } });
@@ -72,10 +72,6 @@ var update_karma_conf_1 = require("./src/utils/rules/update-karma-conf");
 Object.defineProperty(exports, "updateKarmaConf", { enumerable: true, get: function () { return update_karma_conf_1.updateKarmaConf; } });
 var visit_not_ignored_files_1 = require("./src/utils/rules/visit-not-ignored-files");
 Object.defineProperty(exports, "visitNotIgnoredFiles", { enumerable: true, get: function () { return visit_not_ignored_files_1.visitNotIgnoredFiles; } });
-var rename_package_imports_1 = require("./src/utils/rules/rename-package-imports");
-Object.defineProperty(exports, "renamePackageImports", { enumerable: true, get: function () { return rename_package_imports_1.renamePackageImports; } });
-var rename_npm_packages_1 = require("./src/utils/rules/rename-npm-packages");
-Object.defineProperty(exports, "renameNpmPackages", { enumerable: true, get: function () { return rename_npm_packages_1.renameNpmPackages; } });
 const strings = require("./src/utils/strings");
 var version_utils_1 = require("./src/utils/version-utils");
 Object.defineProperty(exports, "checkAndCleanWithSemver", { enumerable: true, get: function () { return version_utils_1.checkAndCleanWithSemver; } });

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,uCAAqC;AAA5B,+FAAA,KAAK,OAAA;AAEd,qDAGkC;AADhC,6HAAA,iCAAiC,OAAA;AAGnC,iDAAgD;AAAvC,gGAAA,MAAM,OAAA;AAEf,8DAGyC;AAFvC,iHAAA,mBAAmB,OAAA;AACnB,6GAAA,eAAe,OAAA;AAGjB,mDAuB+B;AAtB7B,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,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,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,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,uCAAqC;AAA5B,+FAAA,KAAK,OAAA;AAEd,qDAGkC;AADhC,6HAAA,iCAAiC,OAAA;AAGnC,iDAAgD;AAAvC,gGAAA,MAAM,OAAA;AAEf,8DAGyC;AAFvC,iHAAA,mBAAmB,OAAA;AACnB,6GAAA,eAAe,OAAA;AAGjB,mDAuB+B;AAtB7B,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,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,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,+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

@@ -77,6 +77,12 @@
       "description": "Migrates from @nrwl/workspace:run-commands to nx:run-commands",
       "cli": "nx",
       "implementation": "./src/migrations/update-14-8-0/change-run-commands-executor"
+    },
+    "15-7-0-split-configuration-into-project-json-files": {
+      "version": "15.7.0-beta.0",
+      "description": "Spilt global configuration files (e.g., workspace.json) into individual project.json files.",
+      "cli": "nx",
+      "implementation": "./src/migrations/update-15-7-0/split-configuration-into-project-json-files"
     }
   },
   "packageJsonUpdates": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/workspace",
-  "version": "15.6.2",
+  "version": "15.7.0-beta.0",
   "private": false,
   "description": "The Workspace plugin contains executors and generators that are useful for any Nx workspace. It should be present in every Nx workspace and other plugins build on it.",
   "repository": {
@@ -33,32 +33,32 @@
     "requirements": {},
     "migrations": "./migrations.json",
     "packageGroup": {
-      "@nrwl/angular": "15.6.2",
-      "@nrwl/cli": "15.6.2",
-      "@nrwl/cypress": "15.6.2",
-      "@nrwl/detox": "15.6.2",
-      "@nrwl/devkit": "15.6.2",
-      "@nrwl/esbuild": "15.6.2",
-      "@nrwl/eslint-plugin-nx": "15.6.2",
-      "@nrwl/expo": "15.6.2",
-      "@nrwl/express": "15.6.2",
-      "@nrwl/jest": "15.6.2",
-      "@nrwl/js": "15.6.2",
-      "@nrwl/linter": "15.6.2",
-      "@nrwl/nest": "15.6.2",
-      "@nrwl/next": "15.6.2",
-      "@nrwl/node": "15.6.2",
+      "@nrwl/angular": "15.7.0-beta.0",
+      "@nrwl/cli": "15.7.0-beta.0",
+      "@nrwl/cypress": "15.7.0-beta.0",
+      "@nrwl/detox": "15.7.0-beta.0",
+      "@nrwl/devkit": "15.7.0-beta.0",
+      "@nrwl/esbuild": "15.7.0-beta.0",
+      "@nrwl/eslint-plugin-nx": "15.7.0-beta.0",
+      "@nrwl/expo": "15.7.0-beta.0",
+      "@nrwl/express": "15.7.0-beta.0",
+      "@nrwl/jest": "15.7.0-beta.0",
+      "@nrwl/js": "15.7.0-beta.0",
+      "@nrwl/linter": "15.7.0-beta.0",
+      "@nrwl/nest": "15.7.0-beta.0",
+      "@nrwl/next": "15.7.0-beta.0",
+      "@nrwl/node": "15.7.0-beta.0",
       "@nrwl/nx-cloud": "latest",
-      "@nrwl/nx-plugin": "15.6.2",
-      "@nrwl/react-native": "15.6.2",
-      "@nrwl/react": "15.6.2",
-      "@nrwl/rollup": "15.6.2",
-      "@nrwl/storybook": "15.6.2",
-      "@nrwl/tao": "15.6.2",
-      "@nrwl/vite": "15.6.2",
-      "@nrwl/web": "15.6.2",
-      "@nrwl/webpack": "15.6.2",
-      "nx": "15.6.2"
+      "@nrwl/nx-plugin": "15.7.0-beta.0",
+      "@nrwl/react-native": "15.7.0-beta.0",
+      "@nrwl/react": "15.7.0-beta.0",
+      "@nrwl/rollup": "15.7.0-beta.0",
+      "@nrwl/storybook": "15.7.0-beta.0",
+      "@nrwl/tao": "15.7.0-beta.0",
+      "@nrwl/vite": "15.7.0-beta.0",
+      "@nrwl/web": "15.7.0-beta.0",
+      "@nrwl/webpack": "15.7.0-beta.0",
+      "nx": "15.7.0-beta.0"
     }
   },
   "peerDependencies": {
@@ -70,15 +70,14 @@
     }
   },
   "dependencies": {
-    "@nrwl/devkit": "15.6.2",
-    "@nrwl/linter": "15.6.2",
+    "@nrwl/devkit": "15.7.0-beta.0",
+    "@nrwl/linter": "15.7.0-beta.0",
     "@parcel/watcher": "2.0.4",
     "chalk": "^4.1.0",
     "chokidar": "^3.5.1",
     "cli-cursor": "3.1.0",
     "cli-spinners": "2.6.1",
     "dotenv": "~10.0.0",
-    "enquirer": "~2.3.6",
     "figures": "3.2.0",
     "flat": "^5.0.2",
     "fs-extra": "^11.1.0",
@@ -87,7 +86,7 @@
     "jsonc-parser": "3.2.0",
     "minimatch": "3.0.5",
     "npm-run-path": "^4.0.1",
-    "nx": "15.6.2",
+    "nx": "15.7.0-beta.0",
     "open": "^8.4.0",
     "rxjs": "^6.5.4",
     "semver": "7.3.4",
@@ -100,5 +99,5 @@
     "access": "public"
   },
   "types": "./index.d.ts",
-  "gitHead": "e15aa567d46eaccbed7c50ece2aa5e50d7374199"
+  "gitHead": "657f62aff3c32cdefd1f562eb38d3acfe2025c94"
 }

package/src/generators/ci-workflow/schema.json

@@ -14,7 +14,7 @@
         "message": "What is your target CI provider?",
         "type": "list",
         "items": [
-          { "value": "github", "label": "Github Actions" },
+          { "value": "github", "label": "GitHub Actions" },
           { "value": "circleci", "label": "Circle CI" },
           { "value": "azure", "label": "Azure DevOps" },
           { "value": "bitbucket-pipelines", "label": "BitBucket Pipelines" },

package/src/generators/convert-to-nx-project/convert-to-nx-project.d.ts

@@ -1,7 +1,6 @@
 import { Tree } from '@nrwl/devkit';
 import { Schema } from './schema';
-export declare const SCHEMA_OPTIONS_ARE_MUTUALLY_EXCLUSIVE = "--project and --all are mutually exclusive";
-export declare function validateSchema(schema: Schema): Promise<void>;
+export declare function validateSchema(schema: Schema, configName: string): Promise<void>;
 export declare function convertToNxProjectGenerator(host: Tree, schema: Schema): Promise<void>;
 export default convertToNxProjectGenerator;
 export declare const convertToNxProjectSchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;

package/src/generators/convert-to-nx-project/convert-to-nx-project.js

@@ -1,51 +1,72 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertToNxProjectSchematic = exports.convertToNxProjectGenerator = exports.validateSchema = exports.SCHEMA_OPTIONS_ARE_MUTUALLY_EXCLUSIVE = void 0;
+exports.convertToNxProjectSchematic = exports.convertToNxProjectGenerator = exports.validateSchema = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
-const enquirer_1 = require("enquirer");
-const project_configuration_1 = require("nx/src/generators/utils/project-configuration");
 const path_1 = require("path");
-const get_project_configuration_path_1 = require("./utils/get-project-configuration-path");
-exports.SCHEMA_OPTIONS_ARE_MUTUALLY_EXCLUSIVE = '--project and --all are mutually exclusive';
-function validateSchema(schema) {
+const angular_json_1 = require("nx/src/adapter/angular-json");
+const output_1 = require("../../utils/output");
+function validateSchema(schema, configName) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         if (schema.project && schema.all) {
-            throw exports.SCHEMA_OPTIONS_ARE_MUTUALLY_EXCLUSIVE;
+            throw new Error('--project and --all are mutually exclusive');
         }
-        if (!schema.project && !schema.all) {
-            schema.project = (yield (0, enquirer_1.prompt)([
-                {
-                    message: 'What project should be converted?',
-                    type: 'input',
-                    name: 'project',
-                },
-            ])).project;
+        if (schema.project && schema.reformat) {
+            throw new Error('--project and --reformat are mutually exclusive');
+        }
+        if (schema.all && schema.reformat) {
+            throw new Error('--all and --reformat are mutually exclusive');
+        }
+        if ((configName === 'workspace.json' && schema.project) ||
+            (configName === 'workspace.json' && schema.reformat)) {
+            throw new Error('workspace.json is no longer supported. Please pass --all to convert all projects and remove workspace.json.');
+        }
+        if (!schema.project && !schema.all && !schema.reformat) {
+            schema.all = true;
         }
     });
 }
 exports.validateSchema = validateSchema;
 function convertToNxProjectGenerator(host, schema) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        yield validateSchema(schema);
-        const projects = schema.all
-            ? (0, devkit_1.getProjects)(host).entries()
-            : [[schema.project, (0, devkit_1.readProjectConfiguration)(host, schema.project)]];
-        for (const [project, configuration] of projects) {
-            const configPath = (0, get_project_configuration_path_1.getProjectConfigurationPath)(configuration);
-            if (host.exists(configPath)) {
-                devkit_1.logger.warn(`Skipping ${project} since ${configPath} already exists.`);
+        const configName = host.exists('angular.json')
+            ? 'angular.json'
+            : 'workspace.json';
+        if (!host.exists(configName))
+            return;
+        yield validateSchema(schema, configName);
+        const projects = (0, angular_json_1.toNewFormat)((0, devkit_1.readJson)(host, configName)).projects;
+        const leftOverProjects = {};
+        for (const projectName of Object.keys(projects)) {
+            const config = projects[projectName];
+            if (typeof config === 'string')
                 continue;
+            if ((!schema.project || schema.project === projectName) &&
+                !schema.reformat) {
+                const path = (0, path_1.join)(config.root, 'project.json');
+                if (!host.exists(path)) {
+                    (0, devkit_1.addProjectConfiguration)(host, path, projects[projectName]);
+                }
             }
-            (0, devkit_1.writeJson)(host, configPath, Object.assign(Object.assign({ $schema: (0, project_configuration_1.getRelativeProjectJsonSchemaPath)(host, configuration) }, configuration), { root: undefined }));
-            (0, devkit_1.updateJson)(host, (0, devkit_1.getWorkspacePath)(host), (value) => {
-                value.projects[project] = (0, devkit_1.normalizePath)((0, path_1.dirname)(configPath));
-                return value;
-            });
+            else {
+                leftOverProjects[projectName] = config;
+            }
+        }
+        if (Object.keys(leftOverProjects).length > 0) {
+            (0, devkit_1.writeJson)(host, 'angular.json', (0, angular_json_1.toOldFormat)({ version: 1, projects: leftOverProjects }));
+        }
+        else {
+            host.delete(configName);
         }
         if (!schema.skipFormat) {
             yield (0, devkit_1.formatFiles)(host);
         }
+        output_1.output.note({
+            title: 'Use "nx show projects" to read the list of projects.',
+            bodyLines: [
+                `If you read the list of projects from ${configName}, use "nx show projects" instead.`,
+            ],
+        });
     });
 }
 exports.convertToNxProjectGenerator = convertToNxProjectGenerator;

package/src/generators/convert-to-nx-project/convert-to-nx-project.js.map

@@ -1 +1 @@
-{"version":3,"file":"convert-to-nx-project.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/convert-to-nx-project/convert-to-nx-project.ts"],"names":[],"mappings":";;;;AAAA,yCAYsB;AACtB,uCAAkC;AAClC,yFAAiG;AACjG,+BAA+B;AAE/B,2FAAqF;AAExE,QAAA,qCAAqC,GAChD,4CAA4C,CAAC;AAE/C,SAAsB,cAAc,CAAC,MAAc;;QACjD,IAAI,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,GAAG,EAAE;YAChC,MAAM,6CAAqC,CAAC;SAC7C;QAED,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE;YAClC,MAAM,CAAC,OAAO,GAAG,CACf,MAAM,IAAA,iBAAM,EAAsB;gBAChC;oBACE,OAAO,EAAE,mCAAmC;oBAC5C,IAAI,EAAE,OAAO;oBACb,IAAI,EAAE,SAAS;iBAChB;aACF,CAAC,CACH,CAAC,OAAO,CAAC;SACX;IACH,CAAC;CAAA;AAhBD,wCAgBC;AAED,SAAsB,2BAA2B,CAAC,IAAU,EAAE,MAAc;;QAC1E,MAAM,cAAc,CAAC,MAAM,CAAC,CAAC;QAE7B,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG;YACzB,CAAC,CAAC,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,OAAO,EAAE;YAC7B,CAAC,CAAE,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,CAG9D,CAAC;QAET,KAAK,MAAM,CAAC,OAAO,EAAE,aAAa,CAAC,IAAI,QAAQ,EAAE;YAC/C,MAAM,UAAU,GAAG,IAAA,4DAA2B,EAAC,aAAa,CAAC,CAAC;YAC9D,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;gBAC3B,eAAM,CAAC,IAAI,CAAC,YAAY,OAAO,UAAU,UAAU,kBAAkB,CAAC,CAAC;gBACvE,SAAS;aACV;YAED,IAAA,kBAAS,EAAC,IAAI,EAAE,UAAU,gCACxB,OAAO,EAAE,IAAA,wDAAgC,EAAC,IAAI,EAAE,aAAa,CAAC,IAC3D,aAAa,KAChB,IAAI,EAAE,SAAS,IACf,CAAC;YAEH,IAAA,mBAAU,EAAC,IAAI,EAAE,IAAA,yBAAgB,EAAC,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE;gBACjD,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,IAAA,sBAAa,EAAC,IAAA,cAAO,EAAC,UAAU,CAAC,CAAC,CAAC;gBAC7D,OAAO,KAAK,CAAC;YACf,CAAC,CAAC,CAAC;SACJ;QAED,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YACtB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;IACH,CAAC;CAAA;AAhCD,kEAgCC;AAED,kBAAe,2BAA2B,CAAC;AAE9B,QAAA,2BAA2B,GAAG,IAAA,2BAAkB,EAC3D,2BAA2B,CAC5B,CAAC"}
+{"version":3,"file":"convert-to-nx-project.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/convert-to-nx-project/convert-to-nx-project.ts"],"names":[],"mappings":"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"}

package/src/generators/convert-to-nx-project/schema.d.ts

@@ -1,5 +1,7 @@
 export interface Schema {
   project?: string;
   all?: boolean;
+
+  reformat?: boolean;
   skipFormat?: boolean;
 }

package/src/generators/convert-to-nx-project/schema.json

@@ -17,15 +17,19 @@
   ],
   "properties": {
     "project": {
-      "description": "Project name.",
+      "description": "Convert a single project",
       "type": "string"
     },
     "all": {
-      "description": "Should every project be converted?",
+      "description": "Convert all projects",
+      "type": "boolean"
+    },
+    "reformat": {
+      "description": "Just reformats the configuration",
       "type": "boolean"
     },
     "skipFormat": {
-      "description": "Skip formatting files.",
+      "description": "Skip formatting files",
       "type": "boolean",
       "default": false,
       "x-priority": "internal"

package/src/generators/library/library.js

@@ -31,7 +31,7 @@ function addProject(tree, options) {
             },
         };
     }
-    (0, devkit_1.addProjectConfiguration)(tree, options.name, projectConfiguration, options.standaloneConfig);
+    (0, devkit_1.addProjectConfiguration)(tree, options.name, projectConfiguration);
 }
 function addLint(tree, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {

package/src/generators/library/library.js.map

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

package/src/generators/library/schema.json

@@ -104,7 +104,8 @@
     "standaloneConfig": {
       "description": "Split the project configuration into `<projectRoot>/project.json` rather than including it inside `workspace.json`.",
       "type": "boolean",
-      "x-priority": "internal"
+      "default": true,
+      "x-deprecated": "Nx only supports standaloneConfig"
     }
   },
   "required": ["name"]

package/src/generators/move/lib/move-project-configuration.js

@@ -6,7 +6,6 @@ function moveProjectConfiguration(tree, schema, projectConfig) {
     if (projectConfig.name) {
         projectConfig.name = schema.newProjectName;
     }
-    const isStandalone = (0, devkit_1.isStandaloneProject)(tree, schema.projectName);
     const projectString = JSON.stringify(projectConfig);
     const newProjectString = projectString.replace(new RegExp(projectConfig.root, 'g'), schema.relativeToRootDestination);
     // rename
@@ -14,7 +13,7 @@ function moveProjectConfiguration(tree, schema, projectConfig) {
     // Delete the original project
     (0, devkit_1.removeProjectConfiguration)(tree, schema.projectName);
     // Create a new project with the root replaced
-    (0, devkit_1.addProjectConfiguration)(tree, schema.newProjectName, newProject, isStandalone);
+    (0, devkit_1.addProjectConfiguration)(tree, schema.newProjectName, newProject);
 }
 exports.moveProjectConfiguration = moveProjectConfiguration;
 //# sourceMappingURL=move-project-configuration.js.map

package/src/generators/move/lib/move-project-configuration.js.map

@@ -1 +1 @@
-{"version":3,"file":"move-project-configuration.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/move-project-configuration.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AAGtB,SAAgB,wBAAwB,CACtC,IAAU,EACV,MAAwB,EACxB,aAAmC;IAEnC,IAAI,aAAa,CAAC,IAAI,EAAE;QACtB,aAAa,CAAC,IAAI,GAAG,MAAM,CAAC,cAAc,CAAC;KAC5C;IAED,MAAM,YAAY,GAAG,IAAA,4BAAmB,EAAC,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;IACnE,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;IACpD,MAAM,gBAAgB,GAAG,aAAa,CAAC,OAAO,CAC5C,IAAI,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,GAAG,CAAC,EACnC,MAAM,CAAC,yBAAyB,CACjC,CAAC;IAEF,SAAS;IACT,MAAM,UAAU,GAAyB,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAEtE,8BAA8B;IAC9B,IAAA,mCAA0B,EAAC,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;IAErD,8CAA8C;IAC9C,IAAA,gCAAuB,EACrB,IAAI,EACJ,MAAM,CAAC,cAAc,EACrB,UAAU,EACV,YAAY,CACb,CAAC;AACJ,CAAC;AA7BD,4DA6BC"}
+{"version":3,"file":"move-project-configuration.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/move-project-configuration.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AAGtB,SAAgB,wBAAwB,CACtC,IAAU,EACV,MAAwB,EACxB,aAAmC;IAEnC,IAAI,aAAa,CAAC,IAAI,EAAE;QACtB,aAAa,CAAC,IAAI,GAAG,MAAM,CAAC,cAAc,CAAC;KAC5C;IAED,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;IACpD,MAAM,gBAAgB,GAAG,aAAa,CAAC,OAAO,CAC5C,IAAI,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,GAAG,CAAC,EACnC,MAAM,CAAC,yBAAyB,CACjC,CAAC;IAEF,SAAS;IACT,MAAM,UAAU,GAAyB,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAEtE,8BAA8B;IAC9B,IAAA,mCAA0B,EAAC,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;IAErD,8CAA8C;IAC9C,IAAA,gCAAuB,EAAC,IAAI,EAAE,MAAM,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;AACnE,CAAC;AAvBD,4DAuBC"}

package/src/generators/move/lib/update-implicit-dependencies.d.ts

@@ -1,8 +1,6 @@
 import type { Tree } from '@nrwl/devkit';
 import type { NormalizedSchema } from '../schema';
 /**
- * Updates the workspace.json file by renaming the project
- *
  * @param schema The options provided to the schematic
  */
 export declare function updateImplicitDependencies(tree: Tree, schema: NormalizedSchema): void;

package/src/generators/move/lib/update-implicit-dependencies.js

@@ -3,8 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateImplicitDependencies = void 0;
 const devkit_1 = require("@nrwl/devkit");
 /**
- * Updates the workspace.json file by renaming the project
- *
  * @param schema The options provided to the schematic
  */
 function updateImplicitDependencies(tree, schema) {

package/src/generators/move/lib/update-implicit-dependencies.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-implicit-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-implicit-dependencies.ts"],"names":[],"mappings":";;;AACA,yCAAuE;AAGvE;;;;GAIG;AACH,SAAgB,0BAA0B,CACxC,IAAU,EACV,MAAwB;IAExB,KAAK,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,EAAE;QACtD,IAAI,OAAO,CAAC,oBAAoB,EAAE;YAChC,MAAM,KAAK,GAAG,OAAO,CAAC,oBAAoB,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;YACvE,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;gBAChB,OAAO,CAAC,oBAAoB,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,cAAc,CAAC;gBAC5D,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;aACxD;SACF;KACF;AACH,CAAC;AAbD,gEAaC"}
+{"version":3,"file":"update-implicit-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-implicit-dependencies.ts"],"names":[],"mappings":";;;AACA,yCAAuE;AAGvE;;GAEG;AACH,SAAgB,0BAA0B,CACxC,IAAU,EACV,MAAwB;IAExB,KAAK,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,EAAE;QACtD,IAAI,OAAO,CAAC,oBAAoB,EAAE;YAChC,MAAM,KAAK,GAAG,OAAO,CAAC,oBAAoB,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;YACvE,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;gBAChB,OAAO,CAAC,oBAAoB,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,cAAc,CAAC;gBAC5D,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;aACxD;SACF;KACF;AACH,CAAC;AAbD,gEAaC"}

package/src/generators/new/new.js

@@ -44,9 +44,6 @@ function validateOptions(options, host) {
     if (options.preset === presets_1.Preset.NodeServer && !options.framework) {
         throw new Error(`Cannot generate ${options.preset} without selecting a framework`);
     }
-    if ((0, devkit_1.getWorkspacePath)(host)) {
-        throw new Error('Cannot generate a new workspace within an existing workspace');
-    }
     if (host.exists(options.name) &&
         !host.isFile(options.name) &&
         host.children(options.name).length > 0) {

package/src/generators/new/new.js.map

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

package/src/generators/npm-package/npm-package.js

@@ -24,13 +24,10 @@ function npmPackageGenerator(tree, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         options = normalizeOptions(options);
         const { libsDir, npmScope } = (0, devkit_1.getWorkspaceLayout)(tree);
-        const workspaceFile = (0, devkit_1.getWorkspacePath)(tree);
         const projectRoot = (0, path_1.join)(libsDir, options.name);
-        if (!!workspaceFile) {
-            (0, devkit_1.addProjectConfiguration)(tree, options.name, {
-                root: projectRoot,
-            });
-        }
+        (0, devkit_1.addProjectConfiguration)(tree, options.name, {
+            root: projectRoot,
+        });
         const fileCount = tree.children(projectRoot).length;
         const projectJsonExists = tree.exists((0, path_1.join)(projectRoot, 'project.json'));
         const isEmpty = fileCount === 0 || (fileCount === 1 && projectJsonExists);