@nx/vite 21.3.7 → 21.4.0-beta.1

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.
Files changed (222) hide show
  1. package/executors.d.ts +1 -0
  2. package/executors.d.ts.map +1 -0
  3. package/executors.js +10 -26
  4. package/index.d.ts +1 -0
  5. package/index.d.ts.map +1 -0
  6. package/index.js +12 -26
  7. package/package.json +7 -4
  8. package/plugin.d.ts +1 -0
  9. package/plugin.d.ts.map +1 -0
  10. package/plugin.js +6 -23
  11. package/plugins/nx-copy-assets.plugin.d.ts +1 -0
  12. package/plugins/nx-copy-assets.plugin.d.ts.map +1 -0
  13. package/plugins/nx-copy-assets.plugin.js +28 -30
  14. package/plugins/nx-tsconfig-paths.plugin.d.ts +1 -0
  15. package/plugins/nx-tsconfig-paths.plugin.d.ts.map +1 -0
  16. package/plugins/nx-tsconfig-paths.plugin.js +86 -88
  17. package/plugins/nx-vite-build-coordination.plugin.d.ts +1 -0
  18. package/plugins/nx-vite-build-coordination.plugin.d.ts.map +1 -0
  19. package/plugins/nx-vite-build-coordination.plugin.js +25 -32
  20. package/plugins/rollup-replace-files.plugin.d.ts +1 -0
  21. package/plugins/rollup-replace-files.plugin.d.ts.map +1 -0
  22. package/plugins/rollup-replace-files.plugin.js +20 -26
  23. package/project.json +52 -0
  24. package/src/executors/build/build.impl.d.ts +1 -0
  25. package/src/executors/build/build.impl.d.ts.map +1 -0
  26. package/src/executors/build/build.impl.js +98 -112
  27. package/src/executors/build/compat.d.ts +1 -0
  28. package/src/executors/build/compat.d.ts.map +1 -0
  29. package/src/executors/build/compat.js +4 -11
  30. package/src/executors/dev-server/compat.d.ts +1 -0
  31. package/src/executors/dev-server/compat.d.ts.map +1 -0
  32. package/src/executors/dev-server/compat.js +4 -11
  33. package/src/executors/dev-server/dev-server.impl.d.ts +1 -0
  34. package/src/executors/dev-server/dev-server.impl.d.ts.map +1 -0
  35. package/src/executors/dev-server/dev-server.impl.js +54 -62
  36. package/src/executors/preview-server/compat.d.ts +1 -0
  37. package/src/executors/preview-server/compat.d.ts.map +1 -0
  38. package/src/executors/preview-server/compat.js +4 -11
  39. package/src/executors/preview-server/preview-server.impl.d.ts +1 -0
  40. package/src/executors/preview-server/preview-server.impl.d.ts.map +1 -0
  41. package/src/executors/preview-server/preview-server.impl.js +74 -77
  42. package/src/executors/test/compat.d.ts +1 -0
  43. package/src/executors/test/compat.d.ts.map +1 -0
  44. package/src/executors/test/compat.js +4 -11
  45. package/src/executors/test/lib/nx-reporter.d.ts +1 -0
  46. package/src/executors/test/lib/nx-reporter.d.ts.map +1 -0
  47. package/src/executors/test/lib/nx-reporter.js +17 -25
  48. package/src/executors/test/lib/utils.d.ts +1 -0
  49. package/src/executors/test/lib/utils.d.ts.map +1 -0
  50. package/src/executors/test/lib/utils.js +36 -59
  51. package/src/executors/test/vitest.impl.d.ts +1 -0
  52. package/src/executors/test/vitest.impl.d.ts.map +1 -0
  53. package/src/executors/test/vitest.impl.js +29 -43
  54. package/src/generators/configuration/configuration.d.ts +1 -0
  55. package/src/generators/configuration/configuration.d.ts.map +1 -0
  56. package/src/generators/configuration/configuration.js +82 -102
  57. package/src/generators/configuration/lib/convert-non-vite.d.ts +1 -0
  58. package/src/generators/configuration/lib/convert-non-vite.d.ts.map +1 -0
  59. package/src/generators/configuration/lib/convert-non-vite.js +33 -32
  60. package/src/generators/convert-to-inferred/convert-to-inferred.d.ts +1 -0
  61. package/src/generators/convert-to-inferred/convert-to-inferred.d.ts.map +1 -0
  62. package/src/generators/convert-to-inferred/convert-to-inferred.js +31 -61
  63. package/src/generators/convert-to-inferred/lib/build-post-target-transformer.d.ts +1 -0
  64. package/src/generators/convert-to-inferred/lib/build-post-target-transformer.d.ts.map +1 -0
  65. package/src/generators/convert-to-inferred/lib/build-post-target-transformer.js +46 -58
  66. package/src/generators/convert-to-inferred/lib/preview-post-target-transformer.d.ts +1 -0
  67. package/src/generators/convert-to-inferred/lib/preview-post-target-transformer.d.ts.map +1 -0
  68. package/src/generators/convert-to-inferred/lib/preview-post-target-transformer.js +9 -14
  69. package/src/generators/convert-to-inferred/lib/serve-post-target-transformer.d.ts +1 -0
  70. package/src/generators/convert-to-inferred/lib/serve-post-target-transformer.d.ts.map +1 -0
  71. package/src/generators/convert-to-inferred/lib/serve-post-target-transformer.js +10 -15
  72. package/src/generators/convert-to-inferred/lib/test-post-target-transformer.d.ts +1 -0
  73. package/src/generators/convert-to-inferred/lib/test-post-target-transformer.d.ts.map +1 -0
  74. package/src/generators/convert-to-inferred/lib/test-post-target-transformer.js +16 -23
  75. package/src/generators/convert-to-inferred/lib/utils.d.ts +1 -0
  76. package/src/generators/convert-to-inferred/lib/utils.d.ts.map +1 -0
  77. package/src/generators/convert-to-inferred/lib/utils.js +18 -33
  78. package/src/generators/init/init.d.ts +1 -0
  79. package/src/generators/init/init.d.ts.map +1 -0
  80. package/src/generators/init/init.js +44 -96
  81. package/src/generators/init/lib/utils.d.ts +1 -0
  82. package/src/generators/init/lib/utils.d.ts.map +1 -0
  83. package/src/generators/init/lib/utils.js +20 -35
  84. package/src/generators/setup-paths-plugin/lib/utils.d.ts +1 -0
  85. package/src/generators/setup-paths-plugin/lib/utils.d.ts.map +1 -0
  86. package/src/generators/setup-paths-plugin/lib/utils.js +0 -3
  87. package/src/generators/setup-paths-plugin/setup-paths-plugin.d.ts +1 -0
  88. package/src/generators/setup-paths-plugin/setup-paths-plugin.d.ts.map +1 -0
  89. package/src/generators/setup-paths-plugin/setup-paths-plugin.js +45 -54
  90. package/src/generators/vitest/vitest-generator.d.ts +1 -0
  91. package/src/generators/vitest/vitest-generator.d.ts.map +1 -0
  92. package/src/generators/vitest/vitest-generator.js +134 -174
  93. package/src/migrations/update-19-6-0/add-depends-on-for-preview.d.ts +1 -0
  94. package/src/migrations/update-19-6-0/add-depends-on-for-preview.d.ts.map +1 -0
  95. package/src/migrations/update-19-6-0/add-depends-on-for-preview.js +10 -18
  96. package/src/migrations/update-20-0-4/add-vite-temp-files-to-git-ignore.d.ts +1 -0
  97. package/src/migrations/update-20-0-4/add-vite-temp-files-to-git-ignore.d.ts.map +1 -0
  98. package/src/migrations/update-20-0-4/add-vite-temp-files-to-git-ignore.js +4 -10
  99. package/src/migrations/update-20-3-0/add-vitest-temp-files-to-git-ignore.d.ts +1 -0
  100. package/src/migrations/update-20-3-0/add-vitest-temp-files-to-git-ignore.d.ts.map +1 -0
  101. package/src/migrations/update-20-3-0/add-vitest-temp-files-to-git-ignore.js +4 -10
  102. package/src/migrations/update-20-5-0/eslint-ignore-vite-temp-files.d.ts +1 -0
  103. package/src/migrations/update-20-5-0/eslint-ignore-vite-temp-files.d.ts.map +1 -0
  104. package/src/migrations/update-20-5-0/eslint-ignore-vite-temp-files.js +20 -24
  105. package/src/migrations/update-20-5-0/install-jiti.d.ts +1 -0
  106. package/src/migrations/update-20-5-0/install-jiti.d.ts.map +1 -0
  107. package/src/migrations/update-20-5-0/install-jiti.js +6 -12
  108. package/src/migrations/update-20-5-0/update-resolve-conditions.d.ts +1 -0
  109. package/src/migrations/update-20-5-0/update-resolve-conditions.d.ts.map +1 -0
  110. package/src/migrations/update-20-5-0/update-resolve-conditions.js +26 -28
  111. package/src/plugins/plugin.d.ts +1 -0
  112. package/src/plugins/plugin.d.ts.map +1 -0
  113. package/src/plugins/plugin.js +189 -267
  114. package/src/utils/detect-ui-framework.d.ts +1 -0
  115. package/src/utils/detect-ui-framework.d.ts.map +1 -0
  116. package/src/utils/detect-ui-framework.js +9 -20
  117. package/src/utils/e2e-web-server-info-utils.d.ts +1 -0
  118. package/src/utils/e2e-web-server-info-utils.d.ts.map +1 -0
  119. package/src/utils/e2e-web-server-info-utils.js +23 -35
  120. package/src/utils/ensure-dependencies.d.ts +1 -0
  121. package/src/utils/ensure-dependencies.d.ts.map +1 -0
  122. package/src/utils/ensure-dependencies.js +24 -26
  123. package/src/utils/executor-utils.d.ts +1 -0
  124. package/src/utils/executor-utils.d.ts.map +1 -0
  125. package/src/utils/executor-utils.js +27 -43
  126. package/src/utils/find-vite-config.d.ts +1 -0
  127. package/src/utils/find-vite-config.d.ts.map +1 -0
  128. package/src/utils/find-vite-config.js +12 -37
  129. package/src/utils/generator-utils.d.ts +1 -0
  130. package/src/utils/generator-utils.d.ts.map +1 -0
  131. package/src/utils/generator-utils.js +204 -216
  132. package/src/utils/ignore-vite-temp-files.d.ts +1 -0
  133. package/src/utils/ignore-vite-temp-files.d.ts.map +1 -0
  134. package/src/utils/ignore-vite-temp-files.js +22 -32
  135. package/src/utils/nx-tsconfig-paths-find-file.d.ts +1 -0
  136. package/src/utils/nx-tsconfig-paths-find-file.d.ts.map +1 -0
  137. package/src/utils/nx-tsconfig-paths-find-file.js +10 -16
  138. package/src/utils/options-utils.d.ts +1 -0
  139. package/src/utils/options-utils.d.ts.map +1 -0
  140. package/src/utils/options-utils.js +48 -58
  141. package/src/utils/test-files/test-vite-configs.d.ts +1 -0
  142. package/src/utils/test-files/test-vite-configs.d.ts.map +1 -0
  143. package/src/utils/test-files/test-vite-configs.js +21 -82
  144. package/src/utils/test-utils.d.ts +1 -0
  145. package/src/utils/test-utils.d.ts.map +1 -0
  146. package/src/utils/test-utils.js +103 -130
  147. package/src/utils/version-utils.d.ts +1 -0
  148. package/src/utils/version-utils.d.ts.map +1 -0
  149. package/src/utils/version-utils.js +26 -44
  150. package/src/utils/versions.d.ts +1 -0
  151. package/src/utils/versions.d.ts.map +1 -0
  152. package/src/utils/versions.js +22 -82
  153. package/src/utils/vite-config-edit-utils.d.ts +1 -0
  154. package/src/utils/vite-config-edit-utils.d.ts.map +1 -0
  155. package/src/utils/vite-config-edit-utils.js +145 -125
  156. package/executors.js.map +0 -1
  157. package/index.js.map +0 -1
  158. package/plugin.js.map +0 -1
  159. package/plugins/nx-copy-assets.plugin.js.map +0 -1
  160. package/plugins/nx-tsconfig-paths.plugin.js.map +0 -1
  161. package/plugins/nx-vite-build-coordination.plugin.js.map +0 -1
  162. package/plugins/rollup-replace-files.plugin.js.map +0 -1
  163. package/src/executors/build/build.impl.js.map +0 -1
  164. package/src/executors/build/compat.js.map +0 -1
  165. package/src/executors/build/schema.d.js +0 -3
  166. package/src/executors/build/schema.d.js.map +0 -1
  167. package/src/executors/dev-server/compat.js.map +0 -1
  168. package/src/executors/dev-server/dev-server.impl.js.map +0 -1
  169. package/src/executors/dev-server/schema.d.js +0 -3
  170. package/src/executors/dev-server/schema.d.js.map +0 -1
  171. package/src/executors/preview-server/compat.js.map +0 -1
  172. package/src/executors/preview-server/preview-server.impl.js.map +0 -1
  173. package/src/executors/preview-server/schema.d.js +0 -3
  174. package/src/executors/preview-server/schema.d.js.map +0 -1
  175. package/src/executors/test/compat.js.map +0 -1
  176. package/src/executors/test/lib/nx-reporter.js.map +0 -1
  177. package/src/executors/test/lib/utils.js.map +0 -1
  178. package/src/executors/test/schema.d.js +0 -3
  179. package/src/executors/test/schema.d.js.map +0 -1
  180. package/src/executors/test/vitest.impl.js.map +0 -1
  181. package/src/generators/configuration/configuration.js.map +0 -1
  182. package/src/generators/configuration/lib/convert-non-vite.js.map +0 -1
  183. package/src/generators/configuration/schema.d.js +0 -3
  184. package/src/generators/configuration/schema.d.js.map +0 -1
  185. package/src/generators/convert-to-inferred/convert-to-inferred.js.map +0 -1
  186. package/src/generators/convert-to-inferred/lib/build-post-target-transformer.js.map +0 -1
  187. package/src/generators/convert-to-inferred/lib/preview-post-target-transformer.js.map +0 -1
  188. package/src/generators/convert-to-inferred/lib/serve-post-target-transformer.js.map +0 -1
  189. package/src/generators/convert-to-inferred/lib/test-post-target-transformer.js.map +0 -1
  190. package/src/generators/convert-to-inferred/lib/utils.js.map +0 -1
  191. package/src/generators/init/init.js.map +0 -1
  192. package/src/generators/init/lib/utils.js.map +0 -1
  193. package/src/generators/init/schema.d.js +0 -3
  194. package/src/generators/init/schema.d.js.map +0 -1
  195. package/src/generators/setup-paths-plugin/lib/utils.js.map +0 -1
  196. package/src/generators/setup-paths-plugin/schema.d.js +0 -3
  197. package/src/generators/setup-paths-plugin/schema.d.js.map +0 -1
  198. package/src/generators/setup-paths-plugin/setup-paths-plugin.js.map +0 -1
  199. package/src/generators/vitest/schema.d.js +0 -3
  200. package/src/generators/vitest/schema.d.js.map +0 -1
  201. package/src/generators/vitest/vitest-generator.js.map +0 -1
  202. package/src/migrations/update-19-6-0/add-depends-on-for-preview.js.map +0 -1
  203. package/src/migrations/update-20-0-4/add-vite-temp-files-to-git-ignore.js.map +0 -1
  204. package/src/migrations/update-20-3-0/add-vitest-temp-files-to-git-ignore.js.map +0 -1
  205. package/src/migrations/update-20-5-0/eslint-ignore-vite-temp-files.js.map +0 -1
  206. package/src/migrations/update-20-5-0/install-jiti.js.map +0 -1
  207. package/src/migrations/update-20-5-0/update-resolve-conditions.js.map +0 -1
  208. package/src/plugins/plugin.js.map +0 -1
  209. package/src/utils/detect-ui-framework.js.map +0 -1
  210. package/src/utils/e2e-web-server-info-utils.js.map +0 -1
  211. package/src/utils/ensure-dependencies.js.map +0 -1
  212. package/src/utils/executor-utils.js.map +0 -1
  213. package/src/utils/find-vite-config.js.map +0 -1
  214. package/src/utils/generator-utils.js.map +0 -1
  215. package/src/utils/ignore-vite-temp-files.js.map +0 -1
  216. package/src/utils/nx-tsconfig-paths-find-file.js.map +0 -1
  217. package/src/utils/options-utils.js.map +0 -1
  218. package/src/utils/test-files/test-vite-configs.js.map +0 -1
  219. package/src/utils/test-utils.js.map +0 -1
  220. package/src/utils/version-utils.js.map +0 -1
  221. package/src/utils/versions.js.map +0 -1
  222. package/src/utils/vite-config-edit-utils.js.map +0 -1
@@ -1,31 +1,17 @@
1
1
  "use strict";
2
- function _export(target, all) {
3
- for(var name in all)Object.defineProperty(target, name, {
4
- enumerable: true,
5
- get: all[name]
6
- });
7
- }
8
- _export(exports, {
9
- getOptions: function() {
10
- return getOptions;
11
- },
12
- getOptionsAsArgv: function() {
13
- return getOptionsAsArgv;
14
- }
15
- });
16
- const _extends = require("@swc/helpers/_/_extends");
17
- const _object_without_properties_loose = require("@swc/helpers/_/_object_without_properties_loose");
18
- const _devkit = require("@nx/devkit");
19
- const _optionsutils = require("../../../utils/options-utils");
20
- const _path = require("path");
21
- const _executorutils = require("../../../utils/executor-utils");
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.getOptions = getOptions;
4
+ exports.getOptionsAsArgv = getOptionsAsArgv;
5
+ const devkit_1 = require("@nx/devkit");
6
+ const options_utils_1 = require("../../../utils/options-utils");
7
+ const path_1 = require("path");
8
+ const executor_utils_1 = require("../../../utils/executor-utils");
22
9
  async function getOptions(options, context, projectRoot) {
23
- var _resolved_config, _resolved_config1;
24
10
  // Allows ESM to be required in CJS modules. Vite will be published as ESM in the future.
25
- const { loadConfigFromFile, mergeConfig } = await (0, _executorutils.loadViteDynamicImport)();
26
- const viteConfigPath = (0, _optionsutils.normalizeViteConfigFilePath)(context.root, projectRoot, options.configFile);
11
+ const { loadConfigFromFile, mergeConfig } = await (0, executor_utils_1.loadViteDynamicImport)();
12
+ const viteConfigPath = (0, options_utils_1.normalizeViteConfigFilePath)(context.root, projectRoot, options.configFile);
27
13
  if (!viteConfigPath) {
28
- throw new Error((0, _devkit.stripIndents)`
14
+ throw new Error((0, devkit_1.stripIndents) `
29
15
  Unable to load test config from config file ${viteConfigPath}.
30
16
 
31
17
  Please make sure that vitest is configured correctly,
@@ -33,59 +19,50 @@ async function getOptions(options, context, projectRoot) {
33
19
  You can read more here: https://nx.dev/nx-api/vite/generators/vitest
34
20
  `);
35
21
  }
36
- var _options_mode;
37
22
  const resolved = await loadConfigFromFile({
38
- mode: (_options_mode = options == null ? void 0 : options.mode) != null ? _options_mode : 'production',
39
- command: 'serve'
23
+ mode: options?.mode ?? 'production',
24
+ command: 'serve',
40
25
  }, viteConfigPath);
41
- if (!viteConfigPath || !(resolved == null ? void 0 : (_resolved_config = resolved.config) == null ? void 0 : _resolved_config['test'])) {
42
- var _resolved_path;
43
- _devkit.logger.warn((0, _devkit.stripIndents)`Unable to load test config from config file ${(_resolved_path = resolved == null ? void 0 : resolved.path) != null ? _resolved_path : viteConfigPath}
26
+ if (!viteConfigPath || !resolved?.config?.['test']) {
27
+ devkit_1.logger.warn((0, devkit_1.stripIndents) `Unable to load test config from config file ${resolved?.path ?? viteConfigPath}
44
28
  Some settings may not be applied as expected.
45
29
  You can manually set the config in the project, ${context.projectName}, configuration.
46
30
  `);
47
31
  }
48
- const root = projectRoot === '.' ? process.cwd() : (0, _path.relative)(context.cwd, (0, _devkit.joinPathFragments)(context.root, projectRoot));
49
- const { parseCLI } = await (0, _executorutils.loadVitestDynamicImport)();
50
- const _parseCLI = parseCLI([
51
- 'vitest',
52
- ...getOptionsAsArgv(options)
53
- ]), { options: { watch } } = _parseCLI, normalizedExtraArgs = _object_without_properties_loose._(_parseCLI.options, [
54
- "watch"
55
- ]);
56
- const { reportsDirectory, coverage } = normalizedExtraArgs, restNormalizedArgs = _object_without_properties_loose._(normalizedExtraArgs, [
57
- "reportsDirectory",
58
- "coverage"
59
- ]);
60
- var _resolved_config_root;
61
- const settings = _extends._({
32
+ const root = projectRoot === '.'
33
+ ? process.cwd()
34
+ : (0, path_1.relative)(context.cwd, (0, devkit_1.joinPathFragments)(context.root, projectRoot));
35
+ const { parseCLI } = await (0, executor_utils_1.loadVitestDynamicImport)();
36
+ const { options: { watch, ...normalizedExtraArgs }, } = parseCLI(['vitest', ...getOptionsAsArgv(options)]);
37
+ const { reportsDirectory, coverage, ...restNormalizedArgs } = normalizedExtraArgs;
38
+ const settings = {
62
39
  // Explicitly set watch mode to false if not provided otherwise vitest
63
40
  // will enable watch mode by default for non CI environments
64
- watch: watch != null ? watch : false
65
- }, restNormalizedArgs, {
41
+ watch: watch ?? false,
42
+ ...restNormalizedArgs,
66
43
  // This should not be needed as it's going to be set in vite.config.ts
67
44
  // but leaving it here in case someone did not migrate correctly
68
- root: (_resolved_config_root = resolved.config.root) != null ? _resolved_config_root : root,
45
+ root: resolved.config.root ?? root,
69
46
  config: viteConfigPath,
70
- coverage: _extends._({}, coverage != null ? coverage : {}, reportsDirectory && {
71
- reportsDirectory
72
- })
73
- });
74
- var _resolved_config_test;
75
- return mergeConfig((_resolved_config_test = resolved == null ? void 0 : (_resolved_config1 = resolved.config) == null ? void 0 : _resolved_config1['test']) != null ? _resolved_config_test : {}, settings);
47
+ coverage: {
48
+ ...(coverage ?? {}),
49
+ ...(reportsDirectory && { reportsDirectory }),
50
+ },
51
+ };
52
+ return mergeConfig(resolved?.config?.['test'] ?? {}, settings);
76
53
  }
77
54
  function getOptionsAsArgv(obj) {
78
55
  const argv = [];
79
- for (const [key, value] of Object.entries(obj)){
56
+ for (const [key, value] of Object.entries(obj)) {
80
57
  if (Array.isArray(value)) {
81
- value.forEach((item)=>argv.push(`--${key}=${item}`));
82
- } else if (typeof value === 'object' && value !== null) {
58
+ value.forEach((item) => argv.push(`--${key}=${item}`));
59
+ }
60
+ else if (typeof value === 'object' && value !== null) {
83
61
  argv.push(`--${key}='${JSON.stringify(value)}'`);
84
- } else {
62
+ }
63
+ else {
85
64
  argv.push(`--${key}=${value}`);
86
65
  }
87
66
  }
88
67
  return argv;
89
68
  }
90
-
91
- //# sourceMappingURL=utils.js.map
@@ -4,3 +4,4 @@ export declare function vitestExecutor(options: VitestExecutorOptions, context:
4
4
  success: boolean;
5
5
  }, unknown>;
6
6
  export default vitestExecutor;
7
+ //# sourceMappingURL=vitest.impl.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"vitest.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/vite/src/executors/test/vitest.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAiB,MAAM,YAAY,CAAC;AAC5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAOjD,wBAAuB,cAAc,CACnC,OAAO,EAAE,qBAAqB,EAC9B,OAAO,EAAE,eAAe;;YAkEzB;AAED,eAAe,cAAc,CAAC"}
@@ -1,52 +1,37 @@
1
1
  "use strict";
2
- function _export(target, all) {
3
- for(var name in all)Object.defineProperty(target, name, {
4
- enumerable: true,
5
- get: all[name]
6
- });
7
- }
8
- _export(exports, {
9
- default: function() {
10
- return _default;
11
- },
12
- vitestExecutor: function() {
13
- return vitestExecutor;
14
- }
15
- });
16
- const _devkit = require("@nx/devkit");
17
- const _path = require("path");
18
- const _internal = require("@nx/js/src/internal");
19
- const _nxreporter = require("./lib/nx-reporter");
20
- const _utils = require("./lib/utils");
21
- const _executorutils = require("../../utils/executor-utils");
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.vitestExecutor = vitestExecutor;
4
+ const devkit_1 = require("@nx/devkit");
5
+ const path_1 = require("path");
6
+ const internal_1 = require("@nx/js/src/internal");
7
+ const nx_reporter_1 = require("./lib/nx-reporter");
8
+ const utils_1 = require("./lib/utils");
9
+ const executor_utils_1 = require("../../utils/executor-utils");
22
10
  async function* vitestExecutor(options, context) {
23
11
  const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
24
- (0, _internal.registerTsConfigPaths)((0, _path.resolve)(_devkit.workspaceRoot, projectRoot, 'tsconfig.json'));
12
+ (0, internal_1.registerTsConfigPaths)((0, path_1.resolve)(devkit_1.workspaceRoot, projectRoot, 'tsconfig.json'));
25
13
  process.env.VITE_CJS_IGNORE_WARNING = 'true';
26
14
  // Allows ESM to be required in CJS modules. Vite will be published as ESM in the future.
27
- const { startVitest } = await (0, _executorutils.loadVitestDynamicImport)();
28
- var _ref;
29
- const resolvedOptions = (_ref = await (0, _utils.getOptions)(options, context, projectRoot)) != null ? _ref : {};
15
+ const { startVitest } = await (0, executor_utils_1.loadVitestDynamicImport)();
16
+ const resolvedOptions = (await (0, utils_1.getOptions)(options, context, projectRoot)) ?? {};
30
17
  const watch = resolvedOptions['watch'] === true;
31
- const nxReporter = new _nxreporter.NxReporter(watch);
18
+ const nxReporter = new nx_reporter_1.NxReporter(watch);
32
19
  if (resolvedOptions['reporters'] === undefined) {
33
20
  resolvedOptions['reporters'] = [];
34
- } else if (typeof resolvedOptions['reporters'] === 'string') {
35
- resolvedOptions['reporters'] = [
36
- resolvedOptions['reporters']
37
- ];
21
+ }
22
+ else if (typeof resolvedOptions['reporters'] === 'string') {
23
+ resolvedOptions['reporters'] = [resolvedOptions['reporters']];
38
24
  }
39
25
  resolvedOptions['reporters'].push(nxReporter);
40
- var _options_testFiles;
41
- const cliFilters = (_options_testFiles = options.testFiles) != null ? _options_testFiles : [];
42
- var _resolvedOptions_mode;
43
- const ctx = await startVitest((_resolvedOptions_mode = resolvedOptions['mode']) != null ? _resolvedOptions_mode : 'test', cliFilters, resolvedOptions);
26
+ const cliFilters = options.testFiles ?? [];
27
+ const ctx = await startVitest(resolvedOptions['mode'] ?? 'test', cliFilters, resolvedOptions);
44
28
  let hasErrors = false;
45
- const processExit = ()=>{
29
+ const processExit = () => {
46
30
  ctx.exit();
47
31
  if (hasErrors) {
48
32
  process.exit(1);
49
- } else {
33
+ }
34
+ else {
50
35
  process.exit(0);
51
36
  }
52
37
  };
@@ -56,18 +41,19 @@ async function* vitestExecutor(options, context) {
56
41
  process.on('exit', processExit);
57
42
  }
58
43
  // vitest sets the exitCode in case of exception without notifying reporters
59
- if (process.exitCode === undefined || watch && ctx.state.getFiles().length > 0) {
60
- for await (const report of nxReporter){
44
+ if (process.exitCode === undefined ||
45
+ (watch && ctx.state.getFiles().length > 0)) {
46
+ for await (const report of nxReporter) {
61
47
  // vitest sets the exitCode = 1 when code coverage isn't met
62
- hasErrors = report.hasErrors || process.exitCode && process.exitCode !== 0;
48
+ hasErrors =
49
+ report.hasErrors || (process.exitCode && process.exitCode !== 0);
63
50
  }
64
- } else {
51
+ }
52
+ else {
65
53
  hasErrors = process.exitCode !== 0;
66
54
  }
67
55
  return {
68
- success: !hasErrors
56
+ success: !hasErrors,
69
57
  };
70
58
  }
71
- const _default = vitestExecutor;
72
-
73
- //# sourceMappingURL=vitest.impl.js.map
59
+ exports.default = vitestExecutor;
@@ -3,3 +3,4 @@ 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
@@ -0,0 +1 @@
1
+ {"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/vite/src/generators/configuration/configuration.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,iBAAiB,EAMjB,IAAI,EAGL,MAAM,YAAY,CAAC;AAuBpB,OAAO,EAAE,gCAAgC,EAAE,MAAM,UAAU,CAAC;AAE5D,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,gCAAgC,8BAMzC;AAED,wBAAsB,kCAAkC,CACtD,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,gCAAgC,8BA6IzC;AAED,eAAe,0BAA0B,CAAC"}
@@ -1,95 +1,78 @@
1
1
  "use strict";
2
- function _export(target, all) {
3
- for(var name in all)Object.defineProperty(target, name, {
4
- enumerable: true,
5
- get: all[name]
6
- });
7
- }
8
- _export(exports, {
9
- default: function() {
10
- return _default;
11
- },
12
- viteConfigurationGenerator: function() {
13
- return viteConfigurationGenerator;
14
- },
15
- viteConfigurationGeneratorInternal: function() {
16
- return viteConfigurationGeneratorInternal;
17
- }
18
- });
19
- const _extends = require("@swc/helpers/_/_extends");
20
- const _devkit = require("@nx/devkit");
21
- const _js = require("@nx/js");
22
- const _getimportpath = require("@nx/js/src/utils/get-import-path");
23
- const _tssolutionsetup = require("@nx/js/src/utils/typescript/ts-solution-setup");
24
- const _posix = require("node:path/posix");
25
- const _ensuredependencies = require("../../utils/ensure-dependencies");
26
- const _generatorutils = require("../../utils/generator-utils");
27
- const _init = require("../init/init");
28
- const _vitestgenerator = require("../vitest/vitest-generator");
29
- const _convertnonvite = require("./lib/convert-non-vite");
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.viteConfigurationGenerator = viteConfigurationGenerator;
4
+ exports.viteConfigurationGeneratorInternal = viteConfigurationGeneratorInternal;
5
+ const devkit_1 = require("@nx/devkit");
6
+ const js_1 = require("@nx/js");
7
+ const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
8
+ const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
9
+ const posix_1 = require("node:path/posix");
10
+ const ensure_dependencies_1 = require("../../utils/ensure-dependencies");
11
+ const generator_utils_1 = require("../../utils/generator-utils");
12
+ const init_1 = require("../init/init");
13
+ const vitest_generator_1 = require("../vitest/vitest-generator");
14
+ const convert_non_vite_1 = require("./lib/convert-non-vite");
30
15
  function viteConfigurationGenerator(host, schema) {
31
- return viteConfigurationGeneratorInternal(host, _extends._({
32
- addPlugin: false
33
- }, schema));
16
+ return viteConfigurationGeneratorInternal(host, {
17
+ addPlugin: false,
18
+ ...schema,
19
+ });
34
20
  }
35
21
  async function viteConfigurationGeneratorInternal(tree, schema) {
36
- var _nxJson_plugins;
37
- var _schema, // Setting default to jsdom since it is the most common use case (React, Web).
38
- // The @nx/js:lib generator specifically sets this to node to be more generic.
39
- _schema1, _schema2;
40
22
  const tasks = [];
41
- const projectConfig = (0, _devkit.readProjectConfiguration)(tree, schema.project);
23
+ const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, schema.project);
42
24
  const { targets, root: projectRoot } = projectConfig;
43
- var _schema_projectType;
44
- const projectType = (0, _tssolutionsetup.getProjectType)(tree, projectConfig.root, (_schema_projectType = schema.projectType) != null ? _schema_projectType : projectConfig.projectType);
45
- var _includeLib;
46
- (_includeLib = (_schema = schema).includeLib) != null ? _includeLib : _schema.includeLib = projectType === 'library';
47
- var _testEnvironment;
48
- (_testEnvironment = (_schema1 = schema).testEnvironment) != null ? _testEnvironment : _schema1.testEnvironment = 'jsdom';
25
+ const projectType = (0, ts_solution_setup_1.getProjectType)(tree, projectConfig.root, schema.projectType ?? projectConfig.projectType);
26
+ schema.includeLib ??= projectType === 'library';
27
+ // Setting default to jsdom since it is the most common use case (React, Web).
28
+ // The @nx/js:lib generator specifically sets this to node to be more generic.
29
+ schema.testEnvironment ??= 'jsdom';
49
30
  /**
50
- * This is for when we are converting an existing project
51
- * to use the vite executors.
52
- */ let projectAlreadyHasViteTargets = {};
31
+ * This is for when we are converting an existing project
32
+ * to use the vite executors.
33
+ */
34
+ let projectAlreadyHasViteTargets = {};
53
35
  if (!schema.newProject) {
54
- await (0, _convertnonvite.convertNonVite)(tree, schema, projectRoot, projectType, targets);
36
+ await (0, convert_non_vite_1.convertNonVite)(tree, schema, projectRoot, projectType, targets);
55
37
  }
56
- const jsInitTask = await (0, _js.initGenerator)(tree, _extends._({}, schema, {
38
+ const jsInitTask = await (0, js_1.initGenerator)(tree, {
39
+ ...schema,
57
40
  skipFormat: true,
58
- tsConfigName: projectRoot === '.' ? 'tsconfig.json' : 'tsconfig.base.json'
59
- }));
41
+ tsConfigName: projectRoot === '.' ? 'tsconfig.json' : 'tsconfig.base.json',
42
+ });
60
43
  tasks.push(jsInitTask);
61
- const initTask = await (0, _init.default)(tree, _extends._({}, schema, {
44
+ const initTask = await (0, init_1.default)(tree, {
45
+ ...schema,
62
46
  projectRoot,
63
- skipFormat: true
64
- }));
47
+ skipFormat: true,
48
+ });
65
49
  tasks.push(initTask);
66
- tasks.push((0, _ensuredependencies.ensureDependencies)(tree, schema));
67
- const nxJson = (0, _devkit.readNxJson)(tree);
68
- const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' && nxJson.useInferencePlugins !== false;
69
- var _addPlugin;
70
- (_addPlugin = (_schema2 = schema).addPlugin) != null ? _addPlugin : _schema2.addPlugin = addPluginDefault;
71
- const hasPlugin = (_nxJson_plugins = nxJson.plugins) == null ? void 0 : _nxJson_plugins.some((p)=>typeof p === 'string' ? p === '@nx/vite/plugin' : p.plugin === '@nx/vite/plugin');
50
+ tasks.push((0, ensure_dependencies_1.ensureDependencies)(tree, schema));
51
+ const nxJson = (0, devkit_1.readNxJson)(tree);
52
+ const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
53
+ nxJson.useInferencePlugins !== false;
54
+ schema.addPlugin ??= addPluginDefault;
55
+ const hasPlugin = nxJson.plugins?.some((p) => typeof p === 'string'
56
+ ? p === '@nx/vite/plugin'
57
+ : p.plugin === '@nx/vite/plugin');
72
58
  if (!hasPlugin) {
73
59
  if (!projectAlreadyHasViteTargets.build) {
74
- (0, _generatorutils.addBuildTarget)(tree, schema, 'build');
60
+ (0, generator_utils_1.addBuildTarget)(tree, schema, 'build');
75
61
  }
76
62
  if (!schema.includeLib) {
77
63
  if (!projectAlreadyHasViteTargets.serve) {
78
- (0, _generatorutils.addServeTarget)(tree, schema, 'serve');
64
+ (0, generator_utils_1.addServeTarget)(tree, schema, 'serve');
79
65
  }
80
66
  if (!projectAlreadyHasViteTargets.preview) {
81
- (0, _generatorutils.addPreviewTarget)(tree, schema, 'preview');
67
+ (0, generator_utils_1.addPreviewTarget)(tree, schema, 'preview');
82
68
  }
83
69
  }
84
70
  }
85
71
  if (projectType === 'library') {
86
72
  // update tsconfig.lib.json to include vite/client
87
- (0, _devkit.updateJson)(tree, (0, _devkit.joinPathFragments)(projectRoot, 'tsconfig.lib.json'), (json)=>{
88
- var _json, _json_compilerOptions;
89
- var _compilerOptions;
90
- (_compilerOptions = (_json = json).compilerOptions) != null ? _compilerOptions : _json.compilerOptions = {};
91
- var _types;
92
- (_types = (_json_compilerOptions = json.compilerOptions).types) != null ? _types : _json_compilerOptions.types = [];
73
+ (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(projectRoot, 'tsconfig.lib.json'), (json) => {
74
+ json.compilerOptions ??= {};
75
+ json.compilerOptions.types ??= [];
93
76
  if (!json.compilerOptions.types.includes('vite/client')) {
94
77
  json.compilerOptions.types.push('vite/client');
95
78
  }
@@ -99,7 +82,7 @@ async function viteConfigurationGeneratorInternal(tree, schema) {
99
82
  if (!schema.newProject) {
100
83
  // We are converting existing project to use Vite
101
84
  if (schema.uiFramework === 'react') {
102
- (0, _generatorutils.createOrEditViteConfig)(tree, {
85
+ (0, generator_utils_1.createOrEditViteConfig)(tree, {
103
86
  project: schema.project,
104
87
  includeLib: schema.includeLib,
105
88
  includeVitest: schema.includeVitest,
@@ -107,22 +90,23 @@ async function viteConfigurationGeneratorInternal(tree, schema) {
107
90
  rollupOptionsExternal: [
108
91
  "'react'",
109
92
  "'react-dom'",
110
- "'react/jsx-runtime'"
93
+ "'react/jsx-runtime'",
111
94
  ],
112
95
  imports: [
113
- schema.compiler === 'swc' ? `import react from '@vitejs/plugin-react-swc'` : `import react from '@vitejs/plugin-react'`
96
+ schema.compiler === 'swc'
97
+ ? `import react from '@vitejs/plugin-react-swc'`
98
+ : `import react from '@vitejs/plugin-react'`,
114
99
  ],
115
- plugins: [
116
- 'react()'
117
- ],
118
- port: schema.port
100
+ plugins: ['react()'],
101
+ port: schema.port,
119
102
  }, false, undefined);
120
- } else {
121
- (0, _generatorutils.createOrEditViteConfig)(tree, schema, false, projectAlreadyHasViteTargets);
103
+ }
104
+ else {
105
+ (0, generator_utils_1.createOrEditViteConfig)(tree, schema, false, projectAlreadyHasViteTargets);
122
106
  }
123
107
  }
124
108
  if (schema.includeVitest) {
125
- const vitestTask = await (0, _vitestgenerator.default)(tree, {
109
+ const vitestTask = await (0, vitest_generator_1.default)(tree, {
126
110
  project: schema.project,
127
111
  uiFramework: schema.uiFramework,
128
112
  inSourceTests: schema.inSourceTests,
@@ -132,59 +116,55 @@ async function viteConfigurationGeneratorInternal(tree, schema) {
132
116
  skipFormat: true,
133
117
  addPlugin: schema.addPlugin,
134
118
  compiler: schema.compiler,
135
- projectType
119
+ projectType,
136
120
  });
137
121
  tasks.push(vitestTask);
138
122
  }
139
- if ((0, _tssolutionsetup.isUsingTsSolutionSetup)(tree)) {
123
+ if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree)) {
140
124
  updatePackageJson(tree, schema, projectType);
141
125
  }
142
126
  if (!schema.skipFormat) {
143
- await (0, _devkit.formatFiles)(tree);
127
+ await (0, devkit_1.formatFiles)(tree);
144
128
  }
145
- return (0, _devkit.runTasksInSerial)(...tasks);
129
+ return (0, devkit_1.runTasksInSerial)(...tasks);
146
130
  }
147
- const _default = viteConfigurationGenerator;
131
+ exports.default = viteConfigurationGenerator;
148
132
  function updatePackageJson(tree, options, projectType) {
149
- const project = (0, _devkit.readProjectConfiguration)(tree, options.project);
150
- const packageJsonPath = (0, _posix.join)(project.root, 'package.json');
133
+ const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
134
+ const packageJsonPath = (0, posix_1.join)(project.root, 'package.json');
151
135
  let packageJson;
152
136
  if (tree.exists(packageJsonPath)) {
153
- packageJson = (0, _devkit.readJson)(tree, packageJsonPath);
154
- } else {
137
+ packageJson = (0, devkit_1.readJson)(tree, packageJsonPath);
138
+ }
139
+ else {
155
140
  packageJson = {
156
- name: (0, _getimportpath.getImportPath)(tree, options.project),
157
- version: '0.0.1'
141
+ name: (0, get_import_path_1.getImportPath)(tree, options.project),
142
+ version: '0.0.1',
158
143
  };
159
- if ((0, _tssolutionsetup.getProjectType)(tree, project.root, projectType) === 'application') {
144
+ if ((0, ts_solution_setup_1.getProjectType)(tree, project.root, projectType) === 'application') {
160
145
  packageJson.private = true;
161
146
  }
162
147
  }
163
148
  if (projectType === 'library') {
164
- var _tsconfigBase_compilerOptions_customConditions, _tsconfigBase_compilerOptions;
165
149
  // we always write/override the vite and project config with some set values,
166
150
  // so we can rely on them
167
- const main = (0, _posix.join)(project.root, 'src/index.ts');
151
+ const main = (0, posix_1.join)(project.root, 'src/index.ts');
168
152
  // we configure the dts plugin with the entryRoot set to `src`
169
- const rootDir = (0, _posix.join)(project.root, 'src');
170
- const outputPath = (0, _devkit.joinPathFragments)(project.root, 'dist');
153
+ const rootDir = (0, posix_1.join)(project.root, 'src');
154
+ const outputPath = (0, devkit_1.joinPathFragments)(project.root, 'dist');
171
155
  // the file must exist in the TS solution setup, which is the only case this
172
156
  // function is called
173
- const tsconfigBase = (0, _devkit.readJson)(tree, 'tsconfig.base.json');
174
- packageJson = (0, _js.getUpdatedPackageJsonContent)(packageJson, {
157
+ const tsconfigBase = (0, devkit_1.readJson)(tree, 'tsconfig.base.json');
158
+ packageJson = (0, js_1.getUpdatedPackageJsonContent)(packageJson, {
175
159
  main,
176
160
  outputPath,
177
161
  projectRoot: project.root,
178
162
  rootDir,
179
163
  generateExportsField: true,
180
164
  packageJsonPath,
181
- format: [
182
- 'esm'
183
- ],
184
- skipDevelopmentExports: !((_tsconfigBase_compilerOptions = tsconfigBase.compilerOptions) == null ? void 0 : (_tsconfigBase_compilerOptions_customConditions = _tsconfigBase_compilerOptions.customConditions) == null ? void 0 : _tsconfigBase_compilerOptions_customConditions.includes('development'))
165
+ format: ['esm'],
166
+ skipDevelopmentExports: !tsconfigBase.compilerOptions?.customConditions?.includes('development'),
185
167
  });
186
168
  }
187
- (0, _devkit.writeJson)(tree, packageJsonPath, packageJson);
169
+ (0, devkit_1.writeJson)(tree, packageJsonPath, packageJson);
188
170
  }
189
-
190
- //# sourceMappingURL=configuration.js.map
@@ -3,3 +3,4 @@ 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
@@ -0,0 +1 @@
1
+ {"version":3,"file":"convert-non-vite.d.ts","sourceRoot":"","sources":["../../../../../../../packages/vite/src/generators/configuration/lib/convert-non-vite.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EACnB,IAAI,EAGL,MAAM,YAAY,CAAC;AAKpB,OAAO,EAAE,gCAAgC,EAAE,MAAM,WAAW,CAAC;AAU7D,wBAAsB,cAAc,CAClC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,gCAAgC,EACxC,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE;IACP,CAAC,UAAU,EAAE,MAAM,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC;CAChD,iBA8EF"}
@@ -1,42 +1,41 @@
1
1
  "use strict";
2
- Object.defineProperty(exports, "convertNonVite", {
3
- enumerable: true,
4
- get: function() {
5
- return convertNonVite;
6
- }
7
- });
8
- const _devkit = require("@nx/devkit");
9
- const _findviteconfig = require("../../../utils/find-vite-config");
10
- const _generatorutils = require("../../../utils/generator-utils");
11
- const _tssolutionsetup = require("@nx/js/src/utils/typescript/ts-solution-setup");
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.convertNonVite = convertNonVite;
4
+ const devkit_1 = require("@nx/devkit");
5
+ const find_vite_config_1 = require("../../../utils/find-vite-config");
6
+ const generator_utils_1 = require("../../../utils/generator-utils");
7
+ const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
12
8
  async function convertNonVite(tree, schema, projectRoot, _projectType, targets) {
13
9
  // Check if it has vite
14
- const hasViteConfig = (0, _findviteconfig.findViteConfig)(tree, projectRoot);
15
- const hasIndexHtmlAtRoot = tree.exists((0, _devkit.joinPathFragments)(projectRoot, 'index.html'));
10
+ const hasViteConfig = (0, find_vite_config_1.findViteConfig)(tree, projectRoot);
11
+ const hasIndexHtmlAtRoot = tree.exists((0, devkit_1.joinPathFragments)(projectRoot, 'index.html'));
16
12
  // Check if it has webpack
17
- const hasWebpackConfig = (0, _findviteconfig.findWebpackConfig)(tree, projectRoot);
18
- const projectType = (0, _tssolutionsetup.getProjectType)(tree, projectRoot, _projectType);
13
+ const hasWebpackConfig = (0, find_vite_config_1.findWebpackConfig)(tree, projectRoot);
14
+ const projectType = (0, ts_solution_setup_1.getProjectType)(tree, projectRoot, _projectType);
19
15
  if (hasWebpackConfig) {
20
16
  if (projectType === 'application') {
21
- (0, _generatorutils.moveAndEditIndexHtml)(tree, schema);
17
+ (0, generator_utils_1.moveAndEditIndexHtml)(tree, schema);
22
18
  }
23
- (0, _generatorutils.deleteWebpackConfig)(tree, projectRoot, hasWebpackConfig);
24
- (0, _generatorutils.editTsConfig)(tree, schema);
19
+ (0, generator_utils_1.deleteWebpackConfig)(tree, projectRoot, hasWebpackConfig);
20
+ (0, generator_utils_1.editTsConfig)(tree, schema);
25
21
  return;
26
22
  }
27
- if (projectType === 'application' && hasViteConfig && hasIndexHtmlAtRoot && !hasWebpackConfig) {
23
+ if (projectType === 'application' &&
24
+ hasViteConfig &&
25
+ hasIndexHtmlAtRoot &&
26
+ !hasWebpackConfig) {
28
27
  throw new Error(`The project ${schema.project} is already configured to use Vite.`);
29
28
  return;
30
29
  }
31
30
  if (projectType === 'library' && hasViteConfig) {
32
31
  // continue anyway - it could need to be updated - only update vite.config.ts in any case
33
- (0, _generatorutils.editTsConfig)(tree, schema);
32
+ (0, generator_utils_1.editTsConfig)(tree, schema);
34
33
  return;
35
34
  }
36
35
  // Does the project have js executors?
37
- const { supported: jsTargetName, unsupported } = (0, _generatorutils.findExistingJsBuildTargetInProject)(targets);
36
+ const { supported: jsTargetName, unsupported } = (0, generator_utils_1.findExistingJsBuildTargetInProject)(targets);
38
37
  if (jsTargetName) {
39
- (0, _generatorutils.editTsConfig)(tree, schema);
38
+ (0, generator_utils_1.editTsConfig)(tree, schema);
40
39
  return;
41
40
  }
42
41
  if (unsupported) {
@@ -47,18 +46,20 @@ async function convertNonVite(tree, schema, projectRoot, _projectType, targets)
47
46
  }
48
47
  // If it's a library, it's most possible it's non-buildable
49
48
  // So fix the tsconfig and return, to continue with the rest of the setup
50
- if (projectType === 'library' && !hasViteConfig && !hasWebpackConfig && !jsTargetName) {
51
- (0, _generatorutils.editTsConfig)(tree, schema);
49
+ if (projectType === 'library' &&
50
+ !hasViteConfig &&
51
+ !hasWebpackConfig &&
52
+ !jsTargetName) {
53
+ (0, generator_utils_1.editTsConfig)(tree, schema);
52
54
  return;
53
55
  }
54
56
  /**
55
- * The project is an app.
56
- * The project has no js executors, no webpack config, no vite config.
57
- * We did not find any configuration that hints the project can
58
- * definitely be converted.
59
- * So, we should warn the user about it.
60
- * They can choose whether to convert it or not
61
- */ await (0, _generatorutils.handleUnknownConfiguration)(schema.project);
57
+ * The project is an app.
58
+ * The project has no js executors, no webpack config, no vite config.
59
+ * We did not find any configuration that hints the project can
60
+ * definitely be converted.
61
+ * So, we should warn the user about it.
62
+ * They can choose whether to convert it or not
63
+ */
64
+ await (0, generator_utils_1.handleUnknownConfiguration)(schema.project);
62
65
  }
63
-
64
- //# sourceMappingURL=convert-non-vite.js.map
@@ -5,3 +5,4 @@ interface Schema {
5
5
  }
6
6
  export declare function convertToInferred(tree: Tree, options: Schema): Promise<() => void>;
7
7
  export default convertToInferred;
8
+ //# sourceMappingURL=convert-to-inferred.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"convert-to-inferred.d.ts","sourceRoot":"","sources":["../../../../../../packages/vite/src/generators/convert-to-inferred/convert-to-inferred.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwC,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAY7E,UAAU,MAAM;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,uBAqDlE;AAED,eAAe,iBAAiB,CAAC"}