@analogjs/platform 2.6.4 → 2.7.0-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.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@analogjs/platform",
3
- "version": "2.6.4",
3
+ "version": "2.7.0-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,9 @@
29
29
  },
30
30
  "dependencies": {
31
31
  "nitropack": "^2.13.1",
32
- "@analogjs/vite-plugin-angular": "^2.6.4",
33
- "@analogjs/vite-plugin-nitro": "^2.6.4",
32
+ "@analogjs/vite-plugin-angular": "^2.7.0-beta.2",
33
+ "@analogjs/vite-plugin-nitro": "^2.7.0-beta.2",
34
+ "oxc-parser": "^0.121.0",
34
35
  "vitefu": "^1.1.2"
35
36
  },
36
37
  "peerDependencies": {
@@ -1,8 +1,11 @@
1
1
  import { normalizePath } from 'vite';
2
+ import { injectServerFnIds, serverFnFileId } from '@analogjs/vite-plugin-nitro';
3
+ import { scrubServerFnModule } from './server-fn-client-transform.js';
2
4
  export function clearClientPageEndpointsPlugin() {
5
+ let projectRoot = process.cwd();
6
+ let isBuild = true;
3
7
  return {
4
8
  name: 'analogjs-platform-clear-client-page-endpoint',
5
- apply: 'build',
6
9
  config() {
7
10
  return {
8
11
  build: {
@@ -17,10 +20,40 @@ export function clearClientPageEndpointsPlugin() {
17
20
  },
18
21
  };
19
22
  },
20
- transform(_code, id, options) {
21
- if (!options?.ssr &&
22
- id.includes(normalizePath('src/app/pages')) &&
23
- id.endsWith('.server.ts')) {
23
+ configResolved(config) {
24
+ projectRoot = config.root;
25
+ isBuild = config.command === 'build';
26
+ },
27
+ transform(code, id, options) {
28
+ if (!id.endsWith('.server.ts')) {
29
+ return;
30
+ }
31
+ // Server-function ids are derived from the project-root-relative path so
32
+ // the client proxy and the server registration always resolve to the same
33
+ // opaque, collision-free route.
34
+ const fileId = serverFnFileId(id, projectRoot);
35
+ if (options?.ssr) {
36
+ // SSR build keeps the real handlers but stamps the derived id into each
37
+ // serverFn config so it registers under the route the client calls.
38
+ const injected = injectServerFnIds(code, fileId);
39
+ return injected ? { code: injected.code, map: null } : undefined;
40
+ }
41
+ // Client build: a `.server.ts` defining server functions is rewritten to
42
+ // client-safe proxies (the `{ id, url, method }` refs the browser
43
+ // dispatches through); handlers and server imports are dropped so they
44
+ // tree-shake away.
45
+ const scrubbed = scrubServerFnModule(code, fileId);
46
+ if (scrubbed) {
47
+ // An empty mapping, not `null`: a null map lets the original module —
48
+ // handlers and all — survive in `sourcesContent` further down the
49
+ // pipeline, which would ship the server code to the browser after the
50
+ // scrub went to the trouble of removing it.
51
+ return { code: scrubbed.code, map: { mappings: '' } };
52
+ }
53
+ // Page load/action endpoints carry no client-consumable exports. Only the
54
+ // client build empties them; the dev server never pulls them into the
55
+ // browser graph, and emptying them there would break the SSR request.
56
+ if (isBuild && id.includes(normalizePath('src/app/pages'))) {
24
57
  return {
25
58
  code: 'export default undefined;',
26
59
  map: null,
@@ -30,4 +63,4 @@ export function clearClientPageEndpointsPlugin() {
30
63
  },
31
64
  };
32
65
  }
33
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xlYXItY2xpZW50LXBhZ2UtZW5kcG9pbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9wbGF0Zm9ybS9zcmMvbGliL2NsZWFyLWNsaWVudC1wYWdlLWVuZHBvaW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBVSxhQUFhLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFFN0MsTUFBTSxVQUFVLDhCQUE4QjtJQUM1QyxPQUFPO1FBQ0wsSUFBSSxFQUFFLDhDQUE4QztRQUNwRCxLQUFLLEVBQUUsT0FBTztRQUNkLE1BQU07WUFDSixPQUFPO2dCQUNMLEtBQUssRUFBRTtvQkFDTCxhQUFhLEVBQUU7d0JBQ2IsTUFBTSxDQUFDLE9BQU87NEJBQ1osSUFDRSxPQUFPLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxhQUFhLENBQUM7Z0NBQ3ZDLE9BQU8sQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLFNBQVMsQ0FBQyxFQUNuQyxDQUFDO2dDQUNELE9BQU87NEJBQ1QsQ0FBQzt3QkFDSCxDQUFDO3FCQUNGO2lCQUNGO2FBQ0YsQ0FBQztRQUNKLENBQUM7UUFDRCxTQUFTLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRSxPQUFPO1lBQzFCLElBQ0UsQ0FBQyxPQUFPLEVBQUUsR0FBRztnQkFDYixFQUFFLENBQUMsUUFBUSxDQUFDLGFBQWEsQ0FBQyxlQUFlLENBQUMsQ0FBQztnQkFDM0MsRUFBRSxDQUFDLFFBQVEsQ0FBQyxZQUFZLENBQUMsRUFDekIsQ0FBQztnQkFDRCxPQUFPO29CQUNMLElBQUksRUFBRSwyQkFBMkI7b0JBQ2pDLEdBQUcsRUFBRSxJQUFJO2lCQUNWLENBQUM7WUFDSixDQUFDO1lBRUQsT0FBTztRQUNULENBQUM7S0FDRixDQUFDO0FBQ0osQ0FBQyJ9
66
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xlYXItY2xpZW50LXBhZ2UtZW5kcG9pbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9wbGF0Zm9ybS9zcmMvbGliL2NsZWFyLWNsaWVudC1wYWdlLWVuZHBvaW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBVSxhQUFhLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFDN0MsT0FBTyxFQUFFLGlCQUFpQixFQUFFLGNBQWMsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBRWhGLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRXRFLE1BQU0sVUFBVSw4QkFBOEI7SUFDNUMsSUFBSSxXQUFXLEdBQUcsT0FBTyxDQUFDLEdBQUcsRUFBRSxDQUFDO0lBQ2hDLElBQUksT0FBTyxHQUFHLElBQUksQ0FBQztJQUVuQixPQUFPO1FBQ0wsSUFBSSxFQUFFLDhDQUE4QztRQUNwRCxNQUFNO1lBQ0osT0FBTztnQkFDTCxLQUFLLEVBQUU7b0JBQ0wsYUFBYSxFQUFFO3dCQUNiLE1BQU0sQ0FBQyxPQUFPOzRCQUNaLElBQ0UsT0FBTyxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsYUFBYSxDQUFDO2dDQUN2QyxPQUFPLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxTQUFTLENBQUMsRUFDbkMsQ0FBQztnQ0FDRCxPQUFPOzRCQUNULENBQUM7d0JBQ0gsQ0FBQztxQkFDRjtpQkFDRjthQUNGLENBQUM7UUFDSixDQUFDO1FBQ0QsY0FBYyxDQUFDLE1BQU07WUFDbkIsV0FBVyxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUM7WUFDMUIsT0FBTyxHQUFHLE1BQU0sQ0FBQyxPQUFPLEtBQUssT0FBTyxDQUFDO1FBQ3ZDLENBQUM7UUFDRCxTQUFTLENBQUMsSUFBSSxFQUFFLEVBQUUsRUFBRSxPQUFPO1lBQ3pCLElBQUksQ0FBQyxFQUFFLENBQUMsUUFBUSxDQUFDLFlBQVksQ0FBQyxFQUFFLENBQUM7Z0JBQy9CLE9BQU87WUFDVCxDQUFDO1lBRUQseUVBQXlFO1lBQ3pFLDBFQUEwRTtZQUMxRSxnQ0FBZ0M7WUFDaEMsTUFBTSxNQUFNLEdBQUcsY0FBYyxDQUFDLEVBQUUsRUFBRSxXQUFXLENBQUMsQ0FBQztZQUUvQyxJQUFJLE9BQU8sRUFBRSxHQUFHLEVBQUUsQ0FBQztnQkFDakIsd0VBQXdFO2dCQUN4RSxvRUFBb0U7Z0JBQ3BFLE1BQU0sUUFBUSxHQUFHLGlCQUFpQixDQUFDLElBQUksRUFBRSxNQUFNLENBQUMsQ0FBQztnQkFDakQsT0FBTyxRQUFRLENBQUMsQ0FBQyxDQUFDLEVBQUUsSUFBSSxFQUFFLFFBQVEsQ0FBQyxJQUFJLEVBQUUsR0FBRyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUM7WUFDbkUsQ0FBQztZQUVELHlFQUF5RTtZQUN6RSxrRUFBa0U7WUFDbEUsdUVBQXVFO1lBQ3ZFLG1CQUFtQjtZQUNuQixNQUFNLFFBQVEsR0FBRyxtQkFBbUIsQ0FBQyxJQUFJLEVBQUUsTUFBTSxDQUFDLENBQUM7WUFDbkQsSUFBSSxRQUFRLEVBQUUsQ0FBQztnQkFDYixzRUFBc0U7Z0JBQ3RFLGtFQUFrRTtnQkFDbEUsc0VBQXNFO2dCQUN0RSw0Q0FBNEM7Z0JBQzVDLE9BQU8sRUFBRSxJQUFJLEVBQUUsUUFBUSxDQUFDLElBQUksRUFBRSxHQUFHLEVBQUUsRUFBRSxRQUFRLEVBQUUsRUFBRSxFQUFFLEVBQUUsQ0FBQztZQUN4RCxDQUFDO1lBRUQsMEVBQTBFO1lBQzFFLHNFQUFzRTtZQUN0RSxzRUFBc0U7WUFDdEUsSUFBSSxPQUFPLElBQUksRUFBRSxDQUFDLFFBQVEsQ0FBQyxhQUFhLENBQUMsZUFBZSxDQUFDLENBQUMsRUFBRSxDQUFDO2dCQUMzRCxPQUFPO29CQUNMLElBQUksRUFBRSwyQkFBMkI7b0JBQ2pDLEdBQUcsRUFBRSxJQUFJO2lCQUNWLENBQUM7WUFDSixDQUFDO1lBRUQsT0FBTztRQUNULENBQUM7S0FDRixDQUFDO0FBQ0osQ0FBQyJ9
@@ -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.6.4";
4
- export declare const V18_X_ANALOG_JS_ROUTER = "^2.6.4";
3
+ export declare const V18_X_ANALOG_JS_CONTENT = "^2.7.0-beta.2";
4
+ export declare const V18_X_ANALOG_JS_ROUTER = "^2.7.0-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.6.4";
7
- export declare const V18_X_ANALOG_JS_VITEST_ANGULAR = "^2.6.4";
6
+ export declare const V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = "^2.7.0-beta.2";
7
+ export declare const V18_X_ANALOG_JS_VITEST_ANGULAR = "^2.7.0-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.6.4";
23
+ export declare const V18_X_ANALOG_JS_PLATFORM = "^2.7.0-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";
@@ -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.6.4';
9
- exports.V18_X_ANALOG_JS_ROUTER = '^2.6.4';
8
+ exports.V18_X_ANALOG_JS_CONTENT = '^2.7.0-beta.2';
9
+ exports.V18_X_ANALOG_JS_ROUTER = '^2.7.0-beta.2';
10
10
  exports.V18_X_ANALOG_JS_TRPC = '~0.4.0';
11
- exports.V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^2.6.4';
12
- exports.V18_X_ANALOG_JS_VITEST_ANGULAR = '^2.6.4';
11
+ exports.V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^2.7.0-beta.2';
12
+ exports.V18_X_ANALOG_JS_VITEST_ANGULAR = '^2.7.0-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.6.4';
29
+ exports.V18_X_ANALOG_JS_PLATFORM = '^2.7.0-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';
@@ -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"}
@@ -1,13 +1,13 @@
1
- export declare const V19_X_ANALOG_JS_ROUTER = "^2.6.4";
2
- export declare const V19_X_ANALOG_JS_CONTENT = "^2.6.4";
1
+ export declare const V19_X_ANALOG_JS_ROUTER = "^2.7.0-beta.2";
2
+ export declare const V19_X_ANALOG_JS_CONTENT = "^2.7.0-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.6.4";
9
- export declare const V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = "^2.6.4";
10
- export declare const V19_X_ANALOG_JS_VITEST_ANGULAR = "^2.6.4";
8
+ export declare const V19_X_ANALOG_JS_PLATFORM = "^2.7.0-beta.2";
9
+ export declare const V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = "^2.7.0-beta.2";
10
+ export declare const V19_X_ANALOG_JS_VITEST_ANGULAR = "^2.7.0-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";
@@ -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.6.4';
6
- exports.V19_X_ANALOG_JS_CONTENT = '^2.6.4';
5
+ exports.V19_X_ANALOG_JS_ROUTER = '^2.7.0-beta.2';
6
+ exports.V19_X_ANALOG_JS_CONTENT = '^2.7.0-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.6.4';
14
- exports.V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^2.6.4';
15
- exports.V19_X_ANALOG_JS_VITEST_ANGULAR = '^2.6.4';
13
+ exports.V19_X_ANALOG_JS_PLATFORM = '^2.7.0-beta.2';
14
+ exports.V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^2.7.0-beta.2';
15
+ exports.V19_X_ANALOG_JS_VITEST_ANGULAR = '^2.7.0-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';
@@ -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"}
@@ -5,9 +5,15 @@ import { ContentPluginOptions } from './content-plugin.js';
5
5
  declare module 'nitropack' {
6
6
  interface NitroRouteConfig {
7
7
  ssr?: boolean;
8
+ /**
9
+ * Disable progressive streaming SSR for matching routes (falls back to a
10
+ * buffered render). Only meaningful when `experimental.streaming` is on.
11
+ */
12
+ streaming?: boolean;
8
13
  }
9
14
  interface NitroRouteRules {
10
15
  ssr?: boolean;
16
+ streaming?: boolean;
11
17
  }
12
18
  }
13
19
  export interface PrerenderOptions {
@@ -124,5 +130,18 @@ export interface Options {
124
130
  * the LOCALE injection token.
125
131
  */
126
132
  i18n?: I18nOptions;
133
+ /**
134
+ * Opt-in experimental features that are not yet stable.
135
+ */
136
+ experimental?: {
137
+ /**
138
+ * Opt into progressive streaming SSR. When enabled, the SSR build patches
139
+ * `@angular/core` with a per-`@defer` block resolution hook so
140
+ * `@analogjs/router`'s `renderStream` can flush the document head first and
141
+ * each `@defer (hydrate …)` block as it resolves on the server. Has no
142
+ * effect unless the server entry uses `renderStream`.
143
+ */
144
+ streaming?: boolean;
145
+ };
127
146
  }
128
147
  export { PrerenderContentDir, PrerenderContentFile };
@@ -1,7 +1,10 @@
1
+ import { createRequire } from 'node:module';
2
+ import { join } from 'node:path';
1
3
  import viteNitroPlugin from '@analogjs/vite-plugin-nitro';
2
4
  import angular from '@analogjs/vite-plugin-angular';
3
5
  import { routerPlugin } from './router-plugin.js';
4
6
  import { ssrBuildPlugin, i18nDefRegistryPlugin, } from './ssr/ssr-build-plugin.js';
7
+ import { deferStreamingPlugin, streamingSupportedOnAngular, MIN_STREAMING_ANGULAR_MAJOR, } from './ssr/defer-streaming-plugin.js';
5
8
  import { contentPlugin } from './content-plugin.js';
6
9
  import { clearClientPageEndpointsPlugin } from './clear-client-page-endpoint.js';
7
10
  import { ssrXhrBuildPlugin } from './ssr/ssr-xhr-plugin.js';
@@ -9,12 +12,46 @@ import { depsPlugin } from './deps-plugin.js';
9
12
  import { injectHTMLPlugin } from './ssr/inject-html-plugin.js';
10
13
  import { serverModePlugin } from '../server-mode-plugin.js';
11
14
  import { i18nExtractPlugin } from './i18n-extract-plugin.js';
15
+ /**
16
+ * The installed `@angular/core` major version, resolved from the workspace root
17
+ * (where the app's Angular is installed). Returns `null` when it cannot be
18
+ * detected, in which case streaming is not blocked and the build-time
19
+ * anchor-drift detection is relied on instead.
20
+ */
21
+ function getAngularCoreMajor(workspaceRoot) {
22
+ try {
23
+ const req = createRequire(join(workspaceRoot, 'noop.js'));
24
+ const { version } = req('@angular/core/package.json');
25
+ const major = Number.parseInt(version.split('.')[0], 10);
26
+ return Number.isNaN(major) ? null : major;
27
+ }
28
+ catch {
29
+ return null;
30
+ }
31
+ }
12
32
  export function platformPlugin(opts = {}) {
13
33
  const isTest = process.env['NODE_ENV'] === 'test' || !!process.env['VITEST'];
14
34
  const { ...platformOptions } = {
15
35
  ssr: true,
16
36
  ...opts,
17
37
  };
38
+ // Gate experimental streaming SSR on an Angular version whose compiled
39
+ // @angular/core matches the patch anchors (see MIN_STREAMING_ANGULAR_MAJOR).
40
+ // Reflect the gated value back onto platformOptions so the nitro renderer
41
+ // selection and the deferStreamingPlugin registration below stay consistent —
42
+ // never select the streaming renderer without applying the patch.
43
+ if (platformOptions.ssr && platformOptions.experimental?.streaming) {
44
+ const major = getAngularCoreMajor(platformOptions.workspaceRoot ?? process.cwd());
45
+ if (!streamingSupportedOnAngular(major)) {
46
+ console.warn(`[@analogjs/platform] experimental.streaming requires Angular ` +
47
+ `${MIN_STREAMING_ANGULAR_MAJOR}+ (detected v${major}); streaming is ` +
48
+ `disabled and rendering falls back to buffered SSR.`);
49
+ platformOptions.experimental = {
50
+ ...platformOptions.experimental,
51
+ streaming: false,
52
+ };
53
+ }
54
+ }
18
55
  let nitroOptions = platformOptions?.nitro;
19
56
  if (nitroOptions?.routeRules) {
20
57
  nitroOptions = {
@@ -27,6 +64,7 @@ export function platformPlugin(opts = {}) {
27
64
  headers: {
28
65
  ...config[curr].headers,
29
66
  'x-analog-no-ssr': config[curr]?.ssr === false ? 'true' : undefined,
67
+ 'x-analog-no-streaming': config[curr]?.streaming === false ? 'true' : undefined,
30
68
  },
31
69
  },
32
70
  };
@@ -36,6 +74,9 @@ export function platformPlugin(opts = {}) {
36
74
  return [
37
75
  ...viteNitroPlugin(platformOptions, nitroOptions),
38
76
  ...(platformOptions.ssr ? [ssrBuildPlugin(), ...injectHTMLPlugin()] : []),
77
+ ...(platformOptions.ssr && platformOptions.experimental?.streaming
78
+ ? [deferStreamingPlugin()]
79
+ : []),
39
80
  ...(!isTest ? depsPlugin(platformOptions) : []),
40
81
  ...routerPlugin(platformOptions),
41
82
  ...contentPlugin(platformOptions?.content, platformOptions),
@@ -66,4 +107,4 @@ export function platformPlugin(opts = {}) {
66
107
  : []),
67
108
  ];
68
109
  }
69
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGxhdGZvcm0tcGx1Z2luLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvcGxhdGZvcm0vc3JjL2xpYi9wbGF0Zm9ybS1wbHVnaW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxlQUFlLE1BQU0sNkJBQTZCLENBQUM7QUFDMUQsT0FBTyxPQUFPLE1BQU0sK0JBQStCLENBQUM7QUFHcEQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ2xELE9BQU8sRUFDTCxjQUFjLEVBQ2QscUJBQXFCLEdBQ3RCLE1BQU0sMkJBQTJCLENBQUM7QUFDbkMsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ3BELE9BQU8sRUFBRSw4QkFBOEIsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ2pGLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzVELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUM5QyxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUMvRCxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUM1RCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUU3RCxNQUFNLFVBQVUsY0FBYyxDQUFDLE9BQWdCLEVBQUU7SUFDL0MsTUFBTSxNQUFNLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsS0FBSyxNQUFNLElBQUksQ0FBQyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDN0UsTUFBTSxFQUFFLEdBQUcsZUFBZSxFQUFFLEdBQUc7UUFDN0IsR0FBRyxFQUFFLElBQUk7UUFDVCxHQUFHLElBQUk7S0FDUixDQUFDO0lBRUYsSUFBSSxZQUFZLEdBQUcsZUFBZSxFQUFFLEtBQUssQ0FBQztJ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
110
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGxhdGZvcm0tcGx1Z2luLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvcGxhdGZvcm0vc3JjL2xpYi9wbGF0Zm9ybS1wbHVnaW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUM1QyxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBQ2pDLE9BQU8sZUFBZSxNQUFNLDZCQUE2QixDQUFDO0FBQzFELE9BQU8sT0FBTyxNQUFNLCtCQUErQixDQUFDO0FBR3BELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNsRCxPQUFPLEVBQ0wsY0FBYyxFQUNkLHFCQUFxQixHQUN0QixNQUFNLDJCQUEyQixDQUFDO0FBQ25DLE9BQU8sRUFDTCxvQkFBb0IsRUFDcEIsMkJBQTJCLEVBQzNCLDJCQUEyQixHQUM1QixNQUFNLGlDQUFpQyxDQUFDO0FBQ3pDLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNwRCxPQUFPLEVBQUUsOEJBQThCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNqRixPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUM1RCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDOUMsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDL0QsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDNUQsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFN0Q7Ozs7O0dBS0c7QUFDSCxTQUFTLG1CQUFtQixDQUFDLGFBQXFCO0lBQ2hELElBQUksQ0FBQztRQUNILE1BQU0sR0FBRyxHQUFHLGFBQWEsQ0FBQyxJQUFJLENBQUMsYUFBYSxFQUFFLFNBQVMsQ0FB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
@@ -0,0 +1,26 @@
1
+ /**
2
+ * Client-build scrub + proxy generation for server functions.
3
+ *
4
+ * On the client build a `*.server.ts` module must not carry server handler
5
+ * bodies (which `inject()` server services, read the request, hit the database).
6
+ * But the client still imports the named `serverFn` exports to dispatch them.
7
+ * This transform regenerates the module so each `export const NAME = serverFn(
8
+ * config, handler)` becomes a call to the client-safe `createServerFnRef`
9
+ * factory — keeping the `{ id, url, method }` metadata `injectServerFn` needs,
10
+ * dropping the handler and every server-only import. Because the regenerated
11
+ * module references nothing else, the server code tree-shakes away entirely.
12
+ *
13
+ * Returns the new module source, or `null` when the module defines no server
14
+ * function (the caller falls back to the page-endpoint scrub for those).
15
+ */
16
+ export interface ServerFnProxy {
17
+ name: string;
18
+ id: string;
19
+ method: 'GET' | 'POST';
20
+ }
21
+ export interface ScrubResult {
22
+ code: string;
23
+ proxies: ServerFnProxy[];
24
+ hadDefaultExport: boolean;
25
+ }
26
+ export declare function scrubServerFnModule(code: string, fileId?: string): ScrubResult | null;
@@ -0,0 +1,148 @@
1
+ import { parseSync } from 'oxc-parser';
2
+ // Light subpath (no vite/nitro barrel): the built scrub is loaded outside a
3
+ // build too, so it must not pull the plugin graph in.
4
+ import { deriveServerFnId } from '@analogjs/vite-plugin-nitro/server-fn-id';
5
+ const SERVER_FN_SOURCE = '@analogjs/router/server';
6
+ export function scrubServerFnModule(code, fileId = 'file.ts') {
7
+ // Cheap bail-out before parsing: no `serverFn` token, nothing to do.
8
+ if (!code.includes('serverFn')) {
9
+ return null;
10
+ }
11
+ const { program } = parseSync(fileId, code);
12
+ const body = program.body;
13
+ const serverFnLocalNames = collectServerFnLocalNames(body);
14
+ const hadDefaultExport = body.some((node) => node.type === 'ExportDefaultDeclaration');
15
+ const proxies = [];
16
+ for (const node of body) {
17
+ if (node.type !== 'ExportNamedDeclaration' ||
18
+ node.declaration?.type !== 'VariableDeclaration') {
19
+ continue;
20
+ }
21
+ for (const declarator of node.declaration.declarations) {
22
+ if (declarator.id?.type !== 'Identifier' ||
23
+ declarator.init?.type !== 'CallExpression' ||
24
+ declarator.init.callee?.type !== 'Identifier' ||
25
+ !serverFnLocalNames.has(declarator.init.callee.name)) {
26
+ continue;
27
+ }
28
+ proxies.push(toProxy(declarator.id.name, declarator.init.arguments ?? [], fileId));
29
+ }
30
+ }
31
+ // Every `serverFn(...)` call in the module must have become a proxy. If one
32
+ // did not, the module uses a shape this transform cannot rewrite (e.g.
33
+ // `const fn = serverFn(...); export { fn };`) and returning `null` would leave
34
+ // it untouched — shipping the handler and its server imports to the browser.
35
+ // Fail the build instead: a scrub that silently opts out is a code leak.
36
+ const callCount = countServerFnCalls(program, serverFnLocalNames);
37
+ if (callCount > proxies.length) {
38
+ throw new Error(`[analog] ${fileId}: found ${callCount} serverFn call(s) but could only rewrite ${proxies.length} for the client build. ` +
39
+ `Server functions must be declared as a directly exported const — \`export const name = serverFn(…)\` — so the handler can be stripped from the browser bundle.`);
40
+ }
41
+ if (proxies.length === 0) {
42
+ return null;
43
+ }
44
+ const lines = [
45
+ `import { createServerFnRef } from '@analogjs/router';`,
46
+ '',
47
+ ...proxies.map((p) => `export const ${p.name} = createServerFnRef({ id: ${JSON.stringify(p.id)}, method: ${JSON.stringify(p.method)} });`),
48
+ ];
49
+ // A file that is also a page endpoint keeps the load-shim the router expects.
50
+ if (hadDefaultExport) {
51
+ lines.push('', 'export default undefined;');
52
+ }
53
+ return { code: lines.join('\n') + '\n', proxies, hadDefaultExport };
54
+ }
55
+ /** Local identifier(s) `serverFn` is imported under from `@analogjs/router/server`. */
56
+ function collectServerFnLocalNames(body) {
57
+ const names = new Set();
58
+ for (const node of body) {
59
+ if (node.type !== 'ImportDeclaration' ||
60
+ node.source?.value !== SERVER_FN_SOURCE) {
61
+ continue;
62
+ }
63
+ for (const spec of node.specifiers ?? []) {
64
+ if (spec.type === 'ImportSpecifier' &&
65
+ spec.imported?.name === 'serverFn') {
66
+ names.add(spec.local.name);
67
+ }
68
+ }
69
+ }
70
+ // Fallback: if the module never imported it (unusual), still match the
71
+ // conventional name so a mis-resolved import doesn't leak server code.
72
+ if (names.size === 0) {
73
+ names.add('serverFn');
74
+ }
75
+ return names;
76
+ }
77
+ function toProxy(name, args, fileId) {
78
+ const method = methodForCall(name, args, fileId);
79
+ // The id is derived, never read from source — same algorithm the server
80
+ // registration uses, so client proxy and server route always match.
81
+ return { name, id: deriveServerFnId(fileId, name), method };
82
+ }
83
+ /**
84
+ * Resolve the HTTP method from the call shape, matching the runtime overloads:
85
+ * `serverFn(handler)` ⇒ GET, `serverFn(schema, handler)` ⇒ POST,
86
+ * `serverFn(config, handler)` ⇒ config-driven.
87
+ */
88
+ function methodForCall(name, args, fileId) {
89
+ const arg0 = args[0];
90
+ // serverFn(handler) — input-less GET.
91
+ if (isFunctionNode(arg0))
92
+ return 'GET';
93
+ // serverFn(config, handler) — read method/input off the object.
94
+ if (arg0?.type === 'ObjectExpression') {
95
+ let method;
96
+ let hasInput = false;
97
+ for (const prop of arg0.properties ?? []) {
98
+ if (prop.type !== 'Property')
99
+ continue;
100
+ const key = prop.key?.type === 'Identifier' ? prop.key.name : prop.key?.value;
101
+ if (key === 'method' && isStringLiteral(prop.value)) {
102
+ method = prop.value.value;
103
+ }
104
+ else if (key === 'input') {
105
+ hasInput = true;
106
+ }
107
+ }
108
+ if (method === 'GET' && hasInput) {
109
+ throw new Error(`[analog] serverFn "${name}" in ${fileId} declares method: 'GET' with an input schema; GET carries no body. Use POST or drop the input.`);
110
+ }
111
+ return method ?? (hasInput ? 'POST' : 'GET');
112
+ }
113
+ // serverFn(schema, handler) — a schema ⇒ POST + input.
114
+ if (arg0 && args.length >= 2)
115
+ return 'POST';
116
+ throw new Error(`[analog] serverFn "${name}" in ${fileId} must be called as serverFn(handler), serverFn(schema, handler), or serverFn(config, handler).`);
117
+ }
118
+ function isFunctionNode(node) {
119
+ return (node?.type === 'ArrowFunctionExpression' ||
120
+ node?.type === 'FunctionExpression');
121
+ }
122
+ function isStringLiteral(node) {
123
+ return node?.type === 'Literal' && typeof node.value === 'string';
124
+ }
125
+ /** Every `serverFn(...)` call anywhere in the module, not just exported ones. */
126
+ function countServerFnCalls(node, names) {
127
+ if (!node || typeof node !== 'object') {
128
+ return 0;
129
+ }
130
+ if (Array.isArray(node)) {
131
+ return node.reduce((total, child) => total + countServerFnCalls(child, names), 0);
132
+ }
133
+ const record = node;
134
+ let count = 0;
135
+ if (record.type === 'CallExpression') {
136
+ const callee = record['callee'];
137
+ if (callee?.type === 'Identifier' &&
138
+ callee.name &&
139
+ names.has(callee.name)) {
140
+ count += 1;
141
+ }
142
+ }
143
+ for (const key of Object.keys(record)) {
144
+ count += countServerFnCalls(record[key], names);
145
+ }
146
+ return count;
147
+ }
148
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmVyLWZuLWNsaWVudC10cmFuc2Zvcm0uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9wbGF0Zm9ybS9zcmMvbGliL3NlcnZlci1mbi1jbGllbnQtdHJhbnNmb3JtLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFDdkMsNEVBQTRFO0FBQzVFLHNEQUFzRDtBQUN0RCxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSwwQ0FBMEMsQ0FBQztBQTZCNUUsTUFBTSxnQkFBZ0IsR0FBRyx5QkFBeUIsQ0FBQztBQUVuRCxNQUFNLFVBQVUsbUJBQW1CLENBQ2pDLElBQVksRUFDWixNQUFNLEdBQUcsU0FBUztJQUVsQixxRUFBcUU7SUFDckUsSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQztRQUMvQixPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFFRCxNQUFNLEVBQUUsT0FBTyxFQUFFLEdBQUcsU0FBUyxDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsQ0FBQztJQUM1QyxNQUFNLElBQUksR0FBSSxPQUEyQixDQUFDLElBQUksQ0FBQztJQUUvQyxNQUFNLGtCQUFrQixHQUFHLHlCQUF5QixDQUFDLElBQUksQ0FBQyxDQUFDO0lBQzNELE1BQU0sZ0JBQWdCLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FDaEMsQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDLElBQUksQ0FBQyxJQUFJLEtBQUssMEJBQTBCLENBQ25ELENBQUM7SUFFRixNQUFNLE9BQU8sR0FBb0IsRUFBRSxDQUFDO0lBQ3BDLEtBQUssTUFBTSxJQUFJLElBQUksSUFBSSxFQUFFLENBQUM7UUFDeEIsSUFDRSxJQUFJLENBQUMsSUFBSSxLQUFLLHdCQUF3QjtZQUN0QyxJQUFJLENBQUMsV0FBVyxFQUFFLElBQUksS0FBSyxxQkFBcUIsRUFDaEQs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
@@ -0,0 +1,65 @@
1
+ import type { Plugin } from 'vite';
2
+ /**
3
+ * Minimum Angular major whose compiled `@angular/core` FESM matches the
4
+ * streaming patch anchors. Incremental hydration is a stable public API from
5
+ * v20 (`withIncrementalHydration`, `@publicApi 20.0`), but v20's FESM inlines
6
+ * the injection anchor's `DeferBlockStateEnd` profiler event to its numeric
7
+ * ordinal, whereas v21+ keeps the symbolic `ProfilerEvent.DeferBlockStateEnd`
8
+ * form the anchor matches on. Keying on the literal ordinal would be fragile
9
+ * (enum values shift between versions), so v21 is the floor.
10
+ */
11
+ export declare const MIN_STREAMING_ANGULAR_MAJOR = 21;
12
+ /**
13
+ * Whether the streaming SSR patch can be applied to the installed Angular.
14
+ * A `null` major (version undetectable) returns `true`: don't block on a failed
15
+ * detection — the plugin's anchor-drift detection catches a real mismatch at
16
+ * build time and falls back to buffered rendering.
17
+ */
18
+ export declare function streamingSupportedOnAngular(major: number | null): boolean;
19
+ /**
20
+ * Pure transform that injects the streaming-SSR per-block resolution hook into
21
+ * `@angular/core`'s compiled output. It is the same class of transform as
22
+ * `i18nDefRegistryPlugin` in ./ssr-build-plugin — a string patch of Angular's
23
+ * bundle applied only to SSR builds. Exported separately so it can be unit
24
+ * tested against a bundle string.
25
+ *
26
+ * Two edits, both keyed on single-occurrence anchors in the module that holds
27
+ * the defer runtime:
28
+ * 1. Inside `applyDeferBlockState`, fire `globalThis.__analogSsrDeferCapture`
29
+ * when a `@defer` block reaches `Complete` on the server, passing the
30
+ * block's live `lContainer` — this is the per-block resolution signal a
31
+ * streaming renderer consumes.
32
+ * 2. Expose `collectNativeNodesInLContainer` via `globalThis.__analogSsrInternals`
33
+ * so the renderer can serialize a block's subtree.
34
+ *
35
+ * Returns `null` when the module is not the one carrying the defer runtime, so
36
+ * it is a no-op on every other Angular module.
37
+ */
38
+ export declare function injectDeferStreamingHook(code: string): string | null;
39
+ /**
40
+ * Classify an `@angular/core` module for the streaming patch. The patch anchors
41
+ * on internal symbol names, so when Angular changes those the transform would
42
+ * otherwise become a silent no-op and streaming would degrade to buffered with
43
+ * no signal. This distinguishes "not the target module" (skip quietly) from
44
+ * "this IS the `@defer` runtime module but the anchors drifted" (worth warning).
45
+ */
46
+ export declare function inspectAngularCoreModule(code: string): {
47
+ kind: 'not-target';
48
+ } | {
49
+ kind: 'patchable';
50
+ } | {
51
+ kind: 'drifted';
52
+ reason: string;
53
+ };
54
+ /**
55
+ * Vite plugin that applies {@link injectDeferStreamingHook} to `@angular/core`
56
+ * during SSR builds, so `@analogjs/router`'s `renderStream` can flush `@defer`
57
+ * blocks as they resolve on the server — without hand-patching node_modules.
58
+ *
59
+ * Only active for SSR. Mirrors the enforce/filter/ssr-gate shape of
60
+ * `i18nDefRegistryPlugin`. If the `@defer` runtime module is found but its
61
+ * anchors have drifted (Angular changed internals), or if it is never
62
+ * encountered at all, the plugin warns rather than silently producing a build
63
+ * that falls back to buffered rendering.
64
+ */
65
+ export declare function deferStreamingPlugin(): Plugin;
@@ -0,0 +1,135 @@
1
+ /**
2
+ * Minimum Angular major whose compiled `@angular/core` FESM matches the
3
+ * streaming patch anchors. Incremental hydration is a stable public API from
4
+ * v20 (`withIncrementalHydration`, `@publicApi 20.0`), but v20's FESM inlines
5
+ * the injection anchor's `DeferBlockStateEnd` profiler event to its numeric
6
+ * ordinal, whereas v21+ keeps the symbolic `ProfilerEvent.DeferBlockStateEnd`
7
+ * form the anchor matches on. Keying on the literal ordinal would be fragile
8
+ * (enum values shift between versions), so v21 is the floor.
9
+ */
10
+ export const MIN_STREAMING_ANGULAR_MAJOR = 21;
11
+ /**
12
+ * Whether the streaming SSR patch can be applied to the installed Angular.
13
+ * A `null` major (version undetectable) returns `true`: don't block on a failed
14
+ * detection — the plugin's anchor-drift detection catches a real mismatch at
15
+ * build time and falls back to buffered rendering.
16
+ */
17
+ export function streamingSupportedOnAngular(major) {
18
+ return major === null || major >= MIN_STREAMING_ANGULAR_MAJOR;
19
+ }
20
+ /**
21
+ * Pure transform that injects the streaming-SSR per-block resolution hook into
22
+ * `@angular/core`'s compiled output. It is the same class of transform as
23
+ * `i18nDefRegistryPlugin` in ./ssr-build-plugin — a string patch of Angular's
24
+ * bundle applied only to SSR builds. Exported separately so it can be unit
25
+ * tested against a bundle string.
26
+ *
27
+ * Two edits, both keyed on single-occurrence anchors in the module that holds
28
+ * the defer runtime:
29
+ * 1. Inside `applyDeferBlockState`, fire `globalThis.__analogSsrDeferCapture`
30
+ * when a `@defer` block reaches `Complete` on the server, passing the
31
+ * block's live `lContainer` — this is the per-block resolution signal a
32
+ * streaming renderer consumes.
33
+ * 2. Expose `collectNativeNodesInLContainer` via `globalThis.__analogSsrInternals`
34
+ * so the renderer can serialize a block's subtree.
35
+ *
36
+ * Returns `null` when the module is not the one carrying the defer runtime, so
37
+ * it is a no-op on every other Angular module.
38
+ */
39
+ export function injectDeferStreamingHook(code) {
40
+ const END_ANCHOR = 'profiler(ProfilerEvent.DeferBlockStateEnd);';
41
+ if (!code.includes('function applyDeferBlockState(') ||
42
+ !code.includes(END_ANCHOR)) {
43
+ return null;
44
+ }
45
+ // Wrap the entire guard — not just the call — so a drifted Angular runtime
46
+ // that still matches the anchors but renamed these locals fails as a silent
47
+ // no-op instead of throwing a ReferenceError inside applyDeferBlockState.
48
+ const capture = `try { if (newState === DeferBlockState.Complete && ` +
49
+ `typeof ngServerMode !== 'undefined' && ngServerMode && ` +
50
+ `typeof globalThis.__analogSsrDeferCapture === 'function') { ` +
51
+ `globalThis.__analogSsrDeferCapture({ ssrUniqueId: lDetails[SSR_UNIQUE_ID], lContainer, hostLView }); } } catch (e) {}\n `;
52
+ let out = code.replace(END_ANCHOR, capture + END_ANCHOR);
53
+ if (code.includes('function collectNativeNodesInLContainer(')) {
54
+ out +=
55
+ '\nglobalThis.__analogSsrInternals = Object.assign(globalThis.__analogSsrInternals || {}, { collectNativeNodesInLContainer });\n';
56
+ }
57
+ return out;
58
+ }
59
+ /**
60
+ * Classify an `@angular/core` module for the streaming patch. The patch anchors
61
+ * on internal symbol names, so when Angular changes those the transform would
62
+ * otherwise become a silent no-op and streaming would degrade to buffered with
63
+ * no signal. This distinguishes "not the target module" (skip quietly) from
64
+ * "this IS the `@defer` runtime module but the anchors drifted" (worth warning).
65
+ */
66
+ export function inspectAngularCoreModule(code) {
67
+ if (!code.includes('function applyDeferBlockState(')) {
68
+ return { kind: 'not-target' };
69
+ }
70
+ const missing = [];
71
+ if (!code.includes('profiler(ProfilerEvent.DeferBlockStateEnd);')) {
72
+ missing.push('DeferBlockStateEnd profiler anchor');
73
+ }
74
+ if (!code.includes('function collectNativeNodesInLContainer(')) {
75
+ missing.push('collectNativeNodesInLContainer');
76
+ }
77
+ return missing.length === 0
78
+ ? { kind: 'patchable' }
79
+ : { kind: 'drifted', reason: `missing ${missing.join(', ')}` };
80
+ }
81
+ /**
82
+ * Vite plugin that applies {@link injectDeferStreamingHook} to `@angular/core`
83
+ * during SSR builds, so `@analogjs/router`'s `renderStream` can flush `@defer`
84
+ * blocks as they resolve on the server — without hand-patching node_modules.
85
+ *
86
+ * Only active for SSR. Mirrors the enforce/filter/ssr-gate shape of
87
+ * `i18nDefRegistryPlugin`. If the `@defer` runtime module is found but its
88
+ * anchors have drifted (Angular changed internals), or if it is never
89
+ * encountered at all, the plugin warns rather than silently producing a build
90
+ * that falls back to buffered rendering.
91
+ */
92
+ export function deferStreamingPlugin() {
93
+ let applied = false;
94
+ let warnedDrift = false;
95
+ return {
96
+ name: 'analogjs-defer-streaming',
97
+ enforce: 'post',
98
+ transform: {
99
+ filter: {
100
+ id: /\/@angular\/core\//,
101
+ },
102
+ handler(code, _id, options) {
103
+ if (!options?.ssr)
104
+ return;
105
+ const info = inspectAngularCoreModule(code);
106
+ if (info.kind === 'not-target')
107
+ return;
108
+ if (info.kind === 'drifted') {
109
+ if (!warnedDrift) {
110
+ warnedDrift = true;
111
+ this.warn(`experimental streaming SSR: found @angular/core's @defer runtime ` +
112
+ `but could not apply the resolution hook (${info.reason}). The ` +
113
+ `installed Angular version likely changed internals the patch ` +
114
+ `depends on; streaming will fall back to buffered rendering.`);
115
+ }
116
+ return;
117
+ }
118
+ const out = injectDeferStreamingHook(code);
119
+ if (!out)
120
+ return;
121
+ applied = true;
122
+ return { code: out };
123
+ },
124
+ },
125
+ buildEnd() {
126
+ if (!applied && !warnedDrift) {
127
+ this.warn(`experimental streaming SSR is enabled but @angular/core's @defer ` +
128
+ `runtime module was never encountered during the SSR build, so the ` +
129
+ `resolution hook was not injected. Streaming will fall back to ` +
130
+ `buffered rendering.`);
131
+ }
132
+ },
133
+ };
134
+ }
135
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVmZXItc3RyZWFtaW5nLXBsdWdpbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL3BsYXRmb3JtL3NyYy9saWIvc3NyL2RlZmVyLXN0cmVhbWluZy1wbHVnaW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUE7Ozs7Ozs7O0dBUUc7QUFDSCxNQUFNLENBQUMsTUFBTSwyQkFBMkIsR0FBRyxFQUFFLENBQUM7QUFFOUM7Ozs7O0dBS0c7QUFDSCxNQUFNLFVBQVUsMkJBQTJCLENBQUMsS0FBb0I7SUFDOUQsT0FBTyxLQUFLLEtBQUssSUFBSSxJQUFJLEtBQUssSUFBSSwyQkFBMkIsQ0FBQztBQUNoRSxDQUFDO0FBRUQ7Ozs7Ozs7Ozs7Ozs7Ozs7OztHQWtCRztBQUNILE1BQU0sVUFBVSx3QkFBd0IsQ0FBQyxJQUFZO0lBQ25ELE1BQU0sVUFBVSxHQUFHLDZDQUE2QyxDQUFDO0lBQ2pFLElBQ0UsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLGdDQUFnQyxDQUFDO1FBQ2hELENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxVQUFVLENBQUMsRUFDMUIsQ0FBQztRQUNELE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVELDJFQUEyRTtJQUMzRSw0RUFBNEU7SUFDNUUsMEVBQTBFO0lBQzFFLE1BQU0sT0FBTyxHQUNYLHFEQUFxRDtRQUNyRCx5REFBeUQ7UUFDekQsOERBQThEO1FBQzlELDJIQUEySCxDQUFDO0lBRTlILElBQUksR0FBRyxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsVUFBVSxFQUFFLE9BQU8sR0FBRyxVQUFVLENBQUMsQ0FBQztJQUV6RCxJQUFJLElBQUksQ0FBQyxRQUFRLENBQUMsMENBQTBDLENBQUMsRUFBRSxDQUFDO1FBQzlELEdBQUc7WUFDRCxpSUFBaUksQ0FBQztJQUN0SSxDQUFDO0lBRUQsT0FBTyxHQUFHLENBQUM7QUFDYixDQUFDO0FBRUQ7Ozs7OztHQU1HO0FBQ0gsTUFB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