@nx/nuxt 23.0.0-beta.5 → 23.0.0-beta.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/nuxt",
-  "version": "23.0.0-beta.5",
+  "version": "23.0.0-beta.7",
   "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.5",
-    "@nx/js": "23.0.0-beta.5",
-    "@nx/eslint": "23.0.0-beta.5",
-    "@nx/vue": "23.0.0-beta.5",
-    "@nx/vite": "23.0.0-beta.5",
-    "@nx/vitest": "23.0.0-beta.5",
+    "@nx/devkit": "23.0.0-beta.7",
+    "@nx/js": "23.0.0-beta.7",
+    "@nx/eslint": "23.0.0-beta.7",
+    "@nx/vue": "23.0.0-beta.7",
+    "@nx/vite": "23.0.0-beta.7",
+    "@nx/vitest": "23.0.0-beta.7",
     "semver": "^7.5.3"
   },
   "devDependencies": {
-    "nx": "23.0.0-beta.5"
+    "nx": "23.0.0-beta.7"
   },
   "peerDependencies": {
     "@nuxt/schema": "^3.10.0 || ^4.0.0"

package/src/generators/application/application.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../../../../../../packages/nuxt/src/generators/application/application.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,iBAAiB,EAKjB,IAAI,EAEL,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AA6BlC,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAKpE;AAED,wBAAsB,4BAA4B,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAiN5E;AAED,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../../../../../../packages/nuxt/src/generators/application/application.ts"],"names":[],"mappings":"AACA,OAAO,EAKL,iBAAiB,EAKjB,IAAI,EAEL,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AA4BlC,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAKpE;AAED,wBAAsB,4BAA4B,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAiN5E;AAED,eAAe,oBAAoB,CAAC"}

package/src/generators/application/application.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.applicationGenerator = applicationGenerator;
 exports.applicationGeneratorInternal = applicationGeneratorInternal;
 const tslib_1 = require("tslib");
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const init_1 = tslib_1.__importDefault(require("../init/init"));
 const normalize_options_1 = require("./lib/normalize-options");
@@ -14,7 +15,6 @@ const add_linting_1 = require("../../utils/add-linting");
 const add_vitest_1 = require("./lib/add-vitest");
 const vue_1 = require("@nx/vue");
 const ensure_dependencies_1 = require("./lib/ensure-dependencies");
-const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 const node_child_process_1 = require("node:child_process");
 const node_path_1 = require("node:path");
 const onboarding_1 = require("nx/src/nx-cloud/utilities/onboarding");
@@ -163,7 +163,7 @@ async function applicationGeneratorInternal(tree, schema) {
         }
     });
     tasks.push(() => {
-        (0, log_show_project_command_1.logShowProjectCommand)(options.projectName);
+        (0, internal_1.logShowProjectCommand)(options.projectName);
     });
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }

package/src/generators/application/lib/add-e2e.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-e2e.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nuxt/src/generators/application/lib/add-e2e.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,iBAAiB,EAGjB,IAAI,EAEL,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAG7C,wBAAsB,MAAM,CAC1B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,iBAAiB,CAAC,CA8G5B"}
+{"version":3,"file":"add-e2e.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nuxt/src/generators/application/lib/add-e2e.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,iBAAiB,EAGjB,IAAI,EAEL,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAG7C,wBAAsB,MAAM,CAC1B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,iBAAiB,CAAC,CA8G5B"}

package/src/generators/application/lib/add-e2e.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addE2e = addE2e;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const e2e_web_server_info_utils_1 = require("@nx/devkit/src/generators/e2e-web-server-info-utils");
 const versions_1 = require("../../../utils/versions");
 async function addE2e(host, options) {
     const e2eWebServerInfo = await getNuxtE2EWebServerInfo(host, options.projectName, (0, devkit_1.joinPathFragments)(options.appProjectRoot, `nuxt.config.${options.js ? 'js' : 'ts'}`));
@@ -96,7 +96,7 @@ async function getNuxtE2EWebServerInfo(tree, projectName, configFilePath) {
         nxJson.targetDefaults?.['serve'].options?.port) {
         e2ePort = nxJson.targetDefaults?.['serve'].options?.port;
     }
-    return (0, e2e_web_server_info_utils_1.getE2EWebServerInfo)(tree, projectName, {
+    return (0, internal_1.getE2EWebServerInfo)(tree, projectName, {
         plugin: '@nx/nuxt/plugin',
         serveTargetName: 'serveTargetName',
         serveStaticTargetName: 'serveStaticTargetName',

package/src/generators/application/lib/normalize-options.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
-const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
+const internal_1 = require("@nx/devkit/internal");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const version_utils_1 = require("../../../utils/version-utils");
 async function normalizeOptions(host, options) {
-    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'application');
-    const { projectName, names: projectNames, projectRoot: appProjectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+    await (0, internal_1.ensureRootProjectName)(options, 'application');
+    const { projectName, names: projectNames, projectRoot: appProjectRoot, importPath, } = await (0, internal_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'application',
         directory: options.directory,

package/src/generators/init/init.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.nuxtInitGenerator = nuxtInitGenerator;
 const devkit_1 = require("@nx/devkit");
-const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
+const internal_1 = require("@nx/devkit/internal");
 const plugin_1 = require("../../plugins/plugin");
 const utils_1 = require("./lib/utils");
 async function nuxtInitGenerator(host, schema) {
-    await (0, add_plugin_1.addPlugin)(host, await (0, devkit_1.createProjectGraphAsync)(), '@nx/nuxt/plugin', plugin_1.createNodesV2, {
+    await (0, internal_1.addPlugin)(host, await (0, devkit_1.createProjectGraphAsync)(), '@nx/nuxt/plugin', plugin_1.createNodesV2, {
         buildTargetName: ['build', 'nuxt:build', 'nuxt-build'],
         serveTargetName: ['serve', 'nuxt:serve', 'nuxt-serve'],
         buildDepsTargetName: ['build-deps', 'nuxt:build-deps', 'nuxt-build-deps'],

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":"AACA,OAAO,EAIL,aAAa,EAQd,MAAM,YAAY,CAAC;AA6BpB,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,CAaxD,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,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"}

package/src/plugins/plugin.js

@@ -1,10 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNodesV2 = exports.createNodes = void 0;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const config_utils_1 = require("@nx/devkit/src/utils/config-utils");
-const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
-const calculate_hash_for_create_nodes_1 = require("@nx/devkit/src/utils/calculate-hash-for-create-nodes");
 const cache_directory_1 = require("nx/src/utils/cache-directory");
 const js_1 = require("@nx/js");
 const path_1 = require("path");
@@ -12,28 +10,21 @@ const fs_1 = require("fs");
 const executor_utils_1 = require("../utils/executor-utils");
 const util_1 = require("@nx/js/src/plugins/typescript/util");
 const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, 'nuxt.hash');
-const targetsCache = readTargetsCache();
-function readTargetsCache() {
-    return (0, fs_1.existsSync)(cachePath) ? (0, devkit_1.readJsonFile)(cachePath) : {};
-}
-function writeTargetsToCache() {
-    const oldCache = readTargetsCache();
-    (0, devkit_1.writeJsonFile)(cachePath, {
-        ...oldCache,
-        ...targetsCache,
-    });
-}
+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 result = await (0, devkit_1.createNodesFromFiles)(createNodesInternal, files, options, context);
-        writeTargetsToCache();
+        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;
     },
 ];
 exports.createNodesV2 = exports.createNodes;
-async function createNodesInternal(configFilePath, options, context) {
+async function createNodesInternal(configFilePath, options, context, pmc, lockFileName) {
     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));
@@ -42,14 +33,15 @@ async function createNodesInternal(configFilePath, options, context) {
         return {};
     }
     options = normalizeOptions(options);
-    const pmc = (0, devkit_1.getPackageManagerCommand)((0, devkit_1.detectPackageManager)(context.workspaceRoot));
-    const hash = await (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, options, context, [(0, js_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot))]);
-    targetsCache[hash] ??= await buildNuxtTargets(configFilePath, projectRoot, options, context, pmc);
+    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));
+    }
     return {
         projects: {
             [projectRoot]: {
                 root: projectRoot,
-                targets: targetsCache[hash],
+                targets: targetsCache.get(hash),
             },
         },
     };
@@ -57,7 +49,7 @@ async function createNodesInternal(configFilePath, options, context) {
 async function buildNuxtTargets(configFilePath, projectRoot, options, context, pmc) {
     const nuxtConfig = await getInfoFromNuxtConfig(configFilePath, context, projectRoot);
     const { buildOutputs } = getOutputs(nuxtConfig, projectRoot);
-    const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
+    const namedInputs = (0, internal_1.getNamedInputs)(projectRoot, context);
     const targets = {};
     targets[options.buildTargetName] = buildTarget(options.buildTargetName, namedInputs, buildOutputs, projectRoot);
     targets[options.serveTargetName] = serveTarget(projectRoot);
@@ -134,7 +126,7 @@ async function getInfoFromNuxtConfig(configFilePath, context, projectRoot) {
         });
     }
     else {
-        config = await (0, config_utils_1.loadConfigFile)((0, path_1.join)(context.workspaceRoot, configFilePath));
+        config = await (0, internal_1.loadConfigFile)((0, path_1.join)(context.workspaceRoot, configFilePath));
     }
     return {
         buildDir: config?.buildDir ??