@nx/js 23.0.0-rc.3 → 23.0.0-rc.4

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

@@ -249,5 +249,7 @@ function updatePackageJson(tree, projectName, projectRoot, main, outputPath, roo
 function mergeTargetDefaults(tree, project, buildTarget) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const projectTarget = project.targets[buildTarget];
-    return (0, devkit_internals_1.mergeTargetConfigurations)(projectTarget, (0, internal_1.readTargetDefaultsForTarget)(buildTarget, nxJson.targetDefaults, projectTarget.executor));
+    return (0, devkit_internals_1.mergeTargetConfigurations)(projectTarget, (projectTarget.executor
+        ? nxJson.targetDefaults?.[projectTarget.executor]
+        : undefined) ?? nxJson.targetDefaults?.[buildTarget]);
 }

package/dist/src/migrations/update-22-0-0/remove-external-options-from-js-executors.js

@@ -35,59 +35,30 @@ async function default_1(tree) {
     if (!nxJson.targetDefaults) {
         return;
     }
-    const cleanEntry = (entry) => {
-        if (entry.options) {
-            delete entry.options.external;
-            delete entry.options.externalBuildTargets;
-            if (!Object.keys(entry.options).length) {
-                delete entry.options;
+    for (const [targetOrExecutor, targetConfig] of Object.entries(nxJson.targetDefaults)) {
+        if (!exports.executors.includes(targetOrExecutor) &&
+            !exports.executors.includes(targetConfig.executor)) {
+            continue;
+        }
+        if (targetConfig.options) {
+            delete targetConfig.options.external;
+            delete targetConfig.options.externalBuildTargets;
+            if (!Object.keys(targetConfig.options).length) {
+                delete targetConfig.options;
             }
         }
-        Object.entries(entry.configurations ?? {}).forEach(([, config]) => {
+        Object.entries(targetConfig.configurations ?? {}).forEach(([, config]) => {
             delete config.external;
             delete config.externalBuildTargets;
         });
-    };
-    if (Array.isArray(nxJson.targetDefaults)) {
-        const remaining = [];
-        for (const entry of nxJson.targetDefaults) {
-            const matches = exports.executors.includes(entry.executor) || exports.executors.includes(entry.target);
-            if (!matches) {
-                remaining.push(entry);
-                continue;
-            }
-            cleanEntry(entry);
-            const meaningfulKeys = Object.keys(entry).filter((k) => k !== 'target' &&
-                k !== 'executor' &&
-                k !== 'projects' &&
-                k !== 'plugin');
-            if (meaningfulKeys.length === 0)
-                continue;
-            remaining.push(entry);
+        if (!Object.keys(targetConfig).length ||
+            (Object.keys(targetConfig).length === 1 &&
+                Object.keys(targetConfig)[0] === 'executor')) {
+            delete nxJson.targetDefaults[targetOrExecutor];
         }
-        if (remaining.length === 0) {
+        if (!Object.keys(nxJson.targetDefaults).length) {
             delete nxJson.targetDefaults;
         }
-        else {
-            nxJson.targetDefaults = remaining;
-        }
-    }
-    else {
-        for (const [targetOrExecutor, targetConfig] of Object.entries(nxJson.targetDefaults)) {
-            if (!exports.executors.includes(targetOrExecutor) &&
-                !exports.executors.includes(targetConfig.executor)) {
-                continue;
-            }
-            cleanEntry(targetConfig);
-            if (!Object.keys(targetConfig).length ||
-                (Object.keys(targetConfig).length === 1 &&
-                    Object.keys(targetConfig)[0] === 'executor')) {
-                delete nxJson.targetDefaults[targetOrExecutor];
-            }
-            if (!Object.keys(nxJson.targetDefaults).length) {
-                delete nxJson.targetDefaults;
-            }
-        }
     }
     (0, devkit_1.updateNxJson)(tree, nxJson);
     await (0, devkit_1.formatFiles)(tree);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "23.0.0-rc.3",
+  "version": "23.0.0-rc.4",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -144,11 +144,11 @@
     "source-map-support": "0.5.19",
     "tinyglobby": "^0.2.12",
     "tslib": "^2.3.0",
-    "@nx/devkit": "23.0.0-rc.3",
-    "@nx/workspace": "23.0.0-rc.3"
+    "@nx/devkit": "23.0.0-rc.4",
+    "@nx/workspace": "23.0.0-rc.4"
   },
   "devDependencies": {
-    "nx": "23.0.0-rc.3"
+    "nx": "23.0.0-rc.4"
   },
   "peerDependencies": {
     "@swc/cli": ">=0.6.0 <0.9.0",