@nx/vue 20.5.0 → 20.6.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/vue",
-  "version": "20.5.0",
+  "version": "20.6.0-beta.0",
   "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.5.0",
-    "@nx/js": "20.5.0",
-    "@nx/eslint": "20.5.0",
-    "@nx/vite": "20.5.0",
-    "@nx/web": "20.5.0"
+    "@nx/devkit": "20.6.0-beta.0",
+    "@nx/js": "20.6.0-beta.0",
+    "@nx/eslint": "20.6.0-beta.0",
+    "@nx/vite": "20.6.0-beta.0",
+    "@nx/web": "20.6.0-beta.0"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/application/application.js

@@ -18,7 +18,11 @@ const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-projec
 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 });
+    return applicationGeneratorInternal(tree, {
+        addPlugin: false,
+        useProjectJson: true,
+        ...options,
+    });
 }
 async function applicationGeneratorInternal(tree, _options) {
     const tasks = [];
@@ -36,18 +40,18 @@ async function applicationGeneratorInternal(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);
+        await (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) {
-        const packageJson = {
-            name: options.importPath,
-            version: '0.0.1',
-            private: true,
-        };
+    const packageJson = {
+        name: options.importPath,
+        version: '0.0.1',
+        private: true,
+    };
+    if (!options.useProjectJson) {
         if (options.projectName !== options.importPath) {
             packageJson.nx = { name: options.projectName };
         }
@@ -55,7 +59,6 @@ async function applicationGeneratorInternal(tree, _options) {
             packageJson.nx ??= {};
             packageJson.nx.tags = options.parsedTags;
         }
-        (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json'), packageJson);
     }
     else {
         (0, devkit_1.addProjectConfiguration)(tree, options.projectName, {
@@ -66,6 +69,9 @@ async function applicationGeneratorInternal(tree, _options) {
             targets: {},
         });
     }
+    if (!options.useProjectJson || options.isUsingTsSolutionConfig) {
+        (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json'), packageJson);
+    }
     tasks.push(await (0, init_1.vueInitGenerator)(tree, {
         ...options,
         skipFormat: true,

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

@@ -34,15 +34,15 @@ async function addE2e(tree, options) {
                 });
             }
             const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
-            if (options.isUsingTsSolutionConfig) {
-                (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), {
-                    name: options.e2eProjectName,
-                    version: '0.0.1',
-                    private: true,
-                    nx: {
-                        implicitDependencies: [options.projectName],
-                    },
-                });
+            const packageJson = {
+                name: options.e2eProjectName,
+                version: '0.0.1',
+                private: true,
+            };
+            if (!options.useProjectJson) {
+                packageJson.nx = {
+                    implicitDependencies: [options.projectName],
+                };
             }
             else {
                 (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
@@ -54,6 +54,9 @@ async function addE2e(tree, options) {
                     implicitDependencies: [options.projectName],
                 });
             }
+            if (!options.useProjectJson || options.isUsingTsSolutionConfig) {
+                (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), packageJson);
+            }
             const e2eTask = await configurationGenerator(tree, {
                 ...options,
                 project: options.e2eProjectName,
@@ -89,15 +92,15 @@ async function addE2e(tree, options) {
         }
         case 'playwright': {
             const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_1.nxVersion);
-            if (options.isUsingTsSolutionConfig) {
-                (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), {
-                    name: options.e2eProjectName,
-                    version: '0.0.1',
-                    private: true,
-                    nx: {
-                        implicitDependencies: [options.projectName],
-                    },
-                });
+            const packageJson = {
+                name: options.e2eProjectName,
+                version: '0.0.1',
+                private: true,
+            };
+            if (!options.useProjectJson) {
+                packageJson.nx = {
+                    implicitDependencies: [options.projectName],
+                };
             }
             else {
                 (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
@@ -108,6 +111,9 @@ async function addE2e(tree, options) {
                     implicitDependencies: [options.projectName],
                 });
             }
+            if (!options.useProjectJson || options.isUsingTsSolutionConfig) {
+                (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), packageJson);
+            }
             const e2eTask = await configurationGenerator(tree, {
                 ...options,
                 project: options.e2eProjectName,

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

@@ -28,6 +28,7 @@ async function normalizeOptions(host, options) {
         e2eProjectRoot,
         parsedTags,
         isUsingTsSolutionConfig,
+        useProjectJson: options.useProjectJson ?? !isUsingTsSolutionConfig,
     };
     normalized.style = options.style ?? 'css';
     normalized.routing = normalized.routing ?? false;

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

@@ -21,6 +21,7 @@ export interface Schema {
   addPlugin?: boolean;
   nxCloudToken?: string;
   useTsSolution?: boolean;
+  useProjectJson?: boolean;
 }
 
 export interface NormalizedSchema extends Omit<Schema, 'useTsSolution'> {

package/src/generators/application/schema.json

@@ -139,6 +139,10 @@
       "type": "boolean",
       "default": false,
       "hidden": true
+    },
+    "useProjectJson": {
+      "type": "boolean",
+      "description": "Use a `project.json` configuration file instead of inlining the Nx configuration in the `package.json` file."
     }
   },
   "required": ["directory"],

package/src/generators/library/lib/create-library-files.js

@@ -15,6 +15,7 @@ function createLibraryFiles(host, options) {
     };
     (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, '../files'), options.projectRoot, substitutions);
     if (!options.isUsingTsSolutionConfig &&
+        options.useProjectJson &&
         (options.publishable || options.bundler !== 'none')) {
         (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), {
             name: options.importPath ?? options.projectName,

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

@@ -39,6 +39,7 @@ async function normalizeOptions(host, options) {
         parsedTags,
         importPath,
         isUsingTsSolutionConfig,
+        useProjectJson: options.useProjectJson ?? !isUsingTsSolutionConfig,
     };
     // Libraries with a bundler or is publishable must also be buildable.
     normalized.bundler =

package/src/generators/library/library.js

@@ -20,7 +20,11 @@ const determine_entry_fields_1 = require("./lib/determine-entry-fields");
 const sort_fields_1 = require("@nx/js/src/utils/package-json/sort-fields");
 const add_release_config_1 = require("@nx/js/src/generators/library/utils/add-release-config");
 function libraryGenerator(tree, schema) {
-    return libraryGeneratorInternal(tree, { addPlugin: false, ...schema });
+    return libraryGeneratorInternal(tree, {
+        addPlugin: false,
+        useProjectJson: true,
+        ...schema,
+    });
 }
 async function libraryGeneratorInternal(tree, schema) {
     const tasks = [];
@@ -32,12 +36,15 @@ async function libraryGeneratorInternal(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) {
-        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(tree, options.projectRoot);
+        await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(tree, options.projectRoot);
     }
-    if (options.isUsingTsSolutionConfig) {
-        const packageJson = {
-            name: options.importPath,
-            version: '0.0.1',
+    let packageJson = {
+        name: options.importPath,
+        version: '0.0.1',
+    };
+    if (!options.useProjectJson) {
+        packageJson = {
+            ...packageJson,
             ...(0, determine_entry_fields_1.determineEntryFields)(options),
             files: options.publishable ? ['dist', '!**/*.tsbuildinfo'] : undefined,
         };
@@ -48,7 +55,6 @@ async function libraryGeneratorInternal(tree, schema) {
             packageJson.nx ??= {};
             packageJson.nx.tags = options.parsedTags;
         }
-        (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), packageJson);
     }
     else {
         (0, devkit_1.addProjectConfiguration)(tree, options.projectName, {
@@ -59,6 +65,9 @@ async function libraryGeneratorInternal(tree, schema) {
             targets: {},
         });
     }
+    if (!options.useProjectJson || options.isUsingTsSolutionConfig) {
+        (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), packageJson);
+    }
     tasks.push(await (0, init_1.vueInitGenerator)(tree, {
         ...options,
         skipFormat: true,

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

@@ -22,6 +22,7 @@ export interface Schema {
   minimal?: boolean;
   e2eTestRunner?: 'cypress' | 'none';
   addPlugin?: boolean;
+  useProjectJson?: boolean;
 }
 
 export interface NormalizedSchema extends Schema {

package/src/generators/library/schema.json

@@ -125,6 +125,10 @@
       "description": "Create a Vue library with a minimal setup, no separate test files.",
       "type": "boolean",
       "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"]