isr-engine 2.0.0 → 3.0.0

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 (41) hide show
  1. package/README.md +4 -10
  2. package/dist/{abVariantContext-Cqp-uxtd.cjs → abVariantContext-BcnxBn4V.cjs} +17 -257
  3. package/dist/abVariantContext-BcnxBn4V.cjs.map +1 -0
  4. package/dist/{abVariantContext-CWCdRSdG.js → abVariantContext-BmZZi1YZ.js} +12 -205
  5. package/dist/abVariantContext-BmZZi1YZ.js.map +1 -0
  6. package/dist/cli/cli.cjs +1 -1
  7. package/dist/cli/cli.js +1 -1
  8. package/dist/{createCacheInspectorMiddleware-B0Eiy7nh.js → createCacheInspectorMiddleware-BY6MX88X.js} +2 -2
  9. package/dist/{createCacheInspectorMiddleware-B0Eiy7nh.js.map → createCacheInspectorMiddleware-BY6MX88X.js.map} +1 -1
  10. package/dist/{createCacheInspectorMiddleware-1ZChBvIw.cjs → createCacheInspectorMiddleware-DZr98Zfn.cjs} +2 -2
  11. package/dist/{createCacheInspectorMiddleware-1ZChBvIw.cjs.map → createCacheInspectorMiddleware-DZr98Zfn.cjs.map} +1 -1
  12. package/dist/{createISRApp-DBichmCL.cjs → createISRApp-CHiiWF3P.cjs} +251 -22
  13. package/dist/createISRApp-CHiiWF3P.cjs.map +1 -0
  14. package/dist/{createISRApp-9PZON4FE.js → createISRApp-CS6XfjHl.js} +217 -18
  15. package/dist/createISRApp-CS6XfjHl.js.map +1 -0
  16. package/dist/{createImagePlugin-ClEnkrXE.cjs → createImagePlugin-BtJzr0t-.cjs} +2 -2
  17. package/dist/{createImagePlugin-ClEnkrXE.cjs.map → createImagePlugin-BtJzr0t-.cjs.map} +1 -1
  18. package/dist/{createImagePlugin-D15Xb8hZ.js → createImagePlugin-Ddo5t3dJ.js} +2 -2
  19. package/dist/{createImagePlugin-D15Xb8hZ.js.map → createImagePlugin-Ddo5t3dJ.js.map} +1 -1
  20. package/dist/isr-engine.cjs +47 -27
  21. package/dist/isr-engine.cjs.map +1 -1
  22. package/dist/isr-engine.js +42 -22
  23. package/dist/isr-engine.js.map +1 -1
  24. package/dist/metrics/PromMetrics.d.ts.map +1 -1
  25. package/dist/plugin/createDevCssHandoffPlugin.d.ts.map +1 -1
  26. package/dist/plugin/createIsrPlugin.d.ts.map +1 -1
  27. package/dist/rsc/index.cjs +2 -2
  28. package/dist/rsc/index.js +2 -2
  29. package/dist/rsc/revalidate.d.ts.map +1 -1
  30. package/dist/rsc/revalidationMetrics.d.ts +6 -0
  31. package/dist/rsc/revalidationMetrics.d.ts.map +1 -0
  32. package/dist/{rsc-lvWPTuVD.js → rsc-BSxvkPHd.js} +2 -2
  33. package/dist/{rsc-lvWPTuVD.js.map → rsc-BSxvkPHd.js.map} +1 -1
  34. package/dist/{rsc-H7D_meHu.cjs → rsc-NB-Uka7j.cjs} +2 -2
  35. package/dist/{rsc-H7D_meHu.cjs.map → rsc-NB-Uka7j.cjs.map} +1 -1
  36. package/package.json +7 -10
  37. package/src/defaults/runtime/dev-style-resource-dispatcher.server.ts +1 -1
  38. package/dist/abVariantContext-CWCdRSdG.js.map +0 -1
  39. package/dist/abVariantContext-Cqp-uxtd.cjs.map +0 -1
  40. package/dist/createISRApp-9PZON4FE.js.map +0 -1
  41. package/dist/createISRApp-DBichmCL.cjs.map +0 -1
@@ -1,11 +1,11 @@
1
- import { $ as CacheCleanup, A as FallbackChain, B as scanComponents, C as loadConfig, D as getRouteFallbackChain, E as getFallbackChain, F as logger$1, G as parseRouteFromFile, H as scanRoutes, J as isTestFile, K as parseRoutes, M as RenderModes, N as extractSsgRoutes, O as matchRoutePattern, P as spiderSsgRoutes, Q as getEnv, R as resolveFetchHandler, T as createMemoryCacheStore, U as parseComponentFromFile, V as scanProject, W as parseComponents, X as isDev, Y as readDirRecursive, Z as isProd, _ as RedisInvalidationBus, a as DEFAULT_SEO_CONFIG, b as createCoherentCacheStore, c as startAppServer, et as assertDistinctHtmlRouteIdentities, g as createIsrCacheMiddleware, h as createIsrCacheHandler, i as createSEOEngine, j as InternalStrategies, k as resolveRenderMode, l as createABVariantMiddleware, m as generateStaticCspManifest, n as ISREngine, o as mergeSEOConfig, q as isCodeFile, r as SEOEngine, s as shutdownServer, t as createISRApp, tt as resolveImageOptions, v as RedisCacheAdapter, w as createHybridCacheStore, x as createDevAssetRequestMiddleware, y as MemoryCacheAdapter, z as DEFAULT_SCAN_CONFIG } from "./createISRApp-9PZON4FE.js";
1
+ import { $ as isTestFile, A as createMemoryCacheStore, B as logger$1, C as loadConfig, D as promRegistry, E as invalidatorRunsTotal, F as FallbackChain, G as scanComponents, I as InternalStrategies, J as parseComponentFromFile, K as scanProject, L as RenderModes, M as getRouteFallbackChain, N as matchRoutePattern, O as recordHttpRequest, P as resolveRenderMode, Q as isCodeFile, R as extractSsgRoutes, T as invalidatorFailuresTotal, U as resolveFetchHandler, W as DEFAULT_SCAN_CONFIG, X as parseRouteFromFile, Y as parseComponents, Z as parseRoutes, _ as RedisInvalidationBus, a as DEFAULT_SEO_CONFIG, at as assertDistinctHtmlRouteIdentities, b as createCoherentCacheStore, c as startAppServer, et as readDirRecursive, g as createIsrCacheMiddleware, h as createIsrCacheHandler, i as createSEOEngine, it as CacheCleanup, j as getFallbackChain, k as createHybridCacheStore, l as createABVariantMiddleware, m as generateStaticCspManifest, n as ISREngine, nt as isProd, o as mergeSEOConfig, ot as resolveImageOptions, q as scanRoutes, r as SEOEngine, rt as getEnv, s as shutdownServer, t as createISRApp, tt as isDev, v as RedisCacheAdapter, w as createPrometheusMetricsMiddleware, x as createDevAssetRequestMiddleware, y as MemoryCacheAdapter, z as spiderSsgRoutes } from "./createISRApp-CS6XfjHl.js";
2
2
  import { c as requestContext, i as getRequestContext } from "./RequestContext-BVQ-rOmV.js";
3
- import { _ as invalidatorRunsTotal, b as recordHttpRequest, c as RevalidationError, d as revalidateTag, g as invalidatorFailuresTotal, h as createPrometheusMetricsMiddleware, l as registerInvalidator, n as cacheTag, r as collectTags, s as runWithTagStore, t as getVariant, u as revalidatePath, x as Logger, y as promRegistry } from "./abVariantContext-CWCdRSdG.js";
3
+ import { c as RevalidationError, d as revalidateTag, l as registerInvalidator, n as cacheTag, p as Logger, r as collectTags, s as runWithTagStore, t as getVariant, u as revalidatePath } from "./abVariantContext-BmZZi1YZ.js";
4
4
  import { c as parseCookieHeader, l as readCookie, o as trimTrailingSlashes, s as getCookieHeader } from "./i18n-Dobe0Wxn.js";
5
5
  import { defineIsrConfig, defineRuntimeConfig } from "./config/defineConfig.js";
6
- import { n as createImagePlugin, t as createImageMiddleware } from "./createImagePlugin-D15Xb8hZ.js";
6
+ import { n as createImagePlugin, t as createImageMiddleware } from "./createImagePlugin-Ddo5t3dJ.js";
7
7
  import { a as defineSiteHooks, i as defineAdminSiteHooks, n as createAdminIntlLoader, o as createCachedFetcher, r as createAdminSeoLoader, t as applyRuntimeToServerHooks } from "./defineSiteHooks-BeVy-qPH.js";
8
- import { a as LEGACY_SERVER_ACTION_ENDPOINT, d as createServerAction, f as serverActionsRegistry, i as getI18nLocale, o as SERVER_ACTION_ENDPOINT, r as getI18n, u as ServerActionUtils } from "./rsc-lvWPTuVD.js";
8
+ import { a as LEGACY_SERVER_ACTION_ENDPOINT, d as createServerAction, f as serverActionsRegistry, i as getI18nLocale, o as SERVER_ACTION_ENDPOINT, r as getI18n, u as ServerActionUtils } from "./rsc-BSxvkPHd.js";
9
9
  import fs, { existsSync, promises, readFileSync, realpathSync } from "node:fs";
10
10
  import path from "node:path";
11
11
  import { existsSync as existsSync$1, readFileSync as readFileSync$1 } from "fs";
@@ -1572,7 +1572,7 @@ function transformDevCssModule(code, id, registryId, browserStyleId) {
1572
1572
  }
1573
1573
  //#endregion
1574
1574
  //#region src/defaults/runtime/dev-style-resource-dispatcher.server.ts
1575
- var PINNED_REACT_DOM_VERSION = "19.3.0-canary-bd6ea412-20260824";
1575
+ var PINNED_REACT_DOM_VERSION = "19.3.1";
1576
1576
  function pinnedResourceDispatcher() {
1577
1577
  const module = ReactDOM;
1578
1578
  const dispatcher = module.__DOM_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE?.d;
@@ -1670,7 +1670,7 @@ function hasUseClientDirective$1(code, id) {
1670
1670
  return false;
1671
1671
  }
1672
1672
  function unsupportedClientProxy(id) {
1673
- return /* @__PURE__ */ new Error(`[isr-engine] Unsupported @vitejs/plugin-rsc client reference proxy shape in ${id}. Expected the pinned 0.5.34 registerClientReference wrapper.`);
1673
+ return /* @__PURE__ */ new Error(`[isr-engine] Unsupported @vitejs/plugin-rsc client reference proxy shape in ${id}. Expected the pinned 0.5.39 registerClientReference wrapper.`);
1674
1674
  }
1675
1675
  function isPinnedRscServerRuntime(value) {
1676
1676
  try {
@@ -1916,10 +1916,11 @@ function isCreateElementCall(node, reactBinding, argumentCount) {
1916
1916
  return ts.isCallExpression(node) && node.arguments.length === argumentCount && isPropertyPath(node.expression, reactBinding, "createElement");
1917
1917
  }
1918
1918
  function isPinnedLinkProps(node, hrefBinding, precedenceBinding) {
1919
- if (!ts.isObjectLiteralExpression(node) || node.properties.length !== 5) return false;
1920
- const [key, rel, precedence, href, dataHref] = node.properties;
1919
+ if (!ts.isObjectLiteralExpression(node) || node.properties.length !== 6) return false;
1920
+ const [key, rel, crossOrigin, precedence, href, dataHref] = node.properties;
1921
1921
  if (!key || !ts.isPropertyAssignment(key) || propertyName(key.name) !== "key" || !ts.isBinaryExpression(key.initializer) || key.initializer.operatorToken.kind !== ts.SyntaxKind.PlusToken || !stringIs(key.initializer.left, "css:") || !identifierIs(key.initializer.right, hrefBinding)) return false;
1922
1922
  if (!rel || !ts.isPropertyAssignment(rel) || propertyName(rel.name) !== "rel" || !stringIs(rel.initializer, "stylesheet")) return false;
1923
+ if (!crossOrigin || !ts.isPropertyAssignment(crossOrigin) || propertyName(crossOrigin.name) !== "crossOrigin" || !stringIs(crossOrigin.initializer, "anonymous")) return false;
1923
1924
  if (!precedence || !ts.isSpreadAssignment(precedence)) return false;
1924
1925
  const condition = precedence.expression;
1925
1926
  if (!ts.isConditionalExpression(condition) || !identifierIs(condition.condition, precedenceBinding) || !ts.isObjectLiteralExpression(condition.whenTrue) || condition.whenTrue.properties.length !== 1 || !ts.isShorthandPropertyAssignment(condition.whenTrue.properties[0]) || condition.whenTrue.properties[0].name.text !== precedenceBinding || !ts.isObjectLiteralExpression(condition.whenFalse) || condition.whenFalse.properties.length !== 0) return false;
@@ -1936,13 +1937,17 @@ function isPinnedResourcesFactory(factory) {
1936
1937
  if (factory.parameters.length !== parameterNames.length || !factory.parameters.every((parameter, index) => {
1937
1938
  const expected = parameterNames[index];
1938
1939
  return expected !== void 0 && identifierIs(parameter.name, expected);
1939
- }) || !ts.isBlock(factory.body) || factory.body.statements.length !== 1) return false;
1940
- const factoryReturn = factory.body.statements[0];
1940
+ }) || !ts.isBlock(factory.body) || factory.body.statements.length !== 2) return false;
1941
+ const [element, factoryReturn] = factory.body.statements;
1942
+ if (!element || !ts.isVariableStatement(element) || (element.declarationList.flags & ts.NodeFlags.Const) === 0 || element.declarationList.declarations.length !== 1) return false;
1943
+ const declaration = element.declarationList.declarations[0];
1944
+ if (!declaration || !identifierIs(declaration.name, "element")) return false;
1941
1945
  if (!factoryReturn || !ts.isReturnStatement(factoryReturn) || !factoryReturn.expression || !ts.isFunctionExpression(factoryReturn.expression) || !identifierIs(factoryReturn.expression.name, "Resources") || factoryReturn.expression.parameters.length !== 0 || factoryReturn.expression.body.statements.length !== 1) return false;
1942
1946
  const resourcesReturn = factoryReturn.expression.body.statements[0];
1943
- const resourcesCall = resourcesReturn && ts.isReturnStatement(resourcesReturn) && resourcesReturn.expression && isCreateElementCall(resourcesReturn.expression, "React", 3) ? resourcesReturn.expression : void 0;
1944
- const [fragment, nullValue, children] = resourcesCall?.arguments ?? [];
1945
- if (!resourcesCall || !fragment || !isPropertyPath(fragment, "React", "Fragment") || nullValue?.kind !== ts.SyntaxKind.NullKeyword || !children || !ts.isArrayLiteralExpression(children) || children.elements.length !== 2) return false;
1947
+ const resourcesCall = declaration.initializer;
1948
+ if (!resourcesReturn || !ts.isReturnStatement(resourcesReturn) || !identifierIs(resourcesReturn.expression, "element") || !resourcesCall || !isCreateElementCall(resourcesCall, "React", 3)) return false;
1949
+ const [fragment, nullValue, children] = resourcesCall.arguments;
1950
+ if (!fragment || !isPropertyPath(fragment, "React", "Fragment") || nullValue?.kind !== ts.SyntaxKind.NullKeyword || !children || !ts.isArrayLiteralExpression(children) || children.elements.length !== 2) return false;
1946
1951
  const [linksSpread, cleanup] = children.elements;
1947
1952
  if (!linksSpread || !ts.isSpreadElement(linksSpread) || !ts.isCallExpression(linksSpread.expression)) return false;
1948
1953
  const mapCall = linksSpread.expression;
@@ -1995,7 +2000,7 @@ function instrumentDevRscStylesheetModule(code, id, declarationsUrl) {
1995
2000
  const reactBinding = defaultImportBinding(source.statements[0], "react");
1996
2001
  const cleanupBinding = defaultImportBinding(source.statements[1], VITE_RSC_REMOVE_DUPLICATE_CSS_ID);
1997
2002
  const depsArgument = initializer && ts.isCallExpression(initializer) ? initializer.arguments[1] : void 0;
1998
- if (source.statements.length !== 3 || reactBinding === void 0 || cleanupBinding === void 0 || source.statements[2] !== resourcesStatement || !resourcesStatement || resourcesStatement.modifiers?.length !== 1 || resourcesStatement.modifiers[0]?.kind !== ts.SyntaxKind.ExportKeyword || (resourcesStatement.declarationList.flags & ts.NodeFlags.Const) === 0 || resourcesStatement.declarationList.declarations.length !== 1 || !initializer || !ts.isCallExpression(initializer) || initializer.arguments.length !== 4 || factory === void 0 || !ts.isArrowFunction(factory) && !ts.isFunctionExpression(factory) || !isPinnedResourcesFactory(factory) || !identifierIs(initializer.arguments[0], reactBinding) || !depsArgument || !isPinnedDependencies(depsArgument) || !identifierIs(initializer.arguments[2], cleanupBinding) || !(stringIs(initializer.arguments[3], "vite-rsc/importer-resources") || identifierIs(initializer.arguments[3], "undefined"))) throw new Error(`[isr-engine] Unsupported @vitejs/plugin-rsc server stylesheet resource shape in ${id}. Expected the pinned 0.5.34 Resources factory.`);
2003
+ if (source.statements.length !== 3 || reactBinding === void 0 || cleanupBinding === void 0 || source.statements[2] !== resourcesStatement || !resourcesStatement || resourcesStatement.modifiers?.length !== 1 || resourcesStatement.modifiers[0]?.kind !== ts.SyntaxKind.ExportKeyword || (resourcesStatement.declarationList.flags & ts.NodeFlags.Const) === 0 || resourcesStatement.declarationList.declarations.length !== 1 || !initializer || !ts.isCallExpression(initializer) || initializer.arguments.length !== 4 || factory === void 0 || !ts.isArrowFunction(factory) && !ts.isFunctionExpression(factory) || !isPinnedResourcesFactory(factory) || !identifierIs(initializer.arguments[0], reactBinding) || !depsArgument || !isPinnedDependencies(depsArgument) || !identifierIs(initializer.arguments[2], cleanupBinding) || !(stringIs(initializer.arguments[3], "vite-rsc/importer-resources") || identifierIs(initializer.arguments[3], "undefined"))) throw new Error(`[isr-engine] Unsupported @vitejs/plugin-rsc server stylesheet resource shape in ${id}. Expected the pinned 0.5.39 Resources factory.`);
1999
2004
  const reactCode = code.slice(initializer.arguments[0].getStart(source), initializer.arguments[0].getEnd());
2000
2005
  const depsCode = code.slice(initializer.arguments[1].getStart(source), initializer.arguments[1].getEnd());
2001
2006
  const replacement = `
@@ -2625,6 +2630,26 @@ async function resolveClientRuntimeConfigModule(root, inlineConfig) {
2625
2630
  function createAppAliasPlugin(root) {
2626
2631
  const userSrc = path.resolve(root, "src");
2627
2632
  const defaultsDir = resolveEngineDefaultsDir();
2633
+ const requireFromEngine = createRequire(path.resolve(defaultsDir, "../../package.json"));
2634
+ const transportAliases = ["client", "server"].map((entry) => {
2635
+ const find = `rsc-html-stream/${entry}`;
2636
+ return {
2637
+ find,
2638
+ replacement: requireFromEngine.resolve(find)
2639
+ };
2640
+ });
2641
+ for (const entry of [
2642
+ "client.browser",
2643
+ "client.edge",
2644
+ "server.edge",
2645
+ "static.edge"
2646
+ ]) {
2647
+ const find = `@vitejs/plugin-rsc/vendor/react-server-dom/${entry}`;
2648
+ transportAliases.push({
2649
+ find,
2650
+ replacement: requireFromEngine.resolve(find)
2651
+ });
2652
+ }
2628
2653
  const emptyConfig = path.resolve(defaultsDir, "runtime/empty-config.ts");
2629
2654
  const emptyRoutes = path.resolve(defaultsDir, "runtime/empty-routes.ts");
2630
2655
  const appEntry = path.resolve(userSrc, "app.tsx");
@@ -2640,7 +2665,7 @@ function createAppAliasPlugin(root) {
2640
2665
  const clientReferenceDeps = detectClientReferenceDependencies(root);
2641
2666
  return {
2642
2667
  resolve: {
2643
- alias: [
2668
+ alias: [...[
2644
2669
  {
2645
2670
  find: "@app/_entry",
2646
2671
  replacement: appEntry
@@ -2665,13 +2690,8 @@ function createAppAliasPlugin(root) {
2665
2690
  find: /^@app\/(.*)$/,
2666
2691
  replacement: `${userSrc}/$1`
2667
2692
  }
2668
- ],
2669
- dedupe: [
2670
- "react",
2671
- "react-dom",
2672
- "react-server-dom-webpack",
2673
- "rsc-html-stream"
2674
- ]
2693
+ ], ...transportAliases],
2694
+ dedupe: ["react", "react-dom"]
2675
2695
  },
2676
2696
  optimizeDeps: {
2677
2697
  entries: ["src/**/*.{js,jsx,ts,tsx}"],