@nx/vite 23.0.0-beta.2 → 23.0.0-beta.21
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
package/dist/PLUGIN.md
ADDED
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
# Vite with Vitest
|
|
2
|
+
|
|
3
|
+
After making changes to a project, run the relevant test file to verify your changes work correctly.
|
|
4
|
+
|
|
5
|
+
## Mode Detection
|
|
6
|
+
|
|
7
|
+
Check in order (first match wins):
|
|
8
|
+
|
|
9
|
+
| Mode | Detection |
|
|
10
|
+
| --------- | ---------------------------------------------------------- |
|
|
11
|
+
| Inference | `@nx/vitest` or `@nx/vite/plugin` in nx.json plugins array |
|
|
12
|
+
| Executor | `@nx/vitest:test` executor in project.json targets |
|
|
13
|
+
|
|
14
|
+
## Run Specific Test File
|
|
15
|
+
|
|
16
|
+
### Inference
|
|
17
|
+
|
|
18
|
+
```bash
|
|
19
|
+
nx test <project> -- <path/to/file.spec.ts>
|
|
20
|
+
```
|
|
21
|
+
|
|
22
|
+
### Executor
|
|
23
|
+
|
|
24
|
+
```bash
|
|
25
|
+
nx run <project>:test --testFile=<path/to/file.spec.ts>
|
|
26
|
+
```
|
|
27
|
+
|
|
28
|
+
## Quick Reference
|
|
29
|
+
|
|
30
|
+
| Task | Inference | Executor |
|
|
31
|
+
| ----------- | ----------------------------------- | ----------------------------------------------- |
|
|
32
|
+
| Run file | `nx test proj -- path/file.spec.ts` | `nx run proj:test --testFile=path/file.spec.ts` |
|
|
33
|
+
| Run pattern | `nx test proj -- -t "pattern"` | `nx run proj:test --testNamePattern="pattern"` |
|
|
@@ -4,6 +4,3 @@ export { type ViteDevServerExecutorOptions } from './src/executors/dev-server/sc
|
|
|
4
4
|
export { viteDevServerExecutor } from './src/executors/dev-server/dev-server.impl';
|
|
5
5
|
export { type VitePreviewServerExecutorOptions } from './src/executors/preview-server/schema';
|
|
6
6
|
export { vitePreviewServerExecutor } from './src/executors/preview-server/preview-server.impl';
|
|
7
|
-
export { type VitestExecutorOptions } from './src/executors/test/schema';
|
|
8
|
-
export { vitestExecutor } from './src/executors/test/vitest.impl';
|
|
9
|
-
//# sourceMappingURL=executors.d.ts.map
|
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.vitePreviewServerExecutor = exports.viteDevServerExecutor = exports.viteBuildExecutor = void 0;
|
|
4
4
|
var build_impl_1 = require("./src/executors/build/build.impl");
|
|
5
5
|
Object.defineProperty(exports, "viteBuildExecutor", { enumerable: true, get: function () { return build_impl_1.viteBuildExecutor; } });
|
|
6
6
|
var dev_server_impl_1 = require("./src/executors/dev-server/dev-server.impl");
|
|
7
7
|
Object.defineProperty(exports, "viteDevServerExecutor", { enumerable: true, get: function () { return dev_server_impl_1.viteDevServerExecutor; } });
|
|
8
8
|
var preview_server_impl_1 = require("./src/executors/preview-server/preview-server.impl");
|
|
9
9
|
Object.defineProperty(exports, "vitePreviewServerExecutor", { enumerable: true, get: function () { return preview_server_impl_1.vitePreviewServerExecutor; } });
|
|
10
|
-
var vitest_impl_1 = require("./src/executors/test/vitest.impl");
|
|
11
|
-
Object.defineProperty(exports, "vitestExecutor", { enumerable: true, get: function () { return vitest_impl_1.vitestExecutor; } });
|
|
@@ -3,8 +3,5 @@ export * from './src/utils/generator-utils';
|
|
|
3
3
|
export * from './src/utils/e2e-web-server-info-utils';
|
|
4
4
|
export { type ViteConfigurationGeneratorSchema } from './src/generators/configuration/schema';
|
|
5
5
|
export { viteConfigurationGenerator } from './src/generators/configuration/configuration';
|
|
6
|
-
export { type VitestGeneratorSchema } from './src/generators/vitest/schema';
|
|
7
|
-
export { vitestGenerator } from './src/generators/vitest/vitest-generator';
|
|
8
6
|
export { type InitGeneratorSchema } from './src/generators/init/schema';
|
|
9
7
|
export { initGenerator } from './src/generators/init/init';
|
|
10
|
-
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1,13 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.initGenerator = exports.
|
|
3
|
+
exports.initGenerator = exports.viteConfigurationGenerator = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
tslib_1.__exportStar(require("./src/utils/versions"), exports);
|
|
6
6
|
tslib_1.__exportStar(require("./src/utils/generator-utils"), exports);
|
|
7
7
|
tslib_1.__exportStar(require("./src/utils/e2e-web-server-info-utils"), exports);
|
|
8
8
|
var configuration_1 = require("./src/generators/configuration/configuration");
|
|
9
9
|
Object.defineProperty(exports, "viteConfigurationGenerator", { enumerable: true, get: function () { return configuration_1.viteConfigurationGenerator; } });
|
|
10
|
-
var vitest_generator_1 = require("./src/generators/vitest/vitest-generator");
|
|
11
|
-
Object.defineProperty(exports, "vitestGenerator", { enumerable: true, get: function () { return vitest_generator_1.vitestGenerator; } });
|
|
12
10
|
var init_1 = require("./src/generators/init/init");
|
|
13
11
|
Object.defineProperty(exports, "initGenerator", { enumerable: true, get: function () { return init_1.initGenerator; } });
|
|
@@ -1,4 +1,3 @@
|
|
|
1
1
|
import type { Plugin } from 'vite';
|
|
2
|
-
import { AssetGlob } from '@nx/js/
|
|
2
|
+
import { AssetGlob } from '@nx/js/internal';
|
|
3
3
|
export declare function nxCopyAssetsPlugin(_assets: (string | AssetGlob)[]): Plugin;
|
|
4
|
-
//# sourceMappingURL=nx-copy-assets.plugin.d.ts.map
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.nxCopyAssetsPlugin = nxCopyAssetsPlugin;
|
|
4
4
|
const node_path_1 = require("node:path");
|
|
5
5
|
const devkit_1 = require("@nx/devkit");
|
|
6
|
-
const
|
|
6
|
+
const internal_1 = require("@nx/js/internal");
|
|
7
7
|
function nxCopyAssetsPlugin(_assets) {
|
|
8
8
|
let config;
|
|
9
9
|
let handler;
|
|
@@ -28,7 +28,7 @@ function nxCopyAssetsPlugin(_assets) {
|
|
|
28
28
|
};
|
|
29
29
|
}
|
|
30
30
|
});
|
|
31
|
-
handler = new
|
|
31
|
+
handler = new internal_1.CopyAssetsHandler({
|
|
32
32
|
rootDir: devkit_1.workspaceRoot,
|
|
33
33
|
projectDir: config.root,
|
|
34
34
|
outputDir: config.build.outDir.startsWith(config.root)
|
|
@@ -2,9 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.nxViteTsPaths = nxViteTsPaths;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
|
-
const
|
|
6
|
-
const
|
|
7
|
-
const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
|
|
5
|
+
const internal_1 = require("@nx/js/internal");
|
|
6
|
+
const js_1 = require("@nx/js");
|
|
8
7
|
const node_fs_1 = require("node:fs");
|
|
9
8
|
const node_path_1 = require("node:path");
|
|
10
9
|
const tsconfig_paths_1 = require("tsconfig-paths");
|
|
@@ -58,7 +57,7 @@ function nxViteTsPaths(options = {}) {
|
|
|
58
57
|
process.env.NX_TASK_TARGET_TARGET === 'test'
|
|
59
58
|
? 'build'
|
|
60
59
|
: process.env.NX_TASK_TARGET_TARGET;
|
|
61
|
-
const { dependencies } = (0,
|
|
60
|
+
const { dependencies } = (0, internal_1.calculateProjectBuildableDependencies)(undefined, projectGraph, devkit_1.workspaceRoot, process.env.NX_TASK_TARGET_PROJECT, depsBuildTarget, process.env.NX_TASK_TARGET_CONFIGURATION);
|
|
62
61
|
if (process.env.NX_GENERATED_TSCONFIG_PATH) {
|
|
63
62
|
// This is needed for vitest browser mode because it runs two vite dev servers
|
|
64
63
|
// so we want to reuse the same tsconfig file for both servers
|
|
@@ -67,7 +66,7 @@ function nxViteTsPaths(options = {}) {
|
|
|
67
66
|
else {
|
|
68
67
|
// This tsconfig is used via the Vite ts paths plugin.
|
|
69
68
|
// It can be also used by other user-defined Vite plugins (e.g. for creating type declaration files).
|
|
70
|
-
foundTsConfigPath = (0,
|
|
69
|
+
foundTsConfigPath = (0, internal_1.createTmpTsConfig)(foundTsConfigPath, devkit_1.workspaceRoot, (0, node_path_1.relative)(devkit_1.workspaceRoot, projectRoot), dependencies, true);
|
|
71
70
|
process.env.NX_GENERATED_TSCONFIG_PATH = foundTsConfigPath;
|
|
72
71
|
}
|
|
73
72
|
if (config.command === 'serve') {
|
|
@@ -85,13 +84,13 @@ function nxViteTsPaths(options = {}) {
|
|
|
85
84
|
throw new Error(`Failed loading tsconfig at ${foundTsConfigPath}`);
|
|
86
85
|
}
|
|
87
86
|
tsConfigPathsEsm = parsed;
|
|
88
|
-
matchTsPathEsm = (0, tsconfig_paths_1.createMatchPath)((0,
|
|
87
|
+
matchTsPathEsm = (0, tsconfig_paths_1.createMatchPath)((0, js_1.resolvePathsBaseUrl)(foundTsConfigPath), parsed.paths, options.mainFields);
|
|
89
88
|
const rootLevelTsConfig = getTsConfig((0, node_path_1.join)(devkit_1.workspaceRoot, 'tsconfig.base.json'));
|
|
90
89
|
const rootLevelParsed = (0, tsconfig_paths_1.loadConfig)(rootLevelTsConfig);
|
|
91
90
|
logIt('fallback parsed tsconfig: ', rootLevelParsed);
|
|
92
91
|
if (rootLevelParsed.resultType === 'success') {
|
|
93
92
|
tsConfigPathsFallback = rootLevelParsed;
|
|
94
|
-
matchTsPathFallback = (0, tsconfig_paths_1.createMatchPath)((0,
|
|
93
|
+
matchTsPathFallback = (0, tsconfig_paths_1.createMatchPath)((0, js_1.resolvePathsBaseUrl)(rootLevelTsConfig), rootLevelParsed.paths, ['main', 'module']);
|
|
95
94
|
}
|
|
96
95
|
},
|
|
97
96
|
resolveId(importPath) {
|
|
@@ -129,7 +128,7 @@ function nxViteTsPaths(options = {}) {
|
|
|
129
128
|
return resolvedFile || null;
|
|
130
129
|
},
|
|
131
130
|
async writeBundle(options) {
|
|
132
|
-
if ((0,
|
|
131
|
+
if ((0, internal_1.isUsingTsSolutionSetup)())
|
|
133
132
|
return;
|
|
134
133
|
const outDir = options.dir || 'dist';
|
|
135
134
|
const src = (0, node_path_1.resolve)(projectRoot, 'package.json');
|
|
@@ -1,49 +1,20 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
-
var ownKeys = function(o) {
|
|
20
|
-
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
-
var ar = [];
|
|
22
|
-
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
-
return ar;
|
|
24
|
-
};
|
|
25
|
-
return ownKeys(o);
|
|
26
|
-
};
|
|
27
|
-
return function (mod) {
|
|
28
|
-
if (mod && mod.__esModule) return mod;
|
|
29
|
-
var result = {};
|
|
30
|
-
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
-
__setModuleDefault(result, mod);
|
|
32
|
-
return result;
|
|
33
|
-
};
|
|
34
|
-
})();
|
|
35
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
3
|
exports.viteBuildExecutor = viteBuildExecutor;
|
|
37
4
|
exports.getBuildExtraArgs = getBuildExtraArgs;
|
|
5
|
+
const tslib_1 = require("tslib");
|
|
6
|
+
const internal_1 = require("@nx/devkit/internal");
|
|
38
7
|
const devkit_1 = require("@nx/devkit");
|
|
39
8
|
const options_utils_1 = require("../../utils/options-utils");
|
|
9
|
+
const schema_json_1 = tslib_1.__importDefault(require("./schema.json"));
|
|
40
10
|
const js_1 = require("@nx/js");
|
|
41
11
|
const fs_1 = require("fs");
|
|
42
12
|
const path_1 = require("path");
|
|
43
|
-
const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
|
|
44
13
|
const executor_utils_1 = require("../../utils/executor-utils");
|
|
45
|
-
const
|
|
14
|
+
const deprecation_1 = require("../../utils/deprecation");
|
|
15
|
+
const internal_2 = require("@nx/js/internal");
|
|
46
16
|
async function* viteBuildExecutor(options, context) {
|
|
17
|
+
(0, deprecation_1.warnViteBuildExecutorDeprecation)();
|
|
47
18
|
process.env.VITE_CJS_IGNORE_WARNING = 'true';
|
|
48
19
|
// Allows ESM to be required in CJS modules. Vite will be published as ESM in the future.
|
|
49
20
|
const { mergeConfig, build, resolveConfig, createBuilder } = await (0, executor_utils_1.loadViteDynamicImport)();
|
|
@@ -74,7 +45,7 @@ async function* viteBuildExecutor(options, context) {
|
|
|
74
45
|
...otherOptions,
|
|
75
46
|
});
|
|
76
47
|
// New TS Solution already has a typecheck target
|
|
77
|
-
if (!options.skipTypeCheck && !(0,
|
|
48
|
+
if (!options.skipTypeCheck && !(0, internal_2.isUsingTsSolutionSetup)()) {
|
|
78
49
|
await (0, executor_utils_1.validateTypes)({
|
|
79
50
|
workspaceRoot: context.root,
|
|
80
51
|
tsconfig: tsConfigForBuild,
|
|
@@ -150,7 +121,7 @@ async function* viteBuildExecutor(options, context) {
|
|
|
150
121
|
],
|
|
151
122
|
}, context);
|
|
152
123
|
}
|
|
153
|
-
const iterable = (0,
|
|
124
|
+
const iterable = (0, internal_1.createAsyncIterable)(({ next, done }) => {
|
|
154
125
|
if ('on' in watcherOrOutput) {
|
|
155
126
|
let success = true;
|
|
156
127
|
watcherOrOutput.on('event', (event) => {
|
|
@@ -180,14 +151,13 @@ async function* viteBuildExecutor(options, context) {
|
|
|
180
151
|
});
|
|
181
152
|
iterables.push(iterable);
|
|
182
153
|
}
|
|
183
|
-
return yield* (0,
|
|
154
|
+
return yield* (0, internal_1.combineAsyncIterables)(iterables.shift(), ...(iterables ?? []));
|
|
184
155
|
}
|
|
185
156
|
async function getBuildExtraArgs(options) {
|
|
186
157
|
// support passing extra args to vite cli
|
|
187
|
-
const schema = await Promise.resolve().then(() => __importStar(require('./schema.json')));
|
|
188
158
|
const extraArgs = {};
|
|
189
159
|
for (const key of Object.keys(options)) {
|
|
190
|
-
if (!
|
|
160
|
+
if (!schema_json_1.default.properties[key]) {
|
|
191
161
|
extraArgs[key] = options[key];
|
|
192
162
|
}
|
|
193
163
|
}
|
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
"cli": "nx",
|
|
6
6
|
"description": "Builds a Vite application for production.",
|
|
7
7
|
"type": "object",
|
|
8
|
+
"x-deprecated": "The `@nx/vite:build` executor is deprecated and will be removed in Nx v24. Run `nx g @nx/vite:convert-to-inferred` to migrate to the `@nx/vite/plugin` inferred plugin. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.",
|
|
8
9
|
"presets": [
|
|
9
10
|
{
|
|
10
11
|
"name": "Default minimum setup",
|
|
@@ -1,45 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
-
var ownKeys = function(o) {
|
|
20
|
-
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
-
var ar = [];
|
|
22
|
-
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
-
return ar;
|
|
24
|
-
};
|
|
25
|
-
return ownKeys(o);
|
|
26
|
-
};
|
|
27
|
-
return function (mod) {
|
|
28
|
-
if (mod && mod.__esModule) return mod;
|
|
29
|
-
var result = {};
|
|
30
|
-
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
-
__setModuleDefault(result, mod);
|
|
32
|
-
return result;
|
|
33
|
-
};
|
|
34
|
-
})();
|
|
35
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
3
|
exports.viteDevServerExecutor = viteDevServerExecutor;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
37
5
|
const devkit_1 = require("@nx/devkit");
|
|
38
6
|
const options_utils_1 = require("../../utils/options-utils");
|
|
7
|
+
const schema_json_1 = tslib_1.__importDefault(require("./schema.json"));
|
|
39
8
|
const executor_utils_1 = require("../../utils/executor-utils");
|
|
9
|
+
const deprecation_1 = require("../../utils/deprecation");
|
|
40
10
|
const path_1 = require("path");
|
|
41
11
|
const build_impl_1 = require("../build/build.impl");
|
|
42
12
|
async function* viteDevServerExecutor(options, context) {
|
|
13
|
+
(0, deprecation_1.warnViteDevServerExecutorDeprecation)();
|
|
43
14
|
process.env.VITE_CJS_IGNORE_WARNING = 'true';
|
|
44
15
|
// Allows ESM to be required in CJS modules. Vite will be published as ESM in the future.
|
|
45
16
|
const { mergeConfig, createServer, resolveConfig } = await (0, executor_utils_1.loadViteDynamicImport)();
|
|
@@ -111,10 +82,9 @@ async function runViteDevServer(server) {
|
|
|
111
82
|
exports.default = viteDevServerExecutor;
|
|
112
83
|
async function getServerExtraArgs(options, configuration, buildOptionsFromBuildTarget, otherOptionsFromBuildTarget) {
|
|
113
84
|
// support passing extra args to vite cli
|
|
114
|
-
const schema = await Promise.resolve().then(() => __importStar(require('./schema.json')));
|
|
115
85
|
const extraArgs = {};
|
|
116
86
|
for (const key of Object.keys(options)) {
|
|
117
|
-
if (!
|
|
87
|
+
if (!schema_json_1.default.properties[key]) {
|
|
118
88
|
extraArgs[key] = options[key];
|
|
119
89
|
}
|
|
120
90
|
}
|
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
"cli": "nx",
|
|
7
7
|
"description": "Starts a dev server using Vite.",
|
|
8
8
|
"type": "object",
|
|
9
|
+
"x-deprecated": "The `@nx/vite:dev-server` executor is deprecated and will be removed in Nx v24. Run `nx g @nx/vite:convert-to-inferred` to migrate to the `@nx/vite/plugin` inferred plugin. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.",
|
|
9
10
|
"presets": [
|
|
10
11
|
{
|
|
11
12
|
"name": "Default minimum setup",
|
|
@@ -1,45 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
-
var ownKeys = function(o) {
|
|
20
|
-
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
-
var ar = [];
|
|
22
|
-
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
-
return ar;
|
|
24
|
-
};
|
|
25
|
-
return ownKeys(o);
|
|
26
|
-
};
|
|
27
|
-
return function (mod) {
|
|
28
|
-
if (mod && mod.__esModule) return mod;
|
|
29
|
-
var result = {};
|
|
30
|
-
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
-
__setModuleDefault(result, mod);
|
|
32
|
-
return result;
|
|
33
|
-
};
|
|
34
|
-
})();
|
|
35
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
3
|
exports.vitePreviewServerExecutor = vitePreviewServerExecutor;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
37
5
|
const devkit_1 = require("@nx/devkit");
|
|
38
6
|
const options_utils_1 = require("../../utils/options-utils");
|
|
7
|
+
const schema_json_1 = tslib_1.__importDefault(require("./schema.json"));
|
|
39
8
|
const path_1 = require("path");
|
|
40
9
|
const build_impl_1 = require("../build/build.impl");
|
|
41
10
|
const executor_utils_1 = require("../../utils/executor-utils");
|
|
11
|
+
const deprecation_1 = require("../../utils/deprecation");
|
|
42
12
|
async function* vitePreviewServerExecutor(options, context) {
|
|
13
|
+
(0, deprecation_1.warnVitePreviewServerExecutorDeprecation)();
|
|
43
14
|
process.env.VITE_CJS_IGNORE_WARNING = 'true';
|
|
44
15
|
// Allows ESM to be required in CJS modules. Vite will be published as ESM in the future.
|
|
45
16
|
const { mergeConfig, preview, resolveConfig } = await (0, executor_utils_1.loadViteDynamicImport)();
|
|
@@ -174,10 +145,9 @@ function closeServer(server) {
|
|
|
174
145
|
exports.default = vitePreviewServerExecutor;
|
|
175
146
|
async function getExtraArgs(options, configuration, otherOptionsFromBuildTarget) {
|
|
176
147
|
// support passing extra args to vite cli
|
|
177
|
-
const schema = await Promise.resolve().then(() => __importStar(require('./schema.json')));
|
|
178
148
|
const extraArgs = {};
|
|
179
149
|
for (const key of Object.keys(options)) {
|
|
180
|
-
if (!
|
|
150
|
+
if (!schema_json_1.default.properties[key]) {
|
|
181
151
|
extraArgs[key] = options[key];
|
|
182
152
|
}
|
|
183
153
|
}
|
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
"description": "Preview Server for Vite.",
|
|
7
7
|
"continuous": true,
|
|
8
8
|
"type": "object",
|
|
9
|
+
"x-deprecated": "The `@nx/vite:preview-server` executor is deprecated and will be removed in Nx v24. Run `nx g @nx/vite:convert-to-inferred` to migrate to the `@nx/vite/plugin` inferred plugin. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.",
|
|
9
10
|
"presets": [
|
|
10
11
|
{
|
|
11
12
|
"name": "Default minimum setup",
|
|
@@ -3,4 +3,3 @@ import { ViteConfigurationGeneratorSchema } from './schema';
|
|
|
3
3
|
export declare function viteConfigurationGenerator(host: Tree, schema: ViteConfigurationGeneratorSchema): Promise<GeneratorCallback>;
|
|
4
4
|
export declare function viteConfigurationGeneratorInternal(tree: Tree, schema: ViteConfigurationGeneratorSchema): Promise<GeneratorCallback>;
|
|
5
5
|
export default viteConfigurationGenerator;
|
|
6
|
-
//# sourceMappingURL=configuration.d.ts.map
|
|
@@ -5,13 +5,13 @@ exports.viteConfigurationGeneratorInternal = viteConfigurationGeneratorInternal;
|
|
|
5
5
|
const tslib_1 = require("tslib");
|
|
6
6
|
const devkit_1 = require("@nx/devkit");
|
|
7
7
|
const js_1 = require("@nx/js");
|
|
8
|
-
const
|
|
9
|
-
const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
|
|
8
|
+
const internal_1 = require("@nx/js/internal");
|
|
10
9
|
const posix_1 = require("node:path/posix");
|
|
11
10
|
const ensure_dependencies_1 = require("../../utils/ensure-dependencies");
|
|
11
|
+
const deprecation_1 = require("../../utils/deprecation");
|
|
12
12
|
const generator_utils_1 = require("../../utils/generator-utils");
|
|
13
|
+
const versions_1 = require("../../utils/versions");
|
|
13
14
|
const init_1 = tslib_1.__importDefault(require("../init/init"));
|
|
14
|
-
const vitest_generator_1 = tslib_1.__importDefault(require("../vitest/vitest-generator"));
|
|
15
15
|
const convert_non_vite_1 = require("./lib/convert-non-vite");
|
|
16
16
|
function viteConfigurationGenerator(host, schema) {
|
|
17
17
|
return viteConfigurationGeneratorInternal(host, {
|
|
@@ -23,7 +23,7 @@ async function viteConfigurationGeneratorInternal(tree, schema) {
|
|
|
23
23
|
const tasks = [];
|
|
24
24
|
const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, schema.project);
|
|
25
25
|
const { targets, root: projectRoot } = projectConfig;
|
|
26
|
-
const projectType = (0,
|
|
26
|
+
const projectType = (0, internal_1.getProjectType)(tree, projectConfig.root, schema.projectType ?? projectConfig.projectType);
|
|
27
27
|
schema.includeLib ??= projectType === 'library';
|
|
28
28
|
// Setting default to jsdom since it is the most common use case (React, Web).
|
|
29
29
|
// The @nx/js:lib generator specifically sets this to node to be more generic.
|
|
@@ -57,6 +57,13 @@ async function viteConfigurationGeneratorInternal(tree, schema) {
|
|
|
57
57
|
? p === '@nx/vite/plugin'
|
|
58
58
|
: p.plugin === '@nx/vite/plugin');
|
|
59
59
|
if (!hasPlugin) {
|
|
60
|
+
const willScaffoldExecutorTargets = !projectAlreadyHasViteTargets.build ||
|
|
61
|
+
(!schema.includeLib &&
|
|
62
|
+
(!projectAlreadyHasViteTargets.serve ||
|
|
63
|
+
!projectAlreadyHasViteTargets.preview));
|
|
64
|
+
if (willScaffoldExecutorTargets) {
|
|
65
|
+
(0, deprecation_1.warnViteExecutorGenerating)();
|
|
66
|
+
}
|
|
60
67
|
if (!projectAlreadyHasViteTargets.build) {
|
|
61
68
|
(0, generator_utils_1.addBuildTarget)(tree, schema, 'build');
|
|
62
69
|
}
|
|
@@ -88,7 +95,7 @@ async function viteConfigurationGeneratorInternal(tree, schema) {
|
|
|
88
95
|
includeLib: schema.includeLib,
|
|
89
96
|
includeVitest: schema.includeVitest,
|
|
90
97
|
inSourceTests: schema.inSourceTests,
|
|
91
|
-
|
|
98
|
+
rolldownOptionsExternal: [
|
|
92
99
|
"'react'",
|
|
93
100
|
"'react-dom'",
|
|
94
101
|
"'react/jsx-runtime'",
|
|
@@ -108,7 +115,11 @@ async function viteConfigurationGeneratorInternal(tree, schema) {
|
|
|
108
115
|
}
|
|
109
116
|
}
|
|
110
117
|
if (schema.includeVitest) {
|
|
111
|
-
|
|
118
|
+
(0, devkit_1.ensurePackage)('@nx/vitest', versions_1.nxVersion);
|
|
119
|
+
// CommonJS `require` instead of dynamic ESM `import` — `ensurePackage`
|
|
120
|
+
// exposes the temp install via `Module._initPaths`, which ESM ignores.
|
|
121
|
+
const { configurationGenerator: vitestConfigurationGenerator, } = require('@nx/vitest/generators');
|
|
122
|
+
const vitestTask = await vitestConfigurationGenerator(tree, {
|
|
112
123
|
project: schema.project,
|
|
113
124
|
uiFramework: schema.uiFramework,
|
|
114
125
|
inSourceTests: schema.inSourceTests,
|
|
@@ -119,10 +130,11 @@ async function viteConfigurationGeneratorInternal(tree, schema) {
|
|
|
119
130
|
addPlugin: schema.addPlugin,
|
|
120
131
|
compiler: schema.compiler,
|
|
121
132
|
projectType,
|
|
122
|
-
|
|
133
|
+
testEnvironment: schema.testEnvironment,
|
|
134
|
+
});
|
|
123
135
|
tasks.push(vitestTask);
|
|
124
136
|
}
|
|
125
|
-
if ((0,
|
|
137
|
+
if ((0, internal_1.isUsingTsSolutionSetup)(tree)) {
|
|
126
138
|
updatePackageJson(tree, schema, projectType);
|
|
127
139
|
}
|
|
128
140
|
if (!schema.skipFormat) {
|
|
@@ -140,10 +152,10 @@ function updatePackageJson(tree, options, projectType) {
|
|
|
140
152
|
}
|
|
141
153
|
else {
|
|
142
154
|
packageJson = {
|
|
143
|
-
name: (0,
|
|
155
|
+
name: (0, internal_1.getImportPath)(tree, options.project),
|
|
144
156
|
version: '0.0.1',
|
|
145
157
|
};
|
|
146
|
-
if ((0,
|
|
158
|
+
if ((0, internal_1.getProjectType)(tree, project.root, projectType) === 'application') {
|
|
147
159
|
packageJson.private = true;
|
|
148
160
|
}
|
|
149
161
|
}
|
|
@@ -162,7 +174,7 @@ function updatePackageJson(tree, options, projectType) {
|
|
|
162
174
|
generateExportsField: true,
|
|
163
175
|
packageJsonPath,
|
|
164
176
|
format: ['esm'],
|
|
165
|
-
developmentConditionName: (0,
|
|
177
|
+
developmentConditionName: (0, internal_1.getDefinedCustomConditionName)(tree),
|
|
166
178
|
});
|
|
167
179
|
}
|
|
168
180
|
(0, devkit_1.writeJson)(tree, packageJsonPath, packageJson);
|
|
@@ -3,4 +3,3 @@ import { ViteConfigurationGeneratorSchema } from '../schema';
|
|
|
3
3
|
export declare function convertNonVite(tree: Tree, schema: ViteConfigurationGeneratorSchema, projectRoot: string, _projectType: string, targets: {
|
|
4
4
|
[targetName: string]: TargetConfiguration<any>;
|
|
5
5
|
}): Promise<void>;
|
|
6
|
-
//# sourceMappingURL=convert-non-vite.d.ts.map
|
|
@@ -4,14 +4,14 @@ exports.convertNonVite = convertNonVite;
|
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
5
|
const find_vite_config_1 = require("../../../utils/find-vite-config");
|
|
6
6
|
const generator_utils_1 = require("../../../utils/generator-utils");
|
|
7
|
-
const
|
|
7
|
+
const internal_1 = require("@nx/js/internal");
|
|
8
8
|
async function convertNonVite(tree, schema, projectRoot, _projectType, targets) {
|
|
9
9
|
// Check if it has vite
|
|
10
10
|
const hasViteConfig = (0, find_vite_config_1.findViteConfig)(tree, projectRoot);
|
|
11
11
|
const hasIndexHtmlAtRoot = tree.exists((0, devkit_1.joinPathFragments)(projectRoot, 'index.html'));
|
|
12
12
|
// Check if it has webpack
|
|
13
13
|
const hasWebpackConfig = (0, find_vite_config_1.findWebpackConfig)(tree, projectRoot);
|
|
14
|
-
const projectType = (0,
|
|
14
|
+
const projectType = (0, internal_1.getProjectType)(tree, projectRoot, _projectType);
|
|
15
15
|
if (hasWebpackConfig) {
|
|
16
16
|
if (projectType === 'application') {
|
|
17
17
|
(0, generator_utils_1.moveAndEditIndexHtml)(tree, schema);
|