@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 +1,2 @@
1
1
  export declare function detectUiFramework(project: string): Promise<'angular' | 'react' | 'none'>;
2
+ //# sourceMappingURL=detect-ui-framework.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"detect-ui-framework.d.ts","sourceRoot":"","sources":["../../../../../packages/vite/src/utils/detect-ui-framework.ts"],"names":[],"mappings":"AAMA,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,SAAS,GAAG,OAAO,GAAG,MAAM,CAAC,CAuBvC"}
@@ -1,28 +1,19 @@
1
1
  "use strict";
2
- Object.defineProperty(exports, "detectUiFramework", {
3
- enumerable: true,
4
- get: function() {
5
- return detectUiFramework;
6
- }
7
- });
8
- const _devkit = require("@nx/devkit");
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.detectUiFramework = detectUiFramework;
4
+ const devkit_1 = require("@nx/devkit");
9
5
  const ANGULAR_NPM_SCOPE = 'angular';
10
- const ANGULAR_DEPS = [
11
- '@nx/angular'
12
- ];
13
- const REACT_DEPS = [
14
- 'react',
15
- '@nx/react'
16
- ];
6
+ const ANGULAR_DEPS = ['@nx/angular'];
7
+ const REACT_DEPS = ['react', '@nx/react'];
17
8
  async function detectUiFramework(project) {
18
- const graph = await (0, _devkit.createProjectGraphAsync)();
19
- var _graph_dependencies_project;
20
- for (const dep of (_graph_dependencies_project = graph.dependencies[project]) != null ? _graph_dependencies_project : []){
9
+ const graph = await (0, devkit_1.createProjectGraphAsync)();
10
+ for (const dep of graph.dependencies[project] ?? []) {
21
11
  if (dep.source !== project || !dep.target.startsWith('npm:')) {
22
12
  continue;
23
13
  }
24
14
  const npmDependency = dep.target.replace('npm:', '');
25
- if (dep.target.startsWith(`npm:@${ANGULAR_NPM_SCOPE}/`) || ANGULAR_DEPS.includes(npmDependency)) {
15
+ if (dep.target.startsWith(`npm:@${ANGULAR_NPM_SCOPE}/`) ||
16
+ ANGULAR_DEPS.includes(npmDependency)) {
26
17
  return 'angular';
27
18
  }
28
19
  if (REACT_DEPS.includes(npmDependency)) {
@@ -31,5 +22,3 @@ async function detectUiFramework(project) {
31
22
  }
32
23
  return 'none';
33
24
  }
34
-
35
- //# sourceMappingURL=detect-ui-framework.js.map
@@ -1,3 +1,4 @@
1
1
  import { type Tree } from '@nx/devkit';
2
2
  export declare function getViteE2EWebServerInfo(tree: Tree, projectName: string, configFilePath: string, isPluginBeingAdded: boolean, e2ePortOverride?: number, e2eCIPortOverride?: number): Promise<import("@nx/devkit/src/generators/e2e-web-server-info-utils").E2EWebServerDetails>;
3
3
  export declare function getReactRouterE2EWebServerInfo(tree: Tree, projectName: string, configFilePath: string, isPluginBeingAdded: boolean, e2ePortOverride?: number, e2eCIPortOverride?: number): Promise<import("@nx/devkit/src/generators/e2e-web-server-info-utils").E2EWebServerDetails>;
4
+ //# sourceMappingURL=e2e-web-server-info-utils.d.ts.map
@@ -0,0 +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,8FAkC3B;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,8FAsB3B"}
@@ -1,57 +1,45 @@
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
- getReactRouterE2EWebServerInfo: function() {
10
- return getReactRouterE2EWebServerInfo;
11
- },
12
- getViteE2EWebServerInfo: function() {
13
- return getViteE2EWebServerInfo;
14
- }
15
- });
16
- const _devkit = require("@nx/devkit");
17
- const _e2ewebserverinfoutils = require("@nx/devkit/src/generators/e2e-web-server-info-utils");
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.getViteE2EWebServerInfo = getViteE2EWebServerInfo;
4
+ exports.getReactRouterE2EWebServerInfo = getReactRouterE2EWebServerInfo;
5
+ const devkit_1 = require("@nx/devkit");
6
+ const e2e_web_server_info_utils_1 = require("@nx/devkit/src/generators/e2e-web-server-info-utils");
18
7
  async function getViteE2EWebServerInfo(tree, projectName, configFilePath, isPluginBeingAdded, e2ePortOverride, e2eCIPortOverride) {
19
- var _nxJson_targetDefaults, _nxJson_targetDefaults_dev_options, _nxJson_targetDefaults1, _nxJson_targetDefaults2, _nxJson_targetDefaults_serve_options, _nxJson_targetDefaults3;
20
- const nxJson = (0, _devkit.readNxJson)(tree);
21
- let e2ePort = e2ePortOverride != null ? e2ePortOverride : 4200;
22
- if (((_nxJson_targetDefaults = nxJson.targetDefaults) == null ? void 0 : _nxJson_targetDefaults['dev']) && ((_nxJson_targetDefaults1 = nxJson.targetDefaults) == null ? void 0 : (_nxJson_targetDefaults_dev_options = _nxJson_targetDefaults1['dev'].options) == null ? void 0 : _nxJson_targetDefaults_dev_options.port) || ((_nxJson_targetDefaults2 = nxJson.targetDefaults) == null ? void 0 : _nxJson_targetDefaults2['serve']) && ((_nxJson_targetDefaults3 = nxJson.targetDefaults) == null ? void 0 : (_nxJson_targetDefaults_serve_options = _nxJson_targetDefaults3['serve'].options) == null ? void 0 : _nxJson_targetDefaults_serve_options.port)) {
23
- var _nxJson_targetDefaults_dev_options1, _nxJson_targetDefaults4, _nxJson_targetDefaults_serve_options1, _nxJson_targetDefaults5;
24
- var _nxJson_targetDefaults_dev_options_port;
25
- e2ePort = (_nxJson_targetDefaults_dev_options_port = (_nxJson_targetDefaults4 = nxJson.targetDefaults) == null ? void 0 : (_nxJson_targetDefaults_dev_options1 = _nxJson_targetDefaults4['dev'].options) == null ? void 0 : _nxJson_targetDefaults_dev_options1.port) != null ? _nxJson_targetDefaults_dev_options_port : (_nxJson_targetDefaults5 = nxJson.targetDefaults) == null ? void 0 : (_nxJson_targetDefaults_serve_options1 = _nxJson_targetDefaults5['serve'].options) == null ? void 0 : _nxJson_targetDefaults_serve_options1.port;
8
+ const nxJson = (0, devkit_1.readNxJson)(tree);
9
+ let e2ePort = e2ePortOverride ?? 4200;
10
+ if ((nxJson.targetDefaults?.['dev'] &&
11
+ nxJson.targetDefaults?.['dev'].options?.port) ||
12
+ (nxJson.targetDefaults?.['serve'] &&
13
+ nxJson.targetDefaults?.['serve'].options?.port)) {
14
+ e2ePort =
15
+ nxJson.targetDefaults?.['dev'].options?.port ??
16
+ nxJson.targetDefaults?.['serve'].options?.port;
26
17
  }
27
- return (0, _e2ewebserverinfoutils.getE2EWebServerInfo)(tree, projectName, {
18
+ return (0, e2e_web_server_info_utils_1.getE2EWebServerInfo)(tree, projectName, {
28
19
  plugin: '@nx/vite/plugin',
29
20
  serveTargetName: 'devTargetName',
30
21
  serveStaticTargetName: 'previewTargetName',
31
- configFilePath
22
+ configFilePath,
32
23
  }, {
33
24
  defaultServeTargetName: 'dev',
34
25
  defaultServeStaticTargetName: 'preview',
35
26
  defaultE2EWebServerAddress: `http://localhost:${e2ePort}`,
36
- defaultE2ECiBaseUrl: `http://localhost:${e2eCIPortOverride != null ? e2eCIPortOverride : 4300}`,
37
- defaultE2EPort: e2ePort
27
+ defaultE2ECiBaseUrl: `http://localhost:${e2eCIPortOverride ?? 4300}`,
28
+ defaultE2EPort: e2ePort,
38
29
  }, isPluginBeingAdded);
39
30
  }
40
31
  async function getReactRouterE2EWebServerInfo(tree, projectName, configFilePath, isPluginBeingAdded, e2ePortOverride, e2eCIPortOverride) {
41
- var _ref;
42
- const e2ePort = (_ref = e2ePortOverride != null ? e2ePortOverride : parseInt(process.env.PORT)) != null ? _ref : 4200;
43
- return await (0, _e2ewebserverinfoutils.getE2EWebServerInfo)(tree, projectName, {
32
+ const e2ePort = e2ePortOverride ?? parseInt(process.env.PORT) ?? 4200;
33
+ return await (0, e2e_web_server_info_utils_1.getE2EWebServerInfo)(tree, projectName, {
44
34
  plugin: '@nx/react/router-plugin',
45
35
  serveTargetName: 'devTargetName',
46
36
  serveStaticTargetName: 'devTargetName',
47
- configFilePath
37
+ configFilePath,
48
38
  }, {
49
39
  defaultServeTargetName: 'dev',
50
40
  defaultServeStaticTargetName: 'dev',
51
41
  defaultE2EWebServerAddress: `http://localhost:${e2ePort}`,
52
- defaultE2ECiBaseUrl: `http://localhost:${e2eCIPortOverride != null ? e2eCIPortOverride : 4200}`,
53
- defaultE2EPort: e2ePort
42
+ defaultE2ECiBaseUrl: `http://localhost:${e2eCIPortOverride ?? 4200}`,
43
+ defaultE2EPort: e2ePort,
54
44
  }, isPluginBeingAdded);
55
45
  }
56
-
57
- //# sourceMappingURL=e2e-web-server-info-utils.js.map
@@ -6,3 +6,4 @@ export type EnsureDependenciesOptions = {
6
6
  testEnvironment?: 'node' | 'jsdom' | 'happy-dom' | 'edge-runtime' | string;
7
7
  };
8
8
  export declare function ensureDependencies(host: Tree, schema: EnsureDependenciesOptions): GeneratorCallback;
9
+ //# sourceMappingURL=ensure-dependencies.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"ensure-dependencies.d.ts","sourceRoot":"","sources":["../../../../../packages/vite/src/utils/ensure-dependencies.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,iBAAiB,EACtB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAYpB,MAAM,MAAM,yBAAyB,GAAG;IACtC,WAAW,EAAE,SAAS,GAAG,OAAO,GAAG,MAAM,CAAC;IAC1C,QAAQ,CAAC,EAAE,OAAO,GAAG,KAAK,CAAC;IAC3B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,WAAW,GAAG,cAAc,GAAG,MAAM,CAAC;CAC5E,CAAC;AAEF,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,yBAAyB,GAChC,iBAAiB,CAoCnB"}
@@ -1,41 +1,39 @@
1
1
  "use strict";
2
- Object.defineProperty(exports, "ensureDependencies", {
3
- enumerable: true,
4
- get: function() {
5
- return ensureDependencies;
6
- }
7
- });
8
- const _devkit = require("@nx/devkit");
9
- const _versions = require("./versions");
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.ensureDependencies = ensureDependencies;
4
+ const devkit_1 = require("@nx/devkit");
5
+ const versions_1 = require("./versions");
10
6
  function ensureDependencies(host, schema) {
11
7
  const devDependencies = {};
12
8
  if (schema.testEnvironment === 'jsdom') {
13
- devDependencies['jsdom'] = _versions.jsdomVersion;
14
- } else if (schema.testEnvironment === 'happy-dom') {
15
- devDependencies['happy-dom'] = _versions.happyDomVersion;
16
- } else if (schema.testEnvironment === 'edge-runtime') {
17
- devDependencies['@edge-runtime/vm'] = _versions.edgeRuntimeVmVersion;
18
- } else if (schema.testEnvironment !== 'node' && schema.testEnvironment) {
19
- _devkit.logger.info(`A custom environment was provided: ${schema.testEnvironment}. You need to install it manually.`);
9
+ devDependencies['jsdom'] = versions_1.jsdomVersion;
10
+ }
11
+ else if (schema.testEnvironment === 'happy-dom') {
12
+ devDependencies['happy-dom'] = versions_1.happyDomVersion;
13
+ }
14
+ else if (schema.testEnvironment === 'edge-runtime') {
15
+ devDependencies['@edge-runtime/vm'] = versions_1.edgeRuntimeVmVersion;
16
+ }
17
+ else if (schema.testEnvironment !== 'node' && schema.testEnvironment) {
18
+ devkit_1.logger.info(`A custom environment was provided: ${schema.testEnvironment}. You need to install it manually.`);
20
19
  }
21
20
  if (schema.uiFramework === 'angular') {
22
- devDependencies['@analogjs/vitest-angular'] = _versions.analogVitestAngular;
23
- devDependencies['@analogjs/vite-plugin-angular'] = _versions.analogVitestAngular;
21
+ devDependencies['@analogjs/vitest-angular'] = versions_1.analogVitestAngular;
22
+ devDependencies['@analogjs/vite-plugin-angular'] = versions_1.analogVitestAngular;
24
23
  }
25
24
  if (schema.uiFramework === 'react') {
26
25
  if (schema.compiler === 'swc') {
27
- devDependencies['@vitejs/plugin-react-swc'] = _versions.vitePluginReactSwcVersion;
28
- } else {
29
- devDependencies['@vitejs/plugin-react'] = _versions.vitePluginReactVersion;
26
+ devDependencies['@vitejs/plugin-react-swc'] = versions_1.vitePluginReactSwcVersion;
27
+ }
28
+ else {
29
+ devDependencies['@vitejs/plugin-react'] = versions_1.vitePluginReactVersion;
30
30
  }
31
31
  }
32
32
  if (schema.includeLib) {
33
- devDependencies['vite-plugin-dts'] = _versions.vitePluginDtsVersion;
34
- if ((0, _devkit.detectPackageManager)() !== 'pnpm') {
35
- devDependencies['ajv'] = _versions.ajvVersion;
33
+ devDependencies['vite-plugin-dts'] = versions_1.vitePluginDtsVersion;
34
+ if ((0, devkit_1.detectPackageManager)() !== 'pnpm') {
35
+ devDependencies['ajv'] = versions_1.ajvVersion;
36
36
  }
37
37
  }
38
- return (0, _devkit.addDependenciesToPackageJson)(host, {}, devDependencies);
38
+ return (0, devkit_1.addDependenciesToPackageJson)(host, {}, devDependencies);
39
39
  }
40
-
41
- //# sourceMappingURL=ensure-dependencies.js.map
@@ -10,3 +10,4 @@ export declare function createBuildableTsConfig(projectRoot: string, options: {
10
10
  }, context: ExecutorContext): string;
11
11
  export declare function loadViteDynamicImport(): Promise<typeof import("vite")>;
12
12
  export declare function loadVitestDynamicImport(): Promise<typeof import("vitest/node")>;
13
+ //# sourceMappingURL=executor-utils.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"executor-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/vite/src/utils/executor-utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAA4B,MAAM,YAAY,CAAC;AAWvE,wBAAsB,aAAa,CAAC,IAAI,EAAE;IACxC,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,GAAG,OAAO,CAAC,IAAI,CAAC,CA0BhB;AAED,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,mBAAmB,CAAC,EAAE,OAAO,CAAA;CAAE,EAC7D,OAAO,EAAE,eAAe,UA4BzB;AAED,wBAAgB,qBAAqB,IACW,OAAO,CAAC,cAAc,MAAM,CAAC,CAAC,CAC7E;AAED,wBAAgB,uBAAuB,IACgB,OAAO,CAC1D,cAAc,aAAa,CAAC,CAC7B,CACF"}
@@ -1,63 +1,49 @@
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
- createBuildableTsConfig: function() {
10
- return createBuildableTsConfig;
11
- },
12
- loadViteDynamicImport: function() {
13
- return loadViteDynamicImport;
14
- },
15
- loadVitestDynamicImport: function() {
16
- return loadVitestDynamicImport;
17
- },
18
- validateTypes: function() {
19
- return validateTypes;
20
- }
21
- });
22
- const _devkit = require("@nx/devkit");
23
- const _buildablelibsutils = require("@nx/js/src/utils/buildable-libs-utils");
24
- const _optionsutils = require("./options-utils");
25
- const _nodechild_process = require("node:child_process");
26
- const _js = require("@nx/js");
27
- const _path = require("path");
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.validateTypes = validateTypes;
4
+ exports.createBuildableTsConfig = createBuildableTsConfig;
5
+ exports.loadViteDynamicImport = loadViteDynamicImport;
6
+ exports.loadVitestDynamicImport = loadVitestDynamicImport;
7
+ const devkit_1 = require("@nx/devkit");
8
+ const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
9
+ const options_utils_1 = require("./options-utils");
10
+ const node_child_process_1 = require("node:child_process");
11
+ const js_1 = require("@nx/js");
12
+ const path_1 = require("path");
28
13
  async function validateTypes(opts) {
29
14
  if (!opts.isVueProject) {
30
- const result = await (0, _js.runTypeCheck)({
15
+ const result = await (0, js_1.runTypeCheck)({
31
16
  workspaceRoot: opts.workspaceRoot,
32
- tsConfigPath: opts.tsconfig.startsWith(opts.workspaceRoot) ? opts.tsconfig : (0, _path.join)(opts.workspaceRoot, opts.tsconfig),
33
- mode: 'noEmit'
17
+ tsConfigPath: opts.tsconfig.startsWith(opts.workspaceRoot)
18
+ ? opts.tsconfig
19
+ : (0, path_1.join)(opts.workspaceRoot, opts.tsconfig),
20
+ mode: 'noEmit',
34
21
  });
35
- await (0, _js.printDiagnostics)(result.errors, result.warnings);
22
+ await (0, js_1.printDiagnostics)(result.errors, result.warnings);
36
23
  if (result.errors.length > 0) {
37
24
  throw new Error('Found type errors. See above.');
38
25
  }
39
- } else {
40
- const pm = (0, _devkit.getPackageManagerCommand)();
41
- const cp = (0, _nodechild_process.execSync)(`${pm.exec} vue-tsc --noEmit -p ${opts.tsconfig} --composite false`, {
26
+ }
27
+ else {
28
+ const pm = (0, devkit_1.getPackageManagerCommand)();
29
+ const cp = (0, node_child_process_1.execSync)(`${pm.exec} vue-tsc --noEmit -p ${opts.tsconfig} --composite false`, {
42
30
  cwd: opts.workspaceRoot,
43
31
  stdio: 'inherit',
44
- windowsHide: false
32
+ windowsHide: false,
45
33
  });
46
34
  }
47
35
  }
48
36
  function createBuildableTsConfig(projectRoot, options, context) {
49
- var _options, _buildLibsFromSource;
50
- var _options_tsConfig;
51
- const tsConfig = (_options_tsConfig = options.tsConfig) != null ? _options_tsConfig : (0, _optionsutils.getProjectTsConfigPath)(projectRoot);
52
- var _;
53
- (_ = (_options = options)[_buildLibsFromSource = 'buildLibsFromSource']) != null ? _ : _options[_buildLibsFromSource] = true;
37
+ const tsConfig = options.tsConfig ?? (0, options_utils_1.getProjectTsConfigPath)(projectRoot);
38
+ options['buildLibsFromSource'] ??= true;
54
39
  if (!options['buildLibsFromSource']) {
55
- const { dependencies } = (0, _buildablelibsutils.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName, // When using incremental building and the serve target is called
40
+ const { dependencies } = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName,
41
+ // When using incremental building and the serve target is called
56
42
  // we need to get the deps for the 'build' target instead.
57
43
  context.targetName === 'serve' ? 'build' : context.targetName, context.configurationName);
58
44
  // This tsconfig is used via the Vite ts paths plugin.
59
45
  // It can be also used by other user-defined Vite plugins (e.g. for creating type declaration files).
60
- const tmpTsConfigPath = (0, _buildablelibsutils.createTmpTsConfig)(tsConfig, context.root, projectRoot, dependencies);
46
+ const tmpTsConfigPath = (0, buildable_libs_utils_1.createTmpTsConfig)(tsConfig, context.root, projectRoot, dependencies);
61
47
  process.env.NX_TSCONFIG_PATH = tmpTsConfigPath;
62
48
  return tmpTsConfigPath;
63
49
  }
@@ -69,5 +55,3 @@ function loadViteDynamicImport() {
69
55
  function loadVitestDynamicImport() {
70
56
  return Function('return import("vitest/node")')();
71
57
  }
72
-
73
- //# sourceMappingURL=executor-utils.js.map
@@ -1,3 +1,4 @@
1
1
  import { Tree } from '@nx/devkit';
2
2
  export declare function findViteConfig(tree: Tree, searchRoot: string): string;
3
3
  export declare function findWebpackConfig(tree: Tree, searchRoot: string): string;
4
+ //# sourceMappingURL=find-vite-config.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"find-vite-config.d.ts","sourceRoot":"","sources":["../../../../../packages/vite/src/utils/find-vite-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAqB,MAAM,YAAY,CAAC;AAErD,wBAAgB,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,UAQ5D;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,UAQ/D"}
@@ -1,46 +1,21 @@
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
- findViteConfig: function() {
10
- return findViteConfig;
11
- },
12
- findWebpackConfig: function() {
13
- return findWebpackConfig;
14
- }
15
- });
16
- const _devkit = require("@nx/devkit");
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.findViteConfig = findViteConfig;
4
+ exports.findWebpackConfig = findWebpackConfig;
5
+ const devkit_1 = require("@nx/devkit");
17
6
  function findViteConfig(tree, searchRoot) {
18
- const allowsExt = [
19
- 'js',
20
- 'mjs',
21
- 'ts',
22
- 'cjs',
23
- 'mts',
24
- 'cts'
25
- ];
26
- for (const ext of allowsExt){
27
- if (tree.exists((0, _devkit.joinPathFragments)(searchRoot, `vite.config.${ext}`))) {
28
- return (0, _devkit.joinPathFragments)(searchRoot, `vite.config.${ext}`);
7
+ const allowsExt = ['js', 'mjs', 'ts', 'cjs', 'mts', 'cts'];
8
+ for (const ext of allowsExt) {
9
+ if (tree.exists((0, devkit_1.joinPathFragments)(searchRoot, `vite.config.${ext}`))) {
10
+ return (0, devkit_1.joinPathFragments)(searchRoot, `vite.config.${ext}`);
29
11
  }
30
12
  }
31
13
  }
32
14
  function findWebpackConfig(tree, searchRoot) {
33
- const allowsExt = [
34
- 'js',
35
- 'ts',
36
- 'mjs',
37
- 'cjs'
38
- ];
39
- for (const ext of allowsExt){
40
- if (tree.exists((0, _devkit.joinPathFragments)(searchRoot, `webpack.config.${ext}`))) {
41
- return (0, _devkit.joinPathFragments)(searchRoot, `webpack.config.${ext}`);
15
+ const allowsExt = ['js', 'ts', 'mjs', 'cjs'];
16
+ for (const ext of allowsExt) {
17
+ if (tree.exists((0, devkit_1.joinPathFragments)(searchRoot, `webpack.config.${ext}`))) {
18
+ return (0, devkit_1.joinPathFragments)(searchRoot, `webpack.config.${ext}`);
42
19
  }
43
20
  }
44
21
  }
45
-
46
- //# sourceMappingURL=find-vite-config.js.map
@@ -45,3 +45,4 @@ export declare function normalizeViteConfigFilePathWithTree(tree: Tree, projectR
45
45
  export declare function getViteConfigPathForProject(tree: Tree, projectName: string, target?: string): string;
46
46
  export declare function handleUnsupportedUserProvidedTargets(userProvidedTargetIsUnsupported: TargetFlags, userProvidedTargetName: UserProvidedTargetName, validFoundTargetName: ValidFoundTargetName): Promise<void>;
47
47
  export declare function handleUnknownConfiguration(projectName: string): Promise<void>;
48
+ //# sourceMappingURL=generator-utils.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"generator-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/vite/src/utils/generator-utils.ts"],"names":[],"mappings":"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"}