@nx/js 16.10.0 → 17.0.0-beta.2

package/migrations.json

@@ -1,35 +1,5 @@
 {
   "generators": {
-    "update-node-executor": {
-      "cli": "nx",
-      "version": "13.8.5-beta.1",
-      "description": "Renames @nrwl/js:node to @nrwl/node:node",
-      "factory": "./src/migrations/update-13-8-5/update-node-executor"
-    },
-    "update-swcrc": {
-      "cli": "nx",
-      "version": "13.8.5-beta.1",
-      "description": "Adjust .swcrc to .lib.swcrc",
-      "factory": "./src/migrations/update-13-8-5/update-swcrc"
-    },
-    "update-swcrc-exclude": {
-      "cli": "nx",
-      "version": "13.10.1-beta.1",
-      "description": "Update .lib.swcrc to exclude missing test files",
-      "factory": "./src/migrations/update-13-10-1/update-lib-swcrc-exclude"
-    },
-    "exclude-jest-config-swcrc": {
-      "cli": "nx",
-      "version": "14.0.0-beta.2",
-      "description": "Exclude jest config from .lib.swcrc",
-      "factory": "./src/migrations/update-14-0-0/exclude-jest-config-swcrc"
-    },
-    "update-swcrc-path": {
-      "cli": "nx",
-      "version": "14.1.5-beta.0",
-      "description": "Rename option swcrcPath to swcrc, and resolve relative to workspace root",
-      "factory": "./src/migrations/update-14-1-5/update-swcrc-path"
-    },
     "rename-swcrc-config": {
       "cli": "nx",
       "version": "15.8.0-beta.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "16.10.0",
+  "version": "17.0.0-beta.2",
   "private": false,
   "description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
   "repository": {
@@ -59,9 +59,9 @@
     "semver": "7.5.3",
     "source-map-support": "0.5.19",
     "tslib": "^2.3.0",
-    "@nx/devkit": "16.10.0",
-    "@nx/workspace": "16.10.0",
-    "@nrwl/js": "16.10.0"
+    "@nx/devkit": "17.0.0-beta.2",
+    "@nx/workspace": "17.0.0-beta.2",
+    "@nrwl/js": "17.0.0-beta.2"
   },
   "peerDependencies": {
     "verdaccio": "^5.0.4"

package/src/executors/verdaccio/verdaccio.impl.js

@@ -134,6 +134,7 @@ function setupNpm(options) {
             }
             else {
                 (0, child_process_1.execSync)(`npm config delete registry --location ${options.location}`);
+                devkit_1.logger.info('Cleared custom npm registry');
             }
             (0, child_process_1.execSync)(`npm config delete //localhost:${options.port}/:_authToken  --location ${options.location}`);
         }
@@ -196,6 +197,7 @@ function setupYarn(options) {
                 else {
                     (0, child_process_1.execSync)(`yarn config ${isYarnV1 ? 'delete' : 'unset'} ${registryConfigName}` +
                         (options.location === 'user' ? ' --home' : ''));
+                    devkit_1.logger.info(`Cleared custom yarn ${registryConfigName}`);
                 }
                 if (whitelistedLocalhost) {
                     const currentWhitelist = getYarnUnsafeHttpWhitelist(isYarnV1);

package/src/generators/init/init.js

@@ -45,6 +45,10 @@ async function initGenerator(tree, schema) {
     const devDependencies = {
         '@nx/js': versions_1.nxVersion,
         prettier: versions_1.prettierVersion,
+        // When loading .ts config files (e.g. webpack.config.ts, jest.config.ts, etc.)
+        // we prefer to use SWC, and fallback to ts-node for workspaces that don't use SWC.
+        '@swc-node/register': versions_1.swcNodeVersion,
+        '@swc/core': versions_1.swcCoreVersion,
     };
     if (!schema.js) {
         const installedTsVersion = await getInstalledTypescriptVersion(tree);
@@ -78,6 +82,7 @@ async function initGenerator(tree, schema) {
         # Add files here to ignore them from prettier formatting
         /dist
         /coverage
+        /.nx/cache
       `);
     }
     if (tree.exists('.vscode/extensions.json')) {

package/src/generators/library/library.js

@@ -148,6 +148,9 @@ function addProject(tree, options) {
 }
 async function addLint(tree, options) {
     const { lintProjectGenerator } = (0, devkit_1.ensurePackage)('@nx/linter', versions_1.nxVersion);
+    const { mapLintPattern } = 
+    // nx-ignore-next-line
+    require('@nx/linter/src/generators/lint-project/lint-project');
     const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, options.name);
     const task = lintProjectGenerator(tree, {
         project: options.name,
@@ -158,7 +161,7 @@ async function addLint(tree, options) {
         ],
         unitTestRunner: options.unitTestRunner,
         eslintFilePatterns: [
-            `${options.projectRoot}/**/*.${options.js ? 'js' : 'ts'}`,
+            mapLintPattern(options.projectRoot, options.js ? 'js' : 'ts', options.rootProject),
         ],
         setParserOptionsProject: options.setParserOptionsProject,
         rootProject: options.rootProject,

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/migrations/update-13-10-1/update-lib-swcrc-exclude.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nx/devkit';
-export default function updateSwcRcExclude(tree: Tree): void;

package/src/migrations/update-13-10-1/update-lib-swcrc-exclude.js

@@ -1,31 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const devkit_1 = require("@nx/devkit");
-const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
-const path_1 = require("path");
-const add_swc_config_1 = require("../../utils/swc/add-swc-config");
-function updateSwcRcExclude(tree) {
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/js:swc', (config, projectName) => {
-        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-        const libSwcPath = (0, path_1.join)(projectConfig.root, '.lib.swcrc');
-        if (!tree.exists(libSwcPath))
-            return;
-        (0, devkit_1.updateJson)(tree, libSwcPath, (json) => {
-            if (json.exclude) {
-                const excludePatterns = new Set([
-                    ...add_swc_config_1.defaultExclude,
-                    ...json.exclude,
-                ]);
-                // remove old patterns that are duplicate for new patterns
-                // defined in defaultExclude
-                excludePatterns.delete('./**/.*.spec.ts$');
-                excludePatterns.delete('./src/**/.*.spec.ts$');
-                excludePatterns.delete('./**/.*.js$');
-                excludePatterns.delete('./src/**/jest-setup.ts$');
-                json.exclude = [...excludePatterns];
-            }
-            return json;
-        }, { expectComments: true });
-    });
-}
-exports.default = updateSwcRcExclude;

package/src/migrations/update-13-8-5/update-node-executor.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nx/devkit';
-export default function update(host: Tree): Promise<import("@nx/devkit").GeneratorCallback>;

package/src/migrations/update-13-8-5/update-node-executor.js

@@ -1,23 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const devkit_1 = require("@nx/devkit");
-const versions_1 = require("@nx/workspace/src/utils/versions");
-async function update(host) {
-    const projects = (0, devkit_1.getProjects)(host);
-    let installNeeded = false;
-    for (const [name, config] of projects.entries()) {
-        if (config?.targets?.serve?.executor !== '@nrwl/js:node')
-            continue;
-        config.targets.serve.executor = '@nrwl/node:node';
-        installNeeded = true;
-        (0, devkit_1.updateProjectConfiguration)(host, name, config);
-    }
-    const task = installNeeded
-        ? (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
-            '@nrwl/node': versions_1.nxVersion,
-        })
-        : undefined;
-    await (0, devkit_1.formatFiles)(host);
-    return task;
-}
-exports.default = update;

package/src/migrations/update-13-8-5/update-swcrc.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nx/devkit';
-export default function update(host: Tree): Promise<void>;

package/src/migrations/update-13-8-5/update-swcrc.js

@@ -1,30 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const devkit_1 = require("@nx/devkit");
-const path_1 = require("path");
-const add_swc_config_1 = require("../../utils/swc/add-swc-config");
-async function update(host) {
-    const projects = (0, devkit_1.getProjects)(host);
-    for (const config of projects.values()) {
-        if (config?.targets?.build?.executor !== '@nrwl/js:swc')
-            continue;
-        const swcrcPath = (0, path_1.join)(config.root, '.swcrc');
-        if (!host.exists(swcrcPath))
-            continue;
-        // rename
-        const libSwcrcPath = (0, path_1.join)(config.root, '.lib.swcrc');
-        host.rename(swcrcPath, libSwcrcPath);
-        const swcrcContent = (0, devkit_1.readJson)(host, libSwcrcPath);
-        // skip if swcrc already has "exclude" field
-        if (swcrcContent['exclude'])
-            continue;
-        // check swcExclude build options
-        const exclude = config?.targets?.build?.options?.['swcExclude'] || add_swc_config_1.defaultExclude;
-        (0, devkit_1.updateJson)(host, libSwcrcPath, (swcrc) => {
-            swcrc['exclude'] = exclude;
-            return swcrc;
-        });
-    }
-    await (0, devkit_1.formatFiles)(host);
-}
-exports.default = update;

package/src/migrations/update-14-0-0/exclude-jest-config-swcrc.d.ts

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

package/src/migrations/update-14-0-0/exclude-jest-config-swcrc.js

@@ -1,26 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.excludeJestConfigSwcrc = void 0;
-const devkit_1 = require("@nx/devkit");
-const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
-const path_1 = require("path");
-function excludeJestConfigSwcrc(tree) {
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/js:swc', (config, projectName) => {
-        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-        const libSwcPath = (0, path_1.join)(projectConfig.root, '.lib.swcrc');
-        if (!tree.exists(libSwcPath))
-            return;
-        (0, devkit_1.updateJson)(tree, libSwcPath, (json) => {
-            if (json.exclude) {
-                const excludePatterns = new Set([
-                    'jest.config.js',
-                    ...json.exclude,
-                ]);
-                json.exclude = [...excludePatterns];
-            }
-            return json;
-        }, { expectComments: true });
-    });
-}
-exports.excludeJestConfigSwcrc = excludeJestConfigSwcrc;
-exports.default = excludeJestConfigSwcrc;

package/src/migrations/update-14-1-5/update-swcrc-path.d.ts

@@ -1,3 +0,0 @@
-import { Tree } from '@nx/devkit';
-export declare function updateSwcrcPath(tree: Tree): Promise<void>;
-export default updateSwcrcPath;

package/src/migrations/update-14-1-5/update-swcrc-path.js

@@ -1,26 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateSwcrcPath = void 0;
-const devkit_1 = require("@nx/devkit");
-const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
-async function updateSwcrcPath(tree) {
-    let changesMade = false;
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/js:swc', (_, projectName, targetName, configurationName) => {
-        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-        const executorOptions = configurationName
-            ? projectConfig.targets[targetName].configurations[configurationName]
-            : projectConfig.targets[targetName].options;
-        if (!executorOptions.swcrcPath)
-            return;
-        const newSwcrcPath = (0, devkit_1.joinPathFragments)(projectConfig.root, executorOptions.swcrcPath);
-        delete executorOptions.swcrcPath;
-        executorOptions.swcrc = newSwcrcPath;
-        (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
-        changesMade = true;
-    });
-    if (changesMade) {
-        await (0, devkit_1.formatFiles)(tree);
-    }
-}
-exports.updateSwcrcPath = updateSwcrcPath;
-exports.default = updateSwcrcPath;