@analogjs/platform 2.0.0-alpha.7 → 2.0.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 (140) hide show
  1. package/package.json +22 -7
  2. package/src/lib/content/marked/index.d.ts +2 -0
  3. package/src/lib/content/marked/marked-setup.service.js +35 -29
  4. package/src/lib/content-plugin.js +3 -14
  5. package/src/lib/nx-plugin/README.md +1 -1
  6. package/src/lib/nx-plugin/executors.json +3 -15
  7. package/src/lib/nx-plugin/generators.json +10 -6
  8. package/src/lib/nx-plugin/src/generators/app/files/template-angular/package.json__template__ +3 -0
  9. package/src/lib/nx-plugin/src/generators/app/files/{template-angular-v16 → template-angular}/src/app/app.component.ts__template__ +1 -2
  10. package/src/lib/nx-plugin/src/generators/app/files/{template-angular-v16 → template-angular}/src/app/app.config.server.ts__template__ +2 -1
  11. package/src/lib/nx-plugin/src/generators/app/files/template-angular/src/app/app.config.ts__template__ +30 -0
  12. package/src/lib/nx-plugin/src/generators/app/files/template-angular/src/main.server.ts__template__ +8 -0
  13. package/src/lib/nx-plugin/src/generators/app/files/template-angular/src/test-setup.ts__template__ +28 -0
  14. package/src/lib/nx-plugin/src/generators/app/files/{template-angular-v16 → template-angular}/tsconfig.app.json__template__ +2 -2
  15. package/src/lib/nx-plugin/src/generators/app/files/template-angular/vite.config.ts__template__ +52 -0
  16. package/src/lib/nx-plugin/src/generators/app/files/template-angular-v15/vite.config.ts__template__ +1 -2
  17. package/src/lib/nx-plugin/src/generators/app/files/template-angular-v17/vite.config.ts__template__ +10 -4
  18. package/src/lib/nx-plugin/src/generators/app/files/template-angular-v18/tsconfig.app.json__template__ +2 -1
  19. package/src/lib/nx-plugin/src/generators/app/files/template-angular-v18/vite.config.ts__template__ +10 -4
  20. package/src/lib/nx-plugin/src/generators/app/files/template-angular-v19/src/main.server.ts__template__ +3 -27
  21. package/src/lib/nx-plugin/src/generators/app/files/template-angular-v19/tsconfig.app.json__template__ +2 -1
  22. package/src/lib/nx-plugin/src/generators/app/files/template-angular-v19/vite.config.ts__template__ +12 -14
  23. package/src/lib/nx-plugin/src/generators/app/generator.d.ts +1 -0
  24. package/src/lib/nx-plugin/src/generators/app/generator.js +47 -20
  25. package/src/lib/nx-plugin/src/generators/app/generator.js.map +1 -1
  26. package/src/lib/nx-plugin/src/generators/app/lib/add-analog-project-config.js +14 -8
  27. package/src/lib/nx-plugin/src/generators/app/lib/add-analog-project-config.js.map +1 -1
  28. package/src/lib/nx-plugin/src/generators/app/lib/add-angular-app.d.ts +3 -0
  29. package/src/lib/nx-plugin/src/generators/app/lib/add-angular-app.js +58 -0
  30. package/src/lib/nx-plugin/src/generators/app/lib/add-angular-app.js.map +1 -0
  31. package/src/lib/nx-plugin/src/generators/app/lib/add-files.js +1 -1
  32. package/src/lib/nx-plugin/src/generators/app/lib/add-files.js.map +1 -1
  33. package/src/lib/nx-plugin/src/generators/app/lib/add-tailwind-helpers.d.ts +1 -1
  34. package/src/lib/nx-plugin/src/generators/app/lib/add-tailwind-helpers.js +33 -12
  35. package/src/lib/nx-plugin/src/generators/app/lib/add-tailwind-helpers.js.map +1 -1
  36. package/src/lib/nx-plugin/src/generators/app/lib/add-vite-plugin.d.ts +2 -0
  37. package/src/lib/nx-plugin/src/generators/app/lib/add-vite-plugin.js +47 -0
  38. package/src/lib/nx-plugin/src/generators/app/lib/add-vite-plugin.js.map +1 -0
  39. package/src/lib/nx-plugin/src/generators/app/lib/cleanup-files.d.ts +3 -0
  40. package/src/lib/nx-plugin/src/generators/app/lib/cleanup-files.js +23 -0
  41. package/src/lib/nx-plugin/src/generators/app/lib/cleanup-files.js.map +1 -0
  42. package/src/lib/nx-plugin/src/generators/app/lib/initialize-analog-workspace.js +1 -1
  43. package/src/lib/nx-plugin/src/generators/app/lib/update-index-html.d.ts +2 -0
  44. package/src/lib/nx-plugin/src/generators/app/lib/update-index-html.js +16 -0
  45. package/src/lib/nx-plugin/src/generators/app/lib/update-index-html.js.map +1 -0
  46. package/src/lib/nx-plugin/src/generators/app/versions/dependencies.d.ts +3 -7
  47. package/src/lib/nx-plugin/src/generators/app/versions/dependencies.js +23 -55
  48. package/src/lib/nx-plugin/src/generators/app/versions/dependencies.js.map +1 -1
  49. package/src/lib/nx-plugin/src/generators/app/versions/dev-dependencies.js +23 -65
  50. package/src/lib/nx-plugin/src/generators/app/versions/dev-dependencies.js.map +1 -1
  51. package/src/lib/nx-plugin/src/generators/app/versions/nx-dependencies.js +15 -41
  52. package/src/lib/nx-plugin/src/generators/app/versions/nx-dependencies.js.map +1 -1
  53. package/src/lib/nx-plugin/src/generators/app/versions/nx_17_X/versions.d.ts +6 -5
  54. package/src/lib/nx-plugin/src/generators/app/versions/nx_17_X/versions.js +7 -6
  55. package/src/lib/nx-plugin/src/generators/app/versions/nx_17_X/versions.js.map +1 -1
  56. package/src/lib/nx-plugin/src/generators/app/versions/nx_18_X/versions.d.ts +15 -14
  57. package/src/lib/nx-plugin/src/generators/app/versions/nx_18_X/versions.js +16 -15
  58. package/src/lib/nx-plugin/src/generators/app/versions/nx_18_X/versions.js.map +1 -1
  59. package/src/lib/nx-plugin/src/generators/app/versions/tailwind-dependencies.d.ts +1 -1
  60. package/src/lib/nx-plugin/src/generators/app/versions/tailwind-dependencies.js +2 -2
  61. package/src/lib/nx-plugin/src/generators/app/versions/tailwind-dependencies.js.map +1 -1
  62. package/src/lib/nx-plugin/src/generators/app/versions/trpc-dependencies.js +16 -40
  63. package/src/lib/nx-plugin/src/generators/app/versions/trpc-dependencies.js.map +1 -1
  64. package/src/lib/nx-plugin/src/generators/app/versions.d.ts +1 -24
  65. package/src/lib/nx-plugin/src/generators/app/versions.js +2 -29
  66. package/src/lib/nx-plugin/src/generators/app/versions.js.map +1 -1
  67. package/src/lib/nx-plugin/src/generators/init/files/src/app/app.config.server.ts__template__ +10 -0
  68. package/src/lib/nx-plugin/src/generators/init/files/src/main.server.ts__template__ +14 -0
  69. package/src/lib/nx-plugin/src/generators/init/files/src/server/routes/api/v1/hello.ts__template__ +3 -0
  70. package/src/lib/nx-plugin/src/generators/init/generator.js +5 -2
  71. package/src/lib/nx-plugin/src/generators/init/generator.js.map +1 -1
  72. package/src/lib/nx-plugin/src/generators/init/lib/add-analog-dependencies.js +4 -1
  73. package/src/lib/nx-plugin/src/generators/init/lib/add-analog-dependencies.js.map +1 -1
  74. package/src/lib/nx-plugin/src/generators/init/lib/update-app-tsconfig.js +6 -1
  75. package/src/lib/nx-plugin/src/generators/init/lib/update-app-tsconfig.js.map +1 -1
  76. package/src/lib/nx-plugin/src/generators/init/lib/update-build-target.js +10 -1
  77. package/src/lib/nx-plugin/src/generators/init/lib/update-build-target.js.map +1 -1
  78. package/src/lib/nx-plugin/src/generators/init/lib/update-index-html.js +1 -1
  79. package/src/lib/nx-plugin/src/generators/init/lib/update-index-html.js.map +1 -1
  80. package/src/lib/nx-plugin/src/generators/init/lib/update-package-json.js +12 -5
  81. package/src/lib/nx-plugin/src/generators/init/lib/update-package-json.js.map +1 -1
  82. package/src/lib/nx-plugin/src/generators/init/lib/update-serve-target.js +5 -1
  83. package/src/lib/nx-plugin/src/generators/init/lib/update-serve-target.js.map +1 -1
  84. package/src/lib/nx-plugin/src/generators/init/lib/update-test-tsconfig.js +1 -1
  85. package/src/lib/nx-plugin/src/generators/init/test-files/src/test-setup.ts__template__ +16 -0
  86. package/src/lib/nx-plugin/src/generators/preset/__snapshots__/generator.spec.ts.snap +151 -0
  87. package/src/lib/nx-plugin/src/generators/preset/generator.js +3 -0
  88. package/src/lib/nx-plugin/src/generators/preset/generator.js.map +1 -1
  89. package/src/lib/nx-plugin/src/generators/setup-vitest/files/src/test-setup.ts__template__ +16 -0
  90. package/src/lib/nx-plugin/src/generators/setup-vitest/generator.js +5 -2
  91. package/src/lib/nx-plugin/src/generators/setup-vitest/generator.js.map +1 -1
  92. package/src/lib/nx-plugin/src/generators/setup-vitest/lib/update-tsconfig.js +1 -1
  93. package/src/lib/nx-plugin/src/utils/versions/dependencies.js +29 -57
  94. package/src/lib/nx-plugin/src/utils/versions/dependencies.js.map +1 -1
  95. package/src/lib/nx-plugin/src/utils/versions/dev-dependencies.js +31 -59
  96. package/src/lib/nx-plugin/src/utils/versions/dev-dependencies.js.map +1 -1
  97. package/src/lib/nx-plugin/src/utils/versions/ng_17_X/versions.d.ts +3 -3
  98. package/src/lib/nx-plugin/src/utils/versions/ng_17_X/versions.js +3 -3
  99. package/src/lib/nx-plugin/src/utils/versions/ng_17_X/versions.js.map +1 -1
  100. package/src/lib/nx-plugin/src/utils/versions/ng_18_X/versions.d.ts +4 -4
  101. package/src/lib/nx-plugin/src/utils/versions/ng_18_X/versions.js +4 -4
  102. package/src/lib/nx-plugin/src/utils/versions/ng_18_X/versions.js.map +1 -1
  103. package/src/lib/nx-plugin/src/utils/versions/ng_19_X/versions.d.ts +8 -8
  104. package/src/lib/nx-plugin/src/utils/versions/ng_19_X/versions.js +8 -8
  105. package/src/lib/nx-plugin/src/utils/versions/ng_19_X/versions.js.map +1 -1
  106. package/src/lib/options.d.ts +8 -0
  107. package/src/lib/platform-plugin.js +4 -2
  108. package/src/lib/router-plugin.js +3 -5
  109. package/src/lib/nx-plugin/src/generators/app/files/template-angular-v16/.eslintrc.json__template__ +0 -36
  110. package/src/lib/nx-plugin/src/generators/app/files/template-angular-v16/index.html__template__ +0 -15
  111. package/src/lib/nx-plugin/src/generators/app/files/template-angular-v16/src/app/app.config.ts__template__ +0 -18
  112. package/src/lib/nx-plugin/src/generators/app/files/template-angular-v16/src/main.server.ts__template__ +0 -23
  113. package/src/lib/nx-plugin/src/generators/app/files/template-angular-v16/src/test-setup.ts__template__ +0 -12
  114. package/src/lib/nx-plugin/src/generators/app/files/template-angular-v16/vite.config.ts__template__ +0 -52
  115. package/src/lib/nx-plugin/src/generators/app/files/template-angular-v19/.eslintrc.json__template__ +0 -36
  116. package/src/lib/nx-plugin/src/generators/app/versions/nx_15_X/versions.d.ts +0 -29
  117. package/src/lib/nx-plugin/src/generators/app/versions/nx_15_X/versions.js +0 -36
  118. package/src/lib/nx-plugin/src/generators/app/versions/nx_15_X/versions.js.map +0 -1
  119. package/src/lib/nx-plugin/src/generators/app/versions/nx_16_X/versions.d.ts +0 -28
  120. package/src/lib/nx-plugin/src/generators/app/versions/nx_16_X/versions.js +0 -35
  121. package/src/lib/nx-plugin/src/generators/app/versions/nx_16_X/versions.js.map +0 -1
  122. package/src/lib/nx-plugin/src/utils/versions/ng_15_X/versions.d.ts +0 -15
  123. package/src/lib/nx-plugin/src/utils/versions/ng_15_X/versions.js +0 -21
  124. package/src/lib/nx-plugin/src/utils/versions/ng_15_X/versions.js.map +0 -1
  125. package/src/lib/nx-plugin/src/utils/versions/ng_16_X/versions.d.ts +0 -15
  126. package/src/lib/nx-plugin/src/utils/versions/ng_16_X/versions.js +0 -21
  127. package/src/lib/nx-plugin/src/utils/versions/ng_16_X/versions.js.map +0 -1
  128. /package/src/lib/nx-plugin/src/generators/app/files/tailwind/{latest → v3}/postcss.config.cjs__template__ +0 -0
  129. /package/src/lib/nx-plugin/src/generators/app/files/tailwind/{latest → v3}/tailwind.config.ts__template__ +0 -0
  130. /package/src/lib/nx-plugin/src/generators/app/files/{template-angular-v16/src/public/assets → template-angular/public}/.gitkeep__template__ +0 -0
  131. /package/src/lib/nx-plugin/src/generators/app/files/{template-angular-v16/src/public/assets → template-angular/public}/analog.svg__template__ +0 -0
  132. /package/src/lib/nx-plugin/src/generators/app/files/{template-angular-v16/src → template-angular/public}/favicon.ico__template__ +0 -0
  133. /package/src/lib/nx-plugin/src/generators/app/files/{template-angular-v16 → template-angular}/src/app/app.component.spec.ts__template__ +0 -0
  134. /package/src/lib/nx-plugin/src/generators/app/files/{template-angular-v16 → template-angular}/src/main.ts__template__ +0 -0
  135. /package/src/lib/nx-plugin/src/generators/app/files/{template-angular-v16/src/server/routes → template-angular/src/server/routes/api}/v1/hello.ts__template__ +0 -0
  136. /package/src/lib/nx-plugin/src/generators/app/files/{template-angular-v16 → template-angular}/src/styles.css__template__ +0 -0
  137. /package/src/lib/nx-plugin/src/generators/app/files/{template-angular-v16 → template-angular}/src/vite-env.d.ts__template__ +0 -0
  138. /package/src/lib/nx-plugin/src/generators/app/files/{template-angular-v16 → template-angular}/tsconfig.editor.json__template__ +0 -0
  139. /package/src/lib/nx-plugin/src/generators/app/files/{template-angular-v16 → template-angular}/tsconfig.json__template__ +0 -0
  140. /package/src/lib/nx-plugin/src/generators/app/files/{template-angular-v16 → template-angular}/tsconfig.spec.json__template__ +0 -0
@@ -2,11 +2,9 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getTrpcDependencies = void 0;
4
4
  const semver_1 = require("semver");
5
- const versions_1 = require("./nx_16_X/versions");
6
- const versions_2 = require("./nx_15_X/versions");
7
5
  const devkit_1 = require("@nx/devkit");
8
- const versions_3 = require("./nx_17_X/versions");
9
- const versions_4 = require("./nx_18_X/versions");
6
+ const versions_1 = require("./nx_17_X/versions");
7
+ const versions_2 = require("./nx_18_X/versions");
10
8
  const tRPCDependencyKeys = [
11
9
  '@analogjs/trpc',
12
10
  '@trpc/client',
@@ -17,51 +15,29 @@ const tRPCDependencyKeys = [
17
15
  ];
18
16
  const getTrpcDependencies = (nxVersion) => {
19
17
  const escapedNxVersion = (0, semver_1.clean)(nxVersion);
20
- // fail out for versions <15.2.0
21
- if ((0, semver_1.lt)(escapedNxVersion, '15.2.0')) {
22
- throw new Error((0, devkit_1.stripIndents) `Nx v15.2.0 or newer is required to install Analog`);
23
- }
24
- // install 15.8 deps for versions 15.8.0 =< 16.1.0
25
- if ((0, semver_1.lt)(escapedNxVersion, '16.1.0')) {
26
- return {
27
- '@analogjs/trpc': versions_2.V15_X_ANALOG_JS_TRPC,
28
- '@trpc/client': versions_2.V15_X_TRPC_CLIENT,
29
- '@trpc/server': versions_2.V15_X_TRPC_SERVER,
30
- superjson: versions_2.V15_X_SUPERJSON,
31
- 'isomorphic-fetch': versions_2.V15_X_ISOMORPHIC_FETCH,
32
- zod: versions_2.V15_X_ZOD,
33
- };
34
- }
35
- // install 16.x deps for versions <17.0.0
18
+ // fail out for versions <17.0.0
36
19
  if ((0, semver_1.lt)(escapedNxVersion, '17.0.0')) {
37
- return {
38
- '@analogjs/trpc': versions_1.V16_X_ANALOG_JS_TRPC,
39
- '@trpc/client': versions_1.V16_X_TRPC_CLIENT,
40
- '@trpc/server': versions_1.V16_X_TRPC_SERVER,
41
- superjson: versions_1.V16_X_SUPERJSON,
42
- 'isomorphic-fetch': versions_1.V16_X_ISOMORPHIC_FETCH,
43
- zod: versions_1.V16_X_ZOD,
44
- };
20
+ throw new Error((0, devkit_1.stripIndents) `Nx 17.0.0 or newer is required to install Analog`);
45
21
  }
46
22
  // install 17.x deps for versions <18.0.0
47
23
  if ((0, semver_1.lt)(escapedNxVersion, '18.0.0')) {
48
24
  return {
49
- '@analogjs/trpc': versions_3.V17_X_ANALOG_JS_TRPC,
50
- '@trpc/client': versions_3.V17_X_TRPC_CLIENT,
51
- '@trpc/server': versions_3.V17_X_TRPC_SERVER,
52
- superjson: versions_3.V17_X_SUPERJSON,
53
- 'isomorphic-fetch': versions_3.V17_X_ISOMORPHIC_FETCH,
54
- zod: versions_3.V17_X_ZOD,
25
+ '@analogjs/trpc': versions_1.V17_X_ANALOG_JS_TRPC,
26
+ '@trpc/client': versions_1.V17_X_TRPC_CLIENT,
27
+ '@trpc/server': versions_1.V17_X_TRPC_SERVER,
28
+ superjson: versions_1.V17_X_SUPERJSON,
29
+ 'isomorphic-fetch': versions_1.V17_X_ISOMORPHIC_FETCH,
30
+ zod: versions_1.V17_X_ZOD,
55
31
  };
56
32
  }
57
33
  // return latest deps for versions >= 18.0.0
58
34
  return {
59
- '@analogjs/trpc': versions_4.V18_X_ANALOG_JS_TRPC,
60
- '@trpc/client': versions_4.V18_X_TRPC_CLIENT,
61
- '@trpc/server': versions_4.V18_X_TRPC_SERVER,
62
- superjson: versions_4.V18_X_SUPERJSON,
63
- 'isomorphic-fetch': versions_4.V18_X_ISOMORPHIC_FETCH,
64
- zod: versions_4.V18_X_ZOD,
35
+ '@analogjs/trpc': versions_2.V18_X_ANALOG_JS_TRPC,
36
+ '@trpc/client': versions_2.V18_X_TRPC_CLIENT,
37
+ '@trpc/server': versions_2.V18_X_TRPC_SERVER,
38
+ superjson: versions_2.V18_X_SUPERJSON,
39
+ 'isomorphic-fetch': versions_2.V18_X_ISOMORPHIC_FETCH,
40
+ zod: versions_2.V18_X_ZOD,
65
41
  };
66
42
  };
67
43
  exports.getTrpcDependencies = getTrpcDependencies;
@@ -1 +1 @@
1
- {"version":3,"file":"trpc-dependencies.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/versions/trpc-dependencies.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AACnC,iDAO4B;AAC5B,iDAO4B;AAC5B,uCAA0C;AAC1C,iDAO4B;AAC5B,iDAO4B;AAE5B,MAAM,kBAAkB,GAAG;IACzB,gBAAgB;IAChB,cAAc;IACd,cAAc;IACd,WAAW;IACX,kBAAkB;IAClB,KAAK;CACG,CAAC;AAGJ,MAAM,mBAAmB,GAAG,CACjC,SAAiB,EACe,EAAE;IAClC,MAAM,gBAAgB,GAAG,IAAA,cAAK,EAAC,SAAS,CAAC,CAAC;IAE1C,gCAAgC;IAChC,IAAI,IAAA,WAAE,EAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAE,CAAC;QACnC,MAAM,IAAI,KAAK,CACb,IAAA,qBAAY,EAAA,mDAAmD,CAChE,CAAC;IACJ,CAAC;IAED,kDAAkD;IAClD,IAAI,IAAA,WAAE,EAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAE,CAAC;QACnC,OAAO;YACL,gBAAgB,EAAE,+BAAoB;YACtC,cAAc,EAAE,4BAAiB;YACjC,cAAc,EAAE,4BAAiB;YACjC,SAAS,EAAE,0BAAe;YAC1B,kBAAkB,EAAE,iCAAsB;YAC1C,GAAG,EAAE,oBAAS;SACf,CAAC;IACJ,CAAC;IAED,yCAAyC;IACzC,IAAI,IAAA,WAAE,EAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAE,CAAC;QACnC,OAAO;YACL,gBAAgB,EAAE,+BAAoB;YACtC,cAAc,EAAE,4BAAiB;YACjC,cAAc,EAAE,4BAAiB;YACjC,SAAS,EAAE,0BAAe;YAC1B,kBAAkB,EAAE,iCAAsB;YAC1C,GAAG,EAAE,oBAAS;SACf,CAAC;IACJ,CAAC;IAED,yCAAyC;IACzC,IAAI,IAAA,WAAE,EAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAE,CAAC;QACnC,OAAO;YACL,gBAAgB,EAAE,+BAAoB;YACtC,cAAc,EAAE,4BAAiB;YACjC,cAAc,EAAE,4BAAiB;YACjC,SAAS,EAAE,0BAAe;YAC1B,kBAAkB,EAAE,iCAAsB;YAC1C,GAAG,EAAE,oBAAS;SACf,CAAC;IACJ,CAAC;IAED,4CAA4C;IAC5C,OAAO;QACL,gBAAgB,EAAE,+BAAoB;QACtC,cAAc,EAAE,4BAAiB;QACjC,cAAc,EAAE,4BAAiB;QACjC,SAAS,EAAE,0BAAe;QAC1B,kBAAkB,EAAE,iCAAsB;QAC1C,GAAG,EAAE,oBAAS;KACf,CAAC;AACJ,CAAC,CAAC;AAzDW,QAAA,mBAAmB,uBAyD9B"}
1
+ {"version":3,"file":"trpc-dependencies.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/versions/trpc-dependencies.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AACnC,uCAA0C;AAC1C,iDAO4B;AAC5B,iDAO4B;AAE5B,MAAM,kBAAkB,GAAG;IACzB,gBAAgB;IAChB,cAAc;IACd,cAAc;IACd,WAAW;IACX,kBAAkB;IAClB,KAAK;CACG,CAAC;AAGJ,MAAM,mBAAmB,GAAG,CACjC,SAAiB,EACe,EAAE;IAClC,MAAM,gBAAgB,GAAG,IAAA,cAAK,EAAC,SAAS,CAAC,CAAC;IAE1C,gCAAgC;IAChC,IAAI,IAAA,WAAE,EAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAE,CAAC;QACnC,MAAM,IAAI,KAAK,CACb,IAAA,qBAAY,EAAA,kDAAkD,CAC/D,CAAC;IACJ,CAAC;IAED,yCAAyC;IACzC,IAAI,IAAA,WAAE,EAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAE,CAAC;QACnC,OAAO;YACL,gBAAgB,EAAE,+BAAoB;YACtC,cAAc,EAAE,4BAAiB;YACjC,cAAc,EAAE,4BAAiB;YACjC,SAAS,EAAE,0BAAe;YAC1B,kBAAkB,EAAE,iCAAsB;YAC1C,GAAG,EAAE,oBAAS;SACf,CAAC;IACJ,CAAC;IAED,4CAA4C;IAC5C,OAAO;QACL,gBAAgB,EAAE,+BAAoB;QACtC,cAAc,EAAE,4BAAiB;QACjC,cAAc,EAAE,4BAAiB;QACjC,SAAS,EAAE,0BAAe;QAC1B,kBAAkB,EAAE,iCAAsB;QAC1C,GAAG,EAAE,oBAAS;KACf,CAAC;AACJ,CAAC,CAAC;AAjCW,QAAA,mBAAmB,uBAiC9B"}
@@ -1,4 +1,4 @@
1
- export declare const MINIMUM_SUPPORTED_ANGULAR_VERSION = "15.0.0";
1
+ export declare const MINIMUM_SUPPORTED_ANGULAR_VERSION = "17.0.0";
2
2
  export declare const V17_ANGULAR = "17.0.0";
3
3
  export declare const V17_NX_DEVKIT = "~18.0.0";
4
4
  export declare const V17_NX_ANGULAR = "~18.0.0";
@@ -9,29 +9,6 @@ export declare const V17_TRPC_CLIENT = "^10.25.0";
9
9
  export declare const V17_TRPC_SERVER = "^10.25.0";
10
10
  export declare const V17_ISOMORPHIC_FETCH = "^3.0.0";
11
11
  export declare const V17_SUPERJSON = "^2.2.1";
12
- export declare const V16_ANGULAR = "16.0.0";
13
- export declare const V16_NX_DEVKIT = "~16.0.0";
14
- export declare const V16_NX_ANGULAR = "~16.0.0";
15
- export declare const V16_ANALOG_JS_CONTENT = "0.2.0-beta.15";
16
- export declare const V16_ANALOG_JS_ROUTER = "0.2.0-beta.15";
17
- export declare const V16_ANALOG_JS_TRPC = "0.2.0-beta.15";
18
- export declare const V16_TRPC_CLIENT = "^10.25.0";
19
- export declare const V16_TRPC_SERVER = "^10.25.0";
20
- export declare const V16_ISOMORPHIC_FETCH = "^3.0.0";
21
- export declare const V16_SUPERJSON = "^2.2.1";
22
- export declare const V16_ANGULAR_PLATFORM_SERVER = "~16.0.0";
23
- export declare const V16_FRONT_MATTER = "^4.0.2";
24
- export declare const V16_MARKED = "^5.0.2";
25
- export declare const V16_MERMAID = "^10.2.4";
26
- export declare const V16_PRISMJS = "^1.29.0";
27
- export declare const V16_ANALOG_JS_PLATFORM = "0.2.0-beta.15";
28
- export declare const V16_NX_VITE = "^16.0.0";
29
- export declare const V16_JSDOM = "^20.0.0";
30
- export declare const V16_TYPESCRIPT = "~5.0.2";
31
- export declare const V16_VITE = "^4.0.3";
32
- export declare const V16_VITE_TSCONFIG_PATHS = "^4.0.2";
33
- export declare const V16_VITEST = "^0.31.0";
34
- export declare const V16_ZOD = "^3.21.4";
35
12
  export declare const V15_ANGULAR = "15.2.7";
36
13
  export declare const V15_NRWL_DEVKIT = "15.9.2";
37
14
  export declare const V15_NRWL_ANGULAR = "15.9.2";
@@ -1,8 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.V15_ANALOG_JS_PLATFORM = exports.V15_PRISMJS = exports.V15_MERMAID = exports.V15_MARKED = exports.V15_FRONT_MATTER = exports.V15_ANGULAR_PLATFORM_SERVER = exports.V15_SUPERJSON = exports.V15_ISOMORPHIC_FETCH = exports.V15_TRPC_SERVER = exports.V15_TRPC_CLIENT = exports.V15_ANALOG_JS_TRPC = exports.V15_ANALOG_JS_ROUTER = exports.V15_ANALOG_JS_CONTENT = exports.V15_NRWL_ANGULAR = exports.V15_NRWL_DEVKIT = exports.V15_ANGULAR = exports.V16_ZOD = exports.V16_VITEST = exports.V16_VITE_TSCONFIG_PATHS = exports.V16_VITE = exports.V16_TYPESCRIPT = exports.V16_JSDOM = exports.V16_NX_VITE = exports.V16_ANALOG_JS_PLATFORM = exports.V16_PRISMJS = exports.V16_MERMAID = exports.V16_MARKED = exports.V16_FRONT_MATTER = exports.V16_ANGULAR_PLATFORM_SERVER = exports.V16_SUPERJSON = exports.V16_ISOMORPHIC_FETCH = exports.V16_TRPC_SERVER = exports.V16_TRPC_CLIENT = exports.V16_ANALOG_JS_TRPC = exports.V16_ANALOG_JS_ROUTER = exports.V16_ANALOG_JS_CONTENT = exports.V16_NX_ANGULAR = exports.V16_NX_DEVKIT = exports.V16_ANGULAR = exports.V17_SUPERJSON = exports.V17_ISOMORPHIC_FETCH = exports.V17_TRPC_SERVER = exports.V17_TRPC_CLIENT = exports.V17_ANALOG_JS_TRPC = exports.V17_ANALOG_JS_ROUTER = exports.V17_ANALOG_JS_CONTENT = exports.V17_NX_ANGULAR = exports.V17_NX_DEVKIT = exports.V17_ANGULAR = exports.MINIMUM_SUPPORTED_ANGULAR_VERSION = void 0;
4
- exports.V15_ZOD = exports.V15_VITEST = exports.V15_VITE_TSCONFIG_PATHS = exports.V15_VITE = exports.V15_TYPESCRIPT = exports.V15_JSDOM = exports.V15_NRWL_VITE = void 0;
5
- exports.MINIMUM_SUPPORTED_ANGULAR_VERSION = '15.0.0';
3
+ exports.V15_ZOD = exports.V15_VITEST = exports.V15_VITE_TSCONFIG_PATHS = exports.V15_VITE = exports.V15_TYPESCRIPT = exports.V15_JSDOM = exports.V15_NRWL_VITE = exports.V15_ANALOG_JS_PLATFORM = exports.V15_PRISMJS = exports.V15_MERMAID = exports.V15_MARKED = exports.V15_FRONT_MATTER = exports.V15_ANGULAR_PLATFORM_SERVER = exports.V15_SUPERJSON = exports.V15_ISOMORPHIC_FETCH = exports.V15_TRPC_SERVER = exports.V15_TRPC_CLIENT = exports.V15_ANALOG_JS_TRPC = exports.V15_ANALOG_JS_ROUTER = exports.V15_ANALOG_JS_CONTENT = exports.V15_NRWL_ANGULAR = exports.V15_NRWL_DEVKIT = exports.V15_ANGULAR = exports.V17_SUPERJSON = exports.V17_ISOMORPHIC_FETCH = exports.V17_TRPC_SERVER = exports.V17_TRPC_CLIENT = exports.V17_ANALOG_JS_TRPC = exports.V17_ANALOG_JS_ROUTER = exports.V17_ANALOG_JS_CONTENT = exports.V17_NX_ANGULAR = exports.V17_NX_DEVKIT = exports.V17_ANGULAR = exports.MINIMUM_SUPPORTED_ANGULAR_VERSION = void 0;
4
+ exports.MINIMUM_SUPPORTED_ANGULAR_VERSION = '17.0.0';
6
5
  // V17
7
6
  // dependencies
8
7
  exports.V17_ANGULAR = '17.0.0';
@@ -15,32 +14,6 @@ exports.V17_TRPC_CLIENT = '^10.25.0';
15
14
  exports.V17_TRPC_SERVER = '^10.25.0';
16
15
  exports.V17_ISOMORPHIC_FETCH = '^3.0.0';
17
16
  exports.V17_SUPERJSON = '^2.2.1';
18
- // V16
19
- // dependencies
20
- exports.V16_ANGULAR = '16.0.0';
21
- exports.V16_NX_DEVKIT = '~16.0.0';
22
- exports.V16_NX_ANGULAR = '~16.0.0';
23
- exports.V16_ANALOG_JS_CONTENT = '0.2.0-beta.15';
24
- exports.V16_ANALOG_JS_ROUTER = '0.2.0-beta.15';
25
- exports.V16_ANALOG_JS_TRPC = '0.2.0-beta.15';
26
- exports.V16_TRPC_CLIENT = '^10.25.0';
27
- exports.V16_TRPC_SERVER = '^10.25.0';
28
- exports.V16_ISOMORPHIC_FETCH = '^3.0.0';
29
- exports.V16_SUPERJSON = '^2.2.1';
30
- exports.V16_ANGULAR_PLATFORM_SERVER = '~16.0.0';
31
- exports.V16_FRONT_MATTER = '^4.0.2';
32
- exports.V16_MARKED = '^5.0.2';
33
- exports.V16_MERMAID = '^10.2.4';
34
- exports.V16_PRISMJS = '^1.29.0';
35
- // devDependencies
36
- exports.V16_ANALOG_JS_PLATFORM = '0.2.0-beta.15';
37
- exports.V16_NX_VITE = '^16.0.0';
38
- exports.V16_JSDOM = '^20.0.0';
39
- exports.V16_TYPESCRIPT = '~5.0.2';
40
- exports.V16_VITE = '^4.0.3';
41
- exports.V16_VITE_TSCONFIG_PATHS = '^4.0.2';
42
- exports.V16_VITEST = '^0.31.0';
43
- exports.V16_ZOD = '^3.21.4';
44
17
  // V15
45
18
  // dependencies
46
19
  exports.V15_ANGULAR = '15.2.7';
@@ -1 +1 @@
1
- {"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../../../../../packages/nx-plugin/src/generators/app/versions.ts"],"names":[],"mappings":";;;;AAAa,QAAA,iCAAiC,GAAG,QAAQ,CAAC;AAC1D,MAAM;AACN,eAAe;AACF,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,cAAc,GAAG,SAAS,CAAC;AAC3B,QAAA,qBAAqB,GAAG,OAAO,CAAC;AAChC,QAAA,oBAAoB,GAAG,OAAO,CAAC;AAC/B,QAAA,kBAAkB,GAAG,OAAO,CAAC;AAC7B,QAAA,eAAe,GAAG,UAAU,CAAC;AAC7B,QAAA,eAAe,GAAG,UAAU,CAAC;AAC7B,QAAA,oBAAoB,GAAG,QAAQ,CAAC;AAChC,QAAA,aAAa,GAAG,QAAQ,CAAC;AAEtC,MAAM;AACN,eAAe;AACF,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,cAAc,GAAG,SAAS,CAAC;AAC3B,QAAA,qBAAqB,GAAG,eAAe,CAAC;AACxC,QAAA,oBAAoB,GAAG,eAAe,CAAC;AACvC,QAAA,kBAAkB,GAAG,eAAe,CAAC;AACrC,QAAA,eAAe,GAAG,UAAU,CAAC;AAC7B,QAAA,eAAe,GAAG,UAAU,CAAC;AAC7B,QAAA,oBAAoB,GAAG,QAAQ,CAAC;AAChC,QAAA,aAAa,GAAG,QAAQ,CAAC;AAEzB,QAAA,2BAA2B,GAAG,SAAS,CAAC;AACxC,QAAA,gBAAgB,GAAG,QAAQ,CAAC;AAC5B,QAAA,UAAU,GAAG,QAAQ,CAAC;AACtB,QAAA,WAAW,GAAG,SAAS,CAAC;AACxB,QAAA,WAAW,GAAG,SAAS,CAAC;AAErC,kBAAkB;AACL,QAAA,sBAAsB,GAAG,eAAe,CAAC;AACzC,QAAA,WAAW,GAAG,SAAS,CAAC;AACxB,QAAA,SAAS,GAAG,SAAS,CAAC;AACtB,QAAA,cAAc,GAAG,QAAQ,CAAC;AAC1B,QAAA,QAAQ,GAAG,QAAQ,CAAC;AACpB,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AACnC,QAAA,UAAU,GAAG,SAAS,CAAC;AACvB,QAAA,OAAO,GAAG,SAAS,CAAC;AAEjC,MAAM;AACN,eAAe;AACF,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,gBAAgB,GAAG,QAAQ,CAAC;AAC5B,QAAA,qBAAqB,GAAG,eAAe,CAAC;AACxC,QAAA,oBAAoB,GAAG,eAAe,CAAC;AACvC,QAAA,kBAAkB,GAAG,eAAe,CAAC;AACrC,QAAA,eAAe,GAAG,UAAU,CAAC;AAC7B,QAAA,eAAe,GAAG,UAAU,CAAC;AAC7B,QAAA,oBAAoB,GAAG,QAAQ,CAAC;AAChC,QAAA,aAAa,GAAG,QAAQ,CAAC;AACzB,QAAA,2BAA2B,GAAG,SAAS,CAAC;AACxC,QAAA,gBAAgB,GAAG,QAAQ,CAAC;AAC5B,QAAA,UAAU,GAAG,QAAQ,CAAC;AACtB,QAAA,WAAW,GAAG,SAAS,CAAC;AACxB,QAAA,WAAW,GAAG,SAAS,CAAC;AAErC,kBAAkB;AACL,QAAA,sBAAsB,GAAG,eAAe,CAAC;AACzC,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,SAAS,GAAG,SAAS,CAAC;AACtB,QAAA,cAAc,GAAG,QAAQ,CAAC;AAC1B,QAAA,QAAQ,GAAG,QAAQ,CAAC;AACpB,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AACnC,QAAA,UAAU,GAAG,SAAS,CAAC;AACvB,QAAA,OAAO,GAAG,SAAS,CAAC"}
1
+ {"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../../../../../packages/nx-plugin/src/generators/app/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,iCAAiC,GAAG,QAAQ,CAAC;AAC1D,MAAM;AACN,eAAe;AACF,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,cAAc,GAAG,SAAS,CAAC;AAC3B,QAAA,qBAAqB,GAAG,OAAO,CAAC;AAChC,QAAA,oBAAoB,GAAG,OAAO,CAAC;AAC/B,QAAA,kBAAkB,GAAG,OAAO,CAAC;AAC7B,QAAA,eAAe,GAAG,UAAU,CAAC;AAC7B,QAAA,eAAe,GAAG,UAAU,CAAC;AAC7B,QAAA,oBAAoB,GAAG,QAAQ,CAAC;AAChC,QAAA,aAAa,GAAG,QAAQ,CAAC;AAEtC,MAAM;AACN,eAAe;AACF,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,gBAAgB,GAAG,QAAQ,CAAC;AAC5B,QAAA,qBAAqB,GAAG,eAAe,CAAC;AACxC,QAAA,oBAAoB,GAAG,eAAe,CAAC;AACvC,QAAA,kBAAkB,GAAG,eAAe,CAAC;AACrC,QAAA,eAAe,GAAG,UAAU,CAAC;AAC7B,QAAA,eAAe,GAAG,UAAU,CAAC;AAC7B,QAAA,oBAAoB,GAAG,QAAQ,CAAC;AAChC,QAAA,aAAa,GAAG,QAAQ,CAAC;AACzB,QAAA,2BAA2B,GAAG,SAAS,CAAC;AACxC,QAAA,gBAAgB,GAAG,QAAQ,CAAC;AAC5B,QAAA,UAAU,GAAG,QAAQ,CAAC;AACtB,QAAA,WAAW,GAAG,SAAS,CAAC;AACxB,QAAA,WAAW,GAAG,SAAS,CAAC;AAErC,kBAAkB;AACL,QAAA,sBAAsB,GAAG,eAAe,CAAC;AACzC,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,SAAS,GAAG,SAAS,CAAC;AACtB,QAAA,cAAc,GAAG,QAAQ,CAAC;AAC1B,QAAA,QAAQ,GAAG,QAAQ,CAAC;AACpB,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AACnC,QAAA,UAAU,GAAG,SAAS,CAAC;AACvB,QAAA,OAAO,GAAG,SAAS,CAAC"}
@@ -0,0 +1,10 @@
1
+ import { mergeApplicationConfig, ApplicationConfig } from '@angular/core';
2
+ import { provideServerRendering } from '@angular/platform-server';
3
+
4
+ import { appConfig } from './app.config';
5
+
6
+ const serverConfig: ApplicationConfig = {
7
+ providers: [provideServerRendering()],
8
+ };
9
+
10
+ export const config = mergeApplicationConfig(appConfig, serverConfig);
@@ -0,0 +1,14 @@
1
+ import 'zone.js/node';
2
+ import '@angular/platform-server/init';
3
+ import { render } from '@analogjs/router/server';
4
+ <% if (majorAngularVersion > 19) { %>
5
+ import { App } from './app/app';
6
+ import { config } from './app/app.config.server';
7
+
8
+ export default render(App, config);
9
+ <% } else { %>
10
+ import { AppComponent } from './app/app.component';
11
+ import { config } from './app/app.config.server';
12
+
13
+ export default render(AppComponent, config);
14
+ <% } %>
@@ -0,0 +1,3 @@
1
+ import { defineEventHandler } from 'h3';
2
+
3
+ export default defineEventHandler(() => ({ message: 'Hello World' }));
@@ -2,6 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.setupAnalogGenerator = setupAnalogGenerator;
4
4
  const devkit_1 = require("@nx/devkit");
5
+ const semver_1 = require("semver");
5
6
  const node_path_1 = require("node:path");
6
7
  const version_utils_1 = require("../../utils/version-utils");
7
8
  const add_analog_dependencies_1 = require("./lib/add-analog-dependencies");
@@ -14,7 +15,7 @@ const update_index_html_1 = require("./lib/update-index-html");
14
15
  const update_main_1 = require("./lib/update-main");
15
16
  const update_app_tsconfig_1 = require("./lib/update-app-tsconfig");
16
17
  const update_git_ignore_1 = require("./lib/update-git-ignore");
17
- function addFiles(tree, options) {
18
+ function addFiles(tree, options, majorAngularVersion) {
18
19
  const isNx = tree.read('/nx.json');
19
20
  const projects = (0, devkit_1.getProjects)(tree);
20
21
  const projectConfig = projects.get(options.project);
@@ -23,6 +24,7 @@ function addFiles(tree, options) {
23
24
  offsetFromRoot: isNx ? '../../' : './',
24
25
  projectRoot: projectConfig.root,
25
26
  template: '',
27
+ majorAngularVersion,
26
28
  isNx,
27
29
  };
28
30
  (0, devkit_1.generateFiles)(tree, (0, node_path_1.join)(__dirname, 'files'), projectConfig.root || '.', templateOptions);
@@ -32,6 +34,7 @@ function addFiles(tree, options) {
32
34
  }
33
35
  async function setupAnalogGenerator(tree, options) {
34
36
  const angularVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular/core');
37
+ const majorAngularVersion = (0, semver_1.major)((0, semver_1.coerce)(angularVersion));
35
38
  (0, add_analog_dependencies_1.addAnalogDependencies)(tree, angularVersion);
36
39
  (0, update_build_target_1.updateBuildTarget)(tree, options);
37
40
  (0, update_serve_target_1.updateServeTarget)(tree, options);
@@ -44,7 +47,7 @@ async function setupAnalogGenerator(tree, options) {
44
47
  (0, update_index_html_1.updateIndex)(tree, options);
45
48
  (0, update_main_1.updateMain)(tree, options);
46
49
  (0, update_git_ignore_1.updateGitIgnore)(tree);
47
- addFiles(tree, options);
50
+ addFiles(tree, options, majorAngularVersion);
48
51
  await (0, devkit_1.formatFiles)(tree);
49
52
  return () => {
50
53
  (0, devkit_1.installPackagesTask)(tree);
@@ -1 +1 @@
1
- {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../../../packages/nx-plugin/src/generators/init/generator.ts"],"names":[],"mappings":";;AAoDA,oDA4BC;AAhFD,uCAMoB;AACpB,yCAAiC;AAEjC,6DAAuE;AACvE,2EAAsE;AACtE,qEAAgE;AAChE,iEAA4D;AAE5D,mEAA8D;AAC9D,mEAA8D;AAC9D,mEAA8D;AAC9D,+DAAsD;AACtD,mDAA+C;AAC/C,mEAA8D;AAC9D,+DAA0D;AAE1D,SAAS,QAAQ,CAAC,IAAU,EAAE,OAAmC;IAC/D,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACnC,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IACnC,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAEpD,MAAM,eAAe,GAAG;QACtB,GAAG,OAAO;QACV,cAAc,EAAE,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI;QACtC,WAAW,EAAE,aAAa,CAAC,IAAI;QAC/B,QAAQ,EAAE,EAAE;QACZ,IAAI;KACL,CAAC;IAEF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,gBAAI,EAAC,SAAS,EAAE,OAAO,CAAC,EACxB,aAAa,CAAC,IAAI,IAAI,GAAG,EACzB,eAAe,CAChB,CAAC;IAEF,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACnB,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,gBAAI,EAAC,SAAS,EAAE,YAAY,CAAC,EAC7B,aAAa,CAAC,IAAI,IAAI,GAAG,EACzB,eAAe,CAChB,CAAC;IACJ,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,oBAAoB,CACxC,IAAU,EACV,OAAmC;IAEnC,MAAM,cAAc,GAAG,IAAA,0CAA0B,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC;IAEzE,IAAA,+CAAqB,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAC5C,IAAA,uCAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACjC,IAAA,uCAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEjC,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACnB,IAAA,qCAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAChC,IAAA,yCAAkB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACpC,CAAC;IAED,IAAA,uCAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACjC,IAAA,uCAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACjC,IAAA,+BAAW,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC3B,IAAA,wBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC1B,IAAA,mCAAe,EAAC,IAAI,CAAC,CAAC;IAEtB,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAExB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAExB,OAAO,GAAG,EAAE;QACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;IAC5B,CAAC,CAAC;AACJ,CAAC;AAED,kBAAe,oBAAoB,CAAC"}
1
+ {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../../../packages/nx-plugin/src/generators/init/generator.ts"],"names":[],"mappings":";;AA0DA,oDA4BC;AAtFD,uCAMoB;AACpB,mCAAuC;AACvC,yCAAiC;AAEjC,6DAAuE;AACvE,2EAAsE;AACtE,qEAAgE;AAChE,iEAA4D;AAE5D,mEAA8D;AAC9D,mEAA8D;AAC9D,mEAA8D;AAC9D,+DAAsD;AACtD,mDAA+C;AAC/C,mEAA8D;AAC9D,+DAA0D;AAE1D,SAAS,QAAQ,CACf,IAAU,EACV,OAAmC,EACnC,mBAA2B;IAE3B,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACnC,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IACnC,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAEpD,MAAM,eAAe,GAAG;QACtB,GAAG,OAAO;QACV,cAAc,EAAE,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI;QACtC,WAAW,EAAE,aAAa,CAAC,IAAI;QAC/B,QAAQ,EAAE,EAAE;QACZ,mBAAmB;QACnB,IAAI;KACL,CAAC;IAEF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,gBAAI,EAAC,SAAS,EAAE,OAAO,CAAC,EACxB,aAAa,CAAC,IAAI,IAAI,GAAG,EACzB,eAAe,CAChB,CAAC;IAEF,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACnB,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,gBAAI,EAAC,SAAS,EAAE,YAAY,CAAC,EAC7B,aAAa,CAAC,IAAI,IAAI,GAAG,EACzB,eAAe,CAChB,CAAC;IACJ,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,oBAAoB,CACxC,IAAU,EACV,OAAmC;IAEnC,MAAM,cAAc,GAAG,IAAA,0CAA0B,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC;IACzE,MAAM,mBAAmB,GAAG,IAAA,cAAK,EAAC,IAAA,eAAM,EAAC,cAAc,CAAC,CAAC,CAAC;IAC1D,IAAA,+CAAqB,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAC5C,IAAA,uCAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACjC,IAAA,uCAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEjC,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACnB,IAAA,qCAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAChC,IAAA,yCAAkB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACpC,CAAC;IAED,IAAA,uCAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACjC,IAAA,uCAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACjC,IAAA,+BAAW,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC3B,IAAA,wBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC1B,IAAA,mCAAe,EAAC,IAAI,CAAC,CAAC;IAEtB,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,mBAAmB,CAAC,CAAC;IAE7C,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAExB,OAAO,GAAG,EAAE;QACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;IAC5B,CAAC,CAAC;AACJ,CAAC;AAED,kBAAe,oBAAoB,CAAC"}
@@ -7,6 +7,9 @@ const dependencies_1 = require("../../../utils/versions/dependencies");
7
7
  function addAnalogDependencies(tree, angularVersion) {
8
8
  const devDependencies = (0, dev_dependencies_1.getAnalogDevDependencies)(angularVersion);
9
9
  const dependencies = (0, dependencies_1.getAnalogDependencies)(angularVersion);
10
- (0, devkit_1.addDependenciesToPackageJson)(tree, dependencies, devDependencies);
10
+ (0, devkit_1.addDependenciesToPackageJson)(tree, {
11
+ ...dependencies,
12
+ '@angular/platform-server': angularVersion,
13
+ }, devDependencies);
11
14
  }
12
15
  //# sourceMappingURL=add-analog-dependencies.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"add-analog-dependencies.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/init/lib/add-analog-dependencies.ts"],"names":[],"mappings":";;AAKA,sDAKC;AAVD,uCAAgE;AAEhE,+EAAoF;AACpF,uEAA6E;AAE7E,SAAgB,qBAAqB,CAAC,IAAU,EAAE,cAAsB;IACtE,MAAM,eAAe,GAAG,IAAA,2CAAwB,EAAC,cAAc,CAAC,CAAC;IACjE,MAAM,YAAY,GAAG,IAAA,oCAAqB,EAAC,cAAc,CAAC,CAAC;IAE3D,IAAA,qCAA4B,EAAC,IAAI,EAAE,YAAY,EAAE,eAAe,CAAC,CAAC;AACpE,CAAC"}
1
+ {"version":3,"file":"add-analog-dependencies.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/init/lib/add-analog-dependencies.ts"],"names":[],"mappings":";;AAKA,sDAYC;AAjBD,uCAAgE;AAEhE,+EAAoF;AACpF,uEAA6E;AAE7E,SAAgB,qBAAqB,CAAC,IAAU,EAAE,cAAsB;IACtE,MAAM,eAAe,GAAG,IAAA,2CAAwB,EAAC,cAAc,CAAC,CAAC;IACjE,MAAM,YAAY,GAAG,IAAA,oCAAqB,EAAC,cAAc,CAAC,CAAC;IAE3D,IAAA,qCAA4B,EAC1B,IAAI,EACJ;QACE,GAAG,YAAY;QACf,0BAA0B,EAAE,cAAc;KAC3C,EACD,eAAe,CAChB,CAAC;AACJ,CAAC"}
@@ -8,7 +8,12 @@ function updateAppTsConfig(tree, schema) {
8
8
  const tsconfigPath = (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.app.json');
9
9
  if (tree.exists(tsconfigPath)) {
10
10
  (0, devkit_1.updateJson)(tree, tsconfigPath, (json) => {
11
- json.include = [...json.include, 'src/app/pages/**/*.page.ts'];
11
+ json.files = [...(json.files || []), 'src/main.server.ts'];
12
+ json.include = [
13
+ ...(json.include || []),
14
+ 'src/app/pages/**/*.page.ts',
15
+ 'src/server/middleware/**/*.ts',
16
+ ];
12
17
  return json;
13
18
  }, { expectComments: true, allowTrailingComma: true });
14
19
  }
@@ -1 +1 @@
1
- {"version":3,"file":"update-app-tsconfig.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/init/lib/update-app-tsconfig.ts"],"names":[],"mappings":";;AAQA,8CAyBC;AAjCD,uCAA8E;AAQ9E,SAAgB,iBAAiB,CAC/B,IAAU,EACV,MAAkC;IAElC,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAEnC,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAEnD,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,aAAa,CAAC,IAAI,EAClB,mBAAmB,CACpB,CAAC;IAEF,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;QAC9B,IAAA,mBAAU,EACR,IAAI,EACJ,YAAY,EACZ,CAAC,IAAI,EAAE,EAAE;YACP,IAAI,CAAC,OAAO,GAAG,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE,4BAA4B,CAAC,CAAC;YAE/D,OAAO,IAAI,CAAC;QACd,CAAC,EACD,EAAE,cAAc,EAAE,IAAI,EAAE,kBAAkB,EAAE,IAAI,EAAE,CACnD,CAAC;IACJ,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"update-app-tsconfig.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/init/lib/update-app-tsconfig.ts"],"names":[],"mappings":";;AASA,8CA+BC;AAxCD,uCAA8E;AAS9E,SAAgB,iBAAiB,CAC/B,IAAU,EACV,MAAkC;IAElC,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAEnC,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAEnD,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,aAAa,CAAC,IAAI,EAClB,mBAAmB,CACpB,CAAC;IAEF,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;QAC9B,IAAA,mBAAU,EACR,IAAI,EACJ,YAAY,EACZ,CAAC,IAAI,EAAE,EAAE;YACP,IAAI,CAAC,KAAK,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,EAAE,oBAAoB,CAAC,CAAC;YAE3D,IAAI,CAAC,OAAO,GAAG;gBACb,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;gBACvB,4BAA4B;gBAC5B,+BAA+B;aAChC,CAAC;YAEF,OAAO,IAAI,CAAC;QACd,CAAC,EACD,EAAE,cAAc,EAAE,IAAI,EAAE,kBAAkB,EAAE,IAAI,EAAE,CACnD,CAAC;IACJ,CAAC;AACH,CAAC"}
@@ -23,11 +23,20 @@ function updateBuildTarget(tree, schema) {
23
23
  },
24
24
  };
25
25
  if (tree.exists(angularJsonPath)) {
26
+ const projects = (0, devkit_1.getProjects)(tree);
27
+ const projectConfig = projects.get(schema.project);
26
28
  (0, devkit_1.updateJson)(tree, angularJsonPath, (json) => {
27
- json.projects[schema.project].root = '.';
29
+ json.projects[schema.project].root = projectConfig.root;
30
+ json.projects[schema.project].sourceRoot = projectConfig.sourceRoot;
28
31
  json.projects[schema.project].architect.build = {
29
32
  builder: '@analogjs/platform:vite',
30
33
  ...commonConfig,
34
+ options: {
35
+ configFile: `${(0, devkit_1.joinPathFragments)(projectConfig.root, 'vite.config.ts')}`,
36
+ main: `${(0, devkit_1.joinPathFragments)(projectConfig.root, 'src/main.ts')}`,
37
+ outputPath: `dist/${(0, devkit_1.joinPathFragments)(projectConfig.root, 'client')}`,
38
+ tsConfig: `${(0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.app.json')}`,
39
+ },
31
40
  };
32
41
  return json;
33
42
  });
@@ -1 +1 @@
1
- {"version":3,"file":"update-build-target.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/init/lib/update-build-target.ts"],"names":[],"mappings":";;AAUA,8CA2DC;AArED,uCAMoB;AAIpB,SAAgB,iBAAiB,CAC/B,IAAU,EACV,MAAkC;IAElC,MAAM,eAAe,GAAG,eAAe,CAAC;IAExC,MAAM,YAAY,GAAG;QACnB,OAAO,EAAE;YACP,UAAU,EAAE,gBAAgB;YAC5B,IAAI,EAAE,aAAa;YACnB,UAAU,EAAE,aAAa;YACzB,QAAQ,EAAE,mBAAmB;SAC9B;QACD,oBAAoB,EAAE,YAAY;QAClC,cAAc,EAAE;YACd,WAAW,EAAE;gBACX,IAAI,EAAE,aAAa;aACpB;YACD,UAAU,EAAE;gBACV,SAAS,EAAE,KAAK;gBAChB,IAAI,EAAE,YAAY;aACnB;SACF;KACF,CAAC;IAEF,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC;QACjC,IAAA,mBAAU,EAAC,IAAI,EAAE,eAAe,EAAE,CAAC,IAAI,EAAE,EAAE;YACzC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,GAAG,GAAG,CAAC;YACzC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,KAAK,GAAG;gBAC9C,OAAO,EAAE,yBAAyB;gBAClC,GAAG,YAAY;aAChB,CAAC;YAEF,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAEnC,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAEnD,aAAa,CAAC,OAAO,CAAC,KAAK,GAAG;YAC5B,QAAQ,EAAE,yBAAyB;YACnC,GAAG,YAAY;YACf,OAAO,EAAE;gBACP,UAAU,EAAE,GAAG,IAAA,0BAAiB,EAC9B,aAAa,CAAC,IAAI,EAClB,gBAAgB,CACjB,EAAE;gBACH,IAAI,EAAE,GAAG,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,EAAE;gBAC/D,UAAU,EAAE,QAAQ,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE;gBACrE,QAAQ,EAAE,GAAG,IAAA,0BAAiB,EAC5B,aAAa,CAAC,IAAI,EAClB,mBAAmB,CACpB,EAAE;aACJ;SACF,CAAC;QAEF,IAAA,mCAA0B,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAClE,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"update-build-target.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/init/lib/update-build-target.ts"],"names":[],"mappings":";;AAUA,8CA4EC;AAtFD,uCAMoB;AAIpB,SAAgB,iBAAiB,CAC/B,IAAU,EACV,MAAkC;IAElC,MAAM,eAAe,GAAG,eAAe,CAAC;IAExC,MAAM,YAAY,GAAG;QACnB,OAAO,EAAE;YACP,UAAU,EAAE,gBAAgB;YAC5B,IAAI,EAAE,aAAa;YACnB,UAAU,EAAE,aAAa;YACzB,QAAQ,EAAE,mBAAmB;SAC9B;QACD,oBAAoB,EAAE,YAAY;QAClC,cAAc,EAAE;YACd,WAAW,EAAE;gBACX,IAAI,EAAE,aAAa;aACpB;YACD,UAAU,EAAE;gBACV,SAAS,EAAE,KAAK;gBAChB,IAAI,EAAE,YAAY;aACnB;SACF;KACF,CAAC;IAEF,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC;QACjC,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAEnC,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAEnD,IAAA,mBAAU,EAAC,IAAI,EAAE,eAAe,EAAE,CAAC,IAAI,EAAE,EAAE;YACzC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,GAAG,aAAa,CAAC,IAAI,CAAC;YACxD,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,UAAU,GAAG,aAAa,CAAC,UAAU,CAAC;YACpE,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,KAAK,GAAG;gBAC9C,OAAO,EAAE,yBAAyB;gBAClC,GAAG,YAAY;gBACf,OAAO,EAAE;oBACP,UAAU,EAAE,GAAG,IAAA,0BAAiB,EAC9B,aAAa,CAAC,IAAI,EAClB,gBAAgB,CACjB,EAAE;oBACH,IAAI,EAAE,GAAG,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,EAAE;oBAC/D,UAAU,EAAE,QAAQ,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE;oBACrE,QAAQ,EAAE,GAAG,IAAA,0BAAiB,EAC5B,aAAa,CAAC,IAAI,EAClB,mBAAmB,CACpB,EAAE;iBACJ;aACF,CAAC;YAEF,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAEnC,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAEnD,aAAa,CAAC,OAAO,CAAC,KAAK,GAAG;YAC5B,QAAQ,EAAE,yBAAyB;YACnC,GAAG,YAAY;YACf,OAAO,EAAE;gBACP,UAAU,EAAE,GAAG,IAAA,0BAAiB,EAC9B,aAAa,CAAC,IAAI,EAClB,gBAAgB,CACjB,EAAE;gBACH,IAAI,EAAE,GAAG,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,EAAE;gBAC/D,UAAU,EAAE,QAAQ,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE;gBACrE,QAAQ,EAAE,GAAG,IAAA,0BAAiB,EAC5B,aAAa,CAAC,IAAI,EAClB,mBAAmB,CACpB,EAAE;aACJ;SACF,CAAC;QAEF,IAAA,mCAA0B,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAClE,CAAC;AACH,CAAC"}
@@ -9,7 +9,7 @@ function updateIndex(tree, schema) {
9
9
  const newIndexPath = (0, devkit_1.joinPathFragments)(projectConfig.root, 'index.html');
10
10
  if (tree.exists(indexPath)) {
11
11
  const indexContents = tree.read(indexPath, 'utf-8');
12
- let updatedIndex = indexContents.replace('</body>', '<script type="module" src="/src/main.ts"></script></body>');
12
+ let updatedIndex = indexContents.replace('</body>', `<script type="module" src="${projectConfig.root && projectConfig.root !== '.' ? `/${projectConfig.root}` : ''}/src/main.ts"></script></body>`);
13
13
  updatedIndex = updatedIndex.replace(`"favicon.ico"`, `"/favicon.ico"`);
14
14
  tree.write(indexPath, updatedIndex);
15
15
  tree.rename(indexPath, newIndexPath);
@@ -1 +1 @@
1
- {"version":3,"file":"update-index-html.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/init/lib/update-index-html.ts"],"names":[],"mappings":";;AAIA,kCAiBC;AArBD,uCAAkE;AAIlE,SAAgB,WAAW,CAAC,IAAU,EAAE,MAAkC;IACxE,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IACnC,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAEnD,MAAM,SAAS,GAAG,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IAC1E,MAAM,YAAY,GAAG,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IAEzE,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;QAC3B,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACpD,IAAI,YAAY,GAAG,aAAa,CAAC,OAAO,CACtC,SAAS,EACT,2DAA2D,CAC5D,CAAC;QACF,YAAY,GAAG,YAAY,CAAC,OAAO,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC;QACvE,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;QACpC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;IACvC,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"update-index-html.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/init/lib/update-index-html.ts"],"names":[],"mappings":";;AAIA,kCAiBC;AArBD,uCAAkE;AAIlE,SAAgB,WAAW,CAAC,IAAU,EAAE,MAAkC;IACxE,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IACnC,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAEnD,MAAM,SAAS,GAAG,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IAC1E,MAAM,YAAY,GAAG,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IAEzE,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;QAC3B,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACpD,IAAI,YAAY,GAAG,aAAa,CAAC,OAAO,CACtC,SAAS,EACT,8BAA8B,aAAa,CAAC,IAAI,IAAI,aAAa,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,aAAa,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,gCAAgC,CAC/I,CAAC;QACF,YAAY,GAAG,YAAY,CAAC,OAAO,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC;QACvE,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;QACpC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;IACvC,CAAC;AACH,CAAC"}
@@ -4,12 +4,19 @@ exports.updatePackageJson = updatePackageJson;
4
4
  const devkit_1 = require("@nx/devkit");
5
5
  function updatePackageJson(tree, schema) {
6
6
  const angularJsonPath = '/angular.json';
7
- const packageJsonPath = '/package.json';
8
7
  if (tree.exists(angularJsonPath)) {
9
- (0, devkit_1.updateJson)(tree, packageJsonPath, (json) => {
10
- json.type = 'module';
11
- return json;
12
- });
8
+ const projects = (0, devkit_1.getProjects)(tree);
9
+ const projectConfig = projects.get(schema.project);
10
+ const packageJsonPath = (0, devkit_1.joinPathFragments)(projectConfig.root || '.', 'package.json');
11
+ if (tree.exists(packageJsonPath)) {
12
+ (0, devkit_1.updateJson)(tree, packageJsonPath, (json) => {
13
+ json.type = 'module';
14
+ return json;
15
+ });
16
+ }
17
+ else {
18
+ (0, devkit_1.writeJson)(tree, packageJsonPath, { type: 'module' });
19
+ }
13
20
  }
14
21
  else {
15
22
  const projects = (0, devkit_1.getProjects)(tree);
@@ -1 +1 @@
1
- {"version":3,"file":"update-package-json.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/init/lib/update-package-json.ts"],"names":[],"mappings":";;AAUA,8CAwBC;AAlCD,uCAMoB;AAIpB,SAAgB,iBAAiB,CAC/B,IAAU,EACV,MAAkC;IAElC,MAAM,eAAe,GAAG,eAAe,CAAC;IACxC,MAAM,eAAe,GAAG,eAAe,CAAC;IAExC,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC;QACjC,IAAA,mBAAU,EAAC,IAAI,EAAE,eAAe,EAAE,CAAC,IAAI,EAAE,EAAE;YACzC,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC;YAErB,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACnC,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAEnD,MAAM,eAAe,GAAG,IAAA,0BAAiB,EACvC,aAAa,CAAC,IAAI,EAClB,cAAc,CACf,CAAC;QAEF,IAAA,kBAAS,EAAC,IAAI,EAAE,eAAe,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;IACvD,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"update-package-json.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/init/lib/update-package-json.ts"],"names":[],"mappings":";;AAUA,8CAkCC;AA5CD,uCAMoB;AAIpB,SAAgB,iBAAiB,CAC/B,IAAU,EACV,MAAkC;IAElC,MAAM,eAAe,GAAG,eAAe,CAAC;IAExC,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC;QACjC,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACnC,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACnD,MAAM,eAAe,GAAG,IAAA,0BAAiB,EACvC,aAAa,CAAC,IAAI,IAAI,GAAG,EACzB,cAAc,CACf,CAAC;QAEF,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC;YACjC,IAAA,mBAAU,EAAC,IAAI,EAAE,eAAe,EAAE,CAAC,IAAI,EAAE,EAAE;gBACzC,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC;gBAErB,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,IAAA,kBAAS,EAAC,IAAI,EAAE,eAAe,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;QACvD,CAAC;IACH,CAAC;SAAM,CAAC;QACN,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACnC,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAEnD,MAAM,eAAe,GAAG,IAAA,0BAAiB,EACvC,aAAa,CAAC,IAAI,EAClB,cAAc,CACf,CAAC;QAEF,IAAA,kBAAS,EAAC,IAAI,EAAE,eAAe,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;IACvD,CAAC;AACH,CAAC"}
@@ -22,7 +22,8 @@ function updateServeTarget(tree, schema) {
22
22
  };
23
23
  if (tree.exists(angularJsonPath)) {
24
24
  (0, devkit_1.updateJson)(tree, angularJsonPath, (json) => {
25
- json.projects[schema.project].root = '.';
25
+ json.projects[schema.project].root =
26
+ json.projects[schema.project].root || '.';
26
27
  json.projects[schema.project].architect.serve = {
27
28
  builder: '@analogjs/platform:vite-dev-server',
28
29
  ...commonConfig,
@@ -37,6 +38,9 @@ function updateServeTarget(tree, schema) {
37
38
  executor: '@analogjs/platform:vite-dev-server',
38
39
  ...commonConfig,
39
40
  };
41
+ projectConfig.targets.build.outputs = [
42
+ `{workspaceRoot}/dist/apps/${projectConfig.name}`,
43
+ ];
40
44
  (0, devkit_1.updateProjectConfiguration)(tree, schema.project, projectConfig);
41
45
  }
42
46
  }
@@ -1 +1 @@
1
- {"version":3,"file":"update-serve-target.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/init/lib/update-serve-target.ts"],"names":[],"mappings":";;AASA,8CAkDC;AA3DD,uCAKoB;AAIpB,SAAgB,iBAAiB,CAC/B,IAAU,EACV,MAAkC;IAElC,MAAM,eAAe,GAAG,eAAe,CAAC;IAExC,MAAM,YAAY,GAAG;QACnB,oBAAoB,EAAE,aAAa;QACnC,OAAO,EAAE;YACP,WAAW,EAAE,GAAG,MAAM,CAAC,OAAO,QAAQ;YACtC,IAAI,EAAE,IAAI;SACX;QACD,cAAc,EAAE;YACd,WAAW,EAAE;gBACX,WAAW,EAAE,GAAG,MAAM,CAAC,OAAO,oBAAoB;gBAClD,GAAG,EAAE,IAAI;aACV;YACD,UAAU,EAAE;gBACV,WAAW,EAAE,GAAG,MAAM,CAAC,OAAO,mBAAmB;aAClD;SACF;KACF,CAAC;IAEF,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC;QACjC,IAAA,mBAAU,EACR,IAAI,EACJ,eAAe,EACf,CAAC,IAAI,EAAE,EAAE;YACP,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,GAAG,GAAG,CAAC;YACzC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,KAAK,GAAG;gBAC9C,OAAO,EAAE,oCAAoC;gBAC7C,GAAG,YAAY;aAChB,CAAC;YAEF,OAAO,IAAI,CAAC;QACd,CAAC,EACD,EAAE,cAAc,EAAE,IAAI,EAAE,kBAAkB,EAAE,IAAI,EAAE,CACnD,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAEnC,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAEnD,aAAa,CAAC,OAAO,CAAC,KAAK,GAAG;YAC5B,QAAQ,EAAE,oCAAoC;YAC9C,GAAG,YAAY;SAChB,CAAC;QAEF,IAAA,mCAA0B,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAClE,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"update-serve-target.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/init/lib/update-serve-target.ts"],"names":[],"mappings":";;AASA,8CAsDC;AA/DD,uCAKoB;AAIpB,SAAgB,iBAAiB,CAC/B,IAAU,EACV,MAAkC;IAElC,MAAM,eAAe,GAAG,eAAe,CAAC;IAExC,MAAM,YAAY,GAAG;QACnB,oBAAoB,EAAE,aAAa;QACnC,OAAO,EAAE;YACP,WAAW,EAAE,GAAG,MAAM,CAAC,OAAO,QAAQ;YACtC,IAAI,EAAE,IAAI;SACX;QACD,cAAc,EAAE;YACd,WAAW,EAAE;gBACX,WAAW,EAAE,GAAG,MAAM,CAAC,OAAO,oBAAoB;gBAClD,GAAG,EAAE,IAAI;aACV;YACD,UAAU,EAAE;gBACV,WAAW,EAAE,GAAG,MAAM,CAAC,OAAO,mBAAmB;aAClD;SACF;KACF,CAAC;IAEF,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC;QACjC,IAAA,mBAAU,EACR,IAAI,EACJ,eAAe,EACf,CAAC,IAAI,EAAE,EAAE;YACP,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI;gBAChC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,IAAI,GAAG,CAAC;YAC5C,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,KAAK,GAAG;gBAC9C,OAAO,EAAE,oCAAoC;gBAC7C,GAAG,YAAY;aAChB,CAAC;YAEF,OAAO,IAAI,CAAC;QACd,CAAC,EACD,EAAE,cAAc,EAAE,IAAI,EAAE,kBAAkB,EAAE,IAAI,EAAE,CACnD,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAEnC,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAEnD,aAAa,CAAC,OAAO,CAAC,KAAK,GAAG;YAC5B,QAAQ,EAAE,oCAAoC;YAC9C,GAAG,YAAY;SAChB,CAAC;QACF,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,GAAG;YACpC,6BAA6B,aAAa,CAAC,IAAI,EAAE;SAClD,CAAC;QAEF,IAAA,mCAA0B,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAClE,CAAC;AACH,CAAC"}
@@ -10,7 +10,7 @@ function updateTestTsConfig(tree, schema) {
10
10
  (0, devkit_1.updateJson)(tree, tsconfigPath, (json) => {
11
11
  json.compilerOptions ??= {};
12
12
  json.compilerOptions.module = undefined;
13
- json.compilerOptions.target ??= 'es2016';
13
+ json.compilerOptions.target ??= 'es2022';
14
14
  json.compilerOptions.types = ['vitest/globals', 'node'];
15
15
  json.files = ['src/test-setup.ts'];
16
16
  return json;
@@ -1,3 +1,18 @@
1
+ <% if (majorAngularVersion > 19) { %>
2
+ import '@angular/compiler';
3
+ import '@analogjs/vitest-angular/setup-zone';
4
+
5
+ import {
6
+ BrowserTestingModule,
7
+ platformBrowserTesting,
8
+ } from '@angular/platform-browser/testing';
9
+ import { getTestBed } from '@angular/core/testing';
10
+
11
+ getTestBed().initTestEnvironment(
12
+ BrowserTestingModule,
13
+ platformBrowserTesting()
14
+ );
15
+ <% } else { %>
1
16
  import '@analogjs/vitest-angular/setup-zone';
2
17
 
3
18
  import {
@@ -10,3 +25,4 @@ getTestBed().initTestEnvironment(
10
25
  BrowserDynamicTestingModule,
11
26
  platformBrowserDynamicTesting()
12
27
  );
28
+ <% } %>
@@ -0,0 +1,151 @@
1
+ // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
2
+
3
+ exports[`preset generator > should match index.html 1`] = `
4
+ "<!doctype html>
5
+ <html lang="en">
6
+ <head>
7
+ <meta charset="utf-8" />
8
+ <title>my-app</title>
9
+ <base href="/" />
10
+ <meta name="viewport" content="width=device-width, initial-scale=1" />
11
+ <link rel="icon" type="image/x-icon" href="/favicon.ico" />
12
+ <link rel="stylesheet" href="/src/styles.css" />
13
+ </head>
14
+ <body>
15
+ <app-root></app-root>
16
+ <script type="module" src="/my-app/src/main.ts"></script>
17
+ </body>
18
+ </html>
19
+ "
20
+ `;
21
+
22
+ exports[`preset generator > should match project.json 1`] = `
23
+ "{
24
+ "name": "my-app",
25
+ "$schema": "../node_modules/nx/schemas/project-schema.json",
26
+ "projectType": "application",
27
+ "prefix": "app",
28
+ "sourceRoot": "my-app/src",
29
+ "tags": ["tag1", "tag2", "type:app"],
30
+ "targets": {
31
+ "build": {
32
+ "executor": "@analogjs/platform:vite",
33
+ "options": {
34
+ "configFile": "my-app/vite.config.ts",
35
+ "main": "my-app/src/main.ts",
36
+ "outputPath": "dist/my-app/client",
37
+ "tsConfig": "my-app/tsconfig.app.json"
38
+ },
39
+ "defaultConfiguration": "production",
40
+ "configurations": {
41
+ "development": {
42
+ "mode": "development"
43
+ },
44
+ "production": {
45
+ "sourcemap": false,
46
+ "mode": "production"
47
+ }
48
+ },
49
+ "outputs": ["{workspaceRoot}/dist/apps/my-app"]
50
+ },
51
+ "serve": {
52
+ "executor": "@analogjs/platform:vite-dev-server",
53
+ "defaultConfiguration": "development",
54
+ "options": {
55
+ "buildTarget": "my-app:build",
56
+ "port": 4200
57
+ },
58
+ "configurations": {
59
+ "development": {
60
+ "buildTarget": "my-app:build:development",
61
+ "hmr": true
62
+ },
63
+ "production": {
64
+ "buildTarget": "my-app:build:production"
65
+ }
66
+ }
67
+ },
68
+ "extract-i18n": {
69
+ "executor": "@angular/build:extract-i18n",
70
+ "options": {
71
+ "buildTarget": "my-app:build"
72
+ }
73
+ },
74
+ "test": {
75
+ "executor": "@analogjs/vitest-angular:test",
76
+ "options": {
77
+ "config": "vite.config.ts"
78
+ }
79
+ },
80
+ "serve-static": {
81
+ "continuous": true,
82
+ "executor": "@nx/web:file-server",
83
+ "options": {
84
+ "buildTarget": "my-app:build",
85
+ "port": 4200,
86
+ "staticFilePath": "dist/my-app/browser",
87
+ "spa": true
88
+ }
89
+ }
90
+ }
91
+ }
92
+ "
93
+ `;
94
+
95
+ exports[`preset generator > should match src/test-setup.ts 1`] = `
96
+ "import '@angular/compiler';
97
+ import '@analogjs/vitest-angular/setup-zone';
98
+
99
+ import {
100
+ BrowserTestingModule,
101
+ platformBrowserTesting,
102
+ } from '@angular/platform-browser/testing';
103
+ import { getTestBed } from '@angular/core/testing';
104
+
105
+ getTestBed().initTestEnvironment(
106
+ BrowserTestingModule,
107
+ platformBrowserTesting(),
108
+ );
109
+ "
110
+ `;
111
+
112
+ exports[`preset generator > should match vite.config.ts 1`] = `
113
+ "/// <reference types="vitest" />
114
+
115
+ import analog from '@analogjs/platform';
116
+ import { defineConfig } from 'vite';
117
+ import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
118
+
119
+ // @ts-expect-error @tailwindcss/vite currently uses mts. TypeScript is complaining this, but it works as expected.
120
+ import tailwindcss from '@tailwindcss/vite';
121
+
122
+ // https://vitejs.dev/config/
123
+ export default defineConfig(({ mode }) => {
124
+ return {
125
+ root: __dirname,
126
+ cacheDir: \`../node_modules/.vite\`,
127
+ build: {
128
+ outDir: '../dist/./my-app/client',
129
+ reportCompressedSize: true,
130
+ target: ['es2020'],
131
+ },
132
+ server: {
133
+ fs: {
134
+ allow: ['.'],
135
+ },
136
+ },
137
+ plugins: [tailwindcss(), analog(), nxViteTsPaths()],
138
+ test: {
139
+ globals: true,
140
+ environment: 'jsdom',
141
+ setupFiles: ['src/test-setup.ts'],
142
+ include: ['**/*.spec.ts'],
143
+ reporters: ['default'],
144
+ },
145
+ define: {
146
+ 'import.meta.vitest': mode !== 'production',
147
+ },
148
+ };
149
+ });
150
+ "
151
+ `;
@@ -34,7 +34,10 @@ var __importStar = (this && this.__importStar) || (function () {
34
34
  })();
35
35
  Object.defineProperty(exports, "__esModule", { value: true });
36
36
  exports.default = default_1;
37
+ const devkit_1 = require("@nx/devkit");
37
38
  async function default_1(tree, options) {
39
+ (0, devkit_1.ensurePackage)('@nx/angular', devkit_1.NX_VERSION);
40
+ (0, devkit_1.ensurePackage)('@angular-devkit/build-angular', 'latest');
38
41
  return await Promise.resolve().then(() => __importStar(require('../app/generator'))).then(({ appGenerator }) => appGenerator(tree, options));
39
42
  }
40
43
  //# sourceMappingURL=generator.js.map