@nx/nuxt 0.0.0-pr-30418-4e2b721 → 0.0.0-pr-3-ec41644

package/generators.json

@@ -11,7 +11,7 @@
       "hidden": true
     },
     "application": {
-      "factory": "./src/generators/application/application#applicationGeneratorInternal",
+      "factory": "./src/generators/application/application",
       "schema": "./src/generators/application/schema.json",
       "aliases": ["app"],
       "description": "Create a Nuxt application."

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/nuxt",
-  "version": "0.0.0-pr-30418-4e2b721",
+  "version": "0.0.0-pr-3-ec41644",
   "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": {
@@ -31,11 +31,11 @@
   "dependencies": {
     "tslib": "^2.3.0",
     "@nuxt/kit": "^3.10.0",
-    "@nx/devkit": "0.0.0-pr-30418-4e2b721",
-    "@nx/js": "0.0.0-pr-30418-4e2b721",
-    "@nx/eslint": "0.0.0-pr-30418-4e2b721",
-    "@nx/vue": "0.0.0-pr-30418-4e2b721",
-    "@nx/vite": "0.0.0-pr-30418-4e2b721",
+    "@nx/devkit": "0.0.0-pr-3-ec41644",
+    "@nx/js": "0.0.0-pr-3-ec41644",
+    "@nx/eslint": "0.0.0-pr-3-ec41644",
+    "@nx/vue": "0.0.0-pr-3-ec41644",
+    "@nx/vite": "0.0.0-pr-3-ec41644",
     "@phenomnomnominal/tsquery": "~5.0.1"
   },
   "peerDependencies": {

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

@@ -1,5 +1,4 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
 import { Schema } from './schema';
 export declare function applicationGenerator(tree: Tree, schema: Schema): Promise<GeneratorCallback>;
-export declare function applicationGeneratorInternal(tree: Tree, schema: Schema): Promise<GeneratorCallback>;
 export default applicationGenerator;

package/src/generators/application/application.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.applicationGenerator = applicationGenerator;
-exports.applicationGeneratorInternal = applicationGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const init_1 = require("../init/init");
 const normalize_options_1 = require("./lib/normalize-options");
@@ -17,15 +16,10 @@ 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 onboarding_1 = require("nx/src/nx-cloud/utilities/onboarding");
+const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
 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");
 async function applicationGenerator(tree, schema) {
-    return await applicationGeneratorInternal(tree, {
-        useProjectJson: true,
-        ...schema,
-    });
-}
-async function applicationGeneratorInternal(tree, schema) {
     const tasks = [];
     const jsInitTask = await (0, js_1.initGenerator)(tree, {
         ...schema,
@@ -41,19 +35,18 @@ async function applicationGeneratorInternal(tree, schema) {
     const connectCloudUrl = onBoardingStatus === 'unclaimed' &&
         (await (0, onboarding_1.getNxCloudAppOnBoardingUrl)(options.nxCloudToken));
     tasks.push((0, ensure_dependencies_1.ensureDependencies)(tree, options));
-    const packageJson = {
-        name: options.importPath,
-        version: '0.0.1',
-        private: true,
-    };
-    if (!options.useProjectJson) {
-        if (options.projectName !== options.importPath) {
-            packageJson.nx = { name: options.projectName };
-        }
-        if (options.parsedTags?.length) {
-            packageJson.nx ??= {};
-            packageJson.nx.tags = options.parsedTags;
-        }
+    if (options.isUsingTsSolutionConfig) {
+        (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json'), {
+            name: (0, get_import_path_1.getImportPath)(tree, options.name),
+            version: '0.0.1',
+            private: true,
+            nx: {
+                name: options.name,
+                projectType: 'application',
+                sourceRoot: `${options.appProjectRoot}/src`,
+                tags: options.parsedTags?.length ? options.parsedTags : undefined,
+            },
+        });
     }
     else {
         (0, devkit_1.addProjectConfiguration)(tree, options.projectName, {
@@ -64,9 +57,6 @@ async function applicationGeneratorInternal(tree, schema) {
             targets: {},
         });
     }
-    if (!options.useProjectJson || options.isUsingTsSolutionConfig) {
-        (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json'), packageJson);
-    }
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, './files/base'), options.appProjectRoot, {
         ...options,
         offsetFromRoot: projectOffsetFromRoot,
@@ -98,11 +88,6 @@ async function applicationGeneratorInternal(tree, schema) {
         isUsingTsSolutionConfig: options.isUsingTsSolutionConfig,
     }, (0, js_1.getRelativePathToRootTsConfig)(tree, options.appProjectRoot));
     (0, update_gitignore_1.updateGitIgnore)(tree);
-    // 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);
-    }
     tasks.push(await (0, add_linting_1.addLinting)(tree, {
         projectName: options.projectName,
         projectRoot: options.appProjectRoot,
@@ -136,6 +121,11 @@ async function applicationGeneratorInternal(tree, schema) {
             ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
             : undefined);
     }
+    // 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) {
+        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(tree, options.appProjectRoot);
+    }
     (0, sort_fields_1.sortPackageJsonFields)(tree, options.appProjectRoot);
     if (!options.skipFormat)
         await (0, devkit_1.formatFiles)(tree);

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

@@ -10,15 +10,17 @@ async function addE2e(host, options) {
     const e2eWebServerInfo = await getNuxtE2EWebServerInfo(host, options.projectName, (0, devkit_1.joinPathFragments)(options.appProjectRoot, `nuxt.config.${options.js ? 'js' : 'ts'}`));
     if (options.e2eTestRunner === 'cypress') {
         const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
-        const packageJson = {
-            name: options.e2eProjectName,
-            version: '0.0.1',
-            private: true,
-        };
-        if (!options.useProjectJson) {
-            packageJson.nx = {
-                implicitDependencies: [options.projectName],
-            };
+        if (options.isUsingTsSolutionConfig) {
+            (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), {
+                name: options.e2eProjectName,
+                version: '0.0.1',
+                private: true,
+                nx: {
+                    projectType: 'application',
+                    sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
+                    implicitDependencies: [options.projectName],
+                },
+            });
         }
         else {
             (0, devkit_1.addProjectConfiguration)(host, options.e2eProjectName, {
@@ -30,9 +32,6 @@ async function addE2e(host, options) {
                 implicitDependencies: [options.projectName],
             });
         }
-        if (!options.useProjectJson || options.isUsingTsSolutionConfig) {
-            (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), packageJson);
-        }
         const e2eTask = await configurationGenerator(host, {
             ...options,
             project: options.e2eProjectName,
@@ -59,15 +58,17 @@ async function addE2e(host, options) {
     }
     else if (options.e2eTestRunner === 'playwright') {
         const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_1.nxVersion);
-        const packageJson = {
-            name: options.e2eProjectName,
-            version: '0.0.1',
-            private: true,
-        };
-        if (!options.useProjectJson) {
-            packageJson.nx = {
-                implicitDependencies: [options.projectName],
-            };
+        if (options.isUsingTsSolutionConfig) {
+            (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), {
+                name: options.e2eProjectName,
+                version: '0.0.1',
+                private: true,
+                nx: {
+                    projectType: 'application',
+                    sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
+                    implicitDependencies: [options.projectName],
+                },
+            });
         }
         else {
             (0, devkit_1.addProjectConfiguration)(host, options.e2eProjectName, {
@@ -78,9 +79,6 @@ async function addE2e(host, options) {
                 implicitDependencies: [options.projectName],
             });
         }
-        if (!options.useProjectJson || options.isUsingTsSolutionConfig) {
-            (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), packageJson);
-        }
         const e2eTask = await configurationGenerator(host, {
             project: options.e2eProjectName,
             skipFormat: true,

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

@@ -1,19 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
+const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 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, project_name_and_root_utils_1.ensureProjectName)(host, options, 'application');
+    const { projectName: appProjectName, projectRoot: appProjectRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'application',
         directory: options.directory,
         rootProject: options.rootProject,
     });
     options.rootProject = appProjectRoot === '.';
-    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
-    const appProjectName = !isUsingTsSolutionConfig || options.name ? projectName : importPath;
     const e2eProjectName = options.rootProject ? 'e2e' : `${appProjectName}-e2e`;
     const e2eProjectRoot = options.rootProject ? 'e2e' : `${appProjectRoot}-e2e`;
     const parsedTags = options.tags
@@ -21,16 +20,14 @@ async function normalizeOptions(host, options) {
         : [];
     const normalized = {
         ...options,
-        name: projectNames.projectFileName,
+        name: (0, devkit_1.names)(options.name).fileName,
         projectName: appProjectName,
         appProjectRoot,
-        importPath,
         e2eProjectName,
         e2eProjectRoot,
         parsedTags,
         style: options.style ?? 'none',
-        isUsingTsSolutionConfig,
-        useProjectJson: options.useProjectJson ?? !isUsingTsSolutionConfig,
+        isUsingTsSolutionConfig: (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host),
     };
     normalized.unitTestRunner ??= 'vitest';
     normalized.e2eTestRunner = normalized.e2eTestRunner ?? 'playwright';

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

@@ -16,13 +16,11 @@ export interface Schema {
   style?: 'css' | 'scss' | 'less' | 'none';
   nxCloudToken?: string;
   useTsSolution?: boolean;
-  useProjectJson?: boolean;
 }
 
-export interface NormalizedSchema extends Omit<Schema, 'useTsSolution'> {
+export interface NormalizedSchema extends Schema {
   projectName: string;
   appProjectRoot: string;
-  importPath: string;
   e2eProjectName: string;
   e2eProjectRoot: string;
   parsedTags: string[];

package/src/generators/application/schema.json

@@ -106,10 +106,6 @@
       "type": "boolean",
       "description": "Whether or not to configure the ESLint `parserOptions.project` option. We do not do this by default for lint performance reasons.",
       "default": false
-    },
-    "useProjectJson": {
-      "type": "boolean",
-      "description": "Use a `project.json` configuration file instead of inlining the Nx configuration in the `package.json` file."
     }
   },
   "required": ["directory"],