@nx/vue 17.0.1 → 17.0.3

package/index.d.ts

@@ -6,6 +6,5 @@ export { storybookConfigurationGenerator } from './src/generators/storybook-conf
 export { storiesGenerator, StorybookStoriesSchema, } from './src/generators/stories/stories';
 export { type InitSchema } from './src/generators/init/schema';
 export { vueInitGenerator } from './src/generators/init/init';
-export { addJest } from './src/generators/application/lib/add-jest';
 export * from './src/utils/versions';
 export * from './src/utils/add-linting';

package/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addJest = exports.vueInitGenerator = exports.storiesGenerator = exports.storybookConfigurationGenerator = exports.componentGenerator = exports.libraryGenerator = exports.applicationGenerator = void 0;
+exports.vueInitGenerator = exports.storiesGenerator = exports.storybookConfigurationGenerator = exports.componentGenerator = exports.libraryGenerator = exports.applicationGenerator = void 0;
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./src/utils/versions"), exports);
 var application_1 = require("./src/generators/application/application");
@@ -15,7 +15,5 @@ var stories_1 = require("./src/generators/stories/stories");
 Object.defineProperty(exports, "storiesGenerator", { enumerable: true, get: function () { return stories_1.storiesGenerator; } });
 var init_1 = require("./src/generators/init/init");
 Object.defineProperty(exports, "vueInitGenerator", { enumerable: true, get: function () { return init_1.vueInitGenerator; } });
-var add_jest_1 = require("./src/generators/application/lib/add-jest");
-Object.defineProperty(exports, "addJest", { enumerable: true, get: function () { return add_jest_1.addJest; } });
 tslib_1.__exportStar(require("./src/utils/versions"), exports);
 tslib_1.__exportStar(require("./src/utils/add-linting"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/vue",
-  "version": "17.0.1",
+  "version": "17.0.3",
   "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 Jest, 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": {
@@ -30,12 +30,11 @@
   "dependencies": {
     "minimatch": "3.0.5",
     "tslib": "^2.3.0",
-    "@nx/devkit": "17.0.1",
-    "@nx/js": "17.0.1",
-    "@nx/eslint": "17.0.1",
-    "@nx/vite": "17.0.1",
-    "@nx/web": "17.0.1",
-    "@phenomnomnominal/tsquery": "~5.0.1"
+    "@nx/devkit": "17.0.3",
+    "@nx/js": "17.0.3",
+    "@nx/eslint": "17.0.3",
+    "@nx/vite": "17.0.3",
+    "@nx/web": "17.0.3"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/application/application.js

@@ -9,7 +9,6 @@ const add_linting_1 = require("../../utils/add-linting");
 const add_e2e_1 = require("./lib/add-e2e");
 const create_application_files_1 = require("./lib/create-application-files");
 const add_vite_1 = require("./lib/add-vite");
-const add_jest_1 = require("./lib/add-jest");
 const create_ts_config_1 = require("../../utils/create-ts-config");
 async function applicationGenerator(tree, _options) {
     const options = await (0, normalize_options_1.normalizeOptions)(tree, _options);
@@ -38,11 +37,6 @@ async function applicationGenerator(tree, _options) {
         rootProject: options.rootProject,
     }, 'app'));
     tasks.push(await (0, add_vite_1.addVite)(tree, options));
-    if (options.unitTestRunner === 'jest')
-        tasks.push(await (0, add_jest_1.addJest)(tree, {
-            name: options.name,
-            projectRoot: options.appProjectRoot,
-        }));
     tasks.push(await (0, add_e2e_1.addE2e)(tree, options));
     if (options.js)
         (0, devkit_1.toJS)(tree);

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

@@ -6,24 +6,34 @@ const web_1 = require("@nx/web");
 const versions_1 = require("../../../utils/versions");
 async function addE2e(tree, options) {
     switch (options.e2eTestRunner) {
-        case 'cypress':
+        case 'cypress': {
             (0, web_1.webStaticServeGenerator)(tree, {
                 buildTarget: `${options.projectName}:build`,
                 targetName: 'serve-static',
             });
-            const { cypressProjectGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
-            return await cypressProjectGenerator(tree, {
+            const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
+            (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
+                projectType: 'application',
+                root: options.e2eProjectRoot,
+                sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
+                targets: {},
+                tags: [],
+                implicitDependencies: [options.projectName],
+            });
+            return await configurationGenerator(tree, {
                 ...options,
-                name: options.e2eProjectName,
-                directory: options.e2eProjectRoot,
-                projectNameAndRootFormat: 'as-provided',
-                project: options.projectName,
+                project: options.e2eProjectName,
+                directory: 'src',
                 bundler: 'vite',
                 skipFormat: true,
+                devServerTarget: `${options.projectName}:serve`,
+                jsx: true,
             });
-        case 'playwright':
+        }
+        case 'playwright': {
             const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_1.nxVersion);
             (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
+                projectType: 'application',
                 root: options.e2eProjectRoot,
                 sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
                 targets: {},
@@ -40,6 +50,7 @@ async function addE2e(tree, options) {
                 webServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx serve ${options.name}`,
                 webServerAddress: 'http://localhost:4200',
             });
+        }
         case 'none':
         default:
             return () => { };

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

@@ -8,7 +8,7 @@ export interface Schema {
   directory?: string;
   projectNameAndRootFormat?: ProjectNameAndRootFormat;
   tags?: string;
-  unitTestRunner?: 'jest' | 'vitest' | 'none';
+  unitTestRunner?: 'vitest' | 'none';
   inSourceTests?: boolean;
   e2eTestRunner: 'cypress' | 'playwright' | 'none';
   linter: Linter;

package/src/generators/application/schema.json

@@ -85,7 +85,7 @@
     },
     "unitTestRunner": {
       "type": "string",
-      "enum": ["jest", "vitest", "none"],
+      "enum": ["vitest", "none"],
       "description": "Test runner to use for unit tests.",
       "x-prompt": "Which unit test runner would you like to use?",
       "default": "vitest"

package/src/generators/component/schema.json

@@ -102,13 +102,7 @@
       "type": "boolean",
       "default": false,
       "x-priority": "internal"
-    },
-    "unitTestRunner": {
-      "type": "string",
-      "enum": ["vitest", "jest", "none"],
-      "description": "Test runner to use for unit tests.",
-      "x-prompt": "What unit test runner should be used?"
     }
   },
-  "required": ["name", "project"]
+  "required": ["name"]
 }

package/src/generators/init/init.js

@@ -8,13 +8,13 @@ function updateDependencies(host, schema) {
     (0, devkit_1.removeDependenciesFromPackageJson)(host, ['@nx/vue'], []);
     let dependencies = {
         vue: versions_1.vueVersion,
-        'vue-tsc': versions_1.vueTscVersion,
     };
     let devDependencies = {
         '@nx/vue': versions_1.nxVersion,
         '@vue/tsconfig': versions_1.vueTsconfigVersion,
         '@vue/test-utils': versions_1.vueTestUtilsVersion,
         '@vitejs/plugin-vue': versions_1.vitePluginVueVersion,
+        'vue-tsc': versions_1.vueTscVersion,
     };
     if (schema.routing) {
         dependencies['vue-router'] = versions_1.vueRouterVersion;

package/src/generators/library/library.js

@@ -10,7 +10,6 @@ const create_library_files_1 = require("./lib/create-library-files");
 const create_ts_config_1 = require("../../utils/create-ts-config");
 const component_1 = require("../component/component");
 const add_vite_1 = require("./lib/add-vite");
-const add_jest_1 = require("./lib/add-jest");
 async function libraryGenerator(tree, schema) {
     const tasks = [];
     const options = await (0, normalize_options_1.normalizeOptions)(tree, schema);
@@ -32,8 +31,6 @@ async function libraryGenerator(tree, schema) {
     tasks.push(await (0, add_linting_1.addLinting)(tree, options, 'lib'));
     (0, create_library_files_1.createLibraryFiles)(tree, options);
     tasks.push(await (0, add_vite_1.addVite)(tree, options));
-    if (options.unitTestRunner === 'jest')
-        tasks.push(await (0, add_jest_1.addJest)(tree, options));
     if (options.component) {
         await (0, component_1.default)(tree, {
             name: options.name,

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

@@ -22,7 +22,7 @@ export interface Schema {
   skipTsConfig?: boolean;
   strict?: boolean;
   tags?: string;
-  unitTestRunner?: 'jest' | 'vitest' | 'none';
+  unitTestRunner?: 'vitest' | 'none';
   minimal?: boolean;
   e2eTestRunner?: 'cypress' | 'none';
 }
@@ -37,5 +37,5 @@ export interface NormalizedSchema extends Schema {
   parsedTags: string[];
   appMain?: string;
   appSourceRoot?: string;
-  unitTestRunner?: 'jest' | 'vitest' | 'none';
+  unitTestRunner?: 'vitest' | 'none';
 }

package/src/generators/library/schema.json

@@ -46,7 +46,7 @@
     },
     "unitTestRunner": {
       "type": "string",
-      "enum": ["vitest", "jest", "none"],
+      "enum": ["vitest", "none"],
       "description": "Test runner to use for unit tests.",
       "x-prompt": "What unit test runner should be used?"
     },

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

@@ -4,7 +4,7 @@ export declare function addLinting(host: Tree, options: {
     linter: Linter;
     name: string;
     projectRoot: string;
-    unitTestRunner?: 'jest' | 'vitest' | 'none';
+    unitTestRunner?: 'vitest' | 'none';
     setParserOptionsProject?: boolean;
     skipPackageJson?: boolean;
     rootProject?: boolean;

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

@@ -14,7 +14,7 @@ function createTsConfig(host, projectRoot, type, options, relativePathToRootTsCo
             jsxImportSource: 'vue',
             moduleResolution: 'node',
             resolveJsonModule: true,
-            verbatimModuleSyntax: options.unitTestRunner !== 'jest',
+            verbatimModuleSyntax: true,
         },
         files: [],
         include: [],

package/src/utils/versions.d.ts

@@ -5,7 +5,6 @@ export declare const vueRouterVersion = "^4.2.4";
 export declare const vueTsconfigVersion = "^0.4.0";
 export declare const vueTestUtilsVersion = "^2.4.1";
 export declare const vitePluginVueVersion = "^4.3.1";
-export declare const vueJest3Version = "^29.2.6";
 export declare const vueEslintConfigPrettierVersion = "7.1.0";
 export declare const vueEslintConfigTypescriptVersion = "^11.0.3";
 export declare const eslintPluginVueVersion = "^9.16.1";

package/src/utils/versions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.lessVersion = exports.sassVersion = exports.autoprefixerVersion = exports.tailwindcssVersion = exports.postcssVersion = exports.eslintPluginVueVersion = exports.vueEslintConfigTypescriptVersion = exports.vueEslintConfigPrettierVersion = exports.vueJest3Version = exports.vitePluginVueVersion = exports.vueTestUtilsVersion = exports.vueTsconfigVersion = exports.vueRouterVersion = exports.vueTscVersion = exports.vueVersion = exports.nxVersion = void 0;
+exports.lessVersion = exports.sassVersion = exports.autoprefixerVersion = exports.tailwindcssVersion = exports.postcssVersion = exports.eslintPluginVueVersion = exports.vueEslintConfigTypescriptVersion = exports.vueEslintConfigPrettierVersion = exports.vitePluginVueVersion = exports.vueTestUtilsVersion = exports.vueTsconfigVersion = exports.vueRouterVersion = exports.vueTscVersion = exports.vueVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
 // vue core
 exports.vueVersion = '^3.3.4';
@@ -11,7 +11,6 @@ exports.vueTsconfigVersion = '^0.4.0';
 // test deps
 exports.vueTestUtilsVersion = '^2.4.1';
 exports.vitePluginVueVersion = '^4.3.1';
-exports.vueJest3Version = '^29.2.6';
 // linting deps
 exports.vueEslintConfigPrettierVersion = '7.1.0';
 exports.vueEslintConfigTypescriptVersion = '^11.0.3';

package/src/generators/application/lib/add-jest.d.ts

@@ -1,5 +0,0 @@
-import { GeneratorCallback, Tree } from '@nx/devkit';
-export declare function addJest(tree: Tree, options: {
-    name: string;
-    projectRoot: string;
-}): Promise<GeneratorCallback>;

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

@@ -1,22 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.addJest = void 0;
-const devkit_1 = require("@nx/devkit");
-const versions_1 = require("../../../utils/versions");
-const setup_jest_1 = require("../../../utils/setup-jest");
-async function addJest(tree, options) {
-    const tasks = [];
-    const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/jest', versions_1.nxVersion);
-    tasks.push(await configurationGenerator(tree, {
-        project: options.name,
-        skipFormat: true,
-        testEnvironment: 'jsdom',
-        compiler: 'babel',
-    }));
-    (0, setup_jest_1.setupJestProject)(tree, options.projectRoot);
-    tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-        '@vue/vue3-jest': versions_1.vueJest3Version,
-    }));
-    return (0, devkit_1.runTasksInSerial)(...tasks);
-}
-exports.addJest = addJest;

package/src/generators/library/lib/add-jest.d.ts

@@ -1,3 +0,0 @@
-import { GeneratorCallback, Tree } from '@nx/devkit';
-import { NormalizedSchema } from '../schema';
-export declare function addJest(tree: Tree, options: NormalizedSchema): Promise<GeneratorCallback>;

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

@@ -1,23 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.addJest = void 0;
-const devkit_1 = require("@nx/devkit");
-const versions_1 = require("../../../utils/versions");
-const setup_jest_1 = require("../../../utils/setup-jest");
-async function addJest(tree, options) {
-    const tasks = [];
-    const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/jest', versions_1.nxVersion);
-    const jestTask = await configurationGenerator(tree, {
-        project: options.name,
-        skipFormat: true,
-        testEnvironment: 'jsdom',
-        compiler: 'babel',
-    });
-    tasks.push(jestTask);
-    (0, setup_jest_1.setupJestProject)(tree, options.projectRoot);
-    tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-        '@vue/vue3-jest': versions_1.vueJest3Version,
-    }));
-    return (0, devkit_1.runTasksInSerial)(...tasks);
-}
-exports.addJest = addJest;

package/src/utils/setup-jest.d.ts

@@ -1,4 +0,0 @@
-import { Tree } from '@nx/devkit';
-export declare function setupJestProject(tree: Tree, projectRoot: string): void;
-export declare function writeBabelRcFile(tree: Tree, projectRoot: string): void;
-export declare function updateJestConfigTsFile(tree: Tree, projectRoot: string): void;

package/src/utils/setup-jest.js

@@ -1,96 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateJestConfigTsFile = exports.writeBabelRcFile = exports.setupJestProject = void 0;
-const devkit_1 = require("@nx/devkit");
-function setupJestProject(tree, projectRoot) {
-    updateJestConfigTsFile(tree, projectRoot);
-    writeBabelRcFile(tree, projectRoot);
-}
-exports.setupJestProject = setupJestProject;
-function writeBabelRcFile(tree, projectRoot) {
-    (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(projectRoot, '.babelrc'), {
-        presets: ['@nx/js/babel'],
-    });
-}
-exports.writeBabelRcFile = writeBabelRcFile;
-function updateJestConfigTsFile(tree, projectRoot) {
-    const jestConfigTs = (0, devkit_1.joinPathFragments)(projectRoot, 'jest.config.ts');
-    if (tree.exists(jestConfigTs)) {
-        const { tsquery } = require('@phenomnomnominal/tsquery');
-        let fileContent = tree.read(jestConfigTs, 'utf-8');
-        const sourceFile = tsquery.ast(fileContent);
-        const settingsObject = tsquery.query(sourceFile, 'ObjectLiteralExpression')?.[0];
-        if (settingsObject) {
-            const moduleFileExtensions = tsquery.query(sourceFile, `PropertyAssignment:has(Identifier:has([name="moduleFileExtensions"]))`)?.[0];
-            if (moduleFileExtensions) {
-                fileContent = (0, devkit_1.applyChangesToString)(fileContent, [
-                    {
-                        type: devkit_1.ChangeType.Delete,
-                        start: moduleFileExtensions.getStart(),
-                        length: moduleFileExtensions.getEnd() -
-                            moduleFileExtensions.getStart() +
-                            1,
-                    },
-                ]);
-            }
-            const transformProperty = tsquery.query(sourceFile, `PropertyAssignment:has(Identifier:has([name="transform"]))`)?.[0];
-            if (transformProperty) {
-                fileContent = (0, devkit_1.applyChangesToString)(fileContent, [
-                    {
-                        type: devkit_1.ChangeType.Delete,
-                        start: transformProperty.getStart(),
-                        length: transformProperty.getEnd() - transformProperty.getStart() + 1,
-                    },
-                ]);
-            }
-            const settingsObjectUpdated = tsquery.query(fileContent, 'ObjectLiteralExpression')?.[0];
-            fileContent = (0, devkit_1.applyChangesToString)(fileContent, [
-                {
-                    type: devkit_1.ChangeType.Insert,
-                    index: settingsObjectUpdated.getEnd() - 1,
-                    text: `,
-            moduleFileExtensions: ['js', 'ts', 'json', 'vue'],
-            transform: {
-              '^.+\\.[tj]sx?$': ['babel-jest'],
-              '^.+\\.vue$': [
-                '@vue/vue3-jest',
-                {
-                  tsConfig: './tsconfig.spec.json',
-                },
-              ],
-            },
-            testEnvironment: 'jsdom',
-            testMatch: ['**/*.spec.ts?(x)', '**/__tests__/*.ts?(x)'],
-            `,
-                },
-            ]);
-            tree.write(jestConfigTs, fileContent);
-        }
-        else {
-            writeNewJestConfig(tree, projectRoot);
-        }
-    }
-    else {
-        writeNewJestConfig(tree, projectRoot);
-    }
-}
-exports.updateJestConfigTsFile = updateJestConfigTsFile;
-function writeNewJestConfig(tree, projectRoot) {
-    tree.write((0, devkit_1.joinPathFragments)(projectRoot, 'jest.config.js'), `
-          module.exports = {
-              preset: '${devkit_1.offsetFromRoot}/jest.preset.js',
-              moduleFileExtensions: ['js', 'ts', 'json', 'vue'],
-              transform: {
-                '^.+\\.[tj]sx?$': ['babel-jest'],
-                '^.+\\.vue$': [
-                  '@vue/vue3-jest',
-                  {
-                    tsConfig: './tsconfig.spec.json',
-                  },
-                ],
-              },
-              testEnvironment: 'jsdom',
-              testMatch: ['**/*.spec.ts?(x)', '**/__tests__/*.ts?(x)'],
-            };
-          `);
-}