@nx/vite 23.0.0-beta.2 → 23.0.0-beta.20
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/PLUGIN.md +33 -0
- package/{executors.d.ts → dist/executors.d.ts} +0 -3
- package/{executors.js → dist/executors.js} +1 -3
- package/{index.d.ts → dist/index.d.ts} +0 -3
- package/{index.js → dist/index.js} +1 -3
- package/{plugin.d.ts → dist/plugin.d.ts} +0 -1
- package/{plugins → dist/plugins}/nx-copy-assets.plugin.d.ts +1 -2
- package/{plugins → dist/plugins}/nx-copy-assets.plugin.js +2 -2
- package/{plugins → dist/plugins}/nx-tsconfig-paths.plugin.d.ts +0 -1
- package/{plugins → dist/plugins}/nx-tsconfig-paths.plugin.js +7 -8
- package/{plugins → dist/plugins}/nx-vite-build-coordination.plugin.d.ts +0 -1
- package/{plugins → dist/plugins}/rollup-replace-files.plugin.d.ts +0 -1
- package/{src → dist/src}/executors/build/build.impl.d.ts +0 -1
- package/{src → dist/src}/executors/build/build.impl.js +10 -40
- package/{src → dist/src}/executors/build/compat.d.ts +0 -1
- package/{src → dist/src}/executors/build/schema.json +1 -0
- package/{src → dist/src}/executors/dev-server/compat.d.ts +0 -1
- package/{src → dist/src}/executors/dev-server/dev-server.impl.d.ts +0 -1
- package/{src → dist/src}/executors/dev-server/dev-server.impl.js +5 -35
- package/{src → dist/src}/executors/dev-server/schema.json +1 -0
- package/{src → dist/src}/executors/preview-server/compat.d.ts +0 -1
- package/{src → dist/src}/executors/preview-server/preview-server.impl.d.ts +0 -1
- package/{src → dist/src}/executors/preview-server/preview-server.impl.js +5 -35
- package/{src → dist/src}/executors/preview-server/schema.json +1 -0
- package/{src → dist/src}/generators/configuration/configuration.d.ts +0 -1
- package/{src → dist/src}/generators/configuration/configuration.js +23 -11
- package/{src → dist/src}/generators/configuration/lib/convert-non-vite.d.ts +0 -1
- package/{src → dist/src}/generators/configuration/lib/convert-non-vite.js +2 -2
- package/{src → dist/src}/generators/convert-to-inferred/convert-to-inferred.d.ts +0 -1
- package/{src → dist/src}/generators/convert-to-inferred/convert-to-inferred.js +4 -12
- package/{src → dist/src}/generators/convert-to-inferred/lib/build-post-target-transformer.d.ts +0 -1
- package/{src → dist/src}/generators/convert-to-inferred/lib/build-post-target-transformer.js +2 -2
- package/{src → dist/src}/generators/convert-to-inferred/lib/preview-post-target-transformer.d.ts +1 -2
- package/{src → dist/src}/generators/convert-to-inferred/lib/serve-post-target-transformer.d.ts +1 -2
- package/{src → dist/src}/generators/convert-to-inferred/lib/utils.d.ts +0 -1
- package/{src → dist/src}/generators/init/init.d.ts +0 -1
- package/{src → dist/src}/generators/init/init.js +2 -3
- package/{src → dist/src}/generators/init/lib/utils.d.ts +0 -1
- package/{src → dist/src}/generators/init/lib/utils.js +13 -16
- package/dist/src/generators/setup-paths-plugin/lib/utils.d.ts +1 -0
- package/dist/src/generators/setup-paths-plugin/lib/utils.js +2 -0
- package/{src → dist/src}/generators/setup-paths-plugin/setup-paths-plugin.d.ts +0 -1
- package/{src → dist/src}/migrations/update-20-0-4/add-vite-temp-files-to-git-ignore.d.ts +0 -1
- package/dist/src/migrations/update-20-0-4/add-vite-temp-files-to-git-ignore.md +12 -0
- package/{src → dist/src}/migrations/update-20-5-0/eslint-ignore-vite-temp-files.d.ts +0 -1
- package/dist/src/migrations/update-20-5-0/eslint-ignore-vite-temp-files.js +44 -0
- package/dist/src/migrations/update-20-5-0/eslint-ignore-vite-temp-files.md +45 -0
- package/{src → dist/src}/migrations/update-20-5-0/install-jiti.d.ts +0 -1
- package/dist/src/migrations/update-20-5-0/install-jiti.md +6 -0
- package/{src → dist/src}/migrations/update-20-5-0/update-resolve-conditions.d.ts +0 -1
- package/dist/src/migrations/update-20-5-0/update-resolve-conditions.md +42 -0
- package/{src → dist/src}/migrations/update-22-2-0/migrate-vitest-to-vitest-package.d.ts +0 -1
- package/{src → dist/src}/migrations/update-22-2-0/migrate-vitest-to-vitest-package.js +30 -14
- package/dist/src/migrations/update-23-0-0/ai-instructions-for-vite-8.md +254 -0
- package/dist/src/migrations/update-23-0-0/ensure-vitest-package-migration.d.ts +2 -0
- package/dist/src/migrations/update-23-0-0/ensure-vitest-package-migration.js +205 -0
- package/dist/src/migrations/update-23-0-0/ensure-vitest-package-migration.md +18 -0
- package/dist/src/migrations/update-23-0-0/rename-rollup-options-to-rolldown-options.d.ts +2 -0
- package/dist/src/migrations/update-23-0-0/rename-rollup-options-to-rolldown-options.js +47 -0
- package/dist/src/migrations/update-23-0-0/rename-rollup-options-to-rolldown-options.md +65 -0
- package/{src → dist/src}/plugins/plugin.d.ts +0 -10
- package/{src → dist/src}/plugins/plugin.js +22 -215
- package/dist/src/utils/deprecation.d.ts +7 -0
- package/dist/src/utils/deprecation.js +31 -0
- package/{src → dist/src}/utils/detect-ui-framework.d.ts +0 -1
- package/{src → dist/src}/utils/e2e-web-server-info-utils.d.ts +2 -3
- package/{src → dist/src}/utils/e2e-web-server-info-utils.js +9 -10
- package/{src → dist/src}/utils/ensure-dependencies.d.ts +0 -2
- package/{src → dist/src}/utils/ensure-dependencies.js +0 -16
- package/{src → dist/src}/utils/executor-utils.d.ts +0 -2
- package/{src → dist/src}/utils/executor-utils.js +3 -7
- package/{src → dist/src}/utils/find-vite-config.d.ts +0 -1
- package/{src → dist/src}/utils/generator-utils.d.ts +1 -4
- package/{src → dist/src}/utils/generator-utils.js +10 -38
- package/{src → dist/src}/utils/ignore-vite-temp-files.d.ts +0 -1
- package/{src → dist/src}/utils/ignore-vite-temp-files.js +7 -35
- package/{src → dist/src}/utils/nx-tsconfig-paths-find-file.d.ts +0 -1
- package/{src → dist/src}/utils/options-utils.d.ts +0 -1
- package/{src → dist/src}/utils/options-utils.js +0 -3
- package/{src → dist/src}/utils/test-files/test-vite-configs.d.ts +3 -4
- package/{src → dist/src}/utils/test-files/test-vite-configs.js +3 -3
- package/dist/src/utils/version-utils.d.ts +3 -0
- package/dist/src/utils/version-utils.js +26 -0
- package/dist/src/utils/versions.d.ts +11 -0
- package/dist/src/utils/versions.js +16 -0
- package/{src → dist/src}/utils/vite-config-edit-utils.d.ts +0 -1
- package/executors.json +12 -22
- package/generators.json +8 -13
- package/migrations.json +44 -7
- package/package.json +75 -30
- package/executors.d.ts.map +0 -1
- package/index.d.ts.map +0 -1
- package/plugin.d.ts.map +0 -1
- package/plugins/nx-copy-assets.plugin.d.ts.map +0 -1
- package/plugins/nx-tsconfig-paths.plugin.d.ts.map +0 -1
- package/plugins/nx-vite-build-coordination.plugin.d.ts.map +0 -1
- package/plugins/rollup-replace-files.plugin.d.ts.map +0 -1
- package/src/executors/build/build.impl.d.ts.map +0 -1
- package/src/executors/build/compat.d.ts.map +0 -1
- package/src/executors/dev-server/compat.d.ts.map +0 -1
- package/src/executors/dev-server/dev-server.impl.d.ts.map +0 -1
- package/src/executors/preview-server/compat.d.ts.map +0 -1
- package/src/executors/preview-server/preview-server.impl.d.ts.map +0 -1
- package/src/executors/test/compat.d.ts +0 -3
- package/src/executors/test/compat.d.ts.map +0 -1
- package/src/executors/test/compat.js +0 -6
- package/src/executors/test/lib/nx-reporter.d.ts +0 -19
- package/src/executors/test/lib/nx-reporter.d.ts.map +0 -1
- package/src/executors/test/lib/nx-reporter.js +0 -39
- package/src/executors/test/lib/utils.d.ts +0 -5
- package/src/executors/test/lib/utils.d.ts.map +0 -1
- package/src/executors/test/lib/utils.js +0 -68
- package/src/executors/test/schema.d.ts +0 -7
- package/src/executors/test/schema.json +0 -36
- package/src/executors/test/vitest.impl.d.ts +0 -10
- package/src/executors/test/vitest.impl.d.ts.map +0 -1
- package/src/executors/test/vitest.impl.js +0 -49
- package/src/generators/configuration/configuration.d.ts.map +0 -1
- package/src/generators/configuration/lib/convert-non-vite.d.ts.map +0 -1
- package/src/generators/convert-to-inferred/convert-to-inferred.d.ts.map +0 -1
- package/src/generators/convert-to-inferred/lib/build-post-target-transformer.d.ts.map +0 -1
- package/src/generators/convert-to-inferred/lib/preview-post-target-transformer.d.ts.map +0 -1
- package/src/generators/convert-to-inferred/lib/serve-post-target-transformer.d.ts.map +0 -1
- package/src/generators/convert-to-inferred/lib/test-post-target-transformer.d.ts +0 -6
- package/src/generators/convert-to-inferred/lib/test-post-target-transformer.d.ts.map +0 -1
- package/src/generators/convert-to-inferred/lib/test-post-target-transformer.js +0 -56
- package/src/generators/convert-to-inferred/lib/utils.d.ts.map +0 -1
- package/src/generators/init/init.d.ts.map +0 -1
- package/src/generators/init/lib/utils.d.ts.map +0 -1
- package/src/generators/setup-paths-plugin/lib/utils.d.ts +0 -1
- package/src/generators/setup-paths-plugin/lib/utils.d.ts.map +0 -1
- package/src/generators/setup-paths-plugin/lib/utils.js +0 -0
- package/src/generators/setup-paths-plugin/setup-paths-plugin.d.ts.map +0 -1
- package/src/generators/vitest/files/tsconfig.spec.json__tmpl__ +0 -22
- package/src/generators/vitest/schema.d.ts +0 -15
- package/src/generators/vitest/schema.json +0 -65
- package/src/generators/vitest/vitest-generator.d.ts +0 -8
- package/src/generators/vitest/vitest-generator.d.ts.map +0 -1
- package/src/generators/vitest/vitest-generator.js +0 -51
- package/src/migrations/update-20-0-4/add-vite-temp-files-to-git-ignore.d.ts.map +0 -1
- package/src/migrations/update-20-5-0/eslint-ignore-vite-temp-files.d.ts.map +0 -1
- package/src/migrations/update-20-5-0/eslint-ignore-vite-temp-files.js +0 -76
- package/src/migrations/update-20-5-0/install-jiti.d.ts.map +0 -1
- package/src/migrations/update-20-5-0/update-resolve-conditions.d.ts.map +0 -1
- package/src/migrations/update-22-2-0/create-ai-instructions-for-vitest-4.d.ts +0 -3
- package/src/migrations/update-22-2-0/create-ai-instructions-for-vitest-4.d.ts.map +0 -1
- package/src/migrations/update-22-2-0/create-ai-instructions-for-vitest-4.js +0 -16
- package/src/migrations/update-22-2-0/migrate-vitest-to-vitest-package.d.ts.map +0 -1
- package/src/plugins/plugin.d.ts.map +0 -1
- package/src/utils/detect-ui-framework.d.ts.map +0 -1
- package/src/utils/e2e-web-server-info-utils.d.ts.map +0 -1
- package/src/utils/ensure-dependencies.d.ts.map +0 -1
- package/src/utils/executor-utils.d.ts.map +0 -1
- package/src/utils/find-vite-config.d.ts.map +0 -1
- package/src/utils/generator-utils.d.ts.map +0 -1
- package/src/utils/ignore-vite-temp-files.d.ts.map +0 -1
- package/src/utils/nx-tsconfig-paths-find-file.d.ts.map +0 -1
- package/src/utils/options-utils.d.ts.map +0 -1
- package/src/utils/test-files/test-vite-configs.d.ts.map +0 -1
- package/src/utils/version-utils.d.ts +0 -15
- package/src/utils/version-utils.d.ts.map +0 -1
- package/src/utils/version-utils.js +0 -87
- package/src/utils/versions.d.ts +0 -31
- package/src/utils/versions.d.ts.map +0 -1
- package/src/utils/versions.js +0 -36
- package/src/utils/vite-config-edit-utils.d.ts.map +0 -1
- /package/{LICENSE → dist/LICENSE} +0 -0
- /package/{plugin.js → dist/plugin.js} +0 -0
- /package/{plugins → dist/plugins}/nx-vite-build-coordination.plugin.js +0 -0
- /package/{plugins → dist/plugins}/rollup-replace-files.plugin.js +0 -0
- /package/{src → dist/src}/executors/build/compat.js +0 -0
- /package/{src → dist/src}/executors/build/schema.d.ts +0 -0
- /package/{src → dist/src}/executors/dev-server/compat.js +0 -0
- /package/{src → dist/src}/executors/dev-server/schema.d.ts +0 -0
- /package/{src → dist/src}/executors/preview-server/compat.js +0 -0
- /package/{src → dist/src}/executors/preview-server/schema.d.ts +0 -0
- /package/{src → dist/src}/generators/configuration/schema.d.ts +0 -0
- /package/{src → dist/src}/generators/configuration/schema.json +0 -0
- /package/{src → dist/src}/generators/convert-to-inferred/lib/preview-post-target-transformer.js +0 -0
- /package/{src → dist/src}/generators/convert-to-inferred/lib/serve-post-target-transformer.js +0 -0
- /package/{src → dist/src}/generators/convert-to-inferred/lib/utils.js +0 -0
- /package/{src → dist/src}/generators/convert-to-inferred/schema.json +0 -0
- /package/{src → dist/src}/generators/init/schema.d.ts +0 -0
- /package/{src → dist/src}/generators/init/schema.json +0 -0
- /package/{src → dist/src}/generators/setup-paths-plugin/schema.d.ts +0 -0
- /package/{src → dist/src}/generators/setup-paths-plugin/schema.json +0 -0
- /package/{src → dist/src}/generators/setup-paths-plugin/setup-paths-plugin.js +0 -0
- /package/{src → dist/src}/migrations/update-20-0-4/add-vite-temp-files-to-git-ignore.js +0 -0
- /package/{src → dist/src}/migrations/update-20-5-0/install-jiti.js +0 -0
- /package/{src → dist/src}/migrations/update-20-5-0/update-resolve-conditions.js +0 -0
- /package/{src/migrations/update-22-2-0/files → dist/src/migrations/update-22-2-0}/ai-instructions-for-vitest-4.md +0 -0
- /package/{src → dist/src}/utils/detect-ui-framework.js +0 -0
- /package/{src → dist/src}/utils/find-vite-config.js +0 -0
- /package/{src → dist/src}/utils/nx-tsconfig-paths-find-file.js +0 -0
- /package/{src → dist/src}/utils/vite-config-edit-utils.js +0 -0
|
@@ -2,21 +2,18 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.convertToInferred = convertToInferred;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
|
-
const
|
|
5
|
+
const internal_1 = require("@nx/devkit/internal");
|
|
6
6
|
const plugin_1 = require("../../plugins/plugin");
|
|
7
7
|
const build_post_target_transformer_1 = require("./lib/build-post-target-transformer");
|
|
8
8
|
const serve_post_target_transformer_1 = require("./lib/serve-post-target-transformer");
|
|
9
9
|
const preview_post_target_transformer_1 = require("./lib/preview-post-target-transformer");
|
|
10
|
-
const test_post_target_transformer_1 = require("./lib/test-post-target-transformer");
|
|
11
|
-
const aggregate_log_util_1 = require("@nx/devkit/src/generators/plugin-migrations/aggregate-log-util");
|
|
12
10
|
async function convertToInferred(tree, options) {
|
|
13
11
|
const projectGraph = await (0, devkit_1.createProjectGraphAsync)();
|
|
14
|
-
const migrationLogs = new
|
|
15
|
-
const migratedProjects = await (0,
|
|
12
|
+
const migrationLogs = new internal_1.AggregatedLog();
|
|
13
|
+
const migratedProjects = await (0, internal_1.migrateProjectExecutorsToPlugin)(tree, projectGraph, '@nx/vite/plugin', plugin_1.createNodesV2, {
|
|
16
14
|
buildTargetName: 'build',
|
|
17
15
|
serveTargetName: 'serve',
|
|
18
16
|
previewTargetName: 'preview',
|
|
19
|
-
testTargetName: 'test',
|
|
20
17
|
serveStaticTargetName: 'serve-static',
|
|
21
18
|
}, [
|
|
22
19
|
{
|
|
@@ -34,14 +31,9 @@ async function convertToInferred(tree, options) {
|
|
|
34
31
|
postTargetTransformer: (0, preview_post_target_transformer_1.previewPostTargetTransformer)(migrationLogs),
|
|
35
32
|
targetPluginOptionMapper: (target) => ({ previewTargetName: target }),
|
|
36
33
|
},
|
|
37
|
-
{
|
|
38
|
-
executors: ['@nx/vite:test'],
|
|
39
|
-
postTargetTransformer: test_post_target_transformer_1.testPostTargetTransformer,
|
|
40
|
-
targetPluginOptionMapper: (target) => ({ testTargetName: target }),
|
|
41
|
-
},
|
|
42
34
|
], options.project);
|
|
43
35
|
if (migratedProjects.size === 0) {
|
|
44
|
-
throw new
|
|
36
|
+
throw new internal_1.NoTargetsToMigrateError();
|
|
45
37
|
}
|
|
46
38
|
if (!options.skipFormat) {
|
|
47
39
|
await (0, devkit_1.formatFiles)(tree);
|
package/{src → dist/src}/generators/convert-to-inferred/lib/build-post-target-transformer.d.ts
RENAMED
|
@@ -4,4 +4,3 @@ export declare function buildPostTargetTransformer(target: TargetConfiguration,
|
|
|
4
4
|
root: string;
|
|
5
5
|
}, inferredTargetConfiguration: TargetConfiguration): TargetConfiguration<any>;
|
|
6
6
|
export declare function moveBuildLibsFromSourceToViteConfig(tree: Tree, configPath: string): void;
|
|
7
|
-
//# sourceMappingURL=build-post-target-transformer.d.ts.map
|
package/{src → dist/src}/generators/convert-to-inferred/lib/build-post-target-transformer.js
RENAMED
|
@@ -2,11 +2,11 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.buildPostTargetTransformer = buildPostTargetTransformer;
|
|
4
4
|
exports.moveBuildLibsFromSourceToViteConfig = moveBuildLibsFromSourceToViteConfig;
|
|
5
|
+
const internal_1 = require("@nx/devkit/internal");
|
|
5
6
|
const devkit_1 = require("@nx/devkit");
|
|
6
7
|
const tsquery_1 = require("@phenomnomnominal/tsquery");
|
|
7
8
|
const posix_1 = require("path/posix");
|
|
8
9
|
const utils_1 = require("./utils");
|
|
9
|
-
const plugin_migration_utils_1 = require("@nx/devkit/src/generators/plugin-migrations/plugin-migration-utils");
|
|
10
10
|
function buildPostTargetTransformer(target, tree, projectDetails, inferredTargetConfiguration) {
|
|
11
11
|
let viteConfigPath = (0, utils_1.getViteConfigPath)(tree, projectDetails.root);
|
|
12
12
|
const configValues = {
|
|
@@ -53,7 +53,7 @@ function buildPostTargetTransformer(target, tree, projectDetails, inferredTarget
|
|
|
53
53
|
removePropertiesFromTargetOptions(tree, target.options, viteConfigPath, projectDetails.root, configValues['default'], true);
|
|
54
54
|
}
|
|
55
55
|
if (target.outputs) {
|
|
56
|
-
(0,
|
|
56
|
+
(0, internal_1.processTargetOutputs)(target, [{ newName: 'outDir', oldName: 'outputPath' }], inferredTargetConfiguration, {
|
|
57
57
|
projectName: projectDetails.projectName,
|
|
58
58
|
projectRoot: projectDetails.root,
|
|
59
59
|
});
|
package/{src → dist/src}/generators/convert-to-inferred/lib/preview-post-target-transformer.d.ts
RENAMED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { type TargetConfiguration, type Tree } from '@nx/devkit';
|
|
2
|
-
import { AggregatedLog } from '@nx/devkit/
|
|
2
|
+
import { AggregatedLog } from '@nx/devkit/internal';
|
|
3
3
|
export declare function previewPostTargetTransformer(migrationLogs: AggregatedLog): (target: TargetConfiguration, tree: Tree, projectDetails: {
|
|
4
4
|
projectName: string;
|
|
5
5
|
root: string;
|
|
6
6
|
}, inferredTargetConfiguration: TargetConfiguration) => TargetConfiguration<any>;
|
|
7
|
-
//# sourceMappingURL=preview-post-target-transformer.d.ts.map
|
package/{src → dist/src}/generators/convert-to-inferred/lib/serve-post-target-transformer.d.ts
RENAMED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { type TargetConfiguration, type Tree } from '@nx/devkit';
|
|
2
|
-
import { AggregatedLog } from '@nx/devkit/
|
|
2
|
+
import { AggregatedLog } from '@nx/devkit/internal';
|
|
3
3
|
export declare function servePostTargetTransformer(migrationLogs: AggregatedLog): (target: TargetConfiguration, tree: Tree, projectDetails: {
|
|
4
4
|
projectName: string;
|
|
5
5
|
root: string;
|
|
6
6
|
}, inferredTargetConfiguration: TargetConfiguration) => TargetConfiguration<any>;
|
|
7
|
-
//# sourceMappingURL=serve-post-target-transformer.d.ts.map
|
|
@@ -2,4 +2,3 @@ import { type Tree } from '@nx/devkit';
|
|
|
2
2
|
export declare function toProjectRelativePath(path: string, projectRoot: string): string;
|
|
3
3
|
export declare function getViteConfigPath(tree: Tree, root: string): string;
|
|
4
4
|
export declare function addConfigValuesToViteConfig(tree: Tree, configFile: string, configValues: Record<string, Record<string, unknown>>): void;
|
|
5
|
-
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -4,4 +4,3 @@ export declare function updateNxJsonSettings(tree: Tree): void;
|
|
|
4
4
|
export declare function initGenerator(tree: Tree, schema: InitGeneratorSchema): Promise<GeneratorCallback>;
|
|
5
5
|
export declare function initGeneratorInternal(tree: Tree, schema: InitGeneratorSchema): Promise<GeneratorCallback>;
|
|
6
6
|
export default initGenerator;
|
|
7
|
-
//# sourceMappingURL=init.d.ts.map
|
|
@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.updateNxJsonSettings = updateNxJsonSettings;
|
|
4
4
|
exports.initGenerator = initGenerator;
|
|
5
5
|
exports.initGeneratorInternal = initGeneratorInternal;
|
|
6
|
+
const internal_1 = require("@nx/devkit/internal");
|
|
6
7
|
const devkit_1 = require("@nx/devkit");
|
|
7
|
-
const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
|
|
8
8
|
const setup_paths_plugin_1 = require("../setup-paths-plugin/setup-paths-plugin");
|
|
9
9
|
const plugin_1 = require("../../plugins/plugin");
|
|
10
10
|
const utils_1 = require("./lib/utils");
|
|
@@ -27,9 +27,8 @@ async function initGeneratorInternal(tree, schema) {
|
|
|
27
27
|
nxJson.useInferencePlugins !== false;
|
|
28
28
|
schema.addPlugin ??= addPluginDefault;
|
|
29
29
|
if (schema.addPlugin) {
|
|
30
|
-
await (0,
|
|
30
|
+
await (0, internal_1.addPlugin)(tree, await (0, devkit_1.createProjectGraphAsync)(), '@nx/vite/plugin', plugin_1.createNodesV2, {
|
|
31
31
|
buildTargetName: ['build', 'vite:build', 'vite-build'],
|
|
32
|
-
testTargetName: ['test', 'vite:test', 'vite-test'],
|
|
33
32
|
serveTargetName: ['serve', 'vite:serve', 'vite-serve'],
|
|
34
33
|
devTargetName: ['dev', 'vite:dev', 'vite-dev'],
|
|
35
34
|
previewTargetName: ['preview', 'vite:preview', 'vite-preview'],
|
|
@@ -2,4 +2,3 @@ import { Tree } from '@nx/devkit';
|
|
|
2
2
|
import { InitGeneratorSchema } from '../schema';
|
|
3
3
|
export declare function checkDependenciesInstalled(host: Tree, schema: InitGeneratorSchema): Promise<import("@nx/devkit").GeneratorCallback>;
|
|
4
4
|
export declare function moveToDevDependencies(tree: Tree): () => void;
|
|
5
|
-
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.checkDependenciesInstalled = checkDependenciesInstalled;
|
|
4
4
|
exports.moveToDevDependencies = moveToDevDependencies;
|
|
5
5
|
const devkit_1 = require("@nx/devkit");
|
|
6
|
-
const
|
|
6
|
+
const internal_1 = require("@nx/js/internal");
|
|
7
7
|
const semver_1 = require("semver");
|
|
8
|
-
const
|
|
8
|
+
const versions_1 = require("../../../utils/versions");
|
|
9
9
|
const version_utils_1 = require("../../../utils/version-utils");
|
|
10
10
|
function hasIncompatibleInstalledEsbuild(host) {
|
|
11
11
|
const installedEsbuildVersion = (0, devkit_1.getDependencyVersionFromPackageJson)(host, 'esbuild');
|
|
@@ -13,7 +13,7 @@ function hasIncompatibleInstalledEsbuild(host) {
|
|
|
13
13
|
return false;
|
|
14
14
|
}
|
|
15
15
|
try {
|
|
16
|
-
return !(0, semver_1.intersects)(installedEsbuildVersion,
|
|
16
|
+
return !(0, semver_1.intersects)(installedEsbuildVersion, internal_1.esbuildVersion, {
|
|
17
17
|
includePrerelease: true,
|
|
18
18
|
});
|
|
19
19
|
}
|
|
@@ -22,7 +22,6 @@ function hasIncompatibleInstalledEsbuild(host) {
|
|
|
22
22
|
}
|
|
23
23
|
}
|
|
24
24
|
async function checkDependenciesInstalled(host, schema) {
|
|
25
|
-
const { vitest } = await (0, version_utils_1.getVitestDependenciesVersionsToInstall)(host);
|
|
26
25
|
// Determine which vite version to install:
|
|
27
26
|
// 1. Explicit flags take priority (useViteV5/V6/V7)
|
|
28
27
|
// 2. If vite is already installed, keep the matching major version
|
|
@@ -36,30 +35,28 @@ async function checkDependenciesInstalled(host, schema) {
|
|
|
36
35
|
title: 'Installed esbuild is incompatible with Vite 8. Using Vite 7.',
|
|
37
36
|
bodyLines: [
|
|
38
37
|
`Found esbuild version "${installedEsbuildVersion}" in the workspace root package.json.`,
|
|
39
|
-
`Update esbuild to a range compatible with ${
|
|
38
|
+
`Update esbuild to a range compatible with ${internal_1.esbuildVersion} if you want newly generated Vite projects to use Vite 8 by default.`,
|
|
40
39
|
],
|
|
41
40
|
});
|
|
42
41
|
}
|
|
43
42
|
const viteVersionToInstall = schema.useViteV5
|
|
44
|
-
?
|
|
43
|
+
? versions_1.viteV5Version
|
|
45
44
|
: schema.useViteV6
|
|
46
|
-
?
|
|
45
|
+
? versions_1.viteV6Version
|
|
47
46
|
: schema.useViteV7 ||
|
|
48
47
|
installedMajor === 7 ||
|
|
49
48
|
useViteV7ForEsbuildCompatibility
|
|
50
|
-
?
|
|
49
|
+
? versions_1.viteV7Version
|
|
51
50
|
: installedMajor === 6
|
|
52
|
-
?
|
|
51
|
+
? versions_1.viteV6Version
|
|
53
52
|
: installedMajor === 5
|
|
54
|
-
?
|
|
55
|
-
:
|
|
53
|
+
? versions_1.viteV5Version
|
|
54
|
+
: versions_1.viteVersion;
|
|
56
55
|
return (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
|
|
57
|
-
'@nx/vite':
|
|
58
|
-
'@nx/web':
|
|
56
|
+
'@nx/vite': versions_1.nxVersion,
|
|
57
|
+
'@nx/web': versions_1.nxVersion,
|
|
59
58
|
vite: viteVersionToInstall,
|
|
60
|
-
|
|
61
|
-
'@vitest/ui': vitest,
|
|
62
|
-
jiti: versions_2.jitiVersion,
|
|
59
|
+
jiti: versions_1.jitiVersion,
|
|
63
60
|
}, undefined, schema.keepExistingVersions);
|
|
64
61
|
}
|
|
65
62
|
function moveToDevDependencies(tree) {
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
#### Add Vite Temp Files to Git Ignore
|
|
2
|
+
|
|
3
|
+
Add gitignore entry for temporary vite config files.
|
|
4
|
+
|
|
5
|
+
#### Sample Code Changes
|
|
6
|
+
|
|
7
|
+
Adds the following entries to the `.gitignore` file.
|
|
8
|
+
|
|
9
|
+
```text title=".gitignore"
|
|
10
|
+
vite.config.*.timestamp*
|
|
11
|
+
vitest.config.*.timestamp*
|
|
12
|
+
```
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.default = default_1;
|
|
4
|
+
const devkit_1 = require("@nx/devkit");
|
|
5
|
+
const ignore_vite_temp_files_1 = require("../../utils/ignore-vite-temp-files");
|
|
6
|
+
const versions_1 = require("../../utils/versions");
|
|
7
|
+
async function default_1(tree) {
|
|
8
|
+
if (!(0, ignore_vite_temp_files_1.isEslintInstalled)(tree)) {
|
|
9
|
+
return;
|
|
10
|
+
}
|
|
11
|
+
(0, devkit_1.ensurePackage)('@nx/eslint', versions_1.nxVersion);
|
|
12
|
+
// CommonJS `require` instead of dynamic ESM `import` — `ensurePackage`
|
|
13
|
+
// exposes the temp install via `Module._initPaths`, which ESM ignores.
|
|
14
|
+
const { addIgnoresToLintConfig, isEslintConfigSupported, useFlatConfig, } = require('@nx/eslint/internal');
|
|
15
|
+
if (!isEslintConfigSupported(tree)) {
|
|
16
|
+
return;
|
|
17
|
+
}
|
|
18
|
+
const isUsingFlatConfig = useFlatConfig(tree);
|
|
19
|
+
if (isUsingFlatConfig) {
|
|
20
|
+
// using flat config, so we update the root eslint config
|
|
21
|
+
addIgnoresToLintConfig(tree, '', [
|
|
22
|
+
'**/vite.config.*.timestamp*',
|
|
23
|
+
'**/vitest.config.*.timestamp*',
|
|
24
|
+
]);
|
|
25
|
+
}
|
|
26
|
+
else {
|
|
27
|
+
// not using flat config, so we update each project's eslint config
|
|
28
|
+
const projects = (0, devkit_1.getProjects)(tree);
|
|
29
|
+
for (const [, { root: projectRoot }] of projects) {
|
|
30
|
+
const viteConfigFiles = await (0, devkit_1.globAsync)(tree, [
|
|
31
|
+
`${projectRoot}/**/{vite,vitest}.config.{js,ts,mjs,mts,cjs,cts}`,
|
|
32
|
+
]);
|
|
33
|
+
if (!viteConfigFiles.length) {
|
|
34
|
+
// the project doesn't use vite or vitest, so we skip it
|
|
35
|
+
continue;
|
|
36
|
+
}
|
|
37
|
+
addIgnoresToLintConfig(tree, projectRoot, [
|
|
38
|
+
'**/vite.config.*.timestamp*',
|
|
39
|
+
'**/vitest.config.*.timestamp*',
|
|
40
|
+
]);
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
await (0, devkit_1.formatFiles)(tree);
|
|
44
|
+
}
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
#### Sample Code Changes
|
|
2
|
+
|
|
3
|
+
Add `vite.config.*.timestamp*` and `vitest.config.*.timestamp*` to the root `eslint.config.mjs` file (using **ESLint Flat Config**).
|
|
4
|
+
|
|
5
|
+
##### Before
|
|
6
|
+
|
|
7
|
+
```js title="eslint.config.mjs"
|
|
8
|
+
export default [
|
|
9
|
+
{
|
|
10
|
+
ignores: ['dist'],
|
|
11
|
+
},
|
|
12
|
+
];
|
|
13
|
+
```
|
|
14
|
+
|
|
15
|
+
##### After
|
|
16
|
+
|
|
17
|
+
```js title="eslint.config.mjs" {3}
|
|
18
|
+
export default [
|
|
19
|
+
{
|
|
20
|
+
ignores: ['dist', 'vite.config.*.timestamp*', 'vitest.config.*.timestamp*'],
|
|
21
|
+
},
|
|
22
|
+
];
|
|
23
|
+
```
|
|
24
|
+
|
|
25
|
+
Add `vite.config.*.timestamp*` and `vitest.config.*.timestamp*` to the project's `.eslintrc.json` file (using **eslintrc** format config).
|
|
26
|
+
|
|
27
|
+
##### Before
|
|
28
|
+
|
|
29
|
+
```json title="apps/app1/eslintrc.json"
|
|
30
|
+
{
|
|
31
|
+
"ignorePatterns": ["!**/*"]
|
|
32
|
+
}
|
|
33
|
+
```
|
|
34
|
+
|
|
35
|
+
##### After
|
|
36
|
+
|
|
37
|
+
```json title="apps/app1/eslintrc.json" {4-5}
|
|
38
|
+
{
|
|
39
|
+
"ignorePatterns": [
|
|
40
|
+
"!**/*",
|
|
41
|
+
"vite.config.*.timestamp*",
|
|
42
|
+
"vitest.config.*.timestamp*"
|
|
43
|
+
]
|
|
44
|
+
}
|
|
45
|
+
```
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
#### Installs the `jiti` package
|
|
2
|
+
|
|
3
|
+
This migration ensures that the [`jiti`](https://github.com/unjs/jiti) package is installed.
|
|
4
|
+
This is a requirement for Vite to parse `postcss` configuration files that use TypeScript.
|
|
5
|
+
|
|
6
|
+
Learn more: [https://vite.dev/guide/migration#postcss-load-config](https://vite.dev/guide/migration#postcss-load-config)
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
#### Update `resolve.conditions` to include defaults
|
|
2
|
+
|
|
3
|
+
In previous Vite versions, the `resolve.conditions` option had defaults that were added internally (i.e. `['module', 'browser', 'development|production']`).
|
|
4
|
+
This default was removed in Vite 6, so this migration adds it to your existing configuration to ensure that the behavior remains intact.
|
|
5
|
+
|
|
6
|
+
Learn more: [https://vite.dev/guide/migration#default-value-for-resolve-conditions](https://vite.dev/guide/migration#default-value-for-resolve-conditions)
|
|
7
|
+
|
|
8
|
+
:::note[Remix]
|
|
9
|
+
Remix does not currently support Vite 6 and therefore any `vite.config` file for Remix will not be migrated.
|
|
10
|
+
:::
|
|
11
|
+
|
|
12
|
+
#### Sample Code Changes
|
|
13
|
+
|
|
14
|
+
##### Before
|
|
15
|
+
|
|
16
|
+
```typescript title="vite.config.ts"
|
|
17
|
+
import { defineConfig } from 'vite';
|
|
18
|
+
|
|
19
|
+
export default defineConfig({
|
|
20
|
+
resolve: {
|
|
21
|
+
conditions: ['require'],
|
|
22
|
+
},
|
|
23
|
+
build: {
|
|
24
|
+
outDir: 'dist',
|
|
25
|
+
},
|
|
26
|
+
});
|
|
27
|
+
```
|
|
28
|
+
|
|
29
|
+
##### After
|
|
30
|
+
|
|
31
|
+
```typescript title="vite.config.ts" {4-6}
|
|
32
|
+
import { defineConfig } from 'vite';
|
|
33
|
+
|
|
34
|
+
export default defineConfig({
|
|
35
|
+
resolve: {
|
|
36
|
+
conditions: ['require', 'module', 'browser', 'development|production'],
|
|
37
|
+
},
|
|
38
|
+
build: {
|
|
39
|
+
outDir: 'dist',
|
|
40
|
+
},
|
|
41
|
+
});
|
|
42
|
+
```
|
|
@@ -9,4 +9,3 @@ import { type GeneratorCallback, type Tree } from '@nx/devkit';
|
|
|
9
9
|
* 4. Migrates targetDefaults from @nx/vite:test to @nx/vitest:test
|
|
10
10
|
*/
|
|
11
11
|
export default function migrateVitestToVitestPackage(tree: Tree): Promise<GeneratorCallback>;
|
|
12
|
-
//# sourceMappingURL=migrate-vitest-to-vitest-package.d.ts.map
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.default = migrateVitestToVitestPackage;
|
|
4
|
+
const internal_1 = require("@nx/devkit/internal");
|
|
4
5
|
const devkit_1 = require("@nx/devkit");
|
|
5
|
-
const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
|
|
6
6
|
const versions_1 = require("../../utils/versions");
|
|
7
7
|
/**
|
|
8
8
|
* Migrates Vitest usage from @nx/vite to @nx/vitest package.
|
|
@@ -32,7 +32,7 @@ function installVitestPackageIfNeeded(tree) {
|
|
|
32
32
|
}
|
|
33
33
|
function migrateExecutorUsages(tree) {
|
|
34
34
|
const projectsToUpdate = new Set();
|
|
35
|
-
(0,
|
|
35
|
+
(0, internal_1.forEachExecutorOptions)(tree, '@nx/vite:test', (_options, projectName, _targetName, _configuration) => {
|
|
36
36
|
projectsToUpdate.add(projectName);
|
|
37
37
|
});
|
|
38
38
|
for (const projectName of projectsToUpdate) {
|
|
@@ -119,19 +119,35 @@ function migrateTargetDefaults(tree) {
|
|
|
119
119
|
return;
|
|
120
120
|
}
|
|
121
121
|
let hasChanges = false;
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
122
|
+
if (Array.isArray(nxJson.targetDefaults)) {
|
|
123
|
+
for (const entry of nxJson.targetDefaults) {
|
|
124
|
+
// Pattern A: an executor entry for @nx/vite:test
|
|
125
|
+
if (entry.executor === '@nx/vite:test' && entry.target === undefined) {
|
|
126
|
+
entry.executor = '@nx/vitest:test';
|
|
127
|
+
hasChanges = true;
|
|
128
|
+
}
|
|
129
|
+
// Pattern B: a target entry whose executor field references @nx/vite:test
|
|
130
|
+
else if (entry.executor === '@nx/vite:test') {
|
|
131
|
+
entry.executor = '@nx/vitest:test';
|
|
132
|
+
hasChanges = true;
|
|
133
|
+
}
|
|
130
134
|
}
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
+
}
|
|
136
|
+
else {
|
|
137
|
+
for (const [targetOrExecutor, targetConfig] of Object.entries(nxJson.targetDefaults)) {
|
|
138
|
+
// Pattern A: Executor-keyed (e.g., "@nx/vite:test": { ... })
|
|
139
|
+
if (targetOrExecutor === '@nx/vite:test') {
|
|
140
|
+
// Move config to new executor key
|
|
141
|
+
nxJson.targetDefaults['@nx/vitest:test'] ??= {};
|
|
142
|
+
Object.assign(nxJson.targetDefaults['@nx/vitest:test'], targetConfig);
|
|
143
|
+
delete nxJson.targetDefaults['@nx/vite:test'];
|
|
144
|
+
hasChanges = true;
|
|
145
|
+
}
|
|
146
|
+
// Pattern B: Target-name-keyed (e.g., "test": { "executor": "@nx/vite:test", ... })
|
|
147
|
+
else if (targetConfig.executor === '@nx/vite:test') {
|
|
148
|
+
targetConfig.executor = '@nx/vitest:test';
|
|
149
|
+
hasChanges = true;
|
|
150
|
+
}
|
|
135
151
|
}
|
|
136
152
|
}
|
|
137
153
|
if (hasChanges) {
|