nx 18.0.4 → 18.0.5

package/src/utils/package-json.js

@@ -5,6 +5,7 @@ const fs_1 = require("fs");
 const path_1 = require("path");
 const fileutils_1 = require("./fileutils");
 const installation_directory_1 = require("./installation-directory");
+const project_configuration_utils_1 = require("../project-graph/utils/project-configuration-utils");
 function normalizePackageGroup(packageGroup) {
     return Array.isArray(packageGroup)
         ? packageGroup.map((x) => typeof x === 'string' ? { package: x, version: '*' } : x)
@@ -37,32 +38,32 @@ function readNxMigrateConfig(json) {
     };
 }
 exports.readNxMigrateConfig = readNxMigrateConfig;
-function buildTargetFromScript(script, nx) {
-    const nxTargetConfiguration = nx?.targets?.[script] || {};
+function buildTargetFromScript(script) {
     return {
-        ...nxTargetConfiguration,
         executor: 'nx:run-script',
         options: {
-            ...(nxTargetConfiguration.options || {}),
             script,
         },
     };
 }
 exports.buildTargetFromScript = buildTargetFromScript;
 function readTargetsFromPackageJson(packageJson) {
-    const { scripts, nx } = packageJson;
+    const { scripts, nx, private: isPrivate } = packageJson ?? {};
     const res = {};
-    Object.keys(scripts || {}).forEach((script) => {
-        if (!nx?.includedScripts || nx?.includedScripts.includes(script)) {
-            res[script] = buildTargetFromScript(script, nx);
-        }
-    });
+    const includedScripts = nx?.includedScripts || Object.keys(scripts ?? {});
+    //
+    for (const script of includedScripts) {
+        res[script] = buildTargetFromScript(script);
+    }
+    for (const targetName in nx?.targets) {
+        res[targetName] = (0, project_configuration_utils_1.mergeTargetConfigurations)(nx?.targets[targetName], res[targetName]);
+    }
     /**
      * Add implicit nx-release-publish target for all package.json files that are
      * not marked as `"private": true` to allow for lightweight configuration for
      * package based repos.
      */
-    if (!packageJson.private && !res['nx-release-publish']) {
+    if (!isPrivate && !res['nx-release-publish']) {
         res['nx-release-publish'] = {
             dependsOn: ['^nx-release-publish'],
             executor: '@nx/js:release-publish',

package/src/utils/plugins/core-plugins.js

@@ -53,6 +53,10 @@ function fetchCorePlugins() {
             name: '@nx/node',
             capabilities: 'executors,generators',
         },
+        {
+            name: '@nx/nuxt',
+            capabilities: 'generators',
+        },
         {
             name: 'nx',
             capabilities: 'executors',