@nx/nuxt 23.0.0-beta.12 → 23.0.0-beta.13

package/package.json

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

package/src/generators/application/application.js

@@ -18,8 +18,7 @@ const ensure_dependencies_1 = require("./lib/ensure-dependencies");
 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");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
-const sort_fields_1 = require("@nx/js/src/utils/package-json/sort-fields");
+const internal_2 = require("@nx/js/internal");
 async function applicationGenerator(tree, schema) {
     return await applicationGeneratorInternal(tree, {
         useProjectJson: true,
@@ -28,7 +27,7 @@ async function applicationGenerator(tree, schema) {
 }
 async function applicationGeneratorInternal(tree, schema) {
     const tasks = [];
-    const addTsPlugin = (0, ts_solution_setup_1.shouldConfigureTsSolutionSetup)(tree, true, // nuxt always adds plugins
+    const addTsPlugin = (0, internal_2.shouldConfigureTsSolutionSetup)(tree, true, // nuxt always adds plugins
     schema.useTsSolution);
     const jsInitTask = await (0, js_1.initGenerator)(tree, {
         ...schema,
@@ -113,7 +112,7 @@ async function applicationGeneratorInternal(tree, schema) {
     // If we are using the new TS solution
     // We need to update the workspace file (package.json or pnpm-workspaces.yaml) to include the new project
     if (options.isUsingTsSolutionConfig) {
-        await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(tree, options.appProjectRoot);
+        await (0, internal_2.addProjectToTsSolutionWorkspace)(tree, options.appProjectRoot);
     }
     tasks.push(await (0, add_linting_1.addLinting)(tree, {
         projectName: options.projectName,
@@ -138,7 +137,7 @@ async function applicationGeneratorInternal(tree, schema) {
     if (options.js)
         (0, devkit_1.toJS)(tree);
     if (options.isUsingTsSolutionConfig) {
-        (0, ts_solution_setup_1.updateTsconfigFiles)(tree, options.appProjectRoot, 'tsconfig.app.json', {
+        (0, internal_2.updateTsconfigFiles)(tree, options.appProjectRoot, 'tsconfig.app.json', {
             jsx: 'preserve',
             jsxImportSource: 'vue',
             module: 'esnext',
@@ -148,7 +147,7 @@ async function applicationGeneratorInternal(tree, schema) {
             ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
             : undefined);
     }
-    (0, sort_fields_1.sortPackageJsonFields)(tree, options.appProjectRoot);
+    (0, internal_2.sortPackageJsonFields)(tree, options.appProjectRoot);
     if (!options.skipFormat)
         await (0, devkit_1.formatFiles)(tree);
     tasks.push(() => {

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":"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"}
+{"version":3,"file":"add-e2e.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nuxt/src/generators/application/lib/add-e2e.ts"],"names":[],"mappings":"AAIA,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

@@ -92,9 +92,9 @@ async function addE2e(host, options) {
 async function getNuxtE2EWebServerInfo(tree, projectName, configFilePath) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     let e2ePort = 4200;
-    if (nxJson.targetDefaults?.['serve'] &&
-        nxJson.targetDefaults?.['serve'].options?.port) {
-        e2ePort = nxJson.targetDefaults?.['serve'].options?.port;
+    const serveTargetOptions = (0, internal_1.readTargetDefaultsForTarget)('serve', nxJson.targetDefaults)?.options;
+    if (serveTargetOptions?.port) {
+        e2ePort = serveTargetOptions.port;
     }
     return (0, internal_1.getE2EWebServerInfo)(tree, projectName, {
         plugin: '@nx/nuxt/plugin',

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 const internal_1 = require("@nx/devkit/internal");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_2 = require("@nx/js/internal");
 const version_utils_1 = require("../../../utils/version-utils");
 async function normalizeOptions(host, options) {
     await (0, internal_1.ensureRootProjectName)(options, 'application');
@@ -13,7 +13,7 @@ async function normalizeOptions(host, options) {
         rootProject: options.rootProject,
     });
     options.rootProject = appProjectRoot === '.';
-    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
+    const isUsingTsSolutionConfig = (0, internal_2.isUsingTsSolutionSetup)(host);
     const appProjectName = !isUsingTsSolutionConfig || options.name ? projectName : importPath;
     const e2eProjectName = options.rootProject ? 'e2e' : `${appProjectName}-e2e`;
     const e2eProjectRoot = options.rootProject ? 'e2e' : `${appProjectRoot}-e2e`;

package/src/plugins/plugin.js

@@ -8,7 +8,7 @@ const js_1 = require("@nx/js");
 const path_1 = require("path");
 const fs_1 = require("fs");
 const executor_utils_1 = require("../utils/executor-utils");
-const util_1 = require("@nx/js/src/plugins/typescript/util");
+const internal_2 = require("@nx/js/internal");
 const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, 'nuxt.hash');
 const targetsCache = new internal_1.PluginCache(cachePath);
 exports.createNodes = [
@@ -55,7 +55,7 @@ async function buildNuxtTargets(configFilePath, projectRoot, options, context, p
     targets[options.serveTargetName] = serveTarget(projectRoot);
     targets[options.serveStaticTargetName] = serveStaticTarget(options);
     targets[options.buildStaticTargetName] = buildStaticTarget(options.buildStaticTargetName, namedInputs, buildOutputs, projectRoot);
-    (0, util_1.addBuildAndWatchDepsTargets)(context.workspaceRoot, projectRoot, targets, options, pmc);
+    (0, internal_2.addBuildAndWatchDepsTargets)(context.workspaceRoot, projectRoot, targets, options, pmc);
     return targets;
 }
 function buildTarget(buildTargetName, namedInputs, buildOutputs, projectRoot) {

package/src/utils/create-ts-config.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createTsConfig = createTsConfig;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-const shared = tslib_1.__importStar(require("@nx/js/src/utils/typescript/create-ts-config"));
+const shared = tslib_1.__importStar(require("@nx/js"));
 function createTsConfig(host, options, relativePathToRootTsConfig) {
     createAppTsConfig(host, options);
     const json = {