one 1.2.24 → 1.2.27

package/src/vite/plugins/virtualEntryPlugin.ts

@@ -14,22 +14,65 @@ import {
   virtualEntryIdNative,
 } from './virtualEntryConstants'
 
-function getSetupFileImport(environmentName: string): string {
-  const envVarMap = {
-    client: 'ONE_SETUP_FILE_CLIENT',
-    ssr: 'ONE_SETUP_FILE_SERVER',
-    ios: 'ONE_SETUP_FILE_IOS',
-    android: 'ONE_SETUP_FILE_ANDROID',
+type NormalizedSetupFiles = {
+  client?: string
+  server?: string
+  ios?: string
+  android?: string
+}
+
+function normalizeSetupFile(setupFile: One.PluginOptions['setupFile']): NormalizedSetupFiles {
+  if (!setupFile) return {}
+  if (typeof setupFile === 'string') {
+    return {
+      client: setupFile,
+      server: setupFile,
+      ios: setupFile,
+      android: setupFile,
+    }
   }
+  if ('native' in setupFile) {
+    return {
+      client: setupFile.client,
+      server: setupFile.server,
+      ios: setupFile.native,
+      android: setupFile.native,
+    }
+  }
+  const sf = setupFile as { client?: string; server?: string; ios?: string; android?: string }
+  return {
+    client: sf.client,
+    server: sf.server,
+    ios: sf.ios,
+    android: sf.android,
+  }
+}
 
-  const envVar = envVarMap[environmentName]
-  if (!envVar) return ''
+function getSetupFileImport(
+  environmentName: string,
+  setupFiles: NormalizedSetupFiles,
+  useStaticImport: boolean
+): string {
+  const envMap: Record<string, keyof NormalizedSetupFiles> = {
+    client: 'client',
+    ssr: 'server',
+    ios: 'ios',
+    android: 'android',
+  }
 
-  return `
-if (process.env.${envVar}) {
-  import(/* @vite-ignore */ process.env.${envVar})
-}
-`
+  const key = envMap[environmentName]
+  if (!key) return ''
+
+  const setupFile = setupFiles[key]
+  if (!setupFile) return ''
+
+  // For native, use static import since dynamic import doesn't work
+  // For web, use top-level await with dynamic import to ensure setup runs before app
+  if (useStaticImport) {
+    return `import ${JSON.stringify(setupFile)}`
+  }
+
+  return `await import(/* @vite-ignore */ ${JSON.stringify(setupFile)})`
 }
 
 export function createVirtualEntry(options: {
@@ -38,6 +81,7 @@ export function createVirtualEntry(options: {
     ignoredRouteFiles?: Array<string>
   }
   flags: One.Flags
+  setupFile?: One.PluginOptions['setupFile']
 }): Plugin {
   const routeGlobs = [
     `/${options.root}/${ROUTE_GLOB_PATTERN}`,
@@ -45,6 +89,8 @@ export function createVirtualEntry(options: {
   ]
   const apiRouteGlobs = `/${options.root}/${API_ROUTE_GLOB_PATTERN}`
 
+  const setupFiles = normalizeSetupFile(options.setupFile)
+
   return {
     name: 'one-virtual-entry',
     enforce: 'pre',
@@ -60,9 +106,8 @@ export function createVirtualEntry(options: {
 
     load(id) {
       if (id === resolvedVirtualEntryId) {
-        const prependCode = isNativeEnvironment(this.environment)
-          ? '' /* `import()` will not work on native */
-          : getSetupFileImport(this.environment.name)
+        const isNative = isNativeEnvironment(this.environment)
+        const prependCode = getSetupFileImport(this.environment.name, setupFiles, isNative)
         return `
 ${prependCode}
 
@@ -89,9 +134,8 @@ export default createApp({
       }
 
       if (id === resolvedVirtualEntryIdNative) {
-        const prependCode = isNativeEnvironment(this.environment)
-          ? '' /* `import()` will not work on native */
-          : getSetupFileImport(this.environment.name)
+        const isNative = isNativeEnvironment(this.environment)
+        const prependCode = getSetupFileImport(this.environment.name, setupFiles, isNative)
         return `
 ${prependCode}
 

package/types/babel-plugins/one-router-metro.d.ts

@@ -1,11 +1,15 @@
+import type { NodePath } from '@babel/core';
+import * as t from '@babel/types';
 type PluginOptions = {
     ONE_ROUTER_APP_ROOT_RELATIVE_TO_ENTRY?: string;
     ONE_ROUTER_ROOT_FOLDER_NAME?: string;
     ONE_ROUTER_REQUIRE_CONTEXT_REGEX_STRING?: string;
+    ONE_SETUP_FILE_NATIVE?: string;
 };
 declare function oneRouterMetroPlugin(_: any, options: PluginOptions): {
     name: string;
     visitor: {
+        Program(path: NodePath<t.Program>, state: any): void;
         MemberExpression(path: any, state: any): void;
     };
 };

package/types/babel-plugins/one-router-metro.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"one-router-metro.d.ts","sourceRoot":"","sources":["../../src/babel-plugins/one-router-metro.ts"],"names":[],"mappings":"AAGA,KAAK,aAAa,GAAG;IACnB,qCAAqC,CAAC,EAAE,MAAM,CAAA;IAC9C,2BAA2B,CAAC,EAAE,MAAM,CAAA;IACpC,uCAAuC,CAAC,EAAE,MAAM,CAAA;CACjD,CAAA;AAED,iBAAS,oBAAoB,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,aAAa;;;+BA8B/B,GAAG,SAAS,GAAG;;EAgB3C;AAED,eAAe,oBAAoB,CAAA"}
+{"version":3,"file":"one-router-metro.d.ts","sourceRoot":"","sources":["../../src/babel-plugins/one-router-metro.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AAEjC,KAAK,aAAa,GAAG;IACnB,qCAAqC,CAAC,EAAE,MAAM,CAAA;IAC9C,2BAA2B,CAAC,EAAE,MAAM,CAAA;IACpC,uCAAuC,CAAC,EAAE,MAAM,CAAA;IAChD,qBAAqB,CAAC,EAAE,MAAM,CAAA;CAC/B,CAAA;AAED,iBAAS,oBAAoB,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,aAAa;;;sBA+BxC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,GAAG;+BAOtB,GAAG,SAAS,GAAG;;EAsB3C;AAED,eAAe,oBAAoB,CAAA"}

package/types/metro-config/getViteMetroPluginOptions.d.ts

@@ -1,8 +1,13 @@
 import type { metroPlugin } from '@vxrn/vite-plugin-metro';
-export declare function getViteMetroPluginOptions({ projectRoot, relativeRouterRoot, ignoredRouteFiles, userDefaultConfigOverrides, }: {
+export declare function getViteMetroPluginOptions({ projectRoot, relativeRouterRoot, ignoredRouteFiles, userDefaultConfigOverrides, setupFile, }: {
     projectRoot: string;
     relativeRouterRoot: string;
     ignoredRouteFiles?: Array<`**/*${string}`>;
     userDefaultConfigOverrides?: NonNullable<Parameters<typeof metroPlugin>[0]>['defaultConfigOverrides'];
+    setupFile?: string | {
+        native?: string;
+        ios?: string;
+        android?: string;
+    };
 }): Parameters<typeof metroPlugin>[0];
 //# sourceMappingURL=getViteMetroPluginOptions.d.ts.map

package/types/metro-config/getViteMetroPluginOptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getViteMetroPluginOptions.d.ts","sourceRoot":"","sources":["../../src/metro-config/getViteMetroPluginOptions.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAQ1D,wBAAgB,yBAAyB,CAAC,EACxC,WAAW,EACX,kBAAkB,EAClB,iBAAiB,EACjB,0BAA0B,GAC3B,EAAE;IACD,WAAW,EAAE,MAAM,CAAA;IACnB,kBAAkB,EAAE,MAAM,CAAA;IAC1B,iBAAiB,CAAC,EAAE,KAAK,CAAC,OAAO,MAAM,EAAE,CAAC,CAAA;IAC1C,0BAA0B,CAAC,EAAE,WAAW,CACtC,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,CAClC,CAAC,wBAAwB,CAAC,CAAA;CAC5B,GAAG,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,CA+KpC"}
+{"version":3,"file":"getViteMetroPluginOptions.d.ts","sourceRoot":"","sources":["../../src/metro-config/getViteMetroPluginOptions.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAQ1D,wBAAgB,yBAAyB,CAAC,EACxC,WAAW,EACX,kBAAkB,EAClB,iBAAiB,EACjB,0BAA0B,EAC1B,SAAS,GACV,EAAE;IACD,WAAW,EAAE,MAAM,CAAA;IACnB,kBAAkB,EAAE,MAAM,CAAA;IAC1B,iBAAiB,CAAC,EAAE,KAAK,CAAC,OAAO,MAAM,EAAE,CAAC,CAAA;IAC1C,0BAA0B,CAAC,EAAE,WAAW,CACtC,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,CAClC,CAAC,wBAAwB,CAAC,CAAA;IAC3B,SAAS,CAAC,EAAE,MAAM,GAAG;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;CACzE,GAAG,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,CA6LpC"}

package/types/vite/one.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"one.d.ts","sourceRoot":"","sources":["../../src/vite/one.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAU,YAAY,EAAE,MAAM,MAAM,CAAA;AAOhD,OAAO,qBAAqB,CAAA;AAW5B,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,SAAS,CAAA;AAoBlC,wBAAgB,GAAG,CAAC,OAAO,GAAE,GAAG,CAAC,aAAkB,GAAG,YAAY,CA4iBjE"}
+{"version":3,"file":"one.d.ts","sourceRoot":"","sources":["../../src/vite/one.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAU,YAAY,EAAE,MAAM,MAAM,CAAA;AAOhD,OAAO,qBAAqB,CAAA;AAW5B,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,SAAS,CAAA;AAoBlC,wBAAgB,GAAG,CAAC,OAAO,GAAE,GAAG,CAAC,aAAkB,GAAG,YAAY,CA6iBjE"}

package/types/vite/plugins/virtualEntryPlugin.d.ts

@@ -6,5 +6,6 @@ export declare function createVirtualEntry(options: {
         ignoredRouteFiles?: Array<string>;
     };
     flags: One.Flags;
+    setupFile?: One.PluginOptions['setupFile'];
 }): Plugin;
 //# sourceMappingURL=virtualEntryPlugin.d.ts.map

package/types/vite/plugins/virtualEntryPlugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"virtualEntryPlugin.d.ts","sourceRoot":"","sources":["../../../src/vite/plugins/virtualEntryPlugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAQlC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,UAAU,CAAA;AA0BnC,wBAAgB,kBAAkB,CAAC,OAAO,EAAE;IAC1C,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE;QACP,iBAAiB,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;KAClC,CAAA;IACD,KAAK,EAAE,GAAG,CAAC,KAAK,CAAA;CACjB,GAAG,MAAM,CAqET"}
+{"version":3,"file":"virtualEntryPlugin.d.ts","sourceRoot":"","sources":["../../../src/vite/plugins/virtualEntryPlugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAQlC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,UAAU,CAAA;AAqEnC,wBAAgB,kBAAkB,CAAC,OAAO,EAAE;IAC1C,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE;QACP,iBAAiB,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;KAClC,CAAA;IACD,KAAK,EAAE,GAAG,CAAC,KAAK,CAAA;IAChB,SAAS,CAAC,EAAE,GAAG,CAAC,aAAa,CAAC,WAAW,CAAC,CAAA;CAC3C,GAAG,MAAM,CAqET"}