@nx/workspace 17.0.0-beta.2 → 17.0.0-beta.4

package/generators.json

@@ -1,37 +1,6 @@
 {
   "name": "nx/workspace",
   "version": "0.1",
-  "schematics": {
-    "move": {
-      "factory": "./src/generators/move/move#moveSchematic",
-      "schema": "./src/generators/move/schema.json",
-      "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."
-    },
-    "convert-to-monorepo": {
-      "factory": "./src/generators/convert-to-monorepo/convert-to-monorepo#monorepoSchematic",
-      "schema": "./src/generators/convert-to-monorepo/schema.json",
-      "description": "Convert a Nx project to a monorepo."
-    },
-    "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."
-    },
-    "npm-package": {
-      "factory": "./src/generators/npm-package/npm-package#npmPackageSchematic",
-      "schema": "./src/generators/npm-package/schema.json",
-      "description": "Create a minimal NPM package.",
-      "x-type": "library"
-    }
-  },
   "generators": {
     "preset": {
       "factory": "./src/generators/preset/preset#presetGenerator",

package/index.d.ts

@@ -16,5 +16,5 @@ export { checkAndCleanWithSemver } from './src/utils/version-utils';
 export { moveGenerator } from './src/generators/move/move';
 export { removeGenerator } from './src/generators/remove/remove';
 export { runCommandsGenerator } from './src/generators/run-commands/run-commands';
-export { convertToNxProjectGenerator, convertToNxProjectSchematic, } from './src/generators/convert-to-nx-project/convert-to-nx-project';
+export { convertToNxProjectGenerator } from './src/generators/convert-to-nx-project/convert-to-nx-project';
 export declare const stringUtils: typeof strings;

package/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stringUtils = exports.convertToNxProjectSchematic = exports.convertToNxProjectGenerator = exports.runCommandsGenerator = exports.removeGenerator = exports.moveGenerator = exports.checkAndCleanWithSemver = exports.visitNotIgnoredFiles = exports.deleteFile = exports.formatFiles = exports.addInstallTask = exports.updateBuilderConfig = exports.updateWorkspace = exports.getWorkspace = exports.serializeTarget = exports.parseTarget = exports.editTarget = exports.getWorkspacePath = exports.readPackageJson = exports.readWorkspaceConfig = exports.output = exports.names = exports.createDirectory = exports.copyFile = exports.updateJsonFile = exports.renameSync = exports.projectRootDir = exports.ProjectType = exports.readTsConfig = void 0;
+exports.stringUtils = exports.convertToNxProjectGenerator = exports.runCommandsGenerator = exports.removeGenerator = exports.moveGenerator = exports.checkAndCleanWithSemver = exports.visitNotIgnoredFiles = exports.deleteFile = exports.formatFiles = exports.addInstallTask = exports.updateBuilderConfig = exports.updateWorkspace = exports.getWorkspace = exports.serializeTarget = exports.parseTarget = exports.editTarget = exports.getWorkspacePath = exports.readPackageJson = exports.readWorkspaceConfig = exports.output = exports.names = exports.createDirectory = exports.copyFile = exports.updateJsonFile = exports.renameSync = exports.projectRootDir = exports.ProjectType = exports.readTsConfig = void 0;
 var ts_config_1 = require("./src/utilities/ts-config");
 Object.defineProperty(exports, "readTsConfig", { enumerable: true, get: function () { return ts_config_1.readTsConfig; } });
 var project_type_1 = require("./src/utils/project-type");
@@ -47,5 +47,4 @@ var run_commands_1 = require("./src/generators/run-commands/run-commands");
 Object.defineProperty(exports, "runCommandsGenerator", { enumerable: true, get: function () { return run_commands_1.runCommandsGenerator; } });
 var convert_to_nx_project_1 = require("./src/generators/convert-to-nx-project/convert-to-nx-project");
 Object.defineProperty(exports, "convertToNxProjectGenerator", { enumerable: true, get: function () { return convert_to_nx_project_1.convertToNxProjectGenerator; } });
-Object.defineProperty(exports, "convertToNxProjectSchematic", { enumerable: true, get: function () { return convert_to_nx_project_1.convertToNxProjectSchematic; } });
 exports.stringUtils = strings;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "17.0.0-beta.2",
+  "version": "17.0.0-beta.4",
   "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": {
@@ -27,8 +27,8 @@
     "url": "https://github.com/nrwl/nx/issues"
   },
   "homepage": "https://nx.dev",
-  "schematics": "./generators.json",
-  "builders": "./executors.json",
+  "generators": "./generators.json",
+  "executors": "./executors.json",
   "ng-update": {
     "requirements": {},
     "migrations": "./migrations.json",
@@ -61,15 +61,15 @@
     }
   },
   "dependencies": {
-    "@nx/devkit": "17.0.0-beta.2",
+    "@nx/devkit": "17.0.0-beta.4",
     "chalk": "^4.1.0",
     "enquirer": "~2.3.6",
     "ignore": "^5.0.4",
     "rxjs": "^7.8.0",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "nx": "17.0.0-beta.2",
-    "@nrwl/workspace": "17.0.0-beta.2"
+    "nx": "17.0.0-beta.4",
+    "@nrwl/workspace": "17.0.0-beta.4"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/convert-to-monorepo/convert-to-monorepo.d.ts

@@ -1,4 +1,3 @@
 import { Tree } from '@nx/devkit';
 export declare function monorepoGenerator(tree: Tree, options: {}): Promise<void>;
 export default monorepoGenerator;
-export declare const monorepoSchematic: (generatorOptions: {}) => (tree: any, context: any) => Promise<any>;

package/src/generators/convert-to-monorepo/convert-to-monorepo.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.monorepoSchematic = exports.monorepoGenerator = void 0;
+exports.monorepoGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const move_1 = require("../move/move");
 async function monorepoGenerator(tree, options) {
@@ -35,4 +35,3 @@ async function monorepoGenerator(tree, options) {
 }
 exports.monorepoGenerator = monorepoGenerator;
 exports.default = monorepoGenerator;
-exports.monorepoSchematic = (0, devkit_1.convertNxGenerator)(monorepoGenerator);

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

@@ -3,4 +3,3 @@ import { Schema } from './schema';
 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,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertToNxProjectSchematic = exports.convertToNxProjectGenerator = exports.validateSchema = void 0;
+exports.convertToNxProjectGenerator = exports.validateSchema = void 0;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const angular_json_1 = require("nx/src/adapter/angular-json");
@@ -77,4 +77,3 @@ async function convertToNxProjectGenerator(host, schema) {
 }
 exports.convertToNxProjectGenerator = convertToNxProjectGenerator;
 exports.default = convertToNxProjectGenerator;
-exports.convertToNxProjectSchematic = (0, devkit_1.convertNxGenerator)(convertToNxProjectGenerator);

package/src/generators/move/move.d.ts

@@ -3,4 +3,3 @@ import { Schema } from './schema';
 export declare function moveGenerator(tree: Tree, rawSchema: Schema): Promise<void>;
 export declare function moveGeneratorInternal(tree: Tree, rawSchema: Schema): Promise<void>;
 export default moveGenerator;
-export declare const moveSchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;

package/src/generators/move/move.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.moveSchematic = exports.moveGeneratorInternal = exports.moveGenerator = void 0;
+exports.moveGeneratorInternal = exports.moveGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const check_destination_1 = require("./lib/check-destination");
 const create_project_configuration_in_new_destination_1 = require("./lib/create-project-configuration-in-new-destination");
@@ -58,4 +58,3 @@ async function moveGeneratorInternal(tree, rawSchema) {
 }
 exports.moveGeneratorInternal = moveGeneratorInternal;
 exports.default = moveGenerator;
-exports.moveSchematic = (0, devkit_1.convertNxGenerator)(moveGenerator);

package/src/generators/new/new.d.ts

@@ -6,7 +6,6 @@ interface Schema {
     appName?: string;
     skipInstall?: boolean;
     style?: string;
-    nxCloud?: boolean;
     preset: string;
     defaultBase: string;
     framework?: string;

package/src/generators/new/new.js

@@ -12,7 +12,6 @@ async function newGenerator(tree, opts) {
     validateOptions(options, tree);
     await (0, generate_workspace_files_1.generateWorkspaceFiles)(tree, { ...options, nxCloud: undefined });
     (0, generate_preset_1.addPresetDependencies)(tree, options);
-    addCloudDependencies(tree, options);
     return async () => {
         const pmc = (0, devkit_1.getPackageManagerCommand)(options.packageManager);
         if (pmc.preInstall) {
@@ -37,9 +36,6 @@ function validateOptions(options, host) {
         options.preset !== presets_1.Preset.NPM) {
         throw new Error(`Cannot select a preset when skipInstall is set to true.`);
     }
-    if (options.skipInstall && options.nxCloud) {
-        throw new Error(`Cannot select nxCloud when skipInstall is set to true.`);
-    }
     if ((options.preset === presets_1.Preset.NodeStandalone ||
         options.preset === presets_1.Preset.NodeMonorepo) &&
         !options.framework) {
@@ -84,8 +80,3 @@ function normalizeOptions(options) {
     normalized.isCustomPreset = !Object.values(presets_1.Preset).includes(options.preset);
     return normalized;
 }
-function addCloudDependencies(host, options) {
-    if (options.nxCloud) {
-        return (0, devkit_1.addDependenciesToPackageJson)(host, {}, { 'nx-cloud': 'latest' }, (0, path_1.join)(options.directory, 'package.json'));
-    }
-}

package/src/generators/new/schema.json

@@ -47,11 +47,6 @@
       "type": "string",
       "description": "Application name."
     },
-    "nxCloud": {
-      "description": "Connect the workspace to the free tier of the distributed cache provided by Nx Cloud.",
-      "type": "boolean",
-      "default": false
-    },
     "linter": {
       "description": "The tool to use for running lint checks.",
       "type": "string",

package/src/generators/npm-package/npm-package.d.ts

@@ -7,4 +7,3 @@ export interface ProjectOptions {
 }
 export declare function npmPackageGenerator(tree: Tree, options: ProjectOptions): Promise<void>;
 export declare function npmPackageGeneratorInternal(tree: Tree, _options: ProjectOptions): Promise<void>;
-export declare const npmPackageSchematic: (generatorOptions: ProjectOptions) => (tree: any, context: any) => Promise<any>;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.npmPackageSchematic = exports.npmPackageGeneratorInternal = exports.npmPackageGenerator = void 0;
+exports.npmPackageGeneratorInternal = exports.npmPackageGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const path_1 = require("path");
@@ -51,4 +51,3 @@ async function npmPackageGeneratorInternal(tree, _options) {
     await (0, devkit_1.formatFiles)(tree);
 }
 exports.npmPackageGeneratorInternal = npmPackageGeneratorInternal;
-exports.npmPackageSchematic = (0, devkit_1.convertNxGenerator)(npmPackageGenerator);

package/src/generators/remove/remove.d.ts

@@ -2,4 +2,3 @@ import { Tree } from '@nx/devkit';
 import { Schema } from './schema';
 export declare function removeGenerator(tree: Tree, schema: Schema): Promise<void>;
 export default removeGenerator;
-export declare const removeSchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;

package/src/generators/remove/remove.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeSchematic = exports.removeGenerator = void 0;
+exports.removeGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const check_project_is_safe_to_remove_1 = require("./lib/check-project-is-safe-to-remove");
 const check_dependencies_1 = require("./lib/check-dependencies");
@@ -24,4 +24,3 @@ async function removeGenerator(tree, schema) {
 }
 exports.removeGenerator = removeGenerator;
 exports.default = removeGenerator;
-exports.removeSchematic = (0, devkit_1.convertNxGenerator)(removeGenerator);

package/src/generators/run-commands/run-commands.d.ts

@@ -2,4 +2,3 @@ import { Schema } from './schema';
 import { Tree } from '@nx/devkit';
 export declare function runCommandsGenerator(host: Tree, schema: Schema): Promise<void>;
 export default runCommandsGenerator;
-export declare const runCommandsSchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;

package/src/generators/run-commands/run-commands.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runCommandsSchematic = exports.runCommandsGenerator = void 0;
+exports.runCommandsGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 async function runCommandsGenerator(host, schema) {
     const project = (0, devkit_1.readProjectConfiguration)(host, schema.project);
@@ -23,4 +23,3 @@ async function runCommandsGenerator(host, schema) {
 }
 exports.runCommandsGenerator = runCommandsGenerator;
 exports.default = runCommandsGenerator;
-exports.runCommandsSchematic = (0, devkit_1.convertNxGenerator)(runCommandsGenerator);