@nx/vite 23.0.0-beta.4 → 23.0.0-beta.6
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/package.json +5 -5
- package/src/executors/build/build.impl.d.ts.map +1 -1
- package/src/executors/build/build.impl.js +3 -3
- package/src/generators/convert-to-inferred/convert-to-inferred.js +4 -5
- package/src/generators/convert-to-inferred/lib/build-post-target-transformer.d.ts.map +1 -1
- package/src/generators/convert-to-inferred/lib/build-post-target-transformer.js +2 -2
- package/src/generators/convert-to-inferred/lib/preview-post-target-transformer.d.ts +1 -1
- package/src/generators/convert-to-inferred/lib/preview-post-target-transformer.d.ts.map +1 -1
- package/src/generators/convert-to-inferred/lib/serve-post-target-transformer.d.ts +1 -1
- package/src/generators/convert-to-inferred/lib/serve-post-target-transformer.d.ts.map +1 -1
- package/src/generators/convert-to-inferred/lib/test-post-target-transformer.js +2 -2
- package/src/generators/init/init.d.ts.map +1 -1
- package/src/generators/init/init.js +2 -2
- package/src/migrations/update-22-2-0/migrate-vitest-to-vitest-package.d.ts.map +1 -1
- package/src/migrations/update-22-2-0/migrate-vitest-to-vitest-package.js +2 -2
- package/src/plugins/plugin.d.ts.map +1 -1
- package/src/plugins/plugin.js +13 -20
- package/src/utils/e2e-web-server-info-utils.d.ts +2 -2
- package/src/utils/e2e-web-server-info-utils.d.ts.map +1 -1
- package/src/utils/e2e-web-server-info-utils.js +3 -3
- package/src/utils/generator-utils.d.ts.map +1 -1
- package/src/utils/generator-utils.js +2 -2
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nx/vite",
|
|
3
|
-
"version": "23.0.0-beta.
|
|
3
|
+
"version": "23.0.0-beta.6",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The Nx Plugin for building and testing applications using Vite",
|
|
6
6
|
"repository": {
|
|
@@ -31,11 +31,11 @@
|
|
|
31
31
|
"migrations": "./migrations.json"
|
|
32
32
|
},
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@nx/devkit": "23.0.0-beta.
|
|
34
|
+
"@nx/devkit": "23.0.0-beta.6",
|
|
35
35
|
"@phenomnomnominal/tsquery": "~6.1.4",
|
|
36
36
|
"enquirer": "~2.3.6",
|
|
37
|
-
"@nx/js": "23.0.0-beta.
|
|
38
|
-
"@nx/vitest": "23.0.0-beta.
|
|
37
|
+
"@nx/js": "23.0.0-beta.6",
|
|
38
|
+
"@nx/vitest": "23.0.0-beta.6",
|
|
39
39
|
"picomatch": "4.0.4",
|
|
40
40
|
"tsconfig-paths": "^4.1.2",
|
|
41
41
|
"semver": "^7.6.3",
|
|
@@ -43,7 +43,7 @@
|
|
|
43
43
|
"ajv": "^8.0.0"
|
|
44
44
|
},
|
|
45
45
|
"devDependencies": {
|
|
46
|
-
"nx": "23.0.0-beta.
|
|
46
|
+
"nx": "23.0.0-beta.6"
|
|
47
47
|
},
|
|
48
48
|
"peerDependencies": {
|
|
49
49
|
"vite": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/vite/src/executors/build/build.impl.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"build.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/vite/src/executors/build/build.impl.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,eAAe,EAMhB,MAAM,YAAY,CAAC;AAKpB,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AAiBpD,wBAAuB,iBAAiB,CACtC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,wBAAwB,EACvD,OAAO,EAAE,eAAe;aA+EgB,OAAO;cAAY,MAAM;aAmIlE;AAED,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,wBAAwB,GAChC,OAAO,CAAC;IAET,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACtC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACnC,CAAC,CAuDD;AAED,eAAe,iBAAiB,CAAC"}
|
|
@@ -35,12 +35,12 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
36
|
exports.viteBuildExecutor = viteBuildExecutor;
|
|
37
37
|
exports.getBuildExtraArgs = getBuildExtraArgs;
|
|
38
|
+
const internal_1 = require("@nx/devkit/internal");
|
|
38
39
|
const devkit_1 = require("@nx/devkit");
|
|
39
40
|
const options_utils_1 = require("../../utils/options-utils");
|
|
40
41
|
const js_1 = require("@nx/js");
|
|
41
42
|
const fs_1 = require("fs");
|
|
42
43
|
const path_1 = require("path");
|
|
43
|
-
const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
|
|
44
44
|
const executor_utils_1 = require("../../utils/executor-utils");
|
|
45
45
|
const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
|
|
46
46
|
async function* viteBuildExecutor(options, context) {
|
|
@@ -150,7 +150,7 @@ async function* viteBuildExecutor(options, context) {
|
|
|
150
150
|
],
|
|
151
151
|
}, context);
|
|
152
152
|
}
|
|
153
|
-
const iterable = (0,
|
|
153
|
+
const iterable = (0, internal_1.createAsyncIterable)(({ next, done }) => {
|
|
154
154
|
if ('on' in watcherOrOutput) {
|
|
155
155
|
let success = true;
|
|
156
156
|
watcherOrOutput.on('event', (event) => {
|
|
@@ -180,7 +180,7 @@ async function* viteBuildExecutor(options, context) {
|
|
|
180
180
|
});
|
|
181
181
|
iterables.push(iterable);
|
|
182
182
|
}
|
|
183
|
-
return yield* (0,
|
|
183
|
+
return yield* (0, internal_1.combineAsyncIterables)(iterables.shift(), ...(iterables ?? []));
|
|
184
184
|
}
|
|
185
185
|
async function getBuildExtraArgs(options) {
|
|
186
186
|
// support passing extra args to vite cli
|
|
@@ -2,17 +2,16 @@
|
|
|
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
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
11
|
async function convertToInferred(tree, options) {
|
|
13
12
|
const projectGraph = await (0, devkit_1.createProjectGraphAsync)();
|
|
14
|
-
const migrationLogs = new
|
|
15
|
-
const migratedProjects = await (0,
|
|
13
|
+
const migrationLogs = new internal_1.AggregatedLog();
|
|
14
|
+
const migratedProjects = await (0, internal_1.migrateProjectExecutorsToPlugin)(tree, projectGraph, '@nx/vite/plugin', plugin_1.createNodesV2, {
|
|
16
15
|
buildTargetName: 'build',
|
|
17
16
|
serveTargetName: 'serve',
|
|
18
17
|
previewTargetName: 'preview',
|
|
@@ -41,7 +40,7 @@ async function convertToInferred(tree, options) {
|
|
|
41
40
|
},
|
|
42
41
|
], options.project);
|
|
43
42
|
if (migratedProjects.size === 0) {
|
|
44
|
-
throw new
|
|
43
|
+
throw new internal_1.NoTargetsToMigrateError();
|
|
45
44
|
}
|
|
46
45
|
if (!options.skipFormat) {
|
|
47
46
|
await (0, devkit_1.formatFiles)(tree);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-post-target-transformer.d.ts","sourceRoot":"","sources":["../../../../../../../packages/vite/src/generators/convert-to-inferred/lib/build-post-target-transformer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"build-post-target-transformer.d.ts","sourceRoot":"","sources":["../../../../../../../packages/vite/src/generators/convert-to-inferred/lib/build-post-target-transformer.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,KAAK,mBAAmB,EACxB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AASpB,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,mBAAmB,EAC3B,IAAI,EAAE,IAAI,EACV,cAAc,EAAE;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EACrD,2BAA2B,EAAE,mBAAmB,4BAmGjD;AA+CD,wBAAgB,mCAAmC,CACjD,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,QA0FnB"}
|
|
@@ -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
|
});
|
|
@@ -1,5 +1,5 @@
|
|
|
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;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preview-post-target-transformer.d.ts","sourceRoot":"","sources":["../../../../../../../packages/vite/src/generators/convert-to-inferred/lib/preview-post-target-transformer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,mBAAmB,EAAE,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"preview-post-target-transformer.d.ts","sourceRoot":"","sources":["../../../../../../../packages/vite/src/generators/convert-to-inferred/lib/preview-post-target-transformer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,mBAAmB,EAAE,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGpD,wBAAgB,4BAA4B,CAAC,aAAa,EAAE,aAAa,IAErE,QAAQ,mBAAmB,EAC3B,MAAM,IAAI,EACV,gBAAgB;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EACrD,6BAA6B,mBAAmB,8BAuCnD"}
|
|
@@ -1,5 +1,5 @@
|
|
|
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;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serve-post-target-transformer.d.ts","sourceRoot":"","sources":["../../../../../../../packages/vite/src/generators/convert-to-inferred/lib/serve-post-target-transformer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,mBAAmB,EAAE,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"serve-post-target-transformer.d.ts","sourceRoot":"","sources":["../../../../../../../packages/vite/src/generators/convert-to-inferred/lib/serve-post-target-transformer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,mBAAmB,EAAE,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGpD,wBAAgB,0BAA0B,CAAC,aAAa,EAAE,aAAa,IAEnE,QAAQ,mBAAmB,EAC3B,MAAM,IAAI,EACV,gBAAgB;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EACrD,6BAA6B,mBAAmB,8BA8CnD"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.testPostTargetTransformer = testPostTargetTransformer;
|
|
4
|
+
const internal_1 = require("@nx/devkit/internal");
|
|
4
5
|
const utils_1 = require("./utils");
|
|
5
|
-
const plugin_migration_utils_1 = require("@nx/devkit/src/generators/plugin-migrations/plugin-migration-utils");
|
|
6
6
|
function testPostTargetTransformer(target, tree, projectDetails, inferredTargetConfiguration) {
|
|
7
7
|
if (target.options) {
|
|
8
8
|
removePropertiesFromTargetOptions(target.options, projectDetails.root);
|
|
@@ -24,7 +24,7 @@ function testPostTargetTransformer(target, tree, projectDetails, inferredTargetC
|
|
|
24
24
|
}
|
|
25
25
|
}
|
|
26
26
|
if (target.outputs) {
|
|
27
|
-
(0,
|
|
27
|
+
(0, internal_1.processTargetOutputs)(target, [{ newName: 'coverage.reportsDirectory', oldName: 'reportsDirectory' }], inferredTargetConfiguration, {
|
|
28
28
|
projectName: projectDetails.projectName,
|
|
29
29
|
projectRoot: projectDetails.root,
|
|
30
30
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/vite/src/generators/init/init.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/vite/src/generators/init/init.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,iBAAiB,EAGjB,IAAI,EAEL,MAAM,YAAY,CAAC;AAIpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAI/C,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,QAe9C;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,mBAAmB,8BAEpE;AAED,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,mBAAmB,8BA2D5B;AAED,eAAe,aAAa,CAAC"}
|
|
@@ -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,7 +27,7 @@ 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
32
|
testTargetName: ['test', 'vite:test', 'vite-test'],
|
|
33
33
|
serveTargetName: ['serve', 'vite:serve', 'vite-serve'],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrate-vitest-to-vitest-package.d.ts","sourceRoot":"","sources":["../../../../../../packages/vite/src/migrations/update-22-2-0/migrate-vitest-to-vitest-package.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"migrate-vitest-to-vitest-package.d.ts","sourceRoot":"","sources":["../../../../../../packages/vite/src/migrations/update-22-2-0/migrate-vitest-to-vitest-package.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,iBAAiB,EAItB,KAAK,IAAI,EAGV,MAAM,YAAY,CAAC;AAWpB;;;;;;;;GAQG;AACH,wBAA8B,4BAA4B,CACxD,IAAI,EAAE,IAAI,GACT,OAAO,CAAC,iBAAiB,CAAC,CAS5B"}
|
|
@@ -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) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/vite/src/plugins/plugin.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/vite/src/plugins/plugin.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,kBAAkB,EAGlB,aAAa,EAOd,MAAM,YAAY,CAAC;AAiBpB,MAAM,WAAW,iBAAiB;IAChC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,SAAS,CAAC;IACtC,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAE7B;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAOD;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAIF,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,iBAAiB,CAqHxD,CAAC;AAEF,eAAO,MAAM,aAAa,kCAAc,CAAC"}
|
package/src/plugins/plugin.js
CHANGED
|
@@ -34,11 +34,10 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
34
34
|
})();
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
36
|
exports.createNodesV2 = exports.createNodes = exports.createDependencies = void 0;
|
|
37
|
+
const internal_1 = require("@nx/devkit/internal");
|
|
37
38
|
const devkit_1 = require("@nx/devkit");
|
|
38
|
-
const calculate_hash_for_create_nodes_1 = require("@nx/devkit/src/utils/calculate-hash-for-create-nodes");
|
|
39
|
-
const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
|
|
40
39
|
const js_1 = require("@nx/js");
|
|
41
|
-
const
|
|
40
|
+
const internal_2 = require("@nx/js/src/internal");
|
|
42
41
|
const util_1 = require("@nx/js/src/plugins/typescript/util");
|
|
43
42
|
const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
|
|
44
43
|
const node_fs_1 = require("node:fs");
|
|
@@ -48,14 +47,6 @@ const cache_directory_1 = require("nx/src/utils/cache-directory");
|
|
|
48
47
|
const plugins_1 = require("nx/src/utils/plugins");
|
|
49
48
|
const executor_utils_1 = require("../utils/executor-utils");
|
|
50
49
|
const picomatch = require("picomatch");
|
|
51
|
-
function readTargetsCache(cachePath) {
|
|
52
|
-
return process.env.NX_CACHE_PROJECT_GRAPH !== 'false' && (0, node_fs_1.existsSync)(cachePath)
|
|
53
|
-
? (0, devkit_1.readJsonFile)(cachePath)
|
|
54
|
-
: {};
|
|
55
|
-
}
|
|
56
|
-
function writeTargetsToCache(cachePath, results) {
|
|
57
|
-
(0, devkit_1.writeJsonFile)(cachePath, results);
|
|
58
|
-
}
|
|
59
50
|
/**
|
|
60
51
|
* @deprecated The 'createDependencies' function is now a no-op. This functionality is included in 'createNodesV2'.
|
|
61
52
|
*/
|
|
@@ -70,7 +61,7 @@ exports.createNodes = [
|
|
|
70
61
|
const optionsHash = (0, file_hasher_1.hashObject)(options);
|
|
71
62
|
const normalizedOptions = normalizeOptions(options);
|
|
72
63
|
const cachePath = (0, node_path_1.join)(cache_directory_1.workspaceDataDirectory, `vite-${optionsHash}.hash`);
|
|
73
|
-
const targetsCache =
|
|
64
|
+
const targetsCache = new internal_1.PluginCache(cachePath);
|
|
74
65
|
const isUsingTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)();
|
|
75
66
|
const { roots: projectRoots, configFiles: validConfigFiles } = configFilePaths.reduce((acc, configFile) => {
|
|
76
67
|
const potentialRoot = (0, node_path_1.dirname)(configFile);
|
|
@@ -87,7 +78,7 @@ exports.createNodes = [
|
|
|
87
78
|
const pmc = (0, devkit_1.getPackageManagerCommand)(detectedPackageManager);
|
|
88
79
|
const lockfile = (0, js_1.getLockFileName)(detectedPackageManager);
|
|
89
80
|
const tsconfigChainsByProjectRoot = collectTsconfigInputsByProjectRoot(projectRoots, context.workspaceRoot);
|
|
90
|
-
const hashes = await (0,
|
|
81
|
+
const hashes = await (0, internal_1.calculateHashesForCreateNodes)(projectRoots, { ...normalizedOptions, isUsingTsSolutionSetup }, context, projectRoots.map((root) => [
|
|
91
82
|
lockfile,
|
|
92
83
|
...(tsconfigChainsByProjectRoot.get(root) ?? []),
|
|
93
84
|
]));
|
|
@@ -108,8 +99,10 @@ exports.createNodes = [
|
|
|
108
99
|
// Adding the config file path to the hash ensures that the final hash value is different
|
|
109
100
|
// for different config files.
|
|
110
101
|
const hash = hashes[idx] + configFile;
|
|
111
|
-
|
|
112
|
-
await buildViteTargets(configFile, projectRoot, normalizedOptions, tsConfigFiles, hasReactRouterConfig, isUsingTsSolutionSetup, context, pmc, tsconfigChainsByProjectRoot.get(projectRoot) ?? []));
|
|
102
|
+
if (!targetsCache.has(hash)) {
|
|
103
|
+
targetsCache.set(hash, await buildViteTargets(configFile, projectRoot, normalizedOptions, tsConfigFiles, hasReactRouterConfig, isUsingTsSolutionSetup, context, pmc, tsconfigChainsByProjectRoot.get(projectRoot) ?? []));
|
|
104
|
+
}
|
|
105
|
+
const { projectType, metadata, targets } = targetsCache.get(hash);
|
|
113
106
|
const project = {
|
|
114
107
|
root: projectRoot,
|
|
115
108
|
targets,
|
|
@@ -128,7 +121,7 @@ exports.createNodes = [
|
|
|
128
121
|
}, validConfigFiles, options, context);
|
|
129
122
|
}
|
|
130
123
|
finally {
|
|
131
|
-
|
|
124
|
+
targetsCache.writeToDisk();
|
|
132
125
|
}
|
|
133
126
|
},
|
|
134
127
|
];
|
|
@@ -176,7 +169,7 @@ async function buildViteTargets(configFilePath, projectRoot, options, tsConfigFi
|
|
|
176
169
|
}, 'build');
|
|
177
170
|
let metadata = {};
|
|
178
171
|
const { buildOutputs, testOutputs, hasTest, isBuildable, hasServeConfig } = getOutputs(viteBuildConfig, projectRoot, context.workspaceRoot);
|
|
179
|
-
const namedInputs = (0,
|
|
172
|
+
const namedInputs = (0, internal_1.getNamedInputs)(projectRoot, context);
|
|
180
173
|
const targets = {};
|
|
181
174
|
// if file is vitest.config or vite.config has definition for test, create targets for test and/or atomized tests
|
|
182
175
|
if (configFilePath.includes('vitest.config') || hasTest) {
|
|
@@ -565,7 +558,7 @@ function collectTsconfigInputsByProjectRoot(projectRoots, workspaceRoot) {
|
|
|
565
558
|
// Walk the project tsconfig's extends chain
|
|
566
559
|
const projectTsconfig = (0, node_path_1.join)(workspaceRoot, projectRoot, 'tsconfig.json');
|
|
567
560
|
if ((0, node_fs_1.existsSync)(projectTsconfig)) {
|
|
568
|
-
(0,
|
|
561
|
+
(0, internal_2.walkTsconfigExtendsChain)(projectTsconfig, (absPath) => {
|
|
569
562
|
collect(absPath);
|
|
570
563
|
return 'continue';
|
|
571
564
|
}, { jsonCache });
|
|
@@ -576,7 +569,7 @@ function collectTsconfigInputsByProjectRoot(projectRoots, workspaceRoot) {
|
|
|
576
569
|
while (dir && dir !== '.') {
|
|
577
570
|
const ancestorTsconfig = (0, node_path_1.join)(workspaceRoot, dir, 'tsconfig.json');
|
|
578
571
|
if ((0, node_fs_1.existsSync)(ancestorTsconfig)) {
|
|
579
|
-
(0,
|
|
572
|
+
(0, internal_2.walkTsconfigExtendsChain)(ancestorTsconfig, (absPath) => {
|
|
580
573
|
collect(absPath);
|
|
581
574
|
return 'continue';
|
|
582
575
|
}, { jsonCache });
|
|
@@ -589,7 +582,7 @@ function collectTsconfigInputsByProjectRoot(projectRoots, workspaceRoot) {
|
|
|
589
582
|
// Check the workspace root itself (dirname loop above stops at '.')
|
|
590
583
|
const rootTsconfig = (0, node_path_1.join)(workspaceRoot, 'tsconfig.json');
|
|
591
584
|
if ((0, node_fs_1.existsSync)(rootTsconfig)) {
|
|
592
|
-
(0,
|
|
585
|
+
(0, internal_2.walkTsconfigExtendsChain)(rootTsconfig, (absPath) => {
|
|
593
586
|
collect(absPath);
|
|
594
587
|
return 'continue';
|
|
595
588
|
}, { jsonCache });
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { type Tree } from '@nx/devkit';
|
|
2
|
-
export declare function getViteE2EWebServerInfo(tree: Tree, projectName: string, configFilePath: string, isPluginBeingAdded: boolean, e2ePortOverride?: number, e2eCIPortOverride?: number): Promise<import("@nx/devkit/
|
|
3
|
-
export declare function getReactRouterE2EWebServerInfo(tree: Tree, projectName: string, configFilePath: string, isPluginBeingAdded: boolean, e2ePortOverride?: number, e2eCIPortOverride?: number): Promise<import("@nx/devkit/
|
|
2
|
+
export declare function getViteE2EWebServerInfo(tree: Tree, projectName: string, configFilePath: string, isPluginBeingAdded: boolean, e2ePortOverride?: number, e2eCIPortOverride?: number): Promise<import("@nx/devkit/internal").E2EWebServerDetails>;
|
|
3
|
+
export declare function getReactRouterE2EWebServerInfo(tree: Tree, projectName: string, configFilePath: string, isPluginBeingAdded: boolean, e2ePortOverride?: number, e2eCIPortOverride?: number): Promise<import("@nx/devkit/internal").E2EWebServerDetails>;
|
|
4
4
|
//# sourceMappingURL=e2e-web-server-info-utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"e2e-web-server-info-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/vite/src/utils/e2e-web-server-info-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAc,MAAM,YAAY,CAAC;AAGnD,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,kBAAkB,EAAE,OAAO,EAC3B,eAAe,CAAC,EAAE,MAAM,EACxB,iBAAiB,CAAC,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"e2e-web-server-info-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/vite/src/utils/e2e-web-server-info-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAc,MAAM,YAAY,CAAC;AAGnD,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,kBAAkB,EAAE,OAAO,EAC3B,eAAe,CAAC,EAAE,MAAM,EACxB,iBAAiB,CAAC,EAAE,MAAM,8DAkC3B;AAED,wBAAsB,8BAA8B,CAClD,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,kBAAkB,EAAE,OAAO,EAC3B,eAAe,CAAC,EAAE,MAAM,EACxB,iBAAiB,CAAC,EAAE,MAAM,8DAsB3B"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getViteE2EWebServerInfo = getViteE2EWebServerInfo;
|
|
4
4
|
exports.getReactRouterE2EWebServerInfo = getReactRouterE2EWebServerInfo;
|
|
5
5
|
const devkit_1 = require("@nx/devkit");
|
|
6
|
-
const
|
|
6
|
+
const internal_1 = require("@nx/devkit/internal");
|
|
7
7
|
async function getViteE2EWebServerInfo(tree, projectName, configFilePath, isPluginBeingAdded, e2ePortOverride, e2eCIPortOverride) {
|
|
8
8
|
const nxJson = (0, devkit_1.readNxJson)(tree);
|
|
9
9
|
let e2ePort = e2ePortOverride ?? 4200;
|
|
@@ -15,7 +15,7 @@ async function getViteE2EWebServerInfo(tree, projectName, configFilePath, isPlug
|
|
|
15
15
|
nxJson.targetDefaults?.['dev'].options?.port ??
|
|
16
16
|
nxJson.targetDefaults?.['serve'].options?.port;
|
|
17
17
|
}
|
|
18
|
-
return (0,
|
|
18
|
+
return (0, internal_1.getE2EWebServerInfo)(tree, projectName, {
|
|
19
19
|
plugin: '@nx/vite/plugin',
|
|
20
20
|
serveTargetName: 'devTargetName',
|
|
21
21
|
serveStaticTargetName: 'previewTargetName',
|
|
@@ -30,7 +30,7 @@ async function getViteE2EWebServerInfo(tree, projectName, configFilePath, isPlug
|
|
|
30
30
|
}
|
|
31
31
|
async function getReactRouterE2EWebServerInfo(tree, projectName, configFilePath, isPluginBeingAdded, e2ePortOverride, e2eCIPortOverride) {
|
|
32
32
|
const e2ePort = e2ePortOverride ?? parseInt(process.env.PORT) ?? 4200;
|
|
33
|
-
return await (0,
|
|
33
|
+
return await (0, internal_1.getE2EWebServerInfo)(tree, projectName, {
|
|
34
34
|
plugin: '@nx/react/router-plugin',
|
|
35
35
|
serveTargetName: 'devTargetName',
|
|
36
36
|
serveStaticTargetName: 'devTargetName',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/vite/src/utils/generator-utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"generator-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/vite/src/utils/generator-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,8 +13,8 @@ exports.normalizeViteConfigFilePathWithTree = normalizeViteConfigFilePathWithTre
|
|
|
13
13
|
exports.getViteConfigPathForProject = getViteConfigPathForProject;
|
|
14
14
|
exports.handleUnsupportedUserProvidedTargets = handleUnsupportedUserProvidedTargets;
|
|
15
15
|
exports.handleUnknownConfiguration = handleUnknownConfiguration;
|
|
16
|
+
const internal_1 = require("@nx/devkit/internal");
|
|
16
17
|
const devkit_1 = require("@nx/devkit");
|
|
17
|
-
const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
|
|
18
18
|
const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
|
|
19
19
|
const vite_config_edit_utils_1 = require("./vite-config-edit-utils");
|
|
20
20
|
function findExistingJsBuildTargetInProject(targets) {
|
|
@@ -92,7 +92,7 @@ function addOrChangeTestTarget(tree, options, hasPlugin) {
|
|
|
92
92
|
(0, devkit_1.updateProjectConfiguration)(tree, options.project, project);
|
|
93
93
|
}
|
|
94
94
|
function addBuildTarget(tree, options, target) {
|
|
95
|
-
(0,
|
|
95
|
+
(0, internal_1.addBuildTargetDefaults)(tree, '@nx/vite:build');
|
|
96
96
|
const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
|
|
97
97
|
const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
|
|
98
98
|
const buildOptions = {
|