vite-plugin-react-server 0.3.9 → 0.3.11

package/dist/plugin/transformer/plugin.js

@@ -3,89 +3,69 @@
  * Copyright (c) Nico Brinkkemper
  * MIT License
  */
-import { DEFAULT_CONFIG } from '../config/defaults.js';
+import { resolveOptions } from '../config/resolveOptions.js';
 import { createClientComponentTransformer } from './transformer-client-components.js';
-import { createServerActionTransformer } from './transformer-server-actions.js';
+import 'vite';
+import { createInputNormalizer } from '../helpers/inputNormalizer.js';
+import { resolveUserConfig } from '../config/resolveUserConfig.js';
 
+let userOptions;
+let userConfig;
+let resolvedConfig;
+let resolvedConfigEnv;
 function reactTransformPlugin(options) {
-  if (process.env["NODE_OPTIONS"]?.match(/--conditions[= ]react-server/)) {
-    console.log("react-server");
-  } else {
-    console.log(process.env["NODE_OPTIONS"]);
-    throw new Error(
-      'react-server condition not found, set NODE_OPTIONS="--conditions react-server"'
-    );
+  const resolvedUserOptions = resolveOptions(options);
+  if (resolvedUserOptions.type === "error") {
+    throw resolvedUserOptions.error;
   }
-  const projectRoot = options?.projectRoot || process.cwd();
-  let transformClientComponent;
-  let transformServerAction;
-  const clientComponents = /* @__PURE__ */ new Set();
+  userOptions = resolvedUserOptions.userOptions;
+  const pendingEmits = /* @__PURE__ */ new Map();
   return {
-    name: "vite:react-stream-transformer",
+    name: "vite:react-transform",
     enforce: "post",
-    configResolved(config) {
-      transformClientComponent = createClientComponentTransformer({
-        moduleId: options?.moduleId || DEFAULT_CONFIG.MODULE_ID({
-          projectRoot,
-          output: {
-            dir: config.build?.outDir ?? DEFAULT_CONFIG.BUILD.server
-          },
-          isProduction: config.isProduction
-        })
-      }).transform;
-      transformServerAction = createServerActionTransformer({
-        moduleId: options?.moduleId || DEFAULT_CONFIG.MODULE_ID({
-          projectRoot,
-          output: {
-            dir: config.build?.outDir ?? DEFAULT_CONFIG.BUILD.server
-          },
-          isProduction: config.isProduction
-        })
-      }).transform;
-    },
-    config(config) {
-      const existingInput = config.build?.rollupOptions?.input || {};
-      const currentInputs = typeof existingInput === "string" ? { default: existingInput } : existingInput;
-      const entries = Array.from(clientComponents).reduce(
-        (acc, path) => ({
-          ...acc,
-          [path.replace(DEFAULT_CONFIG.FILE_REGEX, "")]: path
-        }),
-        {}
-      );
-      return {
-        build: {
-          rollupOptions: {
-            input: {
-              ...currentInputs,
-              ...entries
-            }
-          }
-        }
-      };
+    config(config, configEnv) {
+      const resolvedUserConfig = resolveUserConfig({
+        isClient: false,
+        config,
+        configEnv,
+        userOptions
+      });
+      if (resolvedUserConfig.type === "error") {
+        throw resolvedUserConfig.error;
+      }
+      userConfig = resolvedUserConfig.userConfig;
+      resolvedConfigEnv = configEnv;
     },
-    buildStart() {
-      clientComponents.clear();
+    configResolved(config) {
+      resolvedConfig = config;
     },
-    async transform(code, id, options2) {
+    transform(code, id, opt = {}) {
       const hasClientDirective = code.match(/^["']use client["'];?/);
-      if (!hasClientDirective) {
-        const hasServerDirective = code.match(/^["']use server["'];?/);
-        if (!hasServerDirective) {
-          return null;
-        }
-        return transformServerAction.bind(this)(code, id, options2);
+      if (!hasClientDirective) return null;
+      const moduleInfo = this.getModuleInfo(id);
+      if (!moduleInfo) return null;
+      if (resolvedConfigEnv.command === "serve") {
+        const transformer2 = createClientComponentTransformer(userOptions, userConfig, resolvedConfigEnv);
+        return transformer2.transform.bind(this)(code, id, opt);
       }
-      clientComponents.add(id);
-      console.log("[TransformerPlugin] Found client component:", id);
-      return transformClientComponent.bind(this)(code, id, options2);
+      const normalizer = createInputNormalizer({
+        root: resolvedConfig.root,
+        preserveModulesRoot: undefined
+      });
+      const [normalizedId, normalizedPath] = normalizer(id);
+      const referenceId = this.emitFile({
+        type: "chunk",
+        id: normalizedPath,
+        name: normalizedId
+      });
+      pendingEmits.set(normalizedId, { referenceId });
+      const transformer = createClientComponentTransformer(userOptions, userConfig, resolvedConfigEnv);
+      return transformer.transform.bind(this)(code, id, opt);
     },
-    // Log final client components list
-    buildEnd() {
-      console.log(
-        "[TransformerPlugin] Final client components:",
-        Array.from(clientComponents)
-      );
+    renderDynamicImport() {
+      for (const [normalizedId, { referenceId }] of pendingEmits) {
+        this.getFileName(referenceId);
+      }
     }
   };
 }

package/dist/plugin/transformer/plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.js","sources":["../../../plugin/transformer/plugin.ts"],"sourcesContent":["import { DEFAULT_CONFIG } from \"../config/defaults.js\";\nimport type { StreamPluginOptions } from \"../types.js\";\nimport { createClientComponentTransformer } from \"./transformer-client-components.js\";\nimport { createServerActionTransformer } from \"./transformer-server-actions.js\";\n\n\n/**\n * Plugin for transforming React Client Components.\n *\n * Core responsibilities:\n * 1. Detects \"use client\" directives\n * 2. Transforms client components for RSC boundaries\n * 3. Adds client reference metadata for RSC\n *\n * When a component is marked with \"use client\", it:\n * - Gets transformed into a client reference\n * - Maintains module ID for RSC boundaries\n * - Preserves class/function behavior\n *\n * @example\n * ```ts\n * export default defineConfig({\n *   plugins: [\n *     viteReactClientTransformPlugin({\n *       projectRoot: process.cwd(),\n *     })\n *   ]\n * });\n * ```\n */\n\nexport function reactTransformPlugin(\n  options?: StreamPluginOptions\n): import(\"vite\").Plugin {\n  if (process.env[\"NODE_OPTIONS\"]?.match(/--conditions[= ]react-server/)) {\n    console.log(\"react-server\");\n  } else {\n    console.log(process.env[\"NODE_OPTIONS\"]);\n    throw new Error(\n      'react-server condition not found, set NODE_OPTIONS=\"--conditions react-server\"'\n    );\n  }\n  const projectRoot = options?.projectRoot || process.cwd();\n  // const includeClient = options?.autoDiscover?.clientComponents || DEFAULT_CONFIG.AUTO_DISCOVER.clientComponents;\n  // const includeServerFunctions = options?.autoDiscover?.serverFunctions || DEFAULT_CONFIG.AUTO_DISCOVER.serverFunctions;\n  let transformClientComponent: any;\n  let transformServerAction: any;\n  // get the file we are imported from (parent)\n\n  // Track client components\n  const clientComponents = new Set<string>();\n\n  return {\n    name: \"vite:react-stream-transformer\",\n    enforce: \"post\",\n\n    configResolved(config) {\n      transformClientComponent = createClientComponentTransformer({\n        moduleId:\n          options?.moduleId ||\n          DEFAULT_CONFIG.MODULE_ID({\n            projectRoot: projectRoot,\n            output: {\n              dir: config.build?.outDir ?? DEFAULT_CONFIG.BUILD.server,\n            },\n            isProduction: config.isProduction,\n          }),\n      }).transform;\n      transformServerAction = createServerActionTransformer({\n        moduleId:\n          options?.moduleId ||\n          DEFAULT_CONFIG.MODULE_ID({\n            projectRoot: projectRoot,\n            output: {\n              dir: config.build?.outDir ?? DEFAULT_CONFIG.BUILD.server,\n            },\n            isProduction: config.isProduction,\n          }),\n      }).transform;\n    },\n\n    config(config) {\n      // Get existing inputs\n      const existingInput = config.build?.rollupOptions?.input || {};\n      const currentInputs =\n        typeof existingInput === \"string\"\n          ? { default: existingInput }\n          : existingInput;\n\n      // Add client components\n      const entries = Array.from(clientComponents).reduce(\n        (acc, path) => ({\n          ...acc,\n          [path.replace(DEFAULT_CONFIG.FILE_REGEX, \"\")]: path,\n        }),\n        {}\n      );\n\n      return {\n        build: {\n          rollupOptions: {\n            input: {\n              ...currentInputs,\n              ...entries,\n            },\n          },\n        },\n      };\n    },\n\n    buildStart() {\n      // Reset client components at start of each build\n      clientComponents.clear();\n    },\n\n    async transform(code: string, id: string, options?: { ssr?: boolean }) {\n      // Check for directives\n      const hasClientDirective = code.match(/^[\"']use client[\"'];?/);\n      if (!hasClientDirective) {\n        const hasServerDirective = code.match(/^[\"']use server[\"'];?/);\n        if (!hasServerDirective) {\n          return null;\n        }\n        return transformServerAction.bind(this)(code, id, options);\n      }\n\n      // Track client component and transform\n      clientComponents.add(id);\n      console.log(\"[TransformerPlugin] Found client component:\", id);\n      return transformClientComponent.bind(this)(code, id, options);\n    },\n\n    // Log final client components list\n    buildEnd() {\n      console.log(\n        \"[TransformerPlugin] Final client components:\",\n        Array.from(clientComponents)\n      );\n    },\n  };\n}\n"],"names":["options"],"mappings":"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"}
+{"version":3,"file":"plugin.js","sources":["../../../plugin/transformer/plugin.ts"],"sourcesContent":["import { resolveOptions } from \"../config/resolveOptions.js\";\nimport type {\n  ResolvedUserConfig,\n  ResolvedUserOptions,\n  StreamPluginOptions,\n} from \"../types.js\";\nimport { createClientComponentTransformer } from \"./transformer-client-components.js\";\nimport { createModuleIdGenerator } from \"../config/createModuleIdGenerator.js\";\nimport { type ConfigEnv, type Plugin, type ResolvedConfig } from \"vite\";\nimport { createInputNormalizer } from \"../helpers/inputNormalizer.js\";\nimport { resolveUserConfig } from \"../config/resolveUserConfig.js\";\n\nlet userOptions: ResolvedUserOptions;\nlet userConfig: ResolvedUserConfig;\nlet resolvedConfig: ResolvedConfig;\nlet resolvedConfigEnv: ConfigEnv;\n\n/**\n * Plugin for transforming React Client Components.\n *\n * Core responsibilities:\n * 1. Detects \"use client\" directives\n * 2. Transforms client components for RSC boundaries\n * 3. Adds client reference metadata for RSC\n *\n * When a component is marked with \"use client\", it:\n * - Gets transformed into a client reference\n * - Maintains module ID for RSC boundaries\n * - Preserves class/function behavior\n *\n * @example\n * ```ts\n * export default defineConfig({\n *   plugins: [\n *     viteReactClientTransformPlugin({\n *       projectRoot: process.cwd(),\n *     })\n *   ]\n * });\n * ```\n */\n\nexport function reactTransformPlugin(options: StreamPluginOptions): Plugin {\n  const resolvedUserOptions = resolveOptions(options);\n  if (resolvedUserOptions.type === \"error\") {\n    throw resolvedUserOptions.error;\n  }\n  userOptions = resolvedUserOptions.userOptions;\n\n  let manifest: Record<string, { file: string }> = {};\n  const pendingEmits = new Map<string, { referenceId: string }>();\n\n  return {\n    name: \"vite:react-transform\",\n    enforce: \"post\",\n\n    config(config, configEnv) {\n      const resolvedUserConfig = resolveUserConfig({\n        isClient: false,\n        config,\n        configEnv,\n        userOptions,\n      });\n      if (resolvedUserConfig.type === \"error\") {\n        throw resolvedUserConfig.error;\n      }\n      userConfig = resolvedUserConfig.userConfig;\n      resolvedConfigEnv = configEnv;\n    },\n    configResolved(config) {\n      resolvedConfig = config;\n    },\n\n    transform(code: string, id: string, opt: { ssr?: boolean } = {}) {\n      const hasClientDirective = code.match(/^[\"']use client[\"'];?/);\n      if (!hasClientDirective) return null;\n\n      const moduleInfo = this.getModuleInfo(id);\n      if (!moduleInfo) return null;\n\n      // In dev mode, just transform the code without emitting\n      if (resolvedConfigEnv.command === 'serve') {\n        const transformer = createClientComponentTransformer(userOptions, userConfig, resolvedConfigEnv);\n        return transformer.transform!.bind(this)(code, id, opt);\n      }\n\n      // Production build logic...\n      const normalizer = createInputNormalizer({\n        root: resolvedConfig.root,\n        preserveModulesRoot: undefined,\n      });\n      const [normalizedId, normalizedPath] = normalizer(id);\n\n      // Add to manifest immediately with a temporary path\n      manifest[normalizedId] = { file: normalizedPath };\n      \n      const referenceId = this.emitFile({\n        type: \"chunk\",\n        id: normalizedPath,\n        name: normalizedId,\n      });\n      pendingEmits.set(normalizedId, { referenceId });\n\n      const transformer = createClientComponentTransformer(userOptions, userConfig, resolvedConfigEnv);\n      return transformer.transform!.bind(this)(code, id, opt);\n    },\n\n    renderDynamicImport() {\n      // Update manifest with real file names\n      for (const [normalizedId, { referenceId }] of pendingEmits) {\n        const fileName = this.getFileName(referenceId);\n        manifest[normalizedId] = { file: fileName };\n      }\n    },\n  };\n}\n"],"names":["transformer"],"mappings":";;;;;;;;;;;AAYA,IAAI,WAAA;AACJ,IAAI,UAAA;AACJ,IAAI,cAAA;AACJ,IAAI,iBAAA;AA2BG,SAAS,qBAAqB,OAAsC,EAAA;AACzE,EAAM,MAAA,mBAAA,GAAsB,eAAe,OAAO,CAAA;AAClD,EAAI,IAAA,mBAAA,CAAoB,SAAS,OAAS,EAAA;AACxC,IAAA,MAAM,mBAAoB,CAAA,KAAA;AAAA;AAE5B,EAAA,WAAA,GAAc,mBAAoB,CAAA,WAAA;AAGlC,EAAM,MAAA,YAAA,uBAAmB,GAAqC,EAAA;AAE9D,EAAO,OAAA;AAAA,IACL,IAAM,EAAA,sBAAA;AAAA,IACN,OAAS,EAAA,MAAA;AAAA,IAET,MAAA,CAAO,QAAQ,SAAW,EAAA;AACxB,MAAA,MAAM,qBAAqB,iBAAkB,CAAA;AAAA,QAC3C,QAAU,EAAA,KAAA;AAAA,QACV,MAAA;AAAA,QACA,SAAA;AAAA,QACA;AAAA,OACD,CAAA;AACD,MAAI,IAAA,kBAAA,CAAmB,SAAS,OAAS,EAAA;AACvC,QAAA,MAAM,kBAAmB,CAAA,KAAA;AAAA;AAE3B,MAAA,UAAA,GAAa,kBAAmB,CAAA,UAAA;AAChC,MAAoB,iBAAA,GAAA,SAAA;AAAA,KACtB;AAAA,IACA,eAAe,MAAQ,EAAA;AACrB,MAAiB,cAAA,GAAA,MAAA;AAAA,KACnB;AAAA,IAEA,SAAU,CAAA,IAAA,EAAc,EAAY,EAAA,GAAA,GAAyB,EAAI,EAAA;AAC/D,MAAM,MAAA,kBAAA,GAAqB,IAAK,CAAA,KAAA,CAAM,uBAAuB,CAAA;AAC7D,MAAI,IAAA,CAAC,oBAA2B,OAAA,IAAA;AAEhC,MAAM,MAAA,UAAA,GAAa,IAAK,CAAA,aAAA,CAAc,EAAE,CAAA;AACxC,MAAI,IAAA,CAAC,YAAmB,OAAA,IAAA;AAGxB,MAAI,IAAA,iBAAA,CAAkB,YAAY,OAAS,EAAA;AACzC,QAAA,MAAMA,YAAc,GAAA,gCAAA,CAAiC,WAAa,EAAA,UAAA,EAAY,iBAAiB,CAAA;AAC/F,QAAA,OAAOA,aAAY,SAAW,CAAA,IAAA,CAAK,IAAI,CAAE,CAAA,IAAA,EAAM,IAAI,GAAG,CAAA;AAAA;AAIxD,MAAA,MAAM,aAAa,qBAAsB,CAAA;AAAA,QACvC,MAAM,cAAe,CAAA,IAAA;AAAA,QACrB,mBAAqB,EAAA;AAAA,OACtB,CAAA;AACD,MAAA,MAAM,CAAC,YAAA,EAAc,cAAc,CAAA,GAAI,WAAW,EAAE,CAAA;AAKpD,MAAM,MAAA,WAAA,GAAc,KAAK,QAAS,CAAA;AAAA,QAChC,IAAM,EAAA,OAAA;AAAA,QACN,EAAI,EAAA,cAAA;AAAA,QACJ,IAAM,EAAA;AAAA,OACP,CAAA;AACD,MAAA,YAAA,CAAa,GAAI,CAAA,YAAA,EAAc,EAAE,WAAA,EAAa,CAAA;AAE9C,MAAA,MAAM,WAAc,GAAA,gCAAA,CAAiC,WAAa,EAAA,UAAA,EAAY,iBAAiB,CAAA;AAC/F,MAAA,OAAO,YAAY,SAAW,CAAA,IAAA,CAAK,IAAI,CAAE,CAAA,IAAA,EAAM,IAAI,GAAG,CAAA;AAAA,KACxD;AAAA,IAEA,mBAAsB,GAAA;AAEpB,MAAA,KAAA,MAAW,CAAC,YAAc,EAAA,EAAE,WAAY,EAAC,KAAK,YAAc,EAAA;AAC1D,QAAiB,IAAK,CAAA,WAAA,CAAY,WAAW;AACH;AAC5C;AACF,GACF;AACF;;;;"}

package/dist/plugin/transformer/transformer-client-components.d.ts

@@ -1,6 +1,15 @@
-import type { Plugin as RollupPlugin } from "rollup";
-import type { TransformerOptions } from "./types.js";
-export declare function createClientComponentTransformer({ moduleId: userModuleId, }: TransformerOptions): RollupPlugin;
+import type { PluginContext } from "rollup";
+import type { ResolvedUserConfig, ResolvedUserOptions } from "../types.js";
+import type { ConfigEnv } from "vite";
+export declare function createClientComponentTransformer({ moduleBase, projectRoot, moduleId, build, }: ResolvedUserOptions, config: ResolvedUserConfig, configEnv: ConfigEnv): {
+    readonly name: "vite-plugin-react-server:client-components-transformer";
+    readonly transform: (this: PluginContext, code: string, id: string, options?: {
+        ssr?: boolean;
+    }) => Promise<{
+        code: string;
+        map: null;
+    } | null>;
+};
 /**
  * transformedCode += `
 const ${exportName}Ref = Object.defineProperties(

package/dist/plugin/transformer/transformer-client-components.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transformer-client-components.d.ts","sourceRoot":"","sources":["../../../plugin/transformer/transformer-client-components.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,YAAY,EAAE,MAAM,QAAQ,CAAC;AACrD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAErD,wBAAgB,gCAAgC,CAAC,EAC/C,QAAQ,EAAE,YAAY,GACvB,EAAE,kBAAkB,GAAG,YAAY,CAsEnC;AAED;;;;;;;;;;;;;;;;GAgBG"}
+{"version":3,"file":"transformer-client-components.d.ts","sourceRoot":"","sources":["../../../plugin/transformer/transformer-client-components.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAI5C,OAAO,KAAK,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAC3E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AAItC,wBAAgB,gCAAgC,CAC9C,EACE,UAAuC,EACvC,WAAW,EACX,QAAQ,EACR,KAAK,GACN,EAAE,mBAAmB,EACtB,MAAM,EAAE,kBAAkB,EAC1B,SAAS,EAAE,SAAS;;+BAsBV,aAAa,QACb,MAAM,MACR,MAAM,YACA;QAAE,GAAG,CAAC,EAAE,OAAO,CAAA;KAAE;;;;EA2GhC;AAED;;;;;;;;;;;;;;;;GAgBG"}

package/dist/plugin/transformer/transformer-client-components.js

@@ -3,10 +3,30 @@
  * Copyright (c) Nico Brinkkemper
  * MIT License
  */
+import { DEFAULT_CONFIG } from '../config/defaults.js';
+import { createInputNormalizer } from '../helpers/inputNormalizer.js';
+import { join } from 'path';
+import { tryManifest } from '../helpers/tryManifest.js';
+
 function createClientComponentTransformer({
-  moduleId: userModuleId
-}) {
-  let moduleIdFn = userModuleId;
+  moduleBase = DEFAULT_CONFIG.MODULE_BASE,
+  projectRoot,
+  moduleId,
+  build
+}, config, configEnv) {
+  let moduleIdFn = moduleId;
+  const normalizer = createInputNormalizer({
+    root: projectRoot,
+    preserveModulesRoot: moduleBase,
+    removeExtension: true
+  });
+  config.build.outDir?.endsWith(build.client);
+  const isServer = config.build.outDir?.endsWith(build.server);
+  isServer ? tryManifest({
+    root: projectRoot,
+    outDir: join(build.outDir, build.client),
+    ssrManifest: false
+  }).manifest : null;
   return {
     name: "vite-plugin-react-server:client-components-transformer",
     async transform(code, id, options) {
@@ -14,6 +34,28 @@ function createClientComponentTransformer({
         if (id.includes("node_modules") || id.includes("vite/dist")) {
           return null;
         }
+        let rest = id.split("/");
+        let fileName = rest.pop();
+        let dir = rest.join("/");
+        if (dir.startsWith(projectRoot)) {
+          dir = dir.replace(projectRoot, "");
+        }
+        const index = dir.indexOf(moduleBase);
+        if (index !== -1) {
+          if (configEnv.command === "build") {
+            if (isServer) {
+              dir = join(build.assetsDir, dir.slice(index + moduleBase.length));
+            } else {
+              dir = new URL(
+                dir,
+                `file://${config?.server?.host ?? "localhost"}:${config?.server?.port ?? configEnv.isPreview ? 4173 : 5173}`
+              ).pathname;
+            }
+          } else if (configEnv.command === "serve") {
+            dir = "";
+          }
+        }
+        if (!fileName) fileName = id;
         const info = this?.getModuleInfo(id);
         const hasDirective = code.match(/^["']use client["'];?/);
         const isClientComponent = hasDirective || info?.meta?.["directives"]?.includes("use client");
@@ -21,7 +63,8 @@ function createClientComponentTransformer({
           return null;
         }
         let transformedCode = code;
-        const moduleId = moduleIdFn(id, options?.ssr ?? false);
+        const moduleId2 = moduleIdFn(id, configEnv.isSsrBuild ?? false);
+        const [key, value] = normalizer([moduleId2, id]);
         const exportMatches = Array.from(
           code.matchAll(/export\s+(?:const|let|var|function|class)\s+(\w+)/g)
         );
@@ -30,27 +73,45 @@ function createClientComponentTransformer({
         }
         for (const [fullMatch, exportName] of exportMatches) {
           if (!exportName) continue;
+          console.log("exportName", dir, fileName, exportName);
           const isClass = fullMatch.includes("class");
           transformedCode = transformedCode.replace(
             fullMatch,
             fullMatch.replace("export ", "")
           );
-          transformedCode += `
-const ${exportName}Ref = Object.defineProperties(
-  ${isClass ? `class extends ${exportName} {
+          let path = `import.meta.url`;
+          const { manifest, error } = tryManifest({
+            root: projectRoot,
+            outDir: join(build.outDir, build.client),
+            ssrManifest: false
+          });
+          if (error) {
+            console.error(`[RSC] Error getting manifest: ${error}`);
+            continue;
+          }
+          const fileFromManifest = manifest[join(moduleBase, value)]?.file;
+          if (fileFromManifest) {
+            path = JSON.stringify(fileFromManifest);
+          } else {
+            console.error(`[RSC] File not found in manifest: ${value}`);
+            continue;
+          }
+          transformedCode += `const ${exportName}Ref = Object.defineProperties(${isClass ? `class extends ${exportName} {
         constructor(...args) { super(...args); }
       }` : `function(...args) { return ${exportName}.apply(null, args); }`},
   {
     $$typeof: { value: Symbol.for("react.client.reference") },
-    $$id: { value: ${JSON.stringify(moduleId + "#" + exportName)} },
-    $$filepath: { value: ${JSON.stringify(id)} }
+    $$id: { value: \`\${${path}}${"#" + exportName}\` }
   }
 );
 export { ${exportName}Ref as ${exportName} };`;
         }
         return { code: transformedCode, map: null };
       } catch (error) {
-        console.error(`[RSC] Error transforming client component: ${id}`, error);
+        console.error(
+          `[RSC] Error transforming client component: ${id}`,
+          error
+        );
         throw error;
       }
     }

package/dist/plugin/transformer/transformer-client-components.js.map

@@ -1 +1 @@
-{"version":3,"file":"transformer-client-components.js","sources":["../../../plugin/transformer/transformer-client-components.ts"],"sourcesContent":["import type { Plugin as RollupPlugin } from \"rollup\";\nimport type { TransformerOptions } from \"./types.js\";\n\nexport function createClientComponentTransformer({\n  moduleId: userModuleId,\n}: TransformerOptions): RollupPlugin {\n  let moduleIdFn = userModuleId;\n\n  return {\n    name: \"vite-plugin-react-server:client-components-transformer\",\n\n    async transform(code: string, id: string, options?: { ssr?: boolean }) {\n      try {\n        // Skip node_modules and vite internal files\n        if (id.includes('node_modules') || id.includes('vite/dist')) {\n          return null;\n        }\n\n        // Check if this is a client component from metadata or directive\n        const info = this?.getModuleInfo(id);\n        const hasDirective = code.match(/^[\"']use client[\"'];?/);\n        const isClientComponent = hasDirective || info?.meta?.['directives']?.includes('use client');\n\n        if (!isClientComponent) {\n          return null;  // Not a client component, skip\n        }\n\n        let transformedCode = code;\n        const moduleId = moduleIdFn!(id, options?.ssr ?? false);\n\n        // Find all named exports\n        const exportMatches = Array.from(\n          code.matchAll(/export\\s+(?:const|let|var|function|class)\\s+(\\w+)/g)\n        );\n\n        if (!exportMatches.length) {\n          return null;\n        }\n\n        // Transform each export\n        for (const [fullMatch, exportName] of exportMatches) {\n          if (!exportName) continue;\n\n          const isClass = fullMatch.includes(\"class\");\n\n          // Remove export keyword\n          transformedCode = transformedCode.replace(\n            fullMatch,\n            fullMatch.replace(\"export \", \"\")\n          );\n\n          transformedCode += `\nconst ${exportName}Ref = Object.defineProperties(\n  ${isClass \n    ? `class extends ${exportName} {\n        constructor(...args) { super(...args); }\n      }`\n    : `function(...args) { return ${exportName}.apply(null, args); }`\n  },\n  {\n    $$typeof: { value: Symbol.for(\"react.client.reference\") },\n    $$id: { value: ${JSON.stringify(moduleId + \"#\" + exportName)} },\n    $$filepath: { value: ${JSON.stringify(id)} }\n  }\n);\nexport { ${exportName}Ref as ${exportName} };`;\n        }\n\n        return { code: transformedCode, map: null };\n      } catch (error) {\n        console.error(`[RSC] Error transforming client component: ${id}`, error);\n        throw error;\n      }\n    },\n  };\n}\n\n/**\n * transformedCode += `\nconst ${exportName}Ref = Object.defineProperties(\n  ${\n    isClass\n      ? `class extends ${exportName} {\n          constructor(...args) { super(...args); }\n        }`\n      : `function(...args) { return ${exportName}.apply(null, args); }`\n  },\n  {\n    $$typeof: { value: Symbol.for(\"react.client.reference\") },\n    $$id: { value: ${JSON.stringify(moduleId + \"#\" + exportName)} }\n  }\n);\nexport { ${exportName}Ref as ${exportName} };`;\n */\n"],"names":[],"mappings":";;;;;AAGO,SAAS,gCAAiC,CAAA;AAAA,EAC/C,QAAU,EAAA;AACZ,CAAqC,EAAA;AACnC,EAAA,IAAI,UAAa,GAAA,YAAA;AAEjB,EAAO,OAAA;AAAA,IACL,IAAM,EAAA,wDAAA;AAAA,IAEN,MAAM,SAAA,CAAU,IAAc,EAAA,EAAA,EAAY,OAA6B,EAAA;AACrE,MAAI,IAAA;AAEF,QAAA,IAAI,GAAG,QAAS,CAAA,cAAc,KAAK,EAAG,CAAA,QAAA,CAAS,WAAW,CAAG,EAAA;AAC3D,UAAO,OAAA,IAAA;AAAA;AAIT,QAAM,MAAA,IAAA,GAAO,IAAM,EAAA,aAAA,CAAc,EAAE,CAAA;AACnC,QAAM,MAAA,YAAA,GAAe,IAAK,CAAA,KAAA,CAAM,uBAAuB,CAAA;AACvD,QAAA,MAAM,oBAAoB,YAAgB,IAAA,IAAA,EAAM,OAAO,YAAY,CAAA,EAAG,SAAS,YAAY,CAAA;AAE3F,QAAA,IAAI,CAAC,iBAAmB,EAAA;AACtB,UAAO,OAAA,IAAA;AAAA;AAGT,QAAA,IAAI,eAAkB,GAAA,IAAA;AACtB,QAAA,MAAM,QAAW,GAAA,UAAA,CAAY,EAAI,EAAA,OAAA,EAAS,OAAO,KAAK,CAAA;AAGtD,QAAA,MAAM,gBAAgB,KAAM,CAAA,IAAA;AAAA,UAC1B,IAAA,CAAK,SAAS,oDAAoD;AAAA,SACpE;AAEA,QAAI,IAAA,CAAC,cAAc,MAAQ,EAAA;AACzB,UAAO,OAAA,IAAA;AAAA;AAIT,QAAA,KAAA,MAAW,CAAC,SAAA,EAAW,UAAU,CAAA,IAAK,aAAe,EAAA;AACnD,UAAA,IAAI,CAAC,UAAY,EAAA;AAEjB,UAAM,MAAA,OAAA,GAAU,SAAU,CAAA,QAAA,CAAS,OAAO,CAAA;AAG1C,UAAA,eAAA,GAAkB,eAAgB,CAAA,OAAA;AAAA,YAChC,SAAA;AAAA,YACA,SAAA,CAAU,OAAQ,CAAA,SAAA,EAAW,EAAE;AAAA,WACjC;AAEA,UAAmB,eAAA,IAAA;AAAA,MAAA,EACrB,UAAU,CAAA;AAAA,EACd,EAAA,OAAA,GACE,iBAAiB,UAAU,CAAA;AAAA;AAAA,OAG3B,CAAA,GAAA,CAAA,2BAAA,EAA8B,UAAU,CAC5C,qBAAA,CAAA,CAAA;AAAA;AAAA;AAAA,mBAAA,EAGmB,IAAK,CAAA,SAAA,CAAU,QAAW,GAAA,GAAA,GAAM,UAAU,CAAC,CAAA;AAAA,yBACrC,EAAA,IAAA,CAAK,SAAU,CAAA,EAAE,CAAC,CAAA;AAAA;AAAA;AAAA,SAGlC,EAAA,UAAU,UAAU,UAAU,CAAA,GAAA,CAAA;AAAA;AAGjC,QAAA,OAAO,EAAE,IAAA,EAAM,eAAiB,EAAA,GAAA,EAAK,IAAK,EAAA;AAAA,eACnC,KAAO,EAAA;AACd,QAAA,OAAA,CAAQ,KAAM,CAAA,CAAA,2CAAA,EAA8C,EAAE,CAAA,CAAA,EAAI,KAAK,CAAA;AACvE,QAAM,MAAA,KAAA;AAAA;AACR;AACF,GACF;AACF;;;;"}
+{"version":3,"file":"transformer-client-components.js","sources":["../../../plugin/transformer/transformer-client-components.ts"],"sourcesContent":["import type { PluginContext } from \"rollup\";\nimport type { TransformerOptions } from \"./types.js\";\nimport { DEFAULT_CONFIG } from \"../config/defaults.js\";\nimport { createInputNormalizer } from \"../helpers/inputNormalizer.js\";\nimport type { ResolvedUserConfig, ResolvedUserOptions } from \"../types.js\";\nimport type { ConfigEnv } from \"vite\";\nimport { join } from \"path\";\nimport { tryManifest } from \"../helpers/tryManifest.js\";\n\nexport function createClientComponentTransformer(\n  {\n    moduleBase = DEFAULT_CONFIG.MODULE_BASE,\n    projectRoot,\n    moduleId,\n    build,\n  }: ResolvedUserOptions,\n  config: ResolvedUserConfig,\n  configEnv: ConfigEnv\n) {\n  let moduleIdFn = moduleId;\n  const normalizer = createInputNormalizer({\n    root: projectRoot,\n    preserveModulesRoot: moduleBase,\n    removeExtension: true,\n  });\n  const isClient = config.build.outDir?.endsWith(build.client);\n  const isServer = config.build.outDir?.endsWith(build.server);\n  const references = isServer\n    ? tryManifest({\n        root: projectRoot,\n        outDir: join(build.outDir, build.client),\n        ssrManifest: false,\n      }).manifest\n    : null;\n\n  return {\n    name: \"vite-plugin-react-server:client-components-transformer\",\n\n    async transform(\n      this: PluginContext,\n      code: string,\n      id: string,\n      options?: { ssr?: boolean }\n    ) {\n      try {\n        // Skip node_modules and vite internal files\n        if (id.includes(\"node_modules\") || id.includes(\"vite/dist\")) {\n          return null;\n        }\n\n        // Check if this is a client component from metadata or directive\n        let rest = id.split(\"/\");\n        let fileName = rest.pop() as string;\n        let dir = rest.join(\"/\");\n        if (dir.startsWith(projectRoot)) {\n          dir = dir.replace(projectRoot, \"\");\n        }\n        const index = dir.indexOf(moduleBase);\n        if (index !== -1) {\n          if (configEnv.command === \"build\") {\n            if (isServer) {\n              dir = join(build.assetsDir, dir.slice(index + moduleBase.length));\n            } else {\n              dir = new URL(\n                dir,\n                `file://${config?.server?.host ?? \"localhost\"}:${\n                  config?.server?.port ?? configEnv.isPreview ? 4173 : 5173\n                }`\n              ).pathname;\n            }\n          } else if (configEnv.command === \"serve\") {\n            dir = \"\";\n          }\n        }\n        if (!fileName) fileName = id;\n        const info = this?.getModuleInfo(id);\n        const hasDirective = code.match(/^[\"']use client[\"'];?/);\n        const isClientComponent =\n          hasDirective || info?.meta?.[\"directives\"]?.includes(\"use client\");\n\n        if (!isClientComponent) {\n          return null; // Not a client component, skip\n        }\n\n        let transformedCode = code;\n        const moduleId = moduleIdFn!(id, configEnv.isSsrBuild ?? false);\n        const [key, value] = normalizer([moduleId, id]);\n        // Find all named exports\n        const exportMatches = Array.from(\n          code.matchAll(/export\\s+(?:const|let|var|function|class)\\s+(\\w+)/g)\n        );\n\n        if (!exportMatches.length) {\n          return null;\n        }\n\n        // Transform each export\n        for (const [fullMatch, exportName] of exportMatches) {\n          if (!exportName) continue;\n          console.log(\"exportName\", dir, fileName, exportName);\n          const isClass = fullMatch.includes(\"class\");\n          // Remove export keyword\n          transformedCode = transformedCode.replace(\n            fullMatch,\n            fullMatch.replace(\"export \", \"\")\n          );\n          let path = `import.meta.url`;\n          // path from moduleBase to value\n          const { manifest, error } = tryManifest({\n            root: projectRoot,\n            outDir: join(build.outDir, build.client),\n            ssrManifest: false,\n          });\n          if (error) {\n            console.error(`[RSC] Error getting manifest: ${error}`);\n            continue;\n          }\n          const fileFromManifest = manifest[join(moduleBase, value)]?.file;\n          if (fileFromManifest) {\n            path = JSON.stringify(fileFromManifest);\n          } else {\n            console.error(`[RSC] File not found in manifest: ${value}`);\n            continue;\n          }\n\n          transformedCode += `const ${exportName}Ref = Object.defineProperties(${\n            isClass\n              ? `class extends ${exportName} {\n        constructor(...args) { super(...args); }\n      }`\n              : `function(...args) { return ${exportName}.apply(null, args); }`\n          },\n  {\n    $$typeof: { value: Symbol.for(\"react.client.reference\") },\n    $$id: { value: \\`\\${${path}}${\"#\" + exportName}\\` }\n  }\n);\nexport { ${exportName}Ref as ${exportName} };`;\n        }\n        return { code: transformedCode, map: null };\n      } catch (error) {\n        console.error(\n          `[RSC] Error transforming client component: ${id}`,\n          error\n        );\n        throw error;\n      }\n    },\n  } as const;\n}\n\n/**\n * transformedCode += `\nconst ${exportName}Ref = Object.defineProperties(\n  ${\n    isClass\n      ? `class extends ${exportName} {\n          constructor(...args) { super(...args); }\n        }`\n      : `function(...args) { return ${exportName}.apply(null, args); }`\n  },\n  {\n    $$typeof: { value: Symbol.for(\"react.client.reference\") },\n    $$id: { value: ${JSON.stringify(moduleId + \"#\" + exportName)} }\n  }\n);\nexport { ${exportName}Ref as ${exportName} };`;\n */\n"],"names":["moduleId"],"mappings":"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"}

package/dist/plugin/transformer/transformer-server-actions.d.ts

@@ -1,7 +1,7 @@
-import type { TransformerOptions } from "./types.js";
-export declare function createServerActionTransformer(options: TransformerOptions): {
+import type { ResolvedUserOptions, ResolvedUserConfig } from "../types.js";
+import type { ConfigEnv } from "vite";
+export declare function createServerActionTransformer({ moduleBase, projectRoot, moduleId, }: ResolvedUserOptions, config: ResolvedUserConfig, configEnv: ConfigEnv): {
     name: string;
-    enforce: "post";
     transform(code: string, path: string, { ssr }?: {
         ssr: boolean;
     }): Promise<{

package/dist/plugin/transformer/transformer-server-actions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transformer-server-actions.d.ts","sourceRoot":"","sources":["../../../plugin/transformer/transformer-server-actions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAErD,wBAAgB,6BAA6B,CAAC,OAAO,EAAE,kBAAkB;;;oBAM7D,MAAM,QACN,MAAM,YACH;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE;;;;EAgF9B;AAED;;;;;;;;;;;;;;;;GAgBG"}
+{"version":3,"file":"transformer-server-actions.d.ts","sourceRoot":"","sources":["../../../plugin/transformer/transformer-server-actions.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAC3E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AAGtC,wBAAgB,6BAA6B,CAAC,EAC5C,UAAuC,EACvC,WAAW,EACX,QAAQ,GACT,EAAE,mBAAmB,EAAE,MAAM,EAAE,kBAAkB,EAAE,SAAS,EAAE,SAAS;;oBAW5D,MAAM,QACN,MAAM,YACD;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE;;;;EAkFhC;AAED;;;;;;;;;;;;;;;;GAgBG"}

package/dist/plugin/transformer/transformer-server-actions.js

@@ -1,76 +1,90 @@
-/**
- * vite-plugin-react-server
- * Copyright (c) Nico Brinkkemper
- * MIT License
- */
-import { SourceMapGenerator } from 'source-map';
-
-function createServerActionTransformer(options) {
-  return {
-    name: "vite-plugin-react-server:server-actions-transformer",
-    enforce: "post",
-    async transform(code, path, { ssr } = { ssr: false }) {
-      try {
-        let transformedCode = code;
-        const directiveMatch = code.match(/^["']use server["'];?/);
-        const moduleId = options.moduleId(path, ssr);
-        console.log("[RSC Transform] Module path transformation:", {
-          original: path,
-          transformed: moduleId
-        });
-        const exportMatches = Array.from(
-          code.matchAll(/export\s+(?:const|let|var|function|class)\s+(\w+)/g)
-        );
-        if (!exportMatches.length) {
-          console.warn(
-            `[RSC] No exports found in server action module: ${path}`
-          );
-          return null;
-        }
-        for (const [fullMatch, exportName] of exportMatches) {
-          if (!exportName) {
-            console.warn(
-              `[RSC] Invalid export in server action module: ${path}`
-            );
-            continue;
-          }
-          const isClass = fullMatch.includes("class");
-          transformedCode = transformedCode.replace(
-            fullMatch,
-            fullMatch.replace("export ", "")
-          );
-          if (!directiveMatch || directiveMatch.index !== 0) {
-          } else {
-            transformedCode += `
+import { SourceMapGenerator } from "source-map";
+import { DEFAULT_CONFIG } from "../config/defaults.js";
+import { createInputNormalizer } from "../helpers/inputNormalizer.js";
+export function createServerActionTransformer({ moduleBase = DEFAULT_CONFIG.MODULE_BASE, projectRoot, moduleId, }, config, configEnv) {
+    let moduleIdFn = moduleId;
+    const normalizer = createInputNormalizer({
+        root: projectRoot,
+        preserveModulesRoot: moduleBase,
+        removeExtension: DEFAULT_CONFIG.FILE_REGEX,
+    });
+    return {
+        name: "vite-plugin-react-server:server-actions-transformer",
+        async transform(code, path, { ssr } = { ssr: false }) {
+            try {
+                let transformedCode = code;
+                const directiveMatch = code.match(/^["']use server["'];?/);
+                const moduleId = moduleIdFn(path, ssr);
+                const [key, value] = normalizer(moduleId);
+                // Log the path transformation
+                console.log("[RSC Transform] Module path transformation:", {
+                    original: path,
+                    transformed: moduleId,
+                });
+                // Find all named exports
+                const exportMatches = Array.from(code.matchAll(/export\s+(?:const|let|var|function|class)\s+(\w+)/g));
+                if (!exportMatches.length) {
+                    console.warn(`[RSC] No exports found in server action module: ${path}`);
+                    return null;
+                }
+                // Transform each export
+                for (const [fullMatch, exportName] of exportMatches) {
+                    if (!exportName) {
+                        console.warn(`[RSC] Invalid export in server action module: ${path}`);
+                        continue;
+                    }
+                    const isClass = fullMatch.includes("class");
+                    // Remove export keyword
+                    transformedCode = transformedCode.replace(fullMatch, fullMatch.replace("export ", ""));
+                    if (!directiveMatch || directiveMatch.index !== 0) {
+                        // Server action
+                    }
+                    else {
+                        // Client component
+                        transformedCode += `
 const ${exportName}Ref = Object.defineProperties(
-  ${isClass ? `class extends ${exportName} {
+  ${isClass
+                            ? `class extends ${exportName} {
           constructor(...args) { super(...args); }
-        }` : `function(...args) { return ${exportName}.apply(null, args); }`},
+        }`
+                            : `function(...args) { return ${exportName}.apply(null, args); }`},
   {
     $$typeof: { value: Symbol.for("react.server.reference") },
-    $$id: { value: ${JSON.stringify(moduleId + "#" + exportName)} },
-    $$filepath: { value: ${JSON.stringify(path)} },
+    $$src: { value: ${JSON.stringify(value)} },
+    $$id: { value: import.meta.url.slice(import.meta.url.indexOf("/${key}")}) + ${JSON.stringify("#" + exportName)} },
     $$async: { value: true }
   }
 );
 export { ${exportName}Ref as ${exportName} };
             `;
-          }
-        }
-        return {
-          code: transformedCode,
-          map: new SourceMapGenerator({ file: path }).toString()
-        };
-      } catch (error) {
-        console.error(
-          `[RSC] Error transforming client component: ${path}`,
-          error
-        );
-        throw error;
-      }
-    }
-  };
+                    }
+                }
+                return {
+                    code: transformedCode,
+                    map: new SourceMapGenerator({ file: path }).toString(),
+                };
+            }
+            catch (error) {
+                console.error(`[RSC] Error transforming client component: ${path}`, error);
+                throw error;
+            }
+        },
+    };
 }
-
-export { createServerActionTransformer };
-//# sourceMappingURL=transformer-server-actions.js.map
+/**
+ * transformedCode += `
+const ${exportName}Ref = Object.defineProperties(
+  ${
+    isClass
+      ? `class extends ${exportName} {
+          constructor(...args) { super(...args); }
+        }`
+      : `function(...args) { return ${exportName}.apply(null, args); }`
+  },
+  {
+    $$typeof: { value: Symbol.for("react.client.reference") },
+    $$id: { value: ${JSON.stringify(moduleId + "#" + exportName)} }
+  }
+);
+export { ${exportName}Ref as ${exportName} };`;
+ */

package/dist/plugin/transformer/types.d.ts

@@ -11,5 +11,9 @@ export interface TransformerOptions {
      * Optional validation function for module IDs
      */
     validateModuleId?: (moduleId: string) => boolean;
+    /**
+     * The directory to use for the module IDs
+     */
+    moduleBase: string;
 }
 //# sourceMappingURL=types.d.ts.map

package/dist/plugin/transformer/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../plugin/transformer/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,+BAA+B;IAC9C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,KAAK,MAAM,CAAC;IAClD,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC;IACjD,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IAChD,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;CACjD;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,KAAK,MAAM,CAAC;IACjD;;OAEG;IACH,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC;CAClD"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../plugin/transformer/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,+BAA+B;IAC9C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,KAAK,MAAM,CAAC;IAClD,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC;IACjD,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IAChD,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;CACjD;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,KAAK,MAAM,CAAC;IACjD;;OAEG;IACH,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC;IACjD;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;CACpB"}