@nx/nuxt 23.0.0-beta.17 → 23.0.0-beta.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/nuxt",
-  "version": "23.0.0-beta.17",
+  "version": "23.0.0-beta.19",
   "private": false,
   "description": "The Nuxt plugin for Nx contains executors and generators for managing Nuxt applications and libraries within an Nx workspace. It provides:\n\n\n- Integration with libraries such as Vitest, Playwright, Cypress, and Storybook.\n\n- Generators for applications, libraries, and more.\n\n- Library build support for publishing packages to npm or other registries.\n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -45,16 +45,16 @@
   "dependencies": {
     "tslib": "^2.3.0",
     "@nuxt/kit": "^3.10.0 || ^4.0.0",
-    "@nx/devkit": "23.0.0-beta.17",
-    "@nx/js": "23.0.0-beta.17",
-    "@nx/eslint": "23.0.0-beta.17",
-    "@nx/vue": "23.0.0-beta.17",
-    "@nx/vite": "23.0.0-beta.17",
-    "@nx/vitest": "23.0.0-beta.17",
+    "@nx/devkit": "23.0.0-beta.19",
+    "@nx/js": "23.0.0-beta.19",
+    "@nx/eslint": "23.0.0-beta.19",
+    "@nx/vue": "23.0.0-beta.19",
+    "@nx/vite": "23.0.0-beta.19",
+    "@nx/vitest": "23.0.0-beta.19",
     "semver": "^7.6.3"
   },
   "devDependencies": {
-    "nx": "23.0.0-beta.17"
+    "nx": "23.0.0-beta.19"
   },
   "peerDependencies": {
     "@nuxt/schema": "^3.10.0 || ^4.0.0"

package/src/plugins/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/nuxt/src/plugins/plugin.ts"],"names":[],"mappings":"AAOA,OAAO,EAIL,aAAa,EAMd,MAAM,YAAY,CAAC;AAapB,MAAM,WAAW,iBAAiB;IAChC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,iBAAiB,CAiBxD,CAAC;AAEF,eAAO,MAAM,aAAa,kCAAc,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/nuxt/src/plugins/plugin.ts"],"names":[],"mappings":"AAOA,OAAO,EAML,aAAa,EAMd,MAAM,YAAY,CAAC;AAapB,MAAM,WAAW,iBAAiB;IAChC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,iBAAiB,CAoDxD,CAAC;AAEF,eAAO,MAAM,aAAa,kCAAc,CAAC"}

package/src/plugins/plugin.js

@@ -14,26 +14,41 @@ const targetsCache = new internal_1.PluginCache(cachePath);
 exports.createNodes = [
     '**/nuxt.config.{js,ts,mjs,mts,cjs,cts}',
     async (files, options, context) => {
-        //TODO(@nrwl/nx-vue-reviewers): This should batch hashing like our other plugins.
         const packageManager = (0, devkit_1.detectPackageManager)(context.workspaceRoot);
         const pmc = (0, devkit_1.getPackageManagerCommand)(packageManager);
         const lockFileName = (0, js_1.getLockFileName)(packageManager);
-        const result = await (0, devkit_1.createNodesFromFiles)((configFile, opts, ctx) => createNodesInternal(configFile, opts, ctx, pmc, lockFileName), files, options, context);
-        targetsCache.writeToDisk();
-        return result;
+        const normalizedOptions = normalizeOptions(options);
+        try {
+            const { entries, preErrors } = await filterNuxtConfigs(files, context);
+            const projectHashes = await (0, internal_1.calculateHashesForCreateNodes)(entries.map((e) => e.projectRoot), normalizedOptions, context, entries.map(() => [lockFileName]));
+            let results = [];
+            let nodeErrors = [];
+            try {
+                results = await (0, devkit_1.createNodesFromFiles)((configFile, _, ctx, idx) => createNodesInternal(configFile, normalizedOptions, ctx, pmc, projectHashes[idx]), entries.map((e) => e.configFile), options, context);
+            }
+            catch (e) {
+                if (e instanceof devkit_1.AggregateCreateNodesError) {
+                    results = e.partialResults ?? [];
+                    nodeErrors = e.errors;
+                }
+                else {
+                    throw e;
+                }
+            }
+            const allErrors = [...preErrors, ...nodeErrors];
+            if (allErrors.length > 0) {
+                throw new devkit_1.AggregateCreateNodesError(allErrors, results);
+            }
+            return results;
+        }
+        finally {
+            targetsCache.writeToDisk();
+        }
     },
 ];
 exports.createNodesV2 = exports.createNodes;
-async function createNodesInternal(configFilePath, options, context, pmc, lockFileName) {
+async function createNodesInternal(configFilePath, options, context, pmc, hash) {
     const projectRoot = (0, path_1.dirname)(configFilePath);
-    // Do not create a project if package.json and project.json isn't there.
-    const siblingFiles = (0, fs_1.readdirSync)((0, path_1.join)(context.workspaceRoot, projectRoot));
-    if (!siblingFiles.includes('package.json') &&
-        !siblingFiles.includes('project.json')) {
-        return {};
-    }
-    options = normalizeOptions(options);
-    const hash = await (0, internal_1.calculateHashForCreateNodes)(projectRoot, options, context, [lockFileName]);
     if (!targetsCache.has(hash)) {
         targetsCache.set(hash, await buildNuxtTargets(configFilePath, projectRoot, options, context, pmc));
     }
@@ -164,6 +179,28 @@ function normalizeOutputPath(outputPath, projectRoot) {
         }
     }
 }
+async function filterNuxtConfigs(configFiles, context) {
+    const preErrors = [];
+    const candidates = await Promise.all(configFiles.map(async (configFile) => {
+        try {
+            const projectRoot = (0, path_1.dirname)(configFile);
+            const siblingFiles = (0, fs_1.readdirSync)((0, path_1.join)(context.workspaceRoot, projectRoot));
+            if (!siblingFiles.includes('package.json') &&
+                !siblingFiles.includes('project.json')) {
+                return null;
+            }
+            return { configFile, projectRoot };
+        }
+        catch (e) {
+            preErrors.push([configFile, e]);
+            return null;
+        }
+    }));
+    return {
+        entries: candidates.filter((c) => c !== null),
+        preErrors,
+    };
+}
 function normalizeOptions(options) {
     options ??= {};
     options.buildTargetName ??= 'build';