@nx/vue 20.4.0-beta.0 → 20.4.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/vue",
-  "version": "20.4.0-beta.0",
+  "version": "20.4.0-beta.2",
   "private": false,
   "description": "The Vue plugin for Nx contains executors and generators for managing Vue 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": {
     "minimatch": "9.0.3",
     "tslib": "^2.3.0",
-    "@nx/devkit": "20.4.0-beta.0",
-    "@nx/js": "20.4.0-beta.0",
-    "@nx/eslint": "20.4.0-beta.0",
-    "@nx/vite": "20.4.0-beta.0",
-    "@nx/web": "20.4.0-beta.0"
+    "@nx/devkit": "20.4.0-beta.2",
+    "@nx/js": "20.4.0-beta.2",
+    "@nx/eslint": "20.4.0-beta.2",
+    "@nx/vite": "20.4.0-beta.2",
+    "@nx/web": "20.4.0-beta.2"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/application/application.js

@@ -15,8 +15,8 @@ const add_rsbuild_1 = require("./lib/add-rsbuild");
 const create_ts_config_1 = require("../../utils/create-ts-config");
 const ensure_dependencies_1 = require("../../utils/ensure-dependencies");
 const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
-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");
 function applicationGenerator(tree, options) {
     return applicationGeneratorInternal(tree, { addPlugin: false, ...options });
 }
@@ -30,23 +30,28 @@ async function applicationGeneratorInternal(tree, _options) {
         skipFormat: true,
         addTsPlugin: _options.useTsSolution,
         formatter: _options.formatter,
+        platform: 'web',
     }));
     const options = await (0, normalize_options_1.normalizeOptions)(tree, _options);
+    // 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);
+    }
     const nxJson = (0, devkit_1.readNxJson)(tree);
     options.addPlugin ??=
         process.env.NX_ADD_PLUGINS !== 'false' &&
             nxJson.useInferencePlugins !== false;
     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),
+            name: options.projectName,
             version: '0.0.1',
             private: true,
-            nx: {
-                name: options.name,
-                projectType: 'application',
-                sourceRoot: `${options.appProjectRoot}/src`,
-                tags: options.parsedTags?.length ? options.parsedTags : undefined,
-            },
+            nx: options.parsedTags?.length
+                ? {
+                    tags: options.parsedTags,
+                }
+                : undefined,
         });
     }
     else {
@@ -78,6 +83,7 @@ async function applicationGeneratorInternal(tree, _options) {
         setParserOptionsProject: options.setParserOptionsProject,
         rootProject: options.rootProject,
         addPlugin: options.addPlugin,
+        projectName: options.projectName,
     }, 'app'));
     if (options.bundler === 'rsbuild') {
         tasks.push(...(await (0, add_rsbuild_1.addRsbuild)(tree, options)));
@@ -101,11 +107,7 @@ async function applicationGeneratorInternal(tree, _options) {
             ? ['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);
     tasks.push(() => {

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

@@ -3,6 +3,7 @@ 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 ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
 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, {
@@ -17,19 +18,22 @@ async function normalizeOptions(host, options) {
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
         : [];
+    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
     const normalized = {
         ...options,
-        projectName: appProjectName,
+        projectName: isUsingTsSolutionConfig
+            ? (0, get_import_path_1.getImportPath)(host, appProjectName)
+            : appProjectName,
         appProjectRoot,
         e2eProjectName,
         e2eProjectRoot,
         parsedTags,
+        isUsingTsSolutionConfig,
     };
     normalized.style = options.style ?? 'css';
     normalized.routing = normalized.routing ?? false;
     normalized.unitTestRunner ??= 'vitest';
     normalized.e2eTestRunner = normalized.e2eTestRunner ?? 'playwright';
-    normalized.isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
     normalized.bundler = normalized.bundler ?? 'vite';
     return normalized;
 }

package/src/generators/component/lib/utils.js

@@ -7,6 +7,7 @@ const path_1 = require("path");
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
 const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
 const ast_utils_1 = require("../../../utils/ast-utils");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 let tsModule;
 async function normalizeOptions(host, options) {
     const { fileName, filePath, directory, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(host, {
@@ -17,8 +18,9 @@ async function normalizeOptions(host, options) {
     let { className } = (0, devkit_1.names)(fileName);
     const componentFileName = fileName;
     const project = (0, devkit_1.getProjects)(host).get(projectName);
-    const { sourceRoot: projectSourceRoot, projectType } = project;
-    if (options.export && projectType === 'application') {
+    const { root, sourceRoot: projectSourceRoot, projectType } = project;
+    if (options.export &&
+        (0, ts_solution_setup_1.getProjectType)(host, root, projectType) === 'application') {
         devkit_1.logger.warn(`The "--export" option should not be used with applications and will do nothing.`);
     }
     options.routing = options.routing ?? false;
@@ -38,9 +40,10 @@ function addExportsToBarrel(host, options) {
         tsModule = (0, ensure_typescript_1.ensureTypescript)();
     }
     const workspace = (0, devkit_1.getProjects)(host);
-    const isApp = workspace.get(options.projectName).projectType === 'application';
+    const proj = workspace.get(options.projectName);
+    const isApp = (0, ts_solution_setup_1.getProjectType)(host, proj.root, proj.projectType) === 'application';
     if (options.export && !isApp) {
-        const indexFilePath = (0, devkit_1.joinPathFragments)(options.projectSourceRoot, options.js ? 'index.js' : 'index.ts');
+        const indexFilePath = (0, devkit_1.joinPathFragments)(options.projectSourceRoot ?? 'src', options.js ? 'index.js' : 'index.ts');
         const indexSource = host.read(indexFilePath, 'utf-8');
         if (indexSource !== null) {
             const indexSourceFile = tsModule.createSourceFile(indexFilePath, indexSource, tsModule.ScriptTarget.Latest, true);

package/src/generators/library/lib/add-vite.js

@@ -10,7 +10,7 @@ async function addVite(tree, options) {
         const { viteConfigurationGenerator, createOrEditViteConfig } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
         const viteTask = await viteConfigurationGenerator(tree, {
             uiFramework: 'none',
-            project: options.name,
+            project: options.projectName,
             newProject: true,
             includeLib: true,
             inSourceTests: options.inSourceTests,
@@ -21,7 +21,7 @@ async function addVite(tree, options) {
         });
         tasks.push(viteTask);
         createOrEditViteConfig(tree, {
-            project: options.name,
+            project: options.projectName,
             includeLib: true,
             includeVitest: options.unitTestRunner === 'vitest',
             inSourceTests: options.inSourceTests,
@@ -36,7 +36,7 @@ async function addVite(tree, options) {
         const { vitestGenerator, createOrEditViteConfig } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
         const vitestTask = await vitestGenerator(tree, {
             uiFramework: 'none',
-            project: options.name,
+            project: options.projectName,
             coverageProvider: 'v8',
             inSourceTests: options.inSourceTests,
             skipFormat: true,
@@ -46,7 +46,7 @@ async function addVite(tree, options) {
         });
         tasks.push(vitestTask);
         createOrEditViteConfig(tree, {
-            project: options.name,
+            project: options.projectName,
             includeLib: true,
             includeVitest: true,
             inSourceTests: options.inSourceTests,

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

@@ -4,6 +4,7 @@ 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");
+const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
 async function normalizeOptions(host, options) {
     await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'library');
     const { projectName, names: projectNames, projectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
@@ -26,9 +27,13 @@ async function normalizeOptions(host, options) {
     const nxJson = (0, devkit_1.readNxJson)(host);
     const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;
+    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
     const normalized = {
         addPlugin,
         ...options,
+        projectName: isUsingTsSolutionConfig
+            ? (0, get_import_path_1.getImportPath)(host, projectName)
+            : projectName,
         bundler,
         fileName,
         routePath: `/${projectNames.projectFileName}`,
@@ -36,7 +41,7 @@ async function normalizeOptions(host, options) {
         projectRoot,
         parsedTags,
         importPath,
-        isUsingTsSolutionConfig: (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host),
+        isUsingTsSolutionConfig,
     };
     // Libraries with a bundler or is publishable must also be buildable.
     normalized.bundler =

package/src/generators/library/library.js

@@ -18,6 +18,7 @@ const path_1 = require("path");
 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 determine_entry_fields_1 = require("./lib/determine-entry-fields");
+const sort_fields_1 = require("@nx/js/src/utils/package-json/sort-fields");
 function libraryGenerator(tree, schema) {
     return libraryGeneratorInternal(tree, { addPlugin: false, ...schema });
 }
@@ -28,6 +29,11 @@ async function libraryGeneratorInternal(tree, schema) {
     if (options.publishable === true && !schema.importPath) {
         throw new Error(`For publishable libs you have to provide a proper "--importPath" which needs to be a valid npm package name (e.g. my-awesome-lib or @myorg/my-lib)`);
     }
+    // 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.projectRoot);
+    }
     if (options.isUsingTsSolutionConfig) {
         (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), {
             name: (0, get_import_path_1.getImportPath)(tree, options.name),
@@ -35,12 +41,11 @@ async function libraryGeneratorInternal(tree, schema) {
             private: true,
             ...(0, determine_entry_fields_1.determineEntryFields)(options),
             files: options.publishable ? ['dist', '!**/*.tsbuildinfo'] : undefined,
-            nx: {
-                name: options.name,
-                projectType: 'library',
-                sourceRoot: `${options.projectRoot}/src`,
-                tags: options.parsedTags?.length ? options.parsedTags : undefined,
-            },
+            nx: options.parsedTags?.length
+                ? {
+                    tags: options.parsedTags,
+                }
+                : undefined,
         });
     }
     else {
@@ -102,11 +107,7 @@ async function libraryGeneratorInternal(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.projectRoot);
-    }
+    (0, sort_fields_1.sortPackageJsonFields)(tree, options.projectRoot);
     if (!options.skipFormat)
         await (0, devkit_1.formatFiles)(tree);
     // Always run install to link packages.

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

@@ -27,6 +27,7 @@ export interface Schema {
 export interface NormalizedSchema extends Schema {
   js: boolean;
   name: string;
+  projectName: string;
   linter: Linter | LinterType;
   fileName: string;
   projectRoot: string;

package/src/utils/add-linting.d.ts

@@ -10,4 +10,5 @@ export declare function addLinting(host: Tree, options: {
     skipPackageJson?: boolean;
     rootProject?: boolean;
     addPlugin?: boolean;
+    projectName: string;
 }, projectType: 'lib' | 'app'): Promise<GeneratorCallback>;

package/src/utils/add-linting.js

@@ -12,7 +12,7 @@ async function addLinting(host, options, projectType) {
         const tasks = [];
         const lintTask = await (0, eslint_1.lintProjectGenerator)(host, {
             linter: options.linter,
-            project: options.name,
+            project: options.projectName,
             tsConfigPaths: [
                 (0, path_1.joinPathFragments)(options.projectRoot, `tsconfig.${projectType}.json`),
             ],