@nx/js 19.0.0-beta.7 → 19.0.0-beta.9

package/migrations.json

@@ -1,11 +1,5 @@
 {
   "generators": {
-    "rename-swcrc-config": {
-      "cli": "nx",
-      "version": "15.8.0-beta.0",
-      "description": "Rename .lib.swcrc to .swcrc for better SWC support throughout the workspace",
-      "factory": "./src/migrations/update-15-8-0/rename-swcrc-config"
-    },
     "update-16-0-0-add-nx-packages": {
       "cli": "nx",
       "version": "16.0.0-beta.1",
@@ -32,18 +26,6 @@
     }
   },
   "packageJsonUpdates": {
-    "15.8.0": {
-      "version": "15.8.0-beta.2",
-      "x-prompt": "Do you want to update to TypeScript v4.9?",
-      "requires": {
-        "typescript": ">=4.8.2 <4.9.0"
-      },
-      "packages": {
-        "typescript": {
-          "version": "~4.9.5"
-        }
-      }
-    },
     "16.0.0": {
       "version": "16.0.0-beta.3",
       "packages": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "19.0.0-beta.7",
+  "version": "19.0.0-beta.9",
   "private": false,
   "description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
   "repository": {
@@ -37,7 +37,6 @@
     "@babel/preset-env": "^7.23.2",
     "@babel/preset-typescript": "^7.22.5",
     "@babel/runtime": "^7.22.6",
-    "@phenomnomnominal/tsquery": "~5.0.1",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^2.8.0",
     "babel-plugin-transform-typescript-metadata": "^0.3.1",
@@ -57,9 +56,9 @@
     "semver": "^7.5.3",
     "source-map-support": "0.5.19",
     "tslib": "^2.3.0",
-    "@nx/devkit": "19.0.0-beta.7",
-    "@nx/workspace": "19.0.0-beta.7",
-    "@nrwl/js": "19.0.0-beta.7"
+    "@nx/devkit": "19.0.0-beta.9",
+    "@nx/workspace": "19.0.0-beta.9",
+    "@nrwl/js": "19.0.0-beta.9"
   },
   "peerDependencies": {
     "verdaccio": "^5.0.4"

package/src/executors/node/node.impl.js

@@ -297,7 +297,7 @@ function getFileToRun(context, project, buildOptions, buildTargetExecutor) {
 function fileToRunCorrectPath(fileToRun) {
     if ((0, fileutils_1.fileExists)(fileToRun))
         return fileToRun;
-    const extensionsToTry = ['.cjs', '.mjs', 'cjs.js', '.esm.js'];
+    const extensionsToTry = ['.cjs', '.mjs', '.cjs.js', '.esm.js'];
     for (const ext of extensionsToTry) {
         const file = fileToRun.replace(/\.js$/, ext);
         if ((0, fileutils_1.fileExists)(file))

package/src/plugins/typescript/plugin.js

@@ -43,11 +43,13 @@ exports.createNodes = [
             !siblingFiles.includes('tsconfig.json')) {
             return {};
         }
-        const hash = (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, pluginOptions, context, [(0, lock_file_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot))]);
-        const targets = targetsCache[hash]
-            ? targetsCache[hash]
+        const nodeHash = (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, pluginOptions, context, [(0, lock_file_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot))]);
+        // The hash is calculated at the node/project level, so we add the config file path to avoid conflicts when caching
+        const cacheKey = `${nodeHash}_${configFilePath}`;
+        const targets = targetsCache[cacheKey]
+            ? targetsCache[cacheKey]
             : buildTscTargets(fullConfigPath, projectRoot, pluginOptions, context);
-        calculatedTargets[hash] = targets;
+        calculatedTargets[cacheKey] = targets;
         return {
             projects: {
                 [projectRoot]: {

package/src/utils/assets/copy-assets-handler.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CopyAssetsHandler = exports.defaultFileEventHandler = void 0;
 const minimatch_1 = require("minimatch");
-const path = require("path");
+const path = require("node:path/posix");
 const fse = require("fs-extra");
 const ignore_1 = require("ignore");
 const fg = require("fast-glob");

package/src/migrations/update-15-8-0/rename-swcrc-config.d.ts

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

package/src/migrations/update-15-8-0/rename-swcrc-config.js

@@ -1,77 +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 tsquery_1 = require("@phenomnomnominal/tsquery");
-async function default_1(tree) {
-    let changesMade = false;
-    const projects = (0, devkit_1.getProjects)(tree);
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/js:swc', (_, projectName, target, configurationName) => {
-        const projectConfiguration = projects.get(projectName);
-        const executorOptions = configurationName
-            ? projectConfiguration.targets[target].configurations[configurationName]
-            : projectConfiguration.targets[target].options;
-        // if the project uses a custom path to swcrc file
-        // and only if it's the default name
-        if (executorOptions.swcrc &&
-            executorOptions.swcrc.includes('.lib.swcrc')) {
-            const newSwcrc = executorOptions.swcrc.replace('.lib.swcrc', '.swcrc');
-            // rename the swcrc file first
-            tree.rename(executorOptions.swcrc, newSwcrc);
-            // then update the executor options
-            executorOptions.swcrc = newSwcrc;
-            changesMade = true;
-        }
-        const libSwcrcPath = (0, devkit_1.joinPathFragments)(projectConfiguration.root, '.lib.swcrc') ||
-            (0, devkit_1.joinPathFragments)(projectConfiguration.sourceRoot, '.lib.swcrc');
-        const isLibSwcrcExist = tree.exists(libSwcrcPath);
-        if (isLibSwcrcExist) {
-            tree.rename(libSwcrcPath, libSwcrcPath.replace('.lib.swcrc', '.swcrc'));
-            changesMade = true;
-        }
-        (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfiguration);
-    });
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/jest:jest', (_, projectName, target, configurationName) => {
-        const projectConfiguration = projects.get(projectName);
-        const executorOptions = configurationName
-            ? projectConfiguration.targets[target].configurations[configurationName]
-            : projectConfiguration.targets[target].options;
-        const isJestConfigExist = executorOptions.jestConfig && tree.exists(executorOptions.jestConfig);
-        if (isJestConfigExist) {
-            const jestConfig = tree.read(executorOptions.jestConfig, 'utf-8');
-            const jsonParseNodes = tsquery_1.tsquery.query(jestConfig, ':matches(CallExpression:has(Identifier[name="JSON"]):has(Identifier[name="parse"]))');
-            if (jsonParseNodes.length) {
-                // if we already assign false to swcrc, skip
-                if (jestConfig.includes('.swcrc = false')) {
-                    return;
-                }
-                let updatedJestConfig = tsquery_1.tsquery.replace(jestConfig, 'CallExpression:has(Identifier[name="JSON"]):has(Identifier[name="parse"]) TemplateSpan', (templateSpan) => {
-                    if (templateSpan.literal.text === '/.lib.swcrc') {
-                        return templateSpan
-                            .getFullText()
-                            .replace('.lib.swcrc', '.swcrc');
-                    }
-                    return '';
-                });
-                updatedJestConfig = tsquery_1.tsquery.replace(updatedJestConfig, ':matches(ExportAssignment, BinaryExpression:has(Identifier[name="module"]):has(Identifier[name="exports"]))', (node) => {
-                    return `
-
-// disable .swcrc look-up by SWC core because we're passing in swcJestConfig ourselves.
-// If we do not disable this, SWC Core will read .swcrc and won't transform our test files due to "exclude"
-if (swcJestConfig.swcrc === undefined) {
-  swcJestConfig.swcrc = false;
-}
-
-${node.getFullText()}
-`;
-                });
-                tree.write(executorOptions.jestConfig, updatedJestConfig);
-                changesMade = true;
-            }
-        }
-    });
-    if (changesMade) {
-        await (0, devkit_1.formatFiles)(tree);
-    }
-}
-exports.default = default_1;