@analogjs/platform 0.2.31-beta.2 → 0.2.32

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 (16) hide show
  1. package/package.json +3 -3
  2. package/src/lib/content-plugin.js +2 -2
  3. package/src/lib/nx-plugin/src/generators/app/versions/dependencies.js +24 -9
  4. package/src/lib/nx-plugin/src/generators/app/versions/dependencies.js.map +1 -1
  5. package/src/lib/nx-plugin/src/generators/app/versions/dev-dependencies.js +27 -9
  6. package/src/lib/nx-plugin/src/generators/app/versions/dev-dependencies.js.map +1 -1
  7. package/src/lib/nx-plugin/src/generators/app/versions/nx-dependencies.js +13 -4
  8. package/src/lib/nx-plugin/src/generators/app/versions/nx-dependencies.js.map +1 -1
  9. package/src/lib/nx-plugin/src/generators/app/versions/nx_18_X/versions.d.ts +24 -0
  10. package/src/lib/nx-plugin/src/generators/app/versions/nx_18_X/versions.js +31 -0
  11. package/src/lib/nx-plugin/src/generators/app/versions/nx_18_X/versions.js.map +1 -0
  12. package/src/lib/nx-plugin/src/generators/app/versions/trpc-dependencies.js +20 -8
  13. package/src/lib/nx-plugin/src/generators/app/versions/trpc-dependencies.js.map +1 -1
  14. package/src/lib/nx-plugin/src/generators/app/versions.d.ts +10 -0
  15. package/src/lib/nx-plugin/src/generators/app/versions.js +14 -1
  16. package/src/lib/nx-plugin/src/generators/app/versions.js.map +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@analogjs/platform",
3
- "version": "0.2.31-beta.2",
3
+ "version": "0.2.32",
4
4
  "type": "commonjs",
5
5
  "description": "The fullstack meta-framework for Angular",
6
6
  "author": "Brandon Roberts <robertsbt@gmail.com>",
@@ -25,8 +25,8 @@
25
25
  },
26
26
  "dependencies": {
27
27
  "nitropack": "^2.6.0",
28
- "@analogjs/vite-plugin-angular": "^0.2.31-beta.2",
29
- "@analogjs/vite-plugin-nitro": "^0.2.31-beta.2"
28
+ "@analogjs/vite-plugin-angular": "^0.2.32",
29
+ "@analogjs/vite-plugin-nitro": "^0.2.32"
30
30
  },
31
31
  "peerDependencies": {
32
32
  "@nx/devkit": "^16.0.0 || ^17.0.0",
package/src/lib/content-plugin.js CHANGED
@@ -9,7 +9,7 @@ function contentPlugin() {
9
9
  name: 'analogjs-content-frontmatter',
10
10
  async transform(code, id) {
11
11
  // Transform only the frontmatter into a JSON object for lists
12
- if (!id.includes('.md?analog-content-list')) {
12
+ if (!id.includes('analog-content-list=true')) {
13
13
  return;
14
14
  }
15
15
  const cachedContent = cache.get(id);
@@ -38,4 +38,4 @@ function contentPlugin() {
38
38
  ];
39
39
  }
40
40
  exports.contentPlugin = contentPlugin;
41
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udGVudC1wbHVnaW4uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9wbGF0Zm9ybS9zcmMvbGliL2NvbnRlbnQtcGx1Z2luLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLHlCQUF5QjtBQU96QixTQUFnQixhQUFhO0lBQzNCLE1BQU0sS0FBSyxHQUFHLElBQUksR0FBRyxFQUFtQixDQUFDO0lBRXpDLE9BQU87UUFDTDtZQUNFLElBQUksRUFBRSw4QkFBOEI7WUFDcEMsS0FBSyxDQUFDLFNBQVMsQ0FBQyxJQUFJLEVBQUUsRUFBRTtnQkFDdEIsOERBQThEO2dCQUM5RCxJQUFJLENBQUMsRUFBRSxDQUFDLFFBQVEsQ0FBQyx5QkFBeUIsQ0FBQyxFQUFFO29CQUMzQyxPQUFPO2lCQUNSO2dCQUVELE1BQU0sYUFBYSxHQUFHLEtBQUssQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLENBQUM7Z0JBQ3BDLHlFQUF5RTtnQkFDekUsOEVBQThFO2dCQUM5RSw4RUFBOEU7Z0JBQzlFLDBDQUEwQztnQkFDMUMsSUFBSSxhQUFhLEVBQUUsSUFBSSxLQUFLLElBQUksRUFBRTtvQkFDaEMsT0FBTyxrQkFBa0IsYUFBYSxDQUFDLFVBQVUsRUFBRSxDQUFDO2lCQUNyRDtnQkFFRCxNQUFNLEVBQUUsR0FBUSwyQ0FBYSxjQUFjLEVBQUMsQ0FBQztnQkFDN0Msa0ZBQWtGO2dCQUNsRixpRkFBaUY7Z0JBQ2pGLDJDQUEyQztnQkFDM0MsTUFBTSxXQUFXLEdBQUcsRUFBRSxDQUFDLE9BQU8sSUFBSSxFQUFFLENBQUM7Z0JBQ3JDLE1BQU0sWUFBWSxHQUFHLEVBQUUsQ0FBQyxZQUFZLENBQUMsRUFBRSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxNQUFNLENBQUMsQ0FBQztnQkFDL0QsTUFBTSxFQUFFLFVBQVUsRUFBRSxHQUFHLFdBQVcsQ0FBQyxZQUFZLENBQUMsQ0FBQztnQkFDakQsTUFBTSxPQUFPLEdBQUc7b0JBQ2QsSUFBSTtvQkFDSixVQUFVLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxVQUFVLENBQUM7aUJBQ3ZDLENBQUM7Z0JBQ0YsS0FBSyxDQUFDLEdBQUcsQ0FBQyxFQUFFLEVBQUUsT0FBTyxDQUFDLENBQUM7Z0JBRXZCLE9BQU8sa0JBQWtCLE9BQU8sQ0FBQyxVQUFVLEVBQUUsQ0FBQztZQUNoRCxDQUFDO1NBQ0Y7S0FDRixDQUFDO0FBQ0osQ0FBQztBQXRDRCxzQ0FzQ0MifQ==
41
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udGVudC1wbHVnaW4uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9wbGF0Zm9ybS9zcmMvbGliL2NvbnRlbnQtcGx1Z2luLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLHlCQUF5QjtBQU96QixTQUFnQixhQUFhO0lBQzNCLE1BQU0sS0FBSyxHQUFHLElBQUksR0FBRyxFQUFtQixDQUFDO0lBRXpDLE9BQU87UUFDTDtZQUNFLElBQUksRUFBRSw4QkFBOEI7WUFDcEMsS0FBSyxDQUFDLFNBQVMsQ0FBQyxJQUFJLEVBQUUsRUFBRTtnQkFDdEIsOERBQThEO2dCQUM5RCxJQUFJLENBQUMsRUFBRSxDQUFDLFFBQVEsQ0FBQywwQkFBMEIsQ0FBQyxFQUFFO29CQUM1QyxPQUFPO2lCQUNSO2dCQUVELE1BQU0sYUFBYSxHQUFHLEtBQUssQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLENBQUM7Z0JBQ3BDLHlFQUF5RTtnQkFDekUsOEVBQThFO2dCQUM5RSw4RUFBOEU7Z0JBQzlFLDBDQUEwQztnQkFDMUMsSUFBSSxhQUFhLEVBQUUsSUFBSSxLQUFLLElBQUksRUFBRTtvQkFDaEMsT0FBTyxrQkFBa0IsYUFBYSxDQUFDLFVBQVUsRUFBRSxDQUFDO2lCQUNyRDtnQkFFRCxNQUFNLEVBQUUsR0FBUSwyQ0FBYSxjQUFjLEVBQUMsQ0FBQztnQkFDN0Msa0ZBQWtGO2dCQUNsRixpRkFBaUY7Z0JBQ2pGLDJDQUEyQztnQkFDM0MsTUFBTSxXQUFXLEdBQUcsRUFBRSxDQUFDLE9BQU8sSUFBSSxFQUFFLENBQUM7Z0JBQ3JDLE1BQU0sWUFBWSxHQUFHLEVBQUUsQ0FBQyxZQUFZLENBQUMsRUFBRSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxNQUFNLENBQUMsQ0FBQztnQkFDL0QsTUFBTSxFQUFFLFVBQVUsRUFBRSxHQUFHLFdBQVcsQ0FBQyxZQUFZLENBQUMsQ0FBQztnQkFDakQsTUFBTSxPQUFPLEdBQUc7b0JBQ2QsSUFBSTtvQkFDSixVQUFVLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxVQUFVLENBQUM7aUJBQ3ZDLENBQUM7Z0JBQ0YsS0FBSyxDQUFDLEdBQUcsQ0FBQyxFQUFFLEVBQUUsT0FBTyxDQUFDLENBQUM7Z0JBRXZCLE9BQU8sa0JBQWtCLE9BQU8sQ0FBQyxVQUFVLEVBQUUsQ0FBQztZQUNoRCxDQUFDO1NBQ0Y7S0FDRixDQUFDO0FBQ0osQ0FBQztBQXRDRCxzQ0FzQ0MifQ==
package/src/lib/nx-plugin/src/generators/app/versions/dependencies.js CHANGED
@@ -6,6 +6,7 @@ const versions_1 = require("./nx_16_X/versions");
6
6
  const versions_2 = require("./nx_15_X/versions");
7
7
  const devkit_1 = require("@nx/devkit");
8
8
  const versions_3 = require("./nx_17_X/versions");
9
+ const versions_4 = require("./nx_18_X/versions");
9
10
  const dependencyKeys15 = [
10
11
  '@analogjs/content',
11
12
  '@analogjs/router',
@@ -52,17 +53,31 @@ const getAnalogDependencies = (nxVersion, angularVersion) => {
52
53
  prismjs: versions_1.V16_X_PRISMJS,
53
54
  };
54
55
  }
55
- // return latest 17.X deps for versions >= 17.0.0
56
+ // install 17.X deps for versions <18.0.0
57
+ if ((0, semver_1.lt)(escapedNxVersion, '18.0.0')) {
58
+ return {
59
+ '@angular/platform-server': angularVersion,
60
+ '@analogjs/content': versions_3.V17_X_ANALOG_JS_CONTENT,
61
+ '@analogjs/router': versions_3.V17_X_ANALOG_JS_ROUTER,
62
+ 'front-matter': versions_3.V17_X_FRONT_MATTER,
63
+ marked: versions_3.V17_X_MARKED,
64
+ 'marked-gfm-heading-id': versions_3.V17_X_MARKED_GFM_HEADING_ID,
65
+ 'marked-highlight': versions_3.V17_X_MARKED_HIGHLIGHT,
66
+ mermaid: versions_3.V17_X_MERMAID,
67
+ prismjs: versions_3.V17_X_PRISMJS,
68
+ };
69
+ }
70
+ // return latest 18.X deps for versions >= 18.0.0
56
71
  return {
57
72
  '@angular/platform-server': angularVersion,
58
- '@analogjs/content': versions_3.V17_X_ANALOG_JS_CONTENT,
59
- '@analogjs/router': versions_3.V17_X_ANALOG_JS_ROUTER,
60
- 'front-matter': versions_3.V17_X_FRONT_MATTER,
61
- marked: versions_3.V17_X_MARKED,
62
- 'marked-gfm-heading-id': versions_3.V17_X_MARKED_GFM_HEADING_ID,
63
- 'marked-highlight': versions_3.V17_X_MARKED_HIGHLIGHT,
64
- mermaid: versions_3.V17_X_MERMAID,
65
- prismjs: versions_3.V17_X_PRISMJS,
73
+ '@analogjs/content': versions_4.V18_X_ANALOG_JS_CONTENT,
74
+ '@analogjs/router': versions_4.V18_X_ANALOG_JS_ROUTER,
75
+ 'front-matter': versions_4.V18_X_FRONT_MATTER,
76
+ marked: versions_4.V18_X_MARKED,
77
+ 'marked-gfm-heading-id': versions_4.V18_X_MARKED_GFM_HEADING_ID,
78
+ 'marked-highlight': versions_4.V18_X_MARKED_HIGHLIGHT,
79
+ mermaid: versions_4.V18_X_MERMAID,
80
+ prismjs: versions_4.V18_X_PRISMJS,
66
81
  };
67
82
  };
68
83
  exports.getAnalogDependencies = getAnalogDependencies;
package/src/lib/nx-plugin/src/generators/app/versions/dependencies.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/versions/dependencies.ts"],"names":[],"mappings":";;;AAAA,mCAA4B;AAC5B,iDAS4B;AAC5B,iDAO4B;AAC5B,uCAA0C;AAC1C,iDAS4B;AAE5B,MAAM,gBAAgB,GAAG;IACvB,mBAAmB;IACnB,kBAAkB;IAClB,0BAA0B;IAC1B,cAAc;IACd,QAAQ;IACR,SAAS;IACT,SAAS;CACD,CAAC;AAEX,MAAM,gBAAgB,GAAG;IACvB,uBAAuB;IACvB,kBAAkB;IAClB,SAAS;CACD,CAAC;AAWJ,MAAM,qBAAqB,GAAG,CACnC,SAAiB,EACjB,cAAsB,EACM,EAAE;IAC9B,MAAM,gBAAgB,GAAG,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IAEvD,gCAAgC;IAChC,IAAI,IAAA,WAAE,EAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAE;QAClC,MAAM,IAAI,KAAK,CACb,IAAA,qBAAY,EAAA,mDAAmD,CAChE,CAAC;KACH;IAED,kDAAkD;IAClD,IAAI,IAAA,WAAE,EAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAE;QAClC,OAAO;YACL,0BAA0B,EAAE,cAAc;YAC1C,mBAAmB,EAAE,kCAAuB;YAC5C,kBAAkB,EAAE,iCAAsB;YAC1C,cAAc,EAAE,6BAAkB;YAClC,MAAM,EAAE,uBAAY;YACpB,OAAO,EAAE,wBAAa;YACtB,OAAO,EAAE,wBAAa;SACvB,CAAC;KACH;IAED,mDAAmD;IACnD,IAAI,IAAA,WAAE,EAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAE;QAClC,OAAO;YACL,0BAA0B,EAAE,cAAc;YAC1C,mBAAmB,EAAE,kCAAuB;YAC5C,kBAAkB,EAAE,iCAAsB;YAC1C,cAAc,EAAE,6BAAkB;YAClC,MAAM,EAAE,uBAAY;YACpB,uBAAuB,EAAE,sCAA2B;YACpD,kBAAkB,EAAE,iCAAsB;YAC1C,OAAO,EAAE,wBAAa;YACtB,OAAO,EAAE,wBAAa;SACvB,CAAC;KACH;IAED,iDAAiD;IACjD,OAAO;QACL,0BAA0B,EAAE,cAAc;QAC1C,mBAAmB,EAAE,kCAAuB;QAC5C,kBAAkB,EAAE,iCAAsB;QAC1C,cAAc,EAAE,6BAAkB;QAClC,MAAM,EAAE,uBAAY;QACpB,uBAAuB,EAAE,sCAA2B;QACpD,kBAAkB,EAAE,iCAAsB;QAC1C,OAAO,EAAE,wBAAa;QACtB,OAAO,EAAE,wBAAa;KACvB,CAAC;AACJ,CAAC,CAAC;AArDW,QAAA,qBAAqB,yBAqDhC"}
1
+ {"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/versions/dependencies.ts"],"names":[],"mappings":";;;AAAA,mCAA4B;AAC5B,iDAS4B;AAC5B,iDAO4B;AAC5B,uCAA0C;AAC1C,iDAS4B;AAC5B,iDAS4B;AAE5B,MAAM,gBAAgB,GAAG;IACvB,mBAAmB;IACnB,kBAAkB;IAClB,0BAA0B;IAC1B,cAAc;IACd,QAAQ;IACR,SAAS;IACT,SAAS;CACD,CAAC;AAEX,MAAM,gBAAgB,GAAG;IACvB,uBAAuB;IACvB,kBAAkB;IAClB,SAAS;CACD,CAAC;AAWJ,MAAM,qBAAqB,GAAG,CACnC,SAAiB,EACjB,cAAsB,EACM,EAAE;IAC9B,MAAM,gBAAgB,GAAG,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IAEvD,gCAAgC;IAChC,IAAI,IAAA,WAAE,EAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAE;QAClC,MAAM,IAAI,KAAK,CACb,IAAA,qBAAY,EAAA,mDAAmD,CAChE,CAAC;KACH;IAED,kDAAkD;IAClD,IAAI,IAAA,WAAE,EAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAE;QAClC,OAAO;YACL,0BAA0B,EAAE,cAAc;YAC1C,mBAAmB,EAAE,kCAAuB;YAC5C,kBAAkB,EAAE,iCAAsB;YAC1C,cAAc,EAAE,6BAAkB;YAClC,MAAM,EAAE,uBAAY;YACpB,OAAO,EAAE,wBAAa;YACtB,OAAO,EAAE,wBAAa;SACvB,CAAC;KACH;IAED,mDAAmD;IACnD,IAAI,IAAA,WAAE,EAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAE;QAClC,OAAO;YACL,0BAA0B,EAAE,cAAc;YAC1C,mBAAmB,EAAE,kCAAuB;YAC5C,kBAAkB,EAAE,iCAAsB;YAC1C,cAAc,EAAE,6BAAkB;YAClC,MAAM,EAAE,uBAAY;YACpB,uBAAuB,EAAE,sCAA2B;YACpD,kBAAkB,EAAE,iCAAsB;YAC1C,OAAO,EAAE,wBAAa;YACtB,OAAO,EAAE,wBAAa;SACvB,CAAC;KACH;IAED,yCAAyC;IACzC,IAAI,IAAA,WAAE,EAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAE;QAClC,OAAO;YACL,0BAA0B,EAAE,cAAc;YAC1C,mBAAmB,EAAE,kCAAuB;YAC5C,kBAAkB,EAAE,iCAAsB;YAC1C,cAAc,EAAE,6BAAkB;YAClC,MAAM,EAAE,uBAAY;YACpB,uBAAuB,EAAE,sCAA2B;YACpD,kBAAkB,EAAE,iCAAsB;YAC1C,OAAO,EAAE,wBAAa;YACtB,OAAO,EAAE,wBAAa;SACvB,CAAC;KACH;IAED,iDAAiD;IACjD,OAAO;QACL,0BAA0B,EAAE,cAAc;QAC1C,mBAAmB,EAAE,kCAAuB;QAC5C,kBAAkB,EAAE,iCAAsB;QAC1C,cAAc,EAAE,6BAAkB;QAClC,MAAM,EAAE,uBAAY;QACpB,uBAAuB,EAAE,sCAA2B;QACpD,kBAAkB,EAAE,iCAAsB;QAC1C,OAAO,EAAE,wBAAa;QACtB,OAAO,EAAE,wBAAa;KACvB,CAAC;AACJ,CAAC,CAAC;AApEW,QAAA,qBAAqB,yBAoEhC"}
package/src/lib/nx-plugin/src/generators/app/versions/dev-dependencies.js CHANGED
@@ -6,6 +6,7 @@ const versions_1 = require("./nx_16_X/versions");
6
6
  const versions_2 = require("./nx_15_X/versions");
7
7
  const devkit_1 = require("@nx/devkit");
8
8
  const versions_3 = require("./nx_17_X/versions");
9
+ const versions_4 = require("./nx_18_X/versions");
9
10
  // TODO: @analogjs/vite-plugin-angular is being defined as we must pin
10
11
  // a supported version for Angular 15.x. This is not necessary for 16.x,
11
12
  // so this could probably be amended to only add as an explicit
@@ -48,9 +49,15 @@ const getViteDependency = (escapedNxVersion) => {
48
49
  '@nx/vite': versions_1.V16_X_NX_VITE,
49
50
  };
50
51
  }
51
- // return latest deps for versions >= 16.4.0
52
+ // install 17.0 deps for versions =< 18.0.0
53
+ if ((0, semver_1.lt)(escapedNxVersion, '18.0.0')) {
54
+ return {
55
+ '@nx/vite': versions_3.V17_X_NX_VITE,
56
+ };
57
+ }
58
+ // return latest deps for versions >= 18.0.0
52
59
  return {
53
- '@nx/vite': versions_3.V17_X_NX_VITE,
60
+ '@nx/vite': versions_4.V18_X_NX_VITE,
54
61
  };
55
62
  };
56
63
  const getDevDependencies = (escapedNxVersion) => {
@@ -80,14 +87,25 @@ const getDevDependencies = (escapedNxVersion) => {
80
87
  vitest: versions_1.V16_X_VITEST,
81
88
  };
82
89
  }
83
- // return latest 17.x deps for versions >17.0.0
90
+ // install 17.x deps for versions <18.0.0
91
+ if ((0, semver_1.lt)(escapedNxVersion, '18.0.0')) {
92
+ return {
93
+ '@analogjs/platform': versions_3.V17_X_ANALOG_JS_PLATFORM,
94
+ '@analogjs/vite-plugin-angular': versions_3.V17_X_ANALOG_JS_VITE_PLUGIN_ANGULAR,
95
+ jsdom: versions_3.V17_X_JSDOM,
96
+ vite: versions_3.V17_X_VITE,
97
+ 'vite-tsconfig-paths': versions_3.V17_X_VITE_TSCONFIG_PATHS,
98
+ vitest: versions_3.V17_X_VITEST,
99
+ };
100
+ }
101
+ // return latest 18.x deps for versions >18.0.0
84
102
  return {
85
- '@analogjs/platform': versions_3.V17_X_ANALOG_JS_PLATFORM,
86
- '@analogjs/vite-plugin-angular': versions_3.V17_X_ANALOG_JS_VITE_PLUGIN_ANGULAR,
87
- jsdom: versions_3.V17_X_JSDOM,
88
- vite: versions_3.V17_X_VITE,
89
- 'vite-tsconfig-paths': versions_3.V17_X_VITE_TSCONFIG_PATHS,
90
- vitest: versions_3.V17_X_VITEST,
103
+ '@analogjs/platform': versions_4.V18_X_ANALOG_JS_PLATFORM,
104
+ '@analogjs/vite-plugin-angular': versions_4.V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR,
105
+ jsdom: versions_4.V18_X_JSDOM,
106
+ vite: versions_4.V18_X_VITE,
107
+ 'vite-tsconfig-paths': versions_4.V18_X_VITE_TSCONFIG_PATHS,
108
+ vitest: versions_4.V18_X_VITEST,
91
109
  };
92
110
  };
93
111
  //# sourceMappingURL=dev-dependencies.js.map
package/src/lib/nx-plugin/src/generators/app/versions/dev-dependencies.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"dev-dependencies.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/versions/dev-dependencies.ts"],"names":[],"mappings":";;;AAAA,mCAA4B;AAC5B,iDAQ4B;AAC5B,iDAS4B;AAC5B,uCAA0C;AAC1C,iDAQ4B;AAE5B,sEAAsE;AACtE,wEAAwE;AACxE,+DAA+D;AAC/D,0BAA0B;AAC1B,MAAM,iBAAiB,GAAG;IACxB,oBAAoB;IACpB,+BAA+B;IAC/B,OAAO;IACP,MAAM;IACN,qBAAqB;IACrB,QAAQ;CACA,CAAC;AAGJ,MAAM,wBAAwB,GAAG,CACtC,SAAiB,EACoB,EAAE;IACvC,MAAM,gBAAgB,GAAG,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IAEvD,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,gBAAgB,CAAC,CAAC;IAC7D,MAAM,eAAe,GAAG,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;IAE7D,OAAO,EAAE,GAAG,gBAAgB,EAAE,GAAG,eAAe,EAAE,CAAC;AACrD,CAAC,CAAC;AATW,QAAA,wBAAwB,4BASnC;AAEF,MAAM,iBAAiB,GAAG,CAAC,gBAAwB,EAAE,EAAE;IACrD,gCAAgC;IAChC,IAAI,IAAA,WAAE,EAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAE;QAClC,MAAM,IAAI,KAAK,CACb,IAAA,qBAAY,EAAA,mDAAmD,CAChE,CAAC;KACH;IACD,kDAAkD;IAClD,IAAI,IAAA,WAAE,EAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAE;QAClC,OAAO;YACL,YAAY,EAAE,0BAAe;SAC9B,CAAC;KACH;IAED,kDAAkD;IAClD,IAAI,IAAA,WAAE,EAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAE;QAClC,OAAO;YACL,UAAU,EAAE,wBAAa;SAC1B,CAAC;KACH;IAED,2CAA2C;IAC3C,IAAI,IAAA,WAAE,EAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAE;QAClC,OAAO;YACL,UAAU,EAAE,wBAAa;SAC1B,CAAC;KACH;IAED,4CAA4C;IAC5C,OAAO;QACL,UAAU,EAAE,wBAAa;KAC1B,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CAAC,gBAAwB,EAAE,EAAE;IACtD,gCAAgC;IAChC,IAAI,IAAA,WAAE,EAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAE;QAClC,MAAM,IAAI,KAAK,CACb,IAAA,qBAAY,EAAA,mDAAmD,CAChE,CAAC;KACH;IAED,yCAAyC;IACzC,IAAI,IAAA,WAAE,EAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAE;QAClC,OAAO;YACL,oBAAoB,EAAE,mCAAwB;YAC9C,+BAA+B,EAAE,8CAAmC;YACpE,KAAK,EAAE,sBAAW;YAClB,IAAI,EAAE,qBAAU;YAChB,qBAAqB,EAAE,oCAAyB;YAChD,MAAM,EAAE,uBAAY;SACrB,CAAC;KACH;IAED,yCAAyC;IACzC,IAAI,IAAA,WAAE,EAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAE;QAClC,OAAO;YACL,oBAAoB,EAAE,mCAAwB;YAC9C,+BAA+B,EAAE,8CAAmC;YACpE,KAAK,EAAE,sBAAW;YAClB,IAAI,EAAE,qBAAU;YAChB,qBAAqB,EAAE,oCAAyB;YAChD,MAAM,EAAE,uBAAY;SACrB,CAAC;KACH;IAED,+CAA+C;IAC/C,OAAO;QACL,oBAAoB,EAAE,mCAAwB;QAC9C,+BAA+B,EAAE,8CAAmC;QACpE,KAAK,EAAE,sBAAW;QAClB,IAAI,EAAE,qBAAU;QAChB,qBAAqB,EAAE,oCAAyB;QAChD,MAAM,EAAE,uBAAY;KACrB,CAAC;AACJ,CAAC,CAAC"}
1
+ {"version":3,"file":"dev-dependencies.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/versions/dev-dependencies.ts"],"names":[],"mappings":"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"}
package/src/lib/nx-plugin/src/generators/app/versions/nx-dependencies.js CHANGED
@@ -6,6 +6,7 @@ const devkit_1 = require("@nx/devkit");
6
6
  const versions_1 = require("./nx_16_X/versions");
7
7
  const versions_2 = require("./nx_15_X/versions");
8
8
  const versions_3 = require("./nx_17_X/versions");
9
+ const versions_4 = require("./nx_18_X/versions");
9
10
  const nrwlDependencyKeys = [
10
11
  '@nrwl/devkit',
11
12
  '@nrwl/angular',
@@ -52,11 +53,19 @@ const getNxDependencies = (nxVersion) => {
52
53
  '@nx/eslint': versions_1.V16_X_NX_LINTER,
53
54
  };
54
55
  }
55
- // return latest for >= 17.0.0
56
+ // install 17.0 deps for versions =< 18.0.0
57
+ if ((0, semver_1.lt)(escapedNxVersion, '18.0.0')) {
58
+ return {
59
+ '@nx/angular': versions_3.V17_X_NX_ANGULAR,
60
+ '@nx/devkit': versions_3.V17_X_NX_DEVKIT,
61
+ '@nx/eslint': versions_3.V17_X_NX_LINTER,
62
+ };
63
+ }
64
+ // return latest for >= 18.0.0
56
65
  return {
57
- '@nx/angular': versions_3.V17_X_NX_ANGULAR,
58
- '@nx/devkit': versions_3.V17_X_NX_DEVKIT,
59
- '@nx/eslint': versions_3.V17_X_NX_LINTER,
66
+ '@nx/angular': versions_4.V18_X_NX_ANGULAR,
67
+ '@nx/devkit': versions_4.V18_X_NX_DEVKIT,
68
+ '@nx/eslint': versions_4.V18_X_NX_LINTER,
60
69
  };
61
70
  };
62
71
  exports.getNxDependencies = getNxDependencies;
package/src/lib/nx-plugin/src/generators/app/versions/nx-dependencies.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"nx-dependencies.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/versions/nx-dependencies.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AACnC,uCAA0C;AAC1C,iDAI4B;AAC5B,iDAO4B;AAC5B,iDAI4B;AAE5B,MAAM,kBAAkB,GAAG;IACzB,cAAc;IACd,eAAe;IACf,cAAc;CACN,CAAC;AAEJ,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;QAClC,MAAM,IAAI,KAAK,CACb,IAAA,qBAAY,EAAA,mDAAmD,CAChE,CAAC;KACH;IAED,kDAAkD;IAClD,IAAI,IAAA,WAAE,EAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAE;QAClC,OAAO;YACL,eAAe,EAAE,6BAAkB;YACnC,cAAc,EAAE,4BAAiB;YACjC,cAAc,EAAE,4BAAiB;SAClC,CAAC;KACH;IAED,uDAAuD;IACvD,MAAM,IAAI,KAAK,CACb,IAAA,qBAAY,EAAA,iHAAiH,SAAS,EAAE,CACzI,CAAC;AACJ,CAAC,CAAC;AAzBW,QAAA,mBAAmB,uBAyB9B;AAEF,MAAM,gBAAgB,GAAG,CAAC,YAAY,EAAE,aAAa,EAAE,YAAY,CAAU,CAAC;AAEvE,MAAM,iBAAiB,GAAG,CAC/B,SAAiB,EACa,EAAE;IAChC,MAAM,gBAAgB,GAAG,IAAA,cAAK,EAAC,SAAS,CAAC,CAAC;IAE1C,uDAAuD;IACvD,IAAI,IAAA,WAAE,EAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAE;QAClC,MAAM,IAAI,KAAK,CACb,IAAA,qBAAY,EAAA,qGAAqG,SAAS,EAAE,CAC7H,CAAC;KACH;IAED,kDAAkD;IAClD,IAAI,IAAA,WAAE,EAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAE;QAClC,OAAO;YACL,aAAa,EAAE,2BAAgB;YAC/B,YAAY,EAAE,0BAAe;YAC7B,YAAY,EAAE,0BAAe;SAC9B,CAAC;KACH;IAED,2CAA2C;IAC3C,IAAI,IAAA,WAAE,EAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAE;QAClC,OAAO;YACL,aAAa,EAAE,2BAAgB;YAC/B,YAAY,EAAE,0BAAe;YAC7B,YAAY,EAAE,0BAAe;SAC9B,CAAC;KACH;IAED,8BAA8B;IAC9B,OAAO;QACL,aAAa,EAAE,2BAAgB;QAC/B,YAAY,EAAE,0BAAe;QAC7B,YAAY,EAAE,0BAAe;KAC9B,CAAC;AACJ,CAAC,CAAC;AApCW,QAAA,iBAAiB,qBAoC5B"}
1
+ {"version":3,"file":"nx-dependencies.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/versions/nx-dependencies.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AACnC,uCAA0C;AAC1C,iDAI4B;AAC5B,iDAO4B;AAC5B,iDAI4B;AAC5B,iDAI4B;AAE5B,MAAM,kBAAkB,GAAG;IACzB,cAAc;IACd,eAAe;IACf,cAAc;CACN,CAAC;AAEJ,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;QAClC,MAAM,IAAI,KAAK,CACb,IAAA,qBAAY,EAAA,mDAAmD,CAChE,CAAC;KACH;IAED,kDAAkD;IAClD,IAAI,IAAA,WAAE,EAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAE;QAClC,OAAO;YACL,eAAe,EAAE,6BAAkB;YACnC,cAAc,EAAE,4BAAiB;YACjC,cAAc,EAAE,4BAAiB;SAClC,CAAC;KACH;IAED,uDAAuD;IACvD,MAAM,IAAI,KAAK,CACb,IAAA,qBAAY,EAAA,iHAAiH,SAAS,EAAE,CACzI,CAAC;AACJ,CAAC,CAAC;AAzBW,QAAA,mBAAmB,uBAyB9B;AAEF,MAAM,gBAAgB,GAAG,CAAC,YAAY,EAAE,aAAa,EAAE,YAAY,CAAU,CAAC;AAEvE,MAAM,iBAAiB,GAAG,CAC/B,SAAiB,EACa,EAAE;IAChC,MAAM,gBAAgB,GAAG,IAAA,cAAK,EAAC,SAAS,CAAC,CAAC;IAE1C,uDAAuD;IACvD,IAAI,IAAA,WAAE,EAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAE;QAClC,MAAM,IAAI,KAAK,CACb,IAAA,qBAAY,EAAA,qGAAqG,SAAS,EAAE,CAC7H,CAAC;KACH;IAED,kDAAkD;IAClD,IAAI,IAAA,WAAE,EAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAE;QAClC,OAAO;YACL,aAAa,EAAE,2BAAgB;YAC/B,YAAY,EAAE,0BAAe;YAC7B,YAAY,EAAE,0BAAe;SAC9B,CAAC;KACH;IAED,2CAA2C;IAC3C,IAAI,IAAA,WAAE,EAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAE;QAClC,OAAO;YACL,aAAa,EAAE,2BAAgB;YAC/B,YAAY,EAAE,0BAAe;YAC7B,YAAY,EAAE,0BAAe;SAC9B,CAAC;KACH;IAED,2CAA2C;IAC3C,IAAI,IAAA,WAAE,EAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAE;QAClC,OAAO;YACL,aAAa,EAAE,2BAAgB;YAC/B,YAAY,EAAE,0BAAe;YAC7B,YAAY,EAAE,0BAAe;SAC9B,CAAC;KACH;IAED,8BAA8B;IAC9B,OAAO;QACL,aAAa,EAAE,2BAAgB;QAC/B,YAAY,EAAE,0BAAe;QAC7B,YAAY,EAAE,0BAAe;KAC9B,CAAC;AACJ,CAAC,CAAC;AA7CW,QAAA,iBAAiB,qBA6C5B"}
package/src/lib/nx-plugin/src/generators/app/versions/nx_18_X/versions.d.ts ADDED
@@ -0,0 +1,24 @@
1
+ export declare const V18_X_NX_DEVKIT = "^18.0.0";
2
+ export declare const V18_X_NX_ANGULAR = "^18.0.0";
3
+ export declare const V18_X_ANALOG_JS_CONTENT = "^0.2.0";
4
+ export declare const V18_X_ANALOG_JS_ROUTER = "^0.2.0";
5
+ export declare const V18_X_ANALOG_JS_TRPC = "^0.2.0";
6
+ export declare const V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = "^0.2.0";
7
+ export declare const V18_X_TRPC_CLIENT = "^10.25.0";
8
+ export declare const V18_X_TRPC_SERVER = "^10.25.0";
9
+ export declare const V18_X_ISOMORPHIC_FETCH = "^3.0.0";
10
+ export declare const V18_X_SUPERJSON = "^2.2.1";
11
+ export declare const V18_X_FRONT_MATTER = "^4.0.2";
12
+ export declare const V18_X_MARKED = "^5.0.2";
13
+ export declare const V18_X_MARKED_GFM_HEADING_ID = "^3.1.0";
14
+ export declare const V18_X_MARKED_HIGHLIGHT = "^2.0.1";
15
+ export declare const V18_X_MERMAID = "^10.2.4";
16
+ export declare const V18_X_PRISMJS = "^1.29.0";
17
+ export declare const V18_X_ANALOG_JS_PLATFORM = "^0.2.0";
18
+ export declare const V18_X_NX_VITE = "^18.0.0";
19
+ export declare const V18_X_NX_LINTER = "^18.0.0";
20
+ export declare const V18_X_JSDOM = "^22.1.0";
21
+ export declare const V18_X_VITE = "^5.0.0";
22
+ export declare const V18_X_VITE_TSCONFIG_PATHS = "^4.2.0";
23
+ export declare const V18_X_VITEST = "^1.0.4";
24
+ export declare const V18_X_ZOD = "^3.21.4";
package/src/lib/nx-plugin/src/generators/app/versions/nx_18_X/versions.js ADDED
@@ -0,0 +1,31 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.V18_X_ZOD = exports.V18_X_VITEST = exports.V18_X_VITE_TSCONFIG_PATHS = exports.V18_X_VITE = exports.V18_X_JSDOM = exports.V18_X_NX_LINTER = exports.V18_X_NX_VITE = exports.V18_X_ANALOG_JS_PLATFORM = exports.V18_X_PRISMJS = exports.V18_X_MERMAID = exports.V18_X_MARKED_HIGHLIGHT = exports.V18_X_MARKED_GFM_HEADING_ID = exports.V18_X_MARKED = exports.V18_X_FRONT_MATTER = exports.V18_X_SUPERJSON = exports.V18_X_ISOMORPHIC_FETCH = exports.V18_X_TRPC_SERVER = exports.V18_X_TRPC_CLIENT = exports.V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = exports.V18_X_ANALOG_JS_TRPC = exports.V18_X_ANALOG_JS_ROUTER = exports.V18_X_ANALOG_JS_CONTENT = exports.V18_X_NX_ANGULAR = exports.V18_X_NX_DEVKIT = void 0;
4
+ // V18_X
5
+ // dependencies
6
+ exports.V18_X_NX_DEVKIT = '^18.0.0';
7
+ exports.V18_X_NX_ANGULAR = '^18.0.0';
8
+ exports.V18_X_ANALOG_JS_CONTENT = '^0.2.0';
9
+ exports.V18_X_ANALOG_JS_ROUTER = '^0.2.0';
10
+ exports.V18_X_ANALOG_JS_TRPC = '^0.2.0';
11
+ exports.V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^0.2.0';
12
+ exports.V18_X_TRPC_CLIENT = '^10.25.0';
13
+ exports.V18_X_TRPC_SERVER = '^10.25.0';
14
+ exports.V18_X_ISOMORPHIC_FETCH = '^3.0.0';
15
+ exports.V18_X_SUPERJSON = '^2.2.1';
16
+ exports.V18_X_FRONT_MATTER = '^4.0.2';
17
+ exports.V18_X_MARKED = '^5.0.2';
18
+ exports.V18_X_MARKED_GFM_HEADING_ID = '^3.1.0';
19
+ exports.V18_X_MARKED_HIGHLIGHT = '^2.0.1';
20
+ exports.V18_X_MERMAID = '^10.2.4';
21
+ exports.V18_X_PRISMJS = '^1.29.0';
22
+ // devDependencies
23
+ exports.V18_X_ANALOG_JS_PLATFORM = '^0.2.0';
24
+ exports.V18_X_NX_VITE = '^18.0.0';
25
+ exports.V18_X_NX_LINTER = '^18.0.0';
26
+ exports.V18_X_JSDOM = '^22.1.0';
27
+ exports.V18_X_VITE = '^5.0.0';
28
+ exports.V18_X_VITE_TSCONFIG_PATHS = '^4.2.0';
29
+ exports.V18_X_VITEST = '^1.0.4';
30
+ exports.V18_X_ZOD = '^3.21.4';
31
+ //# sourceMappingURL=versions.js.map
package/src/lib/nx-plugin/src/generators/app/versions/nx_18_X/versions.js.map ADDED
@@ -0,0 +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,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,QAAQ,CAAC;AACxB,QAAA,2BAA2B,GAAG,QAAQ,CAAC;AACvC,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAClC,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,aAAa,GAAG,SAAS,CAAC;AAEvC,kBAAkB;AACL,QAAA,wBAAwB,GAAG,QAAQ,CAAC;AACpC,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/app/versions/trpc-dependencies.js CHANGED
@@ -6,6 +6,7 @@ const versions_1 = require("./nx_16_X/versions");
6
6
  const versions_2 = require("./nx_15_X/versions");
7
7
  const devkit_1 = require("@nx/devkit");
8
8
  const versions_3 = require("./nx_17_X/versions");
9
+ const versions_4 = require("./nx_18_X/versions");
9
10
  const tRPCDependencyKeys = [
10
11
  '@analogjs/trpc',
11
12
  '@trpc/client',
@@ -31,7 +32,7 @@ const getTrpcDependencies = (nxVersion) => {
31
32
  zod: versions_2.V15_X_ZOD,
32
33
  };
33
34
  }
34
- // install 16.x deps for versions 17.0.0
35
+ // install 16.x deps for versions <17.0.0
35
36
  if ((0, semver_1.lt)(escapedNxVersion, '17.0.0')) {
36
37
  return {
37
38
  '@analogjs/trpc': versions_1.V16_X_ANALOG_JS_TRPC,
@@ -42,14 +43,25 @@ const getTrpcDependencies = (nxVersion) => {
42
43
  zod: versions_1.V16_X_ZOD,
43
44
  };
44
45
  }
45
- // return latest deps for versions >= 17.0.0
46
+ // install 17.x deps for versions <18.0.0
47
+ if ((0, semver_1.lt)(escapedNxVersion, '18.0.0')) {
48
+ 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,
55
+ };
56
+ }
57
+ // return latest deps for versions >= 18.0.0
46
58
  return {
47
- '@analogjs/trpc': versions_3.V17_X_ANALOG_JS_TRPC,
48
- '@trpc/client': versions_3.V17_X_TRPC_CLIENT,
49
- '@trpc/server': versions_3.V17_X_TRPC_SERVER,
50
- superjson: versions_3.V17_X_SUPERJSON,
51
- 'isomorphic-fetch': versions_3.V17_X_ISOMORPHIC_FETCH,
52
- zod: versions_3.V17_X_ZOD,
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,
53
65
  };
54
66
  };
55
67
  exports.getTrpcDependencies = getTrpcDependencies;
package/src/lib/nx-plugin/src/generators/app/versions/trpc-dependencies.js.map CHANGED
@@ -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;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;QAClC,MAAM,IAAI,KAAK,CACb,IAAA,qBAAY,EAAA,mDAAmD,CAChE,CAAC;KACH;IAED,kDAAkD;IAClD,IAAI,IAAA,WAAE,EAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAE;QAClC,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;KACH;IAED,wCAAwC;IACxC,IAAI,IAAA,WAAE,EAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAE;QAClC,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;KACH;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;AA7CW,QAAA,mBAAmB,uBA6C9B"}
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;QAClC,MAAM,IAAI,KAAK,CACb,IAAA,qBAAY,EAAA,mDAAmD,CAChE,CAAC;KACH;IAED,kDAAkD;IAClD,IAAI,IAAA,WAAE,EAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAE;QAClC,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;KACH;IAED,yCAAyC;IACzC,IAAI,IAAA,WAAE,EAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAE;QAClC,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;KACH;IAED,yCAAyC;IACzC,IAAI,IAAA,WAAE,EAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAE;QAClC,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;KACH;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"}
package/src/lib/nx-plugin/src/generators/app/versions.d.ts CHANGED
@@ -1,4 +1,14 @@
1
1
  export declare const MINIMUM_SUPPORTED_ANGULAR_VERSION = "15.0.0";
2
+ export declare const V17_ANGULAR = "17.0.0";
3
+ export declare const V17_NX_DEVKIT = "~18.0.0";
4
+ export declare const V17_NX_ANGULAR = "~18.0.0";
5
+ export declare const V17_ANALOG_JS_CONTENT = "0.2.0";
6
+ export declare const V17_ANALOG_JS_ROUTER = "0.2.0";
7
+ export declare const V17_ANALOG_JS_TRPC = "0.2.0";
8
+ export declare const V17_TRPC_CLIENT = "^10.25.0";
9
+ export declare const V17_TRPC_SERVER = "^10.25.0";
10
+ export declare const V17_ISOMORPHIC_FETCH = "^3.0.0";
11
+ export declare const V17_SUPERJSON = "^2.2.1";
2
12
  export declare const V16_ANGULAR = "16.0.0";
3
13
  export declare const V16_NX_DEVKIT = "~16.0.0";
4
14
  export declare const V16_NX_ANGULAR = "~16.0.0";
package/src/lib/nx-plugin/src/generators/app/versions.js CHANGED
@@ -1,7 +1,20 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
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.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.MINIMUM_SUPPORTED_ANGULAR_VERSION = void 0;
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;
4
5
  exports.MINIMUM_SUPPORTED_ANGULAR_VERSION = '15.0.0';
6
+ // V17
7
+ // dependencies
8
+ exports.V17_ANGULAR = '17.0.0';
9
+ exports.V17_NX_DEVKIT = '~18.0.0';
10
+ exports.V17_NX_ANGULAR = '~18.0.0';
11
+ exports.V17_ANALOG_JS_CONTENT = '0.2.0';
12
+ exports.V17_ANALOG_JS_ROUTER = '0.2.0';
13
+ exports.V17_ANALOG_JS_TRPC = '0.2.0';
14
+ exports.V17_TRPC_CLIENT = '^10.25.0';
15
+ exports.V17_TRPC_SERVER = '^10.25.0';
16
+ exports.V17_ISOMORPHIC_FETCH = '^3.0.0';
17
+ exports.V17_SUPERJSON = '^2.2.1';
5
18
  // V16
6
19
  // dependencies
7
20
  exports.V16_ANGULAR = '16.0.0';
package/src/lib/nx-plugin/src/generators/app/versions.js.map CHANGED
@@ -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,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,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"}