@nx/js 17.0.0-beta.1 → 17.0.0-beta.4

package/executors.json

@@ -28,27 +28,5 @@
       "schema": "./src/executors/verdaccio/schema.json",
       "description": "Start local registry with verdaccio"
     }
-  },
-  "builders": {
-    "tsc": {
-      "implementation": "./src/executors/tsc/compat",
-      "schema": "./src/executors/tsc/schema.json",
-      "description": "Build a project using TypeScript."
-    },
-    "swc": {
-      "implementation": "./src/executors/swc/compat",
-      "schema": "./src/executors/swc/schema.json",
-      "description": "Build a project using SWC."
-    },
-    "node": {
-      "implementation": "./src/executors/node/compat",
-      "schema": "./src/executors/node/schema.json",
-      "description": "Execute a Node application."
-    },
-    "verdaccio": {
-      "implementation": "./src/executors/verdaccio/compat",
-      "schema": "./src/executors/verdaccio/schema.json",
-      "description": "Start local registry with verdaccio"
-    }
   }
 }

package/generators.json

@@ -1,41 +1,6 @@
 {
   "name": "nx/js",
   "version": "0.1",
-  "schematics": {
-    "library": {
-      "factory": "./src/generators/library/library#librarySchematic",
-      "schema": "./src/generators/library/schema.json",
-      "aliases": ["lib"],
-      "x-type": "library",
-      "description": "Create a library."
-    },
-    "init": {
-      "factory": "./src/generators/init/init#initSchematic",
-      "schema": "./src/generators/init/schema.json",
-      "x-type": "init",
-      "description": "Initialize a TS/JS workspace.",
-      "hidden": true
-    },
-    "convert-to-swc": {
-      "factory": "./src/generators/convert-to-swc/convert-to-swc#convertToSwcSchematic",
-      "schema": "./src/generators/convert-to-swc/schema.json",
-      "aliases": ["swc"],
-      "x-type": "library",
-      "description": "Convert a TypeScript library to compile with SWC."
-    },
-    "setup-verdaccio": {
-      "factory": "./src/generators/setup-verdaccio/generator#setupVerdaccioSchematic",
-      "schema": "./src/generators/setup-verdaccio/schema.json",
-      "alias": ["verdaccio"],
-      "description": "Setup Verdaccio for local package management."
-    },
-    "setup-build": {
-      "factory": "./src/generators/setup-build/generator#setupBuildSchematic",
-      "schema": "./src/generators/setup-build/schema.json",
-      "alias": ["build"],
-      "description": "setup-build generator"
-    }
-  },
   "generators": {
     "library": {
       "factory": "./src/generators/library/library#libraryGeneratorInternal",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "17.0.0-beta.1",
+  "version": "17.0.0-beta.4",
   "private": false,
   "description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
   "repository": {
@@ -28,9 +28,7 @@
     "migrations": "./migrations.json"
   },
   "generators": "./generators.json",
-  "schematics": "./generators.json",
   "executors": "./executors.json",
-  "builders": "./executors.json",
   "dependencies": {
     "@babel/core": "^7.22.9",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
@@ -59,9 +57,9 @@
     "semver": "7.5.3",
     "source-map-support": "0.5.19",
     "tslib": "^2.3.0",
-    "@nx/devkit": "17.0.0-beta.1",
-    "@nx/workspace": "17.0.0-beta.1",
-    "@nrwl/js": "17.0.0-beta.1"
+    "@nx/devkit": "17.0.0-beta.4",
+    "@nx/workspace": "17.0.0-beta.4",
+    "@nrwl/js": "17.0.0-beta.4"
   },
   "peerDependencies": {
     "verdaccio": "^5.0.4"

package/src/executors/swc/schema.json

@@ -84,19 +84,6 @@
       ],
       "hidden": true
     },
-    "updateBuildableProjectDepsInPackageJson": {
-      "type": "boolean",
-      "description": "Whether to update the buildable project dependencies in the build output package.json.",
-      "default": false,
-      "x-deprecated": "Configure the project to use the '@nx/dependency-checks' ESLint rule instead (https://nx.dev/packages/eslint-plugin/documents/dependency-checks). It will be removed in v17."
-    },
-    "buildableProjectDepsInPackageJsonType": {
-      "type": "string",
-      "description": "When `updateBuildableProjectDepsInPackageJson` is `true`, this adds dependencies to either `peerDependencies` or `dependencies`.",
-      "enum": ["dependencies", "peerDependencies"],
-      "default": "peerDependencies",
-      "x-deprecated": "Configure the project to use the '@nx/dependency-checks' ESLint rule instead (https://nx.dev/packages/eslint-plugin/documents/dependency-checks). It will be removed in v17."
-    },
     "external": {
       "description": "A list projects to be treated as external. This feature is experimental",
       "oneOf": [

package/src/executors/tsc/schema.json

@@ -72,19 +72,6 @@
       },
       "x-priority": "important"
     },
-    "updateBuildableProjectDepsInPackageJson": {
-      "type": "boolean",
-      "description": "Whether to update the buildable project dependencies in the build output package.json.",
-      "default": false,
-      "x-deprecated": "Configure the project to use the '@nx/dependency-checks' ESLint rule instead (https://nx.dev/packages/eslint-plugin/documents/dependency-checks). It will be removed in v17."
-    },
-    "buildableProjectDepsInPackageJsonType": {
-      "type": "string",
-      "description": "When `updateBuildableProjectDepsInPackageJson` is `true`, this adds dependencies to either `peerDependencies` or `dependencies`.",
-      "enum": ["dependencies", "peerDependencies"],
-      "default": "peerDependencies",
-      "x-deprecated": "Configure the project to use the '@nx/dependency-checks' ESLint rule instead (https://nx.dev/packages/eslint-plugin/documents/dependency-checks). It will be removed in v17."
-    },
     "external": {
       "description": "A list projects to be treated as external. This feature is experimental",
       "oneOf": [

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

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

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertToSwcSchematic = exports.convertToSwcGenerator = void 0;
+exports.convertToSwcGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const add_swc_config_1 = require("../../utils/swc/add-swc-config");
@@ -57,4 +57,3 @@ function checkSwcDependencies(tree, projectConfiguration) {
     };
 }
 exports.default = convertToSwcGenerator;
-exports.convertToSwcSchematic = (0, devkit_1.convertNxGenerator)(convertToSwcGenerator);

package/src/generators/init/init.d.ts

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

package/src/generators/init/init.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initSchematic = exports.initGenerator = void 0;
+exports.initGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const semver_1 = require("@nx/devkit/src/utils/semver");
 const package_json_1 = require("nx/src/utils/package-json");
@@ -111,4 +111,3 @@ async function initGenerator(tree, schema) {
 }
 exports.initGenerator = initGenerator;
 exports.default = initGenerator;
-exports.initSchematic = (0, devkit_1.convertNxGenerator)(initGenerator);

package/src/generators/library/library.d.ts

@@ -14,4 +14,3 @@ export interface NormalizedSchema extends LibraryGeneratorSchema {
 export type AddLintOptions = Pick<NormalizedSchema, 'name' | 'linter' | 'projectRoot' | 'unitTestRunner' | 'js' | 'setParserOptionsProject' | 'rootProject' | 'bundler'>;
 export declare function addLint(tree: Tree, options: AddLintOptions): Promise<GeneratorCallback>;
 export default libraryGenerator;
-export declare const librarySchematic: (generatorOptions: LibraryGeneratorSchema) => (tree: any, context: any) => Promise<any>;

package/src/generators/library/library.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.librarySchematic = exports.addLint = exports.libraryGeneratorInternal = exports.libraryGenerator = void 0;
+exports.addLint = exports.libraryGeneratorInternal = exports.libraryGenerator = 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 ts_config_1 = require("../../utils/typescript/ts-config");
@@ -595,4 +595,3 @@ function determineEntryFields(options) {
     }
 }
 exports.default = libraryGenerator;
-exports.librarySchematic = (0, devkit_1.convertNxGenerator)(libraryGenerator);

package/src/generators/setup-build/generator.d.ts

@@ -2,4 +2,3 @@ import { type GeneratorCallback, type Tree } from '@nx/devkit';
 import { SetupBuildGeneratorSchema } from './schema';
 export declare function setupBuildGenerator(tree: Tree, options: SetupBuildGeneratorSchema): Promise<GeneratorCallback>;
 export default setupBuildGenerator;
-export declare const setupBuildSchematic: (generatorOptions: SetupBuildGeneratorSchema) => (tree: any, context: any) => Promise<any>;

package/src/generators/setup-build/generator.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setupBuildSchematic = exports.setupBuildGenerator = void 0;
+exports.setupBuildGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const add_swc_config_1 = require("../../utils/swc/add-swc-config");
 const add_swc_dependencies_1 = require("../../utils/swc/add-swc-dependencies");
@@ -137,4 +137,3 @@ async function setupBuildGenerator(tree, options) {
 }
 exports.setupBuildGenerator = setupBuildGenerator;
 exports.default = setupBuildGenerator;
-exports.setupBuildSchematic = (0, devkit_1.convertNxGenerator)(setupBuildGenerator);

package/src/generators/setup-verdaccio/generator.d.ts

@@ -2,4 +2,3 @@ import { Tree } from '@nx/devkit';
 import { SetupVerdaccioGeneratorSchema } from './schema';
 export declare function setupVerdaccio(tree: Tree, options: SetupVerdaccioGeneratorSchema): Promise<import("@nx/devkit").GeneratorCallback>;
 export default setupVerdaccio;
-export declare const setupVerdaccioSchematic: (generatorOptions: SetupVerdaccioGeneratorSchema) => (tree: any, context: any) => Promise<any>;

package/src/generators/setup-verdaccio/generator.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setupVerdaccioSchematic = exports.setupVerdaccio = void 0;
+exports.setupVerdaccio = void 0;
 const devkit_1 = require("@nx/devkit");
 const path = require("path");
 const versions_1 = require("../../utils/versions");
@@ -54,4 +54,3 @@ async function setupVerdaccio(tree, options) {
 }
 exports.setupVerdaccio = setupVerdaccio;
 exports.default = setupVerdaccio;
-exports.setupVerdaccioSchematic = (0, devkit_1.convertNxGenerator)(setupVerdaccio);

package/src/migrations/update-17-0-0/remove-deprecated-build-options.d.ts

@@ -0,0 +1,6 @@
+import { Tree } from '@nx/devkit';
+/**
+ * Removes deprecated
+ * @param tree
+ */
+export default function (tree: Tree): Promise<void>;

package/src/migrations/update-17-0-0/remove-deprecated-build-options.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const devkit_1 = require("@nx/devkit");
+/**
+ * Removes deprecated
+ * @param tree
+ */
+async function default_1(tree) {
+    const projects = (0, devkit_1.getProjects)(tree);
+    for (const [projectName, projectConfig] of projects) {
+        let shouldUpdate = false;
+        if (!projectConfig.targets)
+            continue;
+        for (const target of Object.values(projectConfig.targets)) {
+            if (target.executor.startsWith('@nx/') &&
+                ('buildableProjectDepsInPackageJsonType' in target.options ||
+                    'updateBuildableProjectDepsInPackageJson' in target.options)) {
+                delete target.options['buildableProjectDepsInPackageJsonType'];
+                delete target.options['updateBuildableProjectDepsInPackageJson'];
+                shouldUpdate = true;
+            }
+        }
+        if (shouldUpdate) {
+            (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
+        }
+    }
+    await (0, devkit_1.formatFiles)(tree);
+}
+exports.default = default_1;

package/src/utils/buildable-libs-utils.js

@@ -49,13 +49,10 @@ function calculateProjectDependencies(projGraph, root, projectName, targetName,
                         ? (0, devkit_1.readJsonFile)(libPackageJsonPath).name // i.e. @workspace/mylib
                         : dep,
                     outputs: (0, devkit_1.getOutputsForTargetAndConfiguration)({
-                        overrides: {},
-                        target: {
-                            project: projectName,
-                            target: targetName,
-                            configuration: configurationName,
-                        },
-                    }, depNode),
+                        project: projectName,
+                        target: targetName,
+                        configuration: configurationName,
+                    }, {}, depNode),
                     node: depNode,
                 };
             }
@@ -128,7 +125,7 @@ function calculateDependenciesFromTaskGraph(taskGraph, projectGraph, root, proje
         if (depProjectNode?.type !== 'lib') {
             return null;
         }
-        let outputs = (0, devkit_1.getOutputsForTargetAndConfiguration)(depTask, depProjectNode);
+        let outputs = (0, devkit_1.getOutputsForTargetAndConfiguration)(depTask.target, depTask.overrides, depProjectNode);
         if (outputs.length === 0) {
             nonBuildableDependencies.push(depTask.target.project);
             continue;
@@ -305,13 +302,10 @@ exports.updatePaths = updatePaths;
  */
 function updateBuildableProjectPackageJsonDependencies(root, projectName, targetName, configurationName, node, dependencies, typeOfDependency = 'dependencies') {
     const outputs = (0, devkit_1.getOutputsForTargetAndConfiguration)({
-        overrides: {},
-        target: {
-            project: projectName,
-            target: targetName,
-            configuration: configurationName,
-        },
-    }, node);
+        project: projectName,
+        target: targetName,
+        configuration: configurationName,
+    }, {}, node);
     const packageJsonPath = `${outputs[0]}/package.json`;
     let packageJson;
     let workspacePackageJson;
@@ -337,13 +331,10 @@ function updateBuildableProjectPackageJsonDependencies(root, projectName, target
                 let depVersion;
                 if (entry.node.type === 'lib') {
                     const outputs = (0, devkit_1.getOutputsForTargetAndConfiguration)({
-                        overrides: {},
-                        target: {
-                            project: projectName,
-                            target: targetName,
-                            configuration: configurationName,
-                        },
-                    }, entry.node);
+                        project: projectName,
+                        target: targetName,
+                        configuration: configurationName,
+                    }, {}, entry.node);
                     const depPackageJsonPath = (0, path_1.join)(root, outputs[0], 'package.json');
                     depVersion = (0, devkit_1.readJsonFile)(depPackageJsonPath).version;
                     packageJson[typeOfDependency][packageName] = depVersion;

package/src/utils/package-json/update-package-json.js

@@ -79,13 +79,10 @@ function addMissingDependencies(packageJson, { projectName, targetName, configur
                 !packageJson.devDependencies?.[packageName] &&
                 !packageJson.peerDependencies?.[packageName]) {
                 const outputs = (0, devkit_1.getOutputsForTargetAndConfiguration)({
-                    overrides: {},
-                    target: {
-                        project: projectName,
-                        target: targetName,
-                        configuration: configurationName,
-                    },
-                }, entry.node);
+                    project: projectName,
+                    target: targetName,
+                    configuration: configurationName,
+                }, {}, entry.node);
                 const depPackageJsonPath = (0, path_1.join)(root, outputs[0], 'package.json');
                 if ((0, fs_1.existsSync)(depPackageJsonPath)) {
                     const version = (0, devkit_1.readJsonFile)(depPackageJsonPath).version;

package/src/utils/schema.d.ts

@@ -1,8 +1,8 @@
 import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
-// nx-ignore-next-line
-const { Linter } = require('@nx/linter'); // use require to import to avoid circular dependency
 import type { AssetGlob, FileInputOutput } from './assets/assets';
 import { TransformerEntry } from './typescript/types';
+// nx-ignore-next-line
+const { Linter } = require('@nx/linter'); // use require to import to avoid circular dependency
 
 export type Compiler = 'tsc' | 'swc';
 export type Bundler = 'swc' | 'tsc' | 'rollup' | 'vite' | 'esbuild' | 'none';
@@ -46,18 +46,6 @@ export interface ExecutorOptions {
   watch: boolean;
   clean?: boolean;
   transformers: TransformerEntry[];
-  /**
-   * @deprecated Configure the project to use the `@nx/dependency-checks` ESLint
-   * rule instead (https://nx.dev/packages/eslint-plugin/documents/dependency-checks).
-   * It will be removed in v17.
-   */
-  updateBuildableProjectDepsInPackageJson?: boolean;
-  /**
-   * @deprecated Configure the project to use the `@nx/dependency-checks` ESLint
-   * rule instead (https://nx.dev/packages/eslint-plugin/documents/dependency-checks).
-   * It will be removed in v17.
-   */
-  buildableProjectDepsInPackageJsonType?: 'dependencies' | 'peerDependencies';
   external?: 'all' | 'none' | string[];
   externalBuildTargets?: string[];
   generateLockfile?: boolean;

package/src/executors/node/compat.d.ts

@@ -1,2 +0,0 @@
-declare const _default: any;
-export default _default;

package/src/executors/node/compat.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const devkit_1 = require("@nx/devkit");
-const node_impl_1 = require("./node.impl");
-exports.default = (0, devkit_1.convertNxExecutor)(node_impl_1.default);

package/src/executors/swc/compat.d.ts

@@ -1,2 +0,0 @@
-declare const _default: any;
-export default _default;

package/src/executors/swc/compat.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const devkit_1 = require("@nx/devkit");
-const swc_impl_1 = require("./swc.impl");
-exports.default = (0, devkit_1.convertNxExecutor)(swc_impl_1.swcExecutor);

package/src/executors/tsc/compat.d.ts

@@ -1,2 +0,0 @@
-declare const _default: any;
-export default _default;

package/src/executors/tsc/compat.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const devkit_1 = require("@nx/devkit");
-const tsc_impl_1 = require("./tsc.impl");
-exports.default = (0, devkit_1.convertNxExecutor)(tsc_impl_1.tscExecutor);

package/src/executors/verdaccio/compat.d.ts

@@ -1,2 +0,0 @@
-declare const _default: any;
-export default _default;

package/src/executors/verdaccio/compat.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const devkit_1 = require("@nx/devkit");
-const verdaccio_impl_1 = require("./verdaccio.impl");
-exports.default = (0, devkit_1.convertNxExecutor)(verdaccio_impl_1.verdaccioExecutor);