@analogjs/platform 2.7.1 → 2.7.2-beta.2

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 (29) hide show
  1. package/package.json +3 -3
  2. package/src/lib/nx-plugin/src/generators/app/files/template-angular/vite.config.ts__template__ +3 -3
  3. package/src/lib/nx-plugin/src/generators/app/files/template-angular-v17/vite.config.ts__template__ +3 -3
  4. package/src/lib/nx-plugin/src/generators/app/files/template-angular-v18/vite.config.ts__template__ +3 -3
  5. package/src/lib/nx-plugin/src/generators/app/files/template-angular-v19/vite.config.ts__template__ +3 -3
  6. package/src/lib/nx-plugin/src/generators/app/generator.js +8 -0
  7. package/src/lib/nx-plugin/src/generators/app/generator.js.map +1 -1
  8. package/src/lib/nx-plugin/src/generators/app/lib/add-angular-app.js +4 -2
  9. package/src/lib/nx-plugin/src/generators/app/lib/add-angular-app.js.map +1 -1
  10. package/src/lib/nx-plugin/src/generators/app/schema.d.ts +1 -0
  11. package/src/lib/nx-plugin/src/generators/app/schema.json +6 -0
  12. package/src/lib/nx-plugin/src/generators/app/versions/minimum-supported-versions.d.ts +2 -0
  13. package/src/lib/nx-plugin/src/generators/app/versions/minimum-supported-versions.js +4 -1
  14. package/src/lib/nx-plugin/src/generators/app/versions/minimum-supported-versions.js.map +1 -1
  15. package/src/lib/nx-plugin/src/generators/app/versions/nx_18_X/versions.d.ts +5 -5
  16. package/src/lib/nx-plugin/src/generators/app/versions/nx_18_X/versions.js +5 -5
  17. package/src/lib/nx-plugin/src/generators/app/versions/nx_18_X/versions.js.map +1 -1
  18. package/src/lib/nx-plugin/src/generators/init/files/vite.config.ts__template__ +1 -9
  19. package/src/lib/nx-plugin/src/generators/preset/__snapshots__/generator.spec.ts.snap +3 -3
  20. package/src/lib/nx-plugin/src/generators/preset/generator.js +10 -1
  21. package/src/lib/nx-plugin/src/generators/preset/generator.js.map +1 -1
  22. package/src/lib/nx-plugin/src/generators/preset/schema.d.ts +1 -0
  23. package/src/lib/nx-plugin/src/generators/preset/schema.json +6 -0
  24. package/src/lib/nx-plugin/src/generators/setup-vitest/files/vite.config.mts__template__ +2 -9
  25. package/src/lib/nx-plugin/src/generators/setup-vitest/generator.js +0 -2
  26. package/src/lib/nx-plugin/src/generators/setup-vitest/generator.js.map +1 -1
  27. package/src/lib/nx-plugin/src/utils/versions/ng_19_X/versions.d.ts +5 -5
  28. package/src/lib/nx-plugin/src/utils/versions/ng_19_X/versions.js +5 -5
  29. package/src/lib/nx-plugin/src/utils/versions/ng_19_X/versions.js.map +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@analogjs/platform",
3
- "version": "2.7.1",
3
+ "version": "2.7.2-beta.2",
4
4
  "description": "The fullstack meta-framework for Angular",
5
5
  "type": "module",
6
6
  "author": "Brandon Roberts <robertsbt@gmail.com>",
@@ -29,8 +29,8 @@
29
29
  },
30
30
  "dependencies": {
31
31
  "nitropack": "^2.13.1",
32
- "@analogjs/vite-plugin-angular": "^2.7.1",
33
- "@analogjs/vite-plugin-nitro": "^2.7.1",
32
+ "@analogjs/vite-plugin-angular": "^2.7.2-beta.2",
33
+ "@analogjs/vite-plugin-nitro": "^2.7.2-beta.2",
34
34
  "oxc-parser": "^0.121.0",
35
35
  "vitefu": "^1.1.2"
36
36
  },
package/src/lib/nx-plugin/src/generators/app/files/template-angular/vite.config.ts__template__ CHANGED
@@ -2,12 +2,12 @@
2
2
 
3
3
  import analog from '@analogjs/platform';
4
4
  import { defineConfig } from 'vite';
5
- import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
5
+ import viteTsConfigPaths from 'vite-tsconfig-paths';
6
6
 
7
7
  // https://vitejs.dev/config/
8
8
  export default defineConfig(({ mode }) => {
9
9
  return {
10
- root: __dirname,
10
+ root: import.meta.dirname,
11
11
  cacheDir: `<%= offsetFromRoot %>node_modules/.vite`,
12
12
  build: {
13
13
  outDir: '<%= offsetFromRoot %>dist/<%= projectRoot %>/client',
@@ -21,7 +21,7 @@ export default defineConfig(({ mode }) => {
21
21
  },
22
22
  plugins: [
23
23
  analog(),
24
- nxViteTsPaths(),
24
+ viteTsConfigPaths(),
25
25
  ],
26
26
  test: {
27
27
  globals: true,
package/src/lib/nx-plugin/src/generators/app/files/template-angular-v17/vite.config.ts__template__ CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
  import analog from '@analogjs/platform';
4
4
  import { defineConfig, Plugin } from 'vite';
5
- import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
5
+ import viteTsConfigPaths from 'vite-tsconfig-paths';
6
6
  <% if (addTailwind) { %>
7
7
  // @ts-expect-error @tailwindcss/vite currently uses mts. TypeScript is complaining this, but it works as expected.
8
8
  import tailwindcss from '@tailwindcss/vite';
@@ -11,7 +11,7 @@ import tailwindcss from '@tailwindcss/vite';
11
11
  // https://vitejs.dev/config/
12
12
  export default defineConfig(({ mode }) => {
13
13
  return {
14
- root: __dirname,
14
+ root: import.meta.dirname,
15
15
  publicDir: 'src/public',
16
16
  cacheDir: `<%= offsetFromRoot %>node_modules/.vite`,
17
17
  <% if (addTRPC) { %>
@@ -46,7 +46,7 @@ export default defineConfig(({ mode }) => {
46
46
  <% } else { %>
47
47
  analog(),
48
48
  <% } %>
49
- nxViteTsPaths(),
49
+ viteTsConfigPaths(),
50
50
  ],
51
51
  test: {
52
52
  globals: true,
package/src/lib/nx-plugin/src/generators/app/files/template-angular-v18/vite.config.ts__template__ CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
  import analog from '@analogjs/platform';
4
4
  import { defineConfig, Plugin } from 'vite';
5
- import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
5
+ import viteTsConfigPaths from 'vite-tsconfig-paths';
6
6
  <% if (addTailwind) { %>
7
7
  // @ts-expect-error @tailwindcss/vite currently uses mts. TypeScript is complaining this, but it works as expected.
8
8
  import tailwindcss from '@tailwindcss/vite';
@@ -11,7 +11,7 @@ import tailwindcss from '@tailwindcss/vite';
11
11
  // https://vitejs.dev/config/
12
12
  export default defineConfig(({ mode }) => {
13
13
  return {
14
- root: __dirname,
14
+ root: import.meta.dirname,
15
15
  cacheDir: `<%= offsetFromRoot %>node_modules/.vite`,
16
16
  <% if (addTRPC) { %>
17
17
  ssr: {
@@ -45,7 +45,7 @@ export default defineConfig(({ mode }) => {
45
45
  <% } else { %>
46
46
  analog(),
47
47
  <% } %>
48
- nxViteTsPaths(),
48
+ viteTsConfigPaths(),
49
49
  ],
50
50
  test: {
51
51
  globals: true,
package/src/lib/nx-plugin/src/generators/app/files/template-angular-v19/vite.config.ts__template__ CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
  import analog from '@analogjs/platform';
4
4
  import { defineConfig } from 'vite';
5
- import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
5
+ import viteTsConfigPaths from 'vite-tsconfig-paths';
6
6
  <% if (addTailwind) { %>
7
7
  // @ts-expect-error @tailwindcss/vite currently uses mts. TypeScript is complaining this, but it works as expected.
8
8
  import tailwindcss from '@tailwindcss/vite';
@@ -11,7 +11,7 @@ import tailwindcss from '@tailwindcss/vite';
11
11
  // https://vitejs.dev/config/
12
12
  export default defineConfig(({ mode }) => {
13
13
  return {
14
- root: __dirname,
14
+ root: import.meta.dirname,
15
15
  cacheDir: `<%= offsetFromRoot %>node_modules/.vite`,
16
16
  build: {
17
17
  outDir: '<%= offsetFromRoot %>dist/<%= projectRoot %>/client',
@@ -36,7 +36,7 @@ export default defineConfig(({ mode }) => {
36
36
  <% } else { %>
37
37
  analog(),
38
38
  <% } %>
39
- nxViteTsPaths(),
39
+ viteTsConfigPaths(),
40
40
  ],
41
41
  test: {
42
42
  globals: true,
package/src/lib/nx-plugin/src/generators/app/generator.js CHANGED
@@ -48,6 +48,14 @@ async function appGenerator(tree, options) {
48
48
  if (nxVersion && (0, minimum_supported_versions_1.belowMinimumSupportedNxVersion)(nxVersion)) {
49
49
  throw new Error((0, devkit_1.stripIndents) `Nx v15.2.0 or newer is required to install Analog`);
50
50
  }
51
+ if (options.linter === 'oxlint') {
52
+ if (!nxVersion) {
53
+ throw new Error((0, devkit_1.stripIndents) `The oxlint linter is only supported in Nx workspaces`);
54
+ }
55
+ if ((0, minimum_supported_versions_1.belowMinimumSupportedOxlintNxVersion)(nxVersion)) {
56
+ throw new Error((0, devkit_1.stripIndents) `Nx v${minimum_supported_versions_1.MINIMUM_SUPPORTED_OXLINT_NX_VERSION} or newer is required to use the oxlint linter`);
57
+ }
58
+ }
51
59
  const normalizedOptions = normalizeOptions(tree, options);
52
60
  if (nxVersion) {
53
61
  await (0, add_angular_app_1.addAngularApp)(tree, normalizedOptions);
package/src/lib/nx-plugin/src/generators/app/generator.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../../../packages/nx-plugin/src/generators/app/generator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../../../packages/nx-plugin/src/generators/app/generator.ts"],"names":[],"mappings":"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"}
package/src/lib/nx-plugin/src/generators/app/lib/add-angular-app.js CHANGED
@@ -41,7 +41,10 @@ async function addAngularApp(tree, options) {
41
41
  const appOptions = {
42
42
  name: options.analogAppName,
43
43
  directory: `${appsDir}/${options.analogAppName}`,
44
- linter: !isNx || process.env['NODE_ENV'] === 'test' ? 'none' : 'eslint',
44
+ linter: !isNx
45
+ ? 'none'
46
+ : (options.linter ??
47
+ (process.env['NODE_ENV'] === 'test' ? 'none' : 'eslint')),
45
48
  // Analog sets up its own Vitest configuration in the init generator, so the
46
49
  // Angular generator should not scaffold a test runner. Nx 23 also removed
47
50
  // the `'vitest'` option in favour of `'vitest-angular'`/`'vitest-analog'`.
@@ -49,7 +52,6 @@ async function addAngularApp(tree, options) {
49
52
  standalone: true,
50
53
  ssr: false,
51
54
  bundler: 'esbuild',
52
- serverRouting: false,
53
55
  skipFormat: true,
54
56
  tags: options.tags,
55
57
  };
package/src/lib/nx-plugin/src/generators/app/lib/add-angular-app.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"add-angular-app.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/add-angular-app.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQA,sCA+BC;AAvCD,uCAAsD;AAQ/C,KAAK,UAAU,aAAa,CAAC,IAAU,EAAE,OAA0B;IACxE,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACrC,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC;IAGrE,MAAM,UAAU,GAAsB;QACpC,IAAI,EAAE,OAAO,CAAC,aAAa;QAC3B,SAAS,EAAE,GAAG,OAAO,IAAI,OAAO,CAAC,aAAa,EAAE;QAChD,MAAM,EAAE,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ;QACvE,4EAA4E;QAC5E,0EAA0E;QAC1E,2EAA2E;QAC3E,cAAc,EAAE,MAA6C;QAC7D,UAAU,EAAE,IAAI;QAChB,GAAG,EAAE,KAAK;QACV,OAAO,EAAE,SAAS;QAClB,aAAa,EAAE,KAAK;QACpB,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,OAAO,CAAC,IAAI;KACnB,CAAC;IAEF,MAAM,CACJ;IACE,6DAA6D;IAC7D,aAAa;IACb,wBAAwB,GACzB,CACF,CAAC,oBAAoB,CAAC,IAAI,EAAE;QAC3B,GAAG,UAAU;QACb,SAAS,EAAE,GAAG,OAAO,IAAI,OAAO,CAAC,aAAa,EAAE;KACjD,CAAC,CAAC;AACL,CAAC"}
1
+ {"version":3,"file":"add-angular-app.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/add-angular-app.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQA,sCAiCC;AAzCD,uCAAsD;AAQ/C,KAAK,UAAU,aAAa,CAAC,IAAU,EAAE,OAA0B;IACxE,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACrC,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC;IAGrE,MAAM,UAAU,GAAsB;QACpC,IAAI,EAAE,OAAO,CAAC,aAAa;QAC3B,SAAS,EAAE,GAAG,OAAO,IAAI,OAAO,CAAC,aAAa,EAAE;QAChD,MAAM,EAAE,CAAC,IAAI;YACX,CAAC,CAAC,MAAM;YACR,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM;gBACf,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QAC7D,4EAA4E;QAC5E,0EAA0E;QAC1E,2EAA2E;QAC3E,cAAc,EAAE,MAA6C;QAC7D,UAAU,EAAE,IAAI;QAChB,GAAG,EAAE,KAAK;QACV,OAAO,EAAE,SAAS;QAClB,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,OAAO,CAAC,IAAI;KACnB,CAAC;IAEF,MAAM,CACJ;IACE,6DAA6D;IAC7D,aAAa;IACb,wBAAwB,GACzB,CACF,CAAC,oBAAoB,CAAC,IAAI,EAAE;QAC3B,GAAG,UAAU;QACb,SAAS,EAAE,GAAG,OAAO,IAAI,OAAO,CAAC,aAAa,EAAE;KACjD,CAAC,CAAC;AACL,CAAC"}
package/src/lib/nx-plugin/src/generators/app/schema.d.ts CHANGED
@@ -2,6 +2,7 @@ export interface AnalogNxApplicationGeneratorOptions {
2
2
  analogAppName: string;
3
3
  tags?: string;
4
4
  addTailwind?: boolean;
5
+ linter?: 'eslint' | 'oxlint' | 'none';
5
6
  skipFormat?: boolean;
6
7
  // Set by the preset, which seeds agent context at the workspace root instead.
7
8
  skipAgentContext?: boolean;
package/src/lib/nx-plugin/src/generators/app/schema.json CHANGED
@@ -20,6 +20,12 @@
20
20
  "x-prompt": "Add TailwindCSS for styling?",
21
21
  "default": false
22
22
  },
23
+ "linter": {
24
+ "description": "The tool to use for running lint checks. `oxlint` requires Nx 23.2 or newer.",
25
+ "type": "string",
26
+ "enum": ["eslint", "oxlint", "none"],
27
+ "default": "eslint"
28
+ },
23
29
  "tags": {
24
30
  "type": "string",
25
31
  "description": "Add tags to the project (used for linting)",
package/src/lib/nx-plugin/src/generators/app/versions/minimum-supported-versions.d.ts CHANGED
@@ -1,5 +1,7 @@
1
1
  export declare const MINIMUM_SUPPORTED_NX_TRPC_VERSION = "16.1.0";
2
2
  export declare const MINIMUM_SUPPORTED_NX_VERSION = "15.2.0";
3
3
  export declare const MINIMUM_SUPPORTED_ANGULAR_VERSION = "15.0.0";
4
+ export declare const MINIMUM_SUPPORTED_OXLINT_NX_VERSION = "23.2.0";
4
5
  export declare const belowMinimumSupportedNxVersion: (nxVersion: string) => boolean;
5
6
  export declare const belowMinimumSupportedAngularVersion: (angularVersion: string) => boolean;
7
+ export declare const belowMinimumSupportedOxlintNxVersion: (nxVersion: string) => boolean;
package/src/lib/nx-plugin/src/generators/app/versions/minimum-supported-versions.js CHANGED
@@ -1,12 +1,15 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.belowMinimumSupportedAngularVersion = exports.belowMinimumSupportedNxVersion = exports.MINIMUM_SUPPORTED_ANGULAR_VERSION = exports.MINIMUM_SUPPORTED_NX_VERSION = exports.MINIMUM_SUPPORTED_NX_TRPC_VERSION = void 0;
3
+ exports.belowMinimumSupportedOxlintNxVersion = exports.belowMinimumSupportedAngularVersion = exports.belowMinimumSupportedNxVersion = exports.MINIMUM_SUPPORTED_OXLINT_NX_VERSION = exports.MINIMUM_SUPPORTED_ANGULAR_VERSION = exports.MINIMUM_SUPPORTED_NX_VERSION = exports.MINIMUM_SUPPORTED_NX_TRPC_VERSION = void 0;
4
4
  const semver_1 = require("semver");
5
5
  exports.MINIMUM_SUPPORTED_NX_TRPC_VERSION = '16.1.0';
6
6
  exports.MINIMUM_SUPPORTED_NX_VERSION = '15.2.0';
7
7
  exports.MINIMUM_SUPPORTED_ANGULAR_VERSION = '15.0.0';
8
+ exports.MINIMUM_SUPPORTED_OXLINT_NX_VERSION = '23.2.0';
8
9
  const belowMinimumSupportedNxVersion = (nxVersion) => (0, semver_1.lt)((0, semver_1.coerce)(nxVersion), exports.MINIMUM_SUPPORTED_NX_VERSION);
9
10
  exports.belowMinimumSupportedNxVersion = belowMinimumSupportedNxVersion;
10
11
  const belowMinimumSupportedAngularVersion = (angularVersion) => (0, semver_1.lt)((0, semver_1.coerce)(angularVersion), exports.MINIMUM_SUPPORTED_ANGULAR_VERSION);
11
12
  exports.belowMinimumSupportedAngularVersion = belowMinimumSupportedAngularVersion;
13
+ const belowMinimumSupportedOxlintNxVersion = (nxVersion) => (0, semver_1.lt)((0, semver_1.coerce)(nxVersion), exports.MINIMUM_SUPPORTED_OXLINT_NX_VERSION);
14
+ exports.belowMinimumSupportedOxlintNxVersion = belowMinimumSupportedOxlintNxVersion;
12
15
  //# sourceMappingURL=minimum-supported-versions.js.map
package/src/lib/nx-plugin/src/generators/app/versions/minimum-supported-versions.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"minimum-supported-versions.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/versions/minimum-supported-versions.ts"],"names":[],"mappings":";;;AAAA,mCAAoC;AACvB,QAAA,iCAAiC,GAAG,QAAQ,CAAC;AAC7C,QAAA,4BAA4B,GAAG,QAAQ,CAAC;AACxC,QAAA,iCAAiC,GAAG,QAAQ,CAAC;AACnD,MAAM,8BAA8B,GAAG,CAAC,SAAiB,EAAE,EAAE,CAClE,IAAA,WAAE,EAAC,IAAA,eAAM,EAAC,SAAS,CAAE,EAAE,oCAA4B,CAAC,CAAC;AAD1C,QAAA,8BAA8B,kCACY;AAChD,MAAM,mCAAmC,GAAG,CAAC,cAAsB,EAAE,EAAE,CAC5E,IAAA,WAAE,EAAC,IAAA,eAAM,EAAC,cAAc,CAAE,EAAE,yCAAiC,CAAC,CAAC;AADpD,QAAA,mCAAmC,uCACiB"}
1
+ {"version":3,"file":"minimum-supported-versions.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/versions/minimum-supported-versions.ts"],"names":[],"mappings":";;;AAAA,mCAAoC;AACvB,QAAA,iCAAiC,GAAG,QAAQ,CAAC;AAC7C,QAAA,4BAA4B,GAAG,QAAQ,CAAC;AACxC,QAAA,iCAAiC,GAAG,QAAQ,CAAC;AAC7C,QAAA,mCAAmC,GAAG,QAAQ,CAAC;AACrD,MAAM,8BAA8B,GAAG,CAAC,SAAiB,EAAE,EAAE,CAClE,IAAA,WAAE,EAAC,IAAA,eAAM,EAAC,SAAS,CAAE,EAAE,oCAA4B,CAAC,CAAC;AAD1C,QAAA,8BAA8B,kCACY;AAChD,MAAM,mCAAmC,GAAG,CAAC,cAAsB,EAAE,EAAE,CAC5E,IAAA,WAAE,EAAC,IAAA,eAAM,EAAC,cAAc,CAAE,EAAE,yCAAiC,CAAC,CAAC;AADpD,QAAA,mCAAmC,uCACiB;AAC1D,MAAM,oCAAoC,GAAG,CAAC,SAAiB,EAAE,EAAE,CACxE,IAAA,WAAE,EAAC,IAAA,eAAM,EAAC,SAAS,CAAE,EAAE,2CAAmC,CAAC,CAAC;AADjD,QAAA,oCAAoC,wCACa"}
package/src/lib/nx-plugin/src/generators/app/versions/nx_18_X/versions.d.ts CHANGED
@@ -1,10 +1,10 @@
1
1
  export declare const V18_X_NX_DEVKIT = "^20.0.0";
2
2
  export declare const V18_X_NX_ANGULAR = "^20.0.0";
3
- export declare const V18_X_ANALOG_JS_CONTENT = "^2.7.1";
4
- export declare const V18_X_ANALOG_JS_ROUTER = "^2.7.1";
3
+ export declare const V18_X_ANALOG_JS_CONTENT = "^2.7.2-beta.2";
4
+ export declare const V18_X_ANALOG_JS_ROUTER = "^2.7.2-beta.2";
5
5
  export declare const V18_X_ANALOG_JS_TRPC = "~0.4.0";
6
- export declare const V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = "^2.7.1";
7
- export declare const V18_X_ANALOG_JS_VITEST_ANGULAR = "^2.7.1";
6
+ export declare const V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = "^2.7.2-beta.2";
7
+ export declare const V18_X_ANALOG_JS_VITEST_ANGULAR = "^2.7.2-beta.2";
8
8
  export declare const V18_X_TRPC_CLIENT = "^10.25.0";
9
9
  export declare const V18_X_TRPC_SERVER = "^10.25.0";
10
10
  export declare const V18_X_ISOMORPHIC_FETCH = "^3.0.0";
@@ -20,7 +20,7 @@ export declare const V18_X_TAILWINDCSS = "^4.1.4";
20
20
  export declare const V18_X_TAILWINDCSS_VITE = "^4.1.4";
21
21
  export declare const V18_X_POSTCSS = "^8.5.3";
22
22
  export declare const V18_X_AUTOPREFIXER = "^10.4.0";
23
- export declare const V18_X_ANALOG_JS_PLATFORM = "^2.7.1";
23
+ export declare const V18_X_ANALOG_JS_PLATFORM = "^2.7.2-beta.2";
24
24
  export declare const V18_X_ANGULAR_DEVKIT_BUILD_ANGULAR = "^19.0.0";
25
25
  export declare const V18_X_NX_VITE = "^21.0.0";
26
26
  export declare const V18_X_NX_LINTER = "^21.0.0";
package/src/lib/nx-plugin/src/generators/app/versions/nx_18_X/versions.js CHANGED
@@ -5,11 +5,11 @@ exports.V18_X_ZOD = exports.V18_X_VITEST = exports.V18_X_VITE_TSCONFIG_PATHS = e
5
5
  // dependencies
6
6
  exports.V18_X_NX_DEVKIT = '^20.0.0';
7
7
  exports.V18_X_NX_ANGULAR = '^20.0.0';
8
- exports.V18_X_ANALOG_JS_CONTENT = '^2.7.1';
9
- exports.V18_X_ANALOG_JS_ROUTER = '^2.7.1';
8
+ exports.V18_X_ANALOG_JS_CONTENT = '^2.7.2-beta.2';
9
+ exports.V18_X_ANALOG_JS_ROUTER = '^2.7.2-beta.2';
10
10
  exports.V18_X_ANALOG_JS_TRPC = '~0.4.0';
11
- exports.V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^2.7.1';
12
- exports.V18_X_ANALOG_JS_VITEST_ANGULAR = '^2.7.1';
11
+ exports.V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^2.7.2-beta.2';
12
+ exports.V18_X_ANALOG_JS_VITEST_ANGULAR = '^2.7.2-beta.2';
13
13
  exports.V18_X_TRPC_CLIENT = '^10.25.0';
14
14
  exports.V18_X_TRPC_SERVER = '^10.25.0';
15
15
  exports.V18_X_ISOMORPHIC_FETCH = '^3.0.0';
@@ -26,7 +26,7 @@ exports.V18_X_TAILWINDCSS_VITE = '^4.1.4';
26
26
  exports.V18_X_POSTCSS = '^8.5.3';
27
27
  exports.V18_X_AUTOPREFIXER = '^10.4.0';
28
28
  // devDependencies
29
- exports.V18_X_ANALOG_JS_PLATFORM = '^2.7.1';
29
+ exports.V18_X_ANALOG_JS_PLATFORM = '^2.7.2-beta.2';
30
30
  exports.V18_X_ANGULAR_DEVKIT_BUILD_ANGULAR = '^19.0.0';
31
31
  exports.V18_X_NX_VITE = '^21.0.0';
32
32
  exports.V18_X_NX_LINTER = '^21.0.0';
package/src/lib/nx-plugin/src/generators/app/versions/nx_18_X/versions.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../../../../../../../packages/nx-plugin/src/generators/app/versions/nx_18_X/versions.ts"],"names":[],"mappings":";;;AAAA,QAAQ;AACR,eAAe;AACF,QAAA,eAAe,GAAG,SAAS,CAAC;AAC5B,QAAA,gBAAgB,GAAG,SAAS,CAAC;AAC7B,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AACnC,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAClC,QAAA,oBAAoB,GAAG,QAAQ,CAAC;AAChC,QAAA,mCAAmC,GAAG,QAAQ,CAAC;AAC/C,QAAA,8BAA8B,GAAG,QAAQ,CAAC;AAC1C,QAAA,iBAAiB,GAAG,UAAU,CAAC;AAC/B,QAAA,iBAAiB,GAAG,UAAU,CAAC;AAC/B,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAClC,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,kBAAkB,GAAG,QAAQ,CAAC;AAC9B,QAAA,YAAY,GAAG,SAAS,CAAC;AACzB,QAAA,2BAA2B,GAAG,QAAQ,CAAC;AACvC,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAClC,QAAA,mBAAmB,GAAG,SAAS,CAAC;AAChC,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAC7B,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAClC,QAAA,aAAa,GAAG,QAAQ,CAAC;AACzB,QAAA,kBAAkB,GAAG,SAAS,CAAC;AAE5C,kBAAkB;AACL,QAAA,wBAAwB,GAAG,QAAQ,CAAC;AACpC,QAAA,kCAAkC,GAAG,SAAS,CAAC;AAC/C,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,eAAe,GAAG,SAAS,CAAC;AAC5B,QAAA,WAAW,GAAG,SAAS,CAAC;AACxB,QAAA,UAAU,GAAG,QAAQ,CAAC;AACtB,QAAA,yBAAyB,GAAG,QAAQ,CAAC;AACrC,QAAA,YAAY,GAAG,QAAQ,CAAC;AACxB,QAAA,SAAS,GAAG,SAAS,CAAC"}
1
+ {"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../../../../../../../packages/nx-plugin/src/generators/app/versions/nx_18_X/versions.ts"],"names":[],"mappings":";;;AAAA,QAAQ;AACR,eAAe;AACF,QAAA,eAAe,GAAG,SAAS,CAAC;AAC5B,QAAA,gBAAgB,GAAG,SAAS,CAAC;AAC7B,QAAA,uBAAuB,GAAG,eAAe,CAAC;AAC1C,QAAA,sBAAsB,GAAG,eAAe,CAAC;AACzC,QAAA,oBAAoB,GAAG,QAAQ,CAAC;AAChC,QAAA,mCAAmC,GAAG,eAAe,CAAC;AACtD,QAAA,8BAA8B,GAAG,eAAe,CAAC;AACjD,QAAA,iBAAiB,GAAG,UAAU,CAAC;AAC/B,QAAA,iBAAiB,GAAG,UAAU,CAAC;AAC/B,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAClC,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,kBAAkB,GAAG,QAAQ,CAAC;AAC9B,QAAA,YAAY,GAAG,SAAS,CAAC;AACzB,QAAA,2BAA2B,GAAG,QAAQ,CAAC;AACvC,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAClC,QAAA,mBAAmB,GAAG,SAAS,CAAC;AAChC,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAC7B,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAClC,QAAA,aAAa,GAAG,QAAQ,CAAC;AACzB,QAAA,kBAAkB,GAAG,SAAS,CAAC;AAE5C,kBAAkB;AACL,QAAA,wBAAwB,GAAG,eAAe,CAAC;AAC3C,QAAA,kCAAkC,GAAG,SAAS,CAAC;AAC/C,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,eAAe,GAAG,SAAS,CAAC;AAC5B,QAAA,WAAW,GAAG,SAAS,CAAC;AACxB,QAAA,UAAU,GAAG,QAAQ,CAAC;AACtB,QAAA,yBAAyB,GAAG,QAAQ,CAAC;AACrC,QAAA,YAAY,GAAG,QAAQ,CAAC;AACxB,QAAA,SAAS,GAAG,SAAS,CAAC"}
package/src/lib/nx-plugin/src/generators/init/files/vite.config.ts__template__ CHANGED
@@ -2,16 +2,12 @@
2
2
 
3
3
  import { defineConfig } from 'vite';
4
4
  import analog from '@analogjs/platform';
5
- <% if (isNx) { %>
6
- import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
7
- <% } else { %>
8
5
  import viteTsConfigPaths from 'vite-tsconfig-paths';
9
- <% } %>
10
6
 
11
7
  // https://vitejs.dev/config/
12
8
  export default defineConfig(({ mode }) => {
13
9
  return {
14
- root: __dirname,
10
+ root: import.meta.dirname,
15
11
  cacheDir: '<%= offsetFromRoot %>node_modules/.vite',
16
12
  build: {
17
13
  outDir: '<%= offsetFromRoot %>dist/<%= projectRoot %>/client',
@@ -26,11 +22,7 @@ export default defineConfig(({ mode }) => {
26
22
  routes: []
27
23
  }
28
24
  }),
29
- <% if (isNx) { %>
30
- nxViteTsPaths(),
31
- <% } else { %>
32
25
  viteTsConfigPaths(),
33
- <% } %>
34
26
  ],
35
27
  server: {
36
28
  fs: {
package/src/lib/nx-plugin/src/generators/preset/__snapshots__/generator.spec.ts.snap CHANGED
@@ -102,12 +102,12 @@ exports[`preset generator > should match vite.config.ts 1`] = `
102
102
 
103
103
  import analog from '@analogjs/platform';
104
104
  import { defineConfig } from 'vite';
105
- import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
105
+ import viteTsConfigPaths from 'vite-tsconfig-paths';
106
106
 
107
107
  // https://vitejs.dev/config/
108
108
  export default defineConfig(({ mode }) => {
109
109
  return {
110
- root: __dirname,
110
+ root: import.meta.dirname,
111
111
  cacheDir: \`../node_modules/.vite\`,
112
112
  build: {
113
113
  outDir: '../dist/./my-app/client',
@@ -119,7 +119,7 @@ export default defineConfig(({ mode }) => {
119
119
  allow: ['.'],
120
120
  },
121
121
  },
122
- plugins: [analog(), nxViteTsPaths()],
122
+ plugins: [analog(), viteTsConfigPaths()],
123
123
  test: {
124
124
  globals: true,
125
125
  environment: 'jsdom',
package/src/lib/nx-plugin/src/generators/preset/generator.js CHANGED
@@ -36,10 +36,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
36
36
  exports.default = default_1;
37
37
  const devkit_1 = require("@nx/devkit");
38
38
  const node_path_1 = require("node:path");
39
+ const minimum_supported_versions_1 = require("../app/versions/minimum-supported-versions");
39
40
  async function default_1(tree, options) {
40
41
  (0, devkit_1.ensurePackage)('@nx/angular', devkit_1.NX_VERSION);
41
42
  (0, devkit_1.ensurePackage)('@nx/vite', devkit_1.NX_VERSION);
42
- (0, devkit_1.ensurePackage)('@nx/eslint', devkit_1.NX_VERSION);
43
+ if (options.linter === 'oxlint') {
44
+ if ((0, minimum_supported_versions_1.belowMinimumSupportedOxlintNxVersion)(devkit_1.NX_VERSION)) {
45
+ throw new Error(`Nx v${minimum_supported_versions_1.MINIMUM_SUPPORTED_OXLINT_NX_VERSION} or newer is required to use the oxlint linter`);
46
+ }
47
+ (0, devkit_1.ensurePackage)('@nx/oxlint', devkit_1.NX_VERSION);
48
+ }
49
+ else if (options.linter !== 'none') {
50
+ (0, devkit_1.ensurePackage)('@nx/eslint', devkit_1.NX_VERSION);
51
+ }
43
52
  (0, devkit_1.ensurePackage)('@angular-devkit/core', 'latest');
44
53
  (0, devkit_1.ensurePackage)('rxjs', 'latest');
45
54
  const appTask = await Promise.resolve().then(() => __importStar(require('../app/generator'))).then(({ appGenerator }) => appGenerator(tree, { ...options, skipAgentContext: true }));
package/src/lib/nx-plugin/src/generators/preset/generator.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../../../packages/nx-plugin/src/generators/preset/generator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,4BAqBC;AAzBD,uCAA4E;AAC5E,yCAAiC;AAGlB,KAAK,oBAAW,IAAU,EAAE,OAA8B;IACvE,IAAA,sBAAa,EAAC,aAAa,EAAE,mBAAU,CAAC,CAAC;IACzC,IAAA,sBAAa,EAAC,UAAU,EAAE,mBAAU,CAAC,CAAC;IACtC,IAAA,sBAAa,EAAC,YAAY,EAAE,mBAAU,CAAC,CAAC;IACxC,IAAA,sBAAa,EAAC,sBAAsB,EAAE,QAAQ,CAAC,CAAC;IAChD,IAAA,sBAAa,EAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAEhC,MAAM,OAAO,GAAG,MAAM,kDAAO,kBAAkB,IAAE,IAAI,CAAC,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE,CACzE,YAAY,CAAC,IAAI,EAAE,EAAE,GAAG,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAC3D,CAAC;IAEF,2EAA2E;IAC3E,sEAAsE;IACtE,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,gBAAI,EAAC,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,CAAC,EAC/C,GAAG,EACH,OAAO,CACR,CAAC;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC"}
1
+ {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../../../packages/nx-plugin/src/generators/preset/generator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQA,4BA8BC;AAtCD,uCAA4E;AAC5E,yCAAiC;AACjC,2FAGoD;AAGrC,KAAK,oBAAW,IAAU,EAAE,OAA8B;IACvE,IAAA,sBAAa,EAAC,aAAa,EAAE,mBAAU,CAAC,CAAC;IACzC,IAAA,sBAAa,EAAC,UAAU,EAAE,mBAAU,CAAC,CAAC;IACtC,IAAI,OAAO,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;QAChC,IAAI,IAAA,iEAAoC,EAAC,mBAAU,CAAC,EAAE,CAAC;YACrD,MAAM,IAAI,KAAK,CACb,OAAO,gEAAmC,gDAAgD,CAC3F,CAAC;QACJ,CAAC;QACD,IAAA,sBAAa,EAAC,YAAY,EAAE,mBAAU,CAAC,CAAC;IAC1C,CAAC;SAAM,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;QACrC,IAAA,sBAAa,EAAC,YAAY,EAAE,mBAAU,CAAC,CAAC;IAC1C,CAAC;IACD,IAAA,sBAAa,EAAC,sBAAsB,EAAE,QAAQ,CAAC,CAAC;IAChD,IAAA,sBAAa,EAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAEhC,MAAM,OAAO,GAAG,MAAM,kDAAO,kBAAkB,IAAE,IAAI,CAAC,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE,CACzE,YAAY,CAAC,IAAI,EAAE,EAAE,GAAG,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAC3D,CAAC;IAEF,2EAA2E;IAC3E,sEAAsE;IACtE,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,gBAAI,EAAC,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,CAAC,EAC/C,GAAG,EACH,OAAO,CACR,CAAC;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC"}
package/src/lib/nx-plugin/src/generators/preset/schema.d.ts CHANGED
@@ -2,5 +2,6 @@ export interface PresetGeneratorSchema {
2
2
  analogAppName: string;
3
3
  tags?: string;
4
4
  addTailwind?: boolean;
5
+ linter?: 'eslint' | 'oxlint' | 'none';
5
6
  skipFormat?: boolean;
6
7
  }
package/src/lib/nx-plugin/src/generators/preset/schema.json CHANGED
@@ -16,6 +16,12 @@
16
16
  "x-prompt": "Add TailwindCSS for styling?",
17
17
  "default": true
18
18
  },
19
+ "linter": {
20
+ "description": "The tool to use for running lint checks. `oxlint` requires Nx 23.2 or newer.",
21
+ "type": "string",
22
+ "enum": ["eslint", "oxlint", "none"],
23
+ "default": "eslint"
24
+ },
19
25
  "tags": {
20
26
  "type": "string",
21
27
  "description": "Add tags to the project (used for linting)",
package/src/lib/nx-plugin/src/generators/setup-vitest/files/vite.config.mts__template__ CHANGED
@@ -1,20 +1,13 @@
1
1
  /// <reference types="vitest" />
2
2
 
3
3
  import angular from '@analogjs/vite-plugin-angular';
4
- <% if (addNxPaths) { %>
5
- import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
6
- <% } %>
7
4
  import { defineConfig } from 'vite';
5
+ import viteTsConfigPaths from 'vite-tsconfig-paths';
8
6
 
9
7
  // https://vitejs.dev/config/
10
8
  export default defineConfig(({ mode }) => {
11
9
  return {
12
- plugins: [
13
- angular(),
14
- <% if (addNxPaths) { %>
15
- nxViteTsPaths()
16
- <% } %>
17
- ],
10
+ plugins: [angular(), viteTsConfigPaths()],
18
11
  test: {
19
12
  globals: true,
20
13
  environment: 'jsdom',
package/src/lib/nx-plugin/src/generators/setup-vitest/generator.js CHANGED
@@ -10,12 +10,10 @@ const update_test_target_1 = require("./lib/update-test-target");
10
10
  const update_tsconfig_1 = require("./lib/update-tsconfig");
11
11
  function addFiles(tree, options, majorAngularVersion) {
12
12
  const projects = (0, devkit_1.getProjects)(tree);
13
- const isNx = tree.exists('/nx.json');
14
13
  const projectConfig = projects.get(options.project);
15
14
  const templateOptions = {
16
15
  ...options,
17
16
  majorAngularVersion,
18
- addNxPaths: isNx,
19
17
  template: '',
20
18
  };
21
19
  (0, devkit_1.generateFiles)(tree, (0, node_path_1.join)(__dirname, 'files'), projectConfig.root || '.', templateOptions);
package/src/lib/nx-plugin/src/generators/setup-vitest/generator.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../../../packages/nx-plugin/src/generators/setup-vitest/generator.ts"],"names":[],"mappings":";;AAyCA,oDAoBC;AA7DD,uCAMoB;AACpB,yCAAiC;AACjC,mCAAuC;AAEvC,6DAAuE;AACvE,2EAAsE;AACtE,iEAA4D;AAC5D,2DAAuD;AAGvD,SAAS,QAAQ,CACf,IAAU,EACV,OAAmC,EACnC,mBAA2B;IAE3B,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IACnC,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAErC,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAE,CAAC;IAErD,MAAM,eAAe,GAAG;QACtB,GAAG,OAAO;QACV,mBAAmB;QACnB,UAAU,EAAE,IAAI;QAChB,QAAQ,EAAE,EAAE;KACb,CAAC;IAEF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,gBAAI,EAAC,SAAS,EAAE,OAAO,CAAC,EACxB,aAAa,CAAC,IAAI,IAAI,GAAG,EACzB,eAAe,CAChB,CAAC;AACJ,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,cAAe,CAAE,CAAC,CAAC;IAE5D,MAAM,SAAS,GAAG,IAAA,0CAA0B,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAEzD,IAAA,+CAAqB,EAAC,IAAI,EAAE,cAAe,EAAE,SAAS,IAAI,SAAS,CAAC,CAAC;IACrE,IAAA,gCAAc,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC9B,IAAA,qCAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEhC,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"}
1
+ {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../../../packages/nx-plugin/src/generators/setup-vitest/generator.ts"],"names":[],"mappings":";;AAuCA,oDAoBC;AA3DD,uCAMoB;AACpB,yCAAiC;AACjC,mCAAuC;AAEvC,6DAAuE;AACvE,2EAAsE;AACtE,iEAA4D;AAC5D,2DAAuD;AAGvD,SAAS,QAAQ,CACf,IAAU,EACV,OAAmC,EACnC,mBAA2B;IAE3B,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAEnC,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAE,CAAC;IAErD,MAAM,eAAe,GAAG;QACtB,GAAG,OAAO;QACV,mBAAmB;QACnB,QAAQ,EAAE,EAAE;KACb,CAAC;IAEF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,gBAAI,EAAC,SAAS,EAAE,OAAO,CAAC,EACxB,aAAa,CAAC,IAAI,IAAI,GAAG,EACzB,eAAe,CAChB,CAAC;AACJ,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,cAAe,CAAE,CAAC,CAAC;IAE5D,MAAM,SAAS,GAAG,IAAA,0CAA0B,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAEzD,IAAA,+CAAqB,EAAC,IAAI,EAAE,cAAe,EAAE,SAAS,IAAI,SAAS,CAAC,CAAC;IACrE,IAAA,gCAAc,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC9B,IAAA,qCAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEhC,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"}
package/src/lib/nx-plugin/src/utils/versions/ng_19_X/versions.d.ts CHANGED
@@ -1,13 +1,13 @@
1
- export declare const V19_X_ANALOG_JS_ROUTER = "^2.7.1";
2
- export declare const V19_X_ANALOG_JS_CONTENT = "^2.7.1";
1
+ export declare const V19_X_ANALOG_JS_ROUTER = "^2.7.2-beta.2";
2
+ export declare const V19_X_ANALOG_JS_CONTENT = "^2.7.2-beta.2";
3
3
  export declare const V19_X_MARKED = "^15.0.7";
4
4
  export declare const V19_X_MARKED_GFM_HEADING_ID = "^4.1.1";
5
5
  export declare const V19_X_MARKED_HIGHLIGHT = "^2.2.1";
6
6
  export declare const V19_X_MARKED_MANGLE = "^1.1.10";
7
7
  export declare const V19_X_PRISMJS = "^1.29.0";
8
- export declare const V19_X_ANALOG_JS_PLATFORM = "^2.7.1";
9
- export declare const V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = "^2.7.1";
10
- export declare const V19_X_ANALOG_JS_VITEST_ANGULAR = "^2.7.1";
8
+ export declare const V19_X_ANALOG_JS_PLATFORM = "^2.7.2-beta.2";
9
+ export declare const V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = "^2.7.2-beta.2";
10
+ export declare const V19_X_ANALOG_JS_VITEST_ANGULAR = "^2.7.2-beta.2";
11
11
  export declare const V19_X_NX_ANGULAR = "^22.0.0";
12
12
  export declare const V19_X_NX_VITE = "^22.0.0";
13
13
  export declare const V19_X_JSDOM = "^22.0.0";
package/src/lib/nx-plugin/src/utils/versions/ng_19_X/versions.js CHANGED
@@ -2,17 +2,17 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.NX_X_LATEST_NX = exports.NX_X_LATEST_VITEST = exports.NX_X_LATEST_VITE = exports.V19_X_VITE = exports.V19_X_VITEST = exports.V19_X_VITE_TSCONFIG_PATHS = exports.V19_X_JSDOM = exports.V19_X_NX_VITE = exports.V19_X_NX_ANGULAR = exports.V19_X_ANALOG_JS_VITEST_ANGULAR = exports.V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = exports.V19_X_ANALOG_JS_PLATFORM = exports.V19_X_PRISMJS = exports.V19_X_MARKED_MANGLE = exports.V19_X_MARKED_HIGHLIGHT = exports.V19_X_MARKED_GFM_HEADING_ID = exports.V19_X_MARKED = exports.V19_X_ANALOG_JS_CONTENT = exports.V19_X_ANALOG_JS_ROUTER = void 0;
4
4
  // V19_X
5
- exports.V19_X_ANALOG_JS_ROUTER = '^2.7.1';
6
- exports.V19_X_ANALOG_JS_CONTENT = '^2.7.1';
5
+ exports.V19_X_ANALOG_JS_ROUTER = '^2.7.2-beta.2';
6
+ exports.V19_X_ANALOG_JS_CONTENT = '^2.7.2-beta.2';
7
7
  exports.V19_X_MARKED = '^15.0.7';
8
8
  exports.V19_X_MARKED_GFM_HEADING_ID = '^4.1.1';
9
9
  exports.V19_X_MARKED_HIGHLIGHT = '^2.2.1';
10
10
  exports.V19_X_MARKED_MANGLE = '^1.1.10';
11
11
  exports.V19_X_PRISMJS = '^1.29.0';
12
12
  // devDependencies
13
- exports.V19_X_ANALOG_JS_PLATFORM = '^2.7.1';
14
- exports.V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^2.7.1';
15
- exports.V19_X_ANALOG_JS_VITEST_ANGULAR = '^2.7.1';
13
+ exports.V19_X_ANALOG_JS_PLATFORM = '^2.7.2-beta.2';
14
+ exports.V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^2.7.2-beta.2';
15
+ exports.V19_X_ANALOG_JS_VITEST_ANGULAR = '^2.7.2-beta.2';
16
16
  exports.V19_X_NX_ANGULAR = '^22.0.0';
17
17
  exports.V19_X_NX_VITE = '^22.0.0';
18
18
  exports.V19_X_JSDOM = '^22.0.0';
package/src/lib/nx-plugin/src/utils/versions/ng_19_X/versions.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/utils/versions/ng_19_X/versions.ts"],"names":[],"mappings":";;;AAAA,QAAQ;AACK,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAClC,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AACnC,QAAA,YAAY,GAAG,SAAS,CAAC;AACzB,QAAA,2BAA2B,GAAG,QAAQ,CAAC;AACvC,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAClC,QAAA,mBAAmB,GAAG,SAAS,CAAC;AAChC,QAAA,aAAa,GAAG,SAAS,CAAC;AAEvC,kBAAkB;AACL,QAAA,wBAAwB,GAAG,QAAQ,CAAC;AACpC,QAAA,mCAAmC,GAAG,QAAQ,CAAC;AAC/C,QAAA,8BAA8B,GAAG,QAAQ,CAAC;AAC1C,QAAA,gBAAgB,GAAG,SAAS,CAAC;AAC7B,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,WAAW,GAAG,SAAS,CAAC;AACxB,QAAA,yBAAyB,GAAG,QAAQ,CAAC;AACrC,QAAA,YAAY,GAAG,QAAQ,CAAC;AACxB,QAAA,UAAU,GAAG,QAAQ,CAAC;AACtB,QAAA,gBAAgB,GAAG,QAAQ,CAAC;AAC5B,QAAA,kBAAkB,GAAG,QAAQ,CAAC;AAC9B,QAAA,cAAc,GAAG,SAAS,CAAC"}
1
+ {"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/utils/versions/ng_19_X/versions.ts"],"names":[],"mappings":";;;AAAA,QAAQ;AACK,QAAA,sBAAsB,GAAG,eAAe,CAAC;AACzC,QAAA,uBAAuB,GAAG,eAAe,CAAC;AAC1C,QAAA,YAAY,GAAG,SAAS,CAAC;AACzB,QAAA,2BAA2B,GAAG,QAAQ,CAAC;AACvC,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAClC,QAAA,mBAAmB,GAAG,SAAS,CAAC;AAChC,QAAA,aAAa,GAAG,SAAS,CAAC;AAEvC,kBAAkB;AACL,QAAA,wBAAwB,GAAG,eAAe,CAAC;AAC3C,QAAA,mCAAmC,GAAG,eAAe,CAAC;AACtD,QAAA,8BAA8B,GAAG,eAAe,CAAC;AACjD,QAAA,gBAAgB,GAAG,SAAS,CAAC;AAC7B,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,WAAW,GAAG,SAAS,CAAC;AACxB,QAAA,yBAAyB,GAAG,QAAQ,CAAC;AACrC,QAAA,YAAY,GAAG,QAAQ,CAAC;AACxB,QAAA,UAAU,GAAG,QAAQ,CAAC;AACtB,QAAA,gBAAgB,GAAG,QAAQ,CAAC;AAC5B,QAAA,kBAAkB,GAAG,QAAQ,CAAC;AAC9B,QAAA,cAAc,GAAG,SAAS,CAAC"}