@nx/nuxt 20.2.2 → 20.3.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/nuxt",
-  "version": "20.2.2",
+  "version": "20.3.0-beta.1",
   "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": "20.2.2",
-    "@nx/js": "20.2.2",
-    "@nx/eslint": "20.2.2",
-    "@nx/vue": "20.2.2",
-    "@nx/vite": "20.2.2",
+    "@nx/devkit": "20.3.0-beta.1",
+    "@nx/js": "20.3.0-beta.1",
+    "@nx/eslint": "20.3.0-beta.1",
+    "@nx/vue": "20.3.0-beta.1",
+    "@nx/vite": "20.3.0-beta.1",
     "@phenomnomnominal/tsquery": "~5.0.1"
   },
   "peerDependencies": {

package/src/generators/application/application.js

@@ -6,7 +6,6 @@ const init_1 = require("../init/init");
 const normalize_options_1 = require("./lib/normalize-options");
 const create_ts_config_1 = require("../../utils/create-ts-config");
 const js_1 = require("@nx/js");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const update_gitignore_1 = require("../../utils/update-gitignore");
 const eslint_1 = require("@nx/eslint");
 const add_e2e_1 = require("./lib/add-e2e");
@@ -17,27 +16,45 @@ 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");
 async function applicationGenerator(tree, schema) {
-    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'nuxt', 'application');
     const tasks = [];
-    const options = await (0, normalize_options_1.normalizeOptions)(tree, schema);
-    const projectOffsetFromRoot = (0, devkit_1.offsetFromRoot)(options.appProjectRoot);
-    const onBoardingStatus = await (0, onboarding_1.createNxCloudOnboardingURLForWelcomeApp)(tree, options.nxCloudToken);
-    const connectCloudUrl = onBoardingStatus === 'unclaimed' &&
-        (await (0, onboarding_1.getNxCloudAppOnBoardingUrl)(options.nxCloudToken));
     const jsInitTask = await (0, js_1.initGenerator)(tree, {
         ...schema,
         tsConfigName: schema.rootProject ? 'tsconfig.json' : 'tsconfig.base.json',
         skipFormat: true,
+        addTsPlugin: schema.useTsSolution,
     });
     tasks.push(jsInitTask);
+    const options = await (0, normalize_options_1.normalizeOptions)(tree, schema);
+    const projectOffsetFromRoot = (0, devkit_1.offsetFromRoot)(options.appProjectRoot);
+    const onBoardingStatus = await (0, onboarding_1.createNxCloudOnboardingURLForWelcomeApp)(tree, options.nxCloudToken);
+    const connectCloudUrl = onBoardingStatus === 'unclaimed' &&
+        (await (0, onboarding_1.getNxCloudAppOnBoardingUrl)(options.nxCloudToken));
     tasks.push((0, ensure_dependencies_1.ensureDependencies)(tree, options));
-    (0, devkit_1.addProjectConfiguration)(tree, options.projectName, {
-        root: options.appProjectRoot,
-        projectType: 'application',
-        sourceRoot: `${options.appProjectRoot}/src`,
-        targets: {},
-    });
+    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, {
+            root: options.appProjectRoot,
+            projectType: 'application',
+            sourceRoot: `${options.appProjectRoot}/src`,
+            tags: options.parsedTags?.length ? options.parsedTags : undefined,
+            targets: {},
+        });
+    }
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, './files/base'), options.appProjectRoot, {
         ...options,
         offsetFromRoot: projectOffsetFromRoot,
@@ -66,6 +83,7 @@ async function applicationGenerator(tree, schema) {
         projectRoot: options.appProjectRoot,
         rootProject: options.rootProject,
         unitTestRunner: options.unitTestRunner,
+        isUsingTsSolutionConfig: options.isUsingTsSolutionConfig,
     }, (0, js_1.getRelativePathToRootTsConfig)(tree, options.appProjectRoot));
     (0, update_gitignore_1.updateGitIgnore)(tree);
     tasks.push(await (0, add_linting_1.addLinting)(tree, {
@@ -103,6 +121,17 @@ async function applicationGenerator(tree, schema) {
             console.error(`Failed to run \`nuxi prepare\` in "${options.appProjectRoot}". Please run the command manually.`);
         }
     });
+    if (options.isUsingTsSolutionConfig) {
+        (0, ts_solution_setup_1.updateTsconfigFiles)(tree, options.appProjectRoot, 'tsconfig.app.json', {
+            jsx: 'preserve',
+            jsxImportSource: 'vue',
+            module: 'esnext',
+            moduleResolution: 'bundler',
+            resolveJsonModule: true,
+        }, options.linter === 'eslint'
+            ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
+            : undefined);
+    }
     tasks.push(() => {
         (0, log_show_project_command_1.logShowProjectCommand)(options.projectName);
     });

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

@@ -10,14 +10,28 @@ 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);
-        (0, devkit_1.addProjectConfiguration)(host, options.e2eProjectName, {
-            projectType: 'application',
-            root: options.e2eProjectRoot,
-            sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
-            targets: {},
-            tags: [],
-            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, {
+                projectType: 'application',
+                root: options.e2eProjectRoot,
+                sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
+                targets: {},
+                tags: [],
+                implicitDependencies: [options.projectName],
+            });
+        }
         const e2eTask = await configurationGenerator(host, {
             ...options,
             project: options.e2eProjectName,
@@ -44,12 +58,27 @@ async function addE2e(host, options) {
     }
     else if (options.e2eTestRunner === 'playwright') {
         const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_1.nxVersion);
-        (0, devkit_1.addProjectConfiguration)(host, options.e2eProjectName, {
-            root: options.e2eProjectRoot,
-            sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
-            targets: {},
-            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, {
+                projectType: 'application',
+                root: options.e2eProjectRoot,
+                sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
+                targets: {},
+                implicitDependencies: [options.projectName],
+            });
+        }
         const e2eTask = await configurationGenerator(host, {
             project: options.e2eProjectName,
             skipFormat: true,

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

@@ -3,6 +3,7 @@ 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.ensureProjectName)(host, options, 'application');
     const { projectName: appProjectName, projectRoot: appProjectRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
@@ -26,6 +27,7 @@ async function normalizeOptions(host, options) {
         e2eProjectRoot,
         parsedTags,
         style: options.style ?? 'none',
+        isUsingTsSolutionConfig: (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host),
     };
     normalized.unitTestRunner ??= 'vitest';
     normalized.e2eTestRunner = normalized.e2eTestRunner ?? 'playwright';

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

@@ -4,6 +4,7 @@ export interface Schema {
   directory: string;
   name?: string;
   linter?: Linter | LinterType;
+  formatter?: 'none' | 'prettier';
   skipFormat?: boolean;
   unitTestRunner?: 'vitest' | 'none';
   e2eTestRunner?: 'cypress' | 'playwright' | 'none';
@@ -14,6 +15,7 @@ export interface Schema {
   setParserOptionsProject?: boolean;
   style?: 'css' | 'scss' | 'less' | 'none';
   nxCloudToken?: string;
+  useTsSolution?: boolean;
 }
 
 export interface NormalizedSchema extends Schema {
@@ -22,4 +24,5 @@ export interface NormalizedSchema extends Schema {
   e2eProjectName: string;
   e2eProjectRoot: string;
   parsedTags: string[];
+  isUsingTsSolutionConfig: boolean;
 }

package/src/generators/application/schema.json

@@ -22,24 +22,27 @@
       "pattern": "^[a-zA-Z][^:]*$",
       "x-priority": "important"
     },
-    "linter": {
-      "description": "The tool to use for running lint checks.",
-      "type": "string",
-      "enum": ["eslint"],
-      "default": "eslint"
-    },
     "skipFormat": {
       "description": "Skip formatting files.",
       "type": "boolean",
       "default": false,
       "x-priority": "internal"
     },
+    "linter": {
+      "description": "The tool to use for running lint checks.",
+      "type": "string",
+      "enum": ["eslint", "none"],
+      "default": "none",
+      "x-prompt": "Which linter would you like to use?",
+      "x-priority": "important"
+    },
     "unitTestRunner": {
       "type": "string",
       "enum": ["vitest", "none"],
       "description": "Test runner to use for unit tests.",
       "x-prompt": "Which unit test runner would you like to use?",
-      "default": "none"
+      "default": "none",
+      "x-priority": "important"
     },
     "e2eTestRunner": {
       "type": "string",

package/src/generators/init/init.js

@@ -3,11 +3,9 @@ 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 ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const plugin_1 = require("../../plugins/plugin");
 const utils_1 = require("./lib/utils");
 async function nuxtInitGenerator(host, schema) {
-    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(host, 'nuxt', 'init');
     await (0, add_plugin_1.addPluginV1)(host, await (0, devkit_1.createProjectGraphAsync)(), '@nx/nuxt/plugin', plugin_1.createNodes, {
         buildTargetName: ['build', 'nuxt:build', 'nuxt-build'],
         serveTargetName: ['serve', 'nuxt:serve', 'nuxt-serve'],

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

@@ -3,4 +3,5 @@ export declare function createTsConfig(host: Tree, options: {
     projectRoot: string;
     rootProject?: boolean;
     unitTestRunner?: string;
+    isUsingTsSolutionConfig: boolean;
 }, relativePathToRootTsConfig: string): void;

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

@@ -6,9 +6,8 @@ const shared = require("@nx/js/src/utils/typescript/create-ts-config");
 function createTsConfig(host, options, relativePathToRootTsConfig) {
     createAppTsConfig(host, options);
     const json = {
-        compilerOptions: {},
         files: [],
-        include: ['.nuxt/nuxt.d.ts'],
+        include: options.isUsingTsSolutionConfig ? undefined : ['.nuxt/nuxt.d.ts'],
         references: [
             {
                 path: './tsconfig.app.json',