@reckona/mreact-router 0.0.90 → 0.0.91

package/src/vite-config.ts

@@ -1,8 +1,10 @@
 import { loadConfigFromFile, type ConfigEnv, type PluginOption, type UserConfig } from "vite";
 import type { ResolvedAppRouterProject } from "./config.js";
+import type { AppRouterImportPolicy } from "./import-policy.js";
 import { mreactRouterConfigFromPlugins } from "./vite.js";
 
 export interface LoadedMreactRouterViteConfig {
+  importPolicy?: AppRouterImportPolicy | undefined;
   project: ResolvedAppRouterProject;
   serverPort?: number | undefined;
   viteConfig?: UserConfig | undefined;
@@ -41,8 +43,12 @@ export async function loadMreactRouterViteConfigDetails(options: {
   }
 
   const serverPort = loaded.config.server?.port;
+  const importPolicy = (config as ResolvedAppRouterProject & {
+    importPolicy?: AppRouterImportPolicy | undefined;
+  }).importPolicy;
 
   return {
+    ...(importPolicy === undefined ? {} : { importPolicy }),
     project: config,
     ...(typeof serverPort === "number" ? { serverPort } : {}),
     viteConfig: {

package/src/vite.ts

@@ -71,8 +71,12 @@ const virtualReactiveCoreId = "\0mreact-router-reactive-core";
 const virtualReactiveDevtoolsId = "\0mreact-router-reactive-devtools";
 const mreactRouterConfigKey = "__mreactRouterConfig";
 
+type MreactRouterPluginConfig = ResolvedAppRouterProject & {
+  importPolicy?: AppRouterImportPolicy | undefined;
+};
+
 type MreactRouterPlugin = Plugin & {
-  [mreactRouterConfigKey]: ResolvedAppRouterProject;
+  [mreactRouterConfigKey]: MreactRouterPluginConfig;
 };
 
 export function createAppRouterVitePlugin(options: AppRouterVitePluginOptions): Plugin {
@@ -151,7 +155,10 @@ export function createAppRouterVitePlugin(options: AppRouterVitePluginOptions):
   ]);
 
   const plugin: MreactRouterPlugin = {
-    [mreactRouterConfigKey]: project,
+    [mreactRouterConfigKey]: {
+      ...project,
+      ...(options.importPolicy === undefined ? {} : { importPolicy: options.importPolicy }),
+    },
     enforce: "pre",
     name: "mreact-router",
     config() {
@@ -351,7 +358,13 @@ export function mreactRouterConfigFromPlugins(
 ): ResolvedAppRouterProject | undefined {
   for (const plugin of plugins.flat(Infinity)) {
     if (plugin !== null && typeof plugin === "object" && mreactRouterConfigKey in plugin) {
-      return (plugin as MreactRouterPlugin)[mreactRouterConfigKey];
+      const config = (plugin as MreactRouterPlugin)[mreactRouterConfigKey];
+
+      if ("project" in config) {
+        return (config as unknown as { project: ResolvedAppRouterProject }).project;
+      }
+
+      return config as unknown as ResolvedAppRouterProject;
     }
   }