vxrn 0.1.45 → 0.1.46

package/src/utils/getOptionsFilled.ts

@@ -20,7 +20,7 @@ export async function getOptionsFilled(options: VXRNConfig) {
 
   const packageRootDir = join(require.resolve('vxrn'), '../../..')
 
-  const cacheDir = join(root, 'node_modules', '.cache', 'vxrn')
+  const cacheDir = join(root, 'node_modules', '.vxrn')
   const internalPatchesDir = join(packageRootDir, 'patches')
   const userPatchesDir = join(root, 'patches')
   const [state, packageJSON] = await Promise.all([

package/src/utils/readVXRNConfig.ts

@@ -8,6 +8,14 @@ export async function readVXRNConfig(): Promise<VXRNConfig> {
     return {}
   }
 
+  if (process.env.VXRN_CJS) {
+    const requireFile = jiti(process.cwd(), {
+      esmResolve: true,
+    })
+    const userConfig = requireFile('./vxrn.config.ts')
+    return resolveOptionalAsyncFunction(userConfig?.default ?? {})
+  }
+
   // try esm load
   try {
     // somewhat hacky creating a server just to read config?
@@ -21,17 +29,21 @@ export async function readVXRNConfig(): Promise<VXRNConfig> {
     })
 
     await vite.close()
-    return userConfig?.default ?? {}
+    return resolveOptionalAsyncFunction(userConfig?.default ?? {})
   } catch (err) {
-    console.info(`Error loading config via ESM, attempting CJS, DEBUG=1 to see logs`)
-    if (process.env.DEBUG) {
-      console.info(err)
-    }
+    console.info(
+      ` [vxrn] Error loading config via ESM, attempting CJS, set VXRN_CJS=1 to run in cjs mode`
+    )
+    throw err
+  }
+}
 
-    const requireFile = jiti(process.cwd(), {
-      esmResolve: true,
-    })
-    const userConfig = requireFile('./vxrn.config.ts')
-    return userConfig?.default ?? {}
+async function resolveOptionalAsyncFunction(value: any) {
+  if (typeof value === 'function') {
+    value = value()
+  }
+  if (value instanceof Promise) {
+    value = await value
   }
+  return value
 }

package/types/constants.d.ts

@@ -1,4 +1,5 @@
 export declare const DEFAULT_PORT = 8081;
+export declare const EMPTY_LOADER_STRING = "function loader() {/* \u2737\u2737\u2737 */};";
 export declare const nativeExtensions: string[];
 export declare const webExtensions: string[];
 export declare const depsToOptimize: string[];

package/types/utils/getHtml.d.ts

@@ -1,7 +1,7 @@
-export declare function getHtml({ template, props, appHtml, headHtml, css, }: {
+export declare function getHtml({ template, loaderData, appHtml, headHtml, css, }: {
     css?: string;
     template: string;
-    props: Object;
+    loaderData: Object;
     appHtml: string;
     headHtml: string;
 }): string;