vxrn 0.1.30 → 0.1.32

package/src/exports/serve.ts

@@ -1,7 +1,8 @@
+import { createServer } from 'node:http'
 import sirv from 'sirv'
 import type { VXRNConfig } from '../types'
 import { getOptionsFilled } from '../utils/getOptionsFilled'
-import { createApp, defineEventHandler } from 'h3'
+import { createApp, defineEventHandler, toNodeListener } from 'h3'
 
 export const serve = async (optionsIn: VXRNConfig) => {
   const options = await getOptionsFilled(optionsIn)
@@ -35,17 +36,14 @@ export const serve = async (optionsIn: VXRNConfig) => {
       })
     })
   )
-}
 
-// app.use(
-//   defineEventHandler(async ({ node: { req, res } }) => {
-//     const url = req.originalUrl
-//     const template = fs.readFileSync(path.resolve('dist/client/index.html'), 'utf-8')
-//     // @ts-ignore
-//     const render = (await import('./dist/server/entry-server.js')).render
-//     const appHtml = await render({ path: url })
-//     const html = template.replace(`<!--ssr-outlet-->`, appHtml)
-//     res.setHeader('Content-Type', 'text/html')
-//     return html
-//   })
-// )
+  const server = createServer(toNodeListener(app))
+  server.listen(3333)
+  console.info(`Listening on http://localhost:3333`)
+
+  await new Promise<void>((res) => {
+    server.on('close', () => {
+      res()
+    })
+  })
+}

package/src/types.ts

@@ -7,7 +7,7 @@ export type VXRNConfig = {
   host?: string
   port?: number
   webConfig?: InlineConfig
-  buildConfig?: InlineConfig
+  nativeConfig?: InlineConfig
   flow?: FlowOptions
 }
 

package/src/utils/getBaseViteConfig.ts

@@ -1,16 +1,22 @@
+import reactSwcPlugin from '@vitejs/plugin-react-swc'
 import type { UserConfig } from 'vite'
-import { resolveFile } from '../exports/dev'
+
+// essentially base web config not base everything
 
 export function getBaseViteConfig({ mode }: { mode: 'development' | 'production' }): UserConfig {
   return {
     mode,
+
+    plugins: [reactSwcPlugin({})],
+
     define: {
       __DEV__: `${mode === 'development'}`,
       'process.env.NODE_ENV': `"${mode}"`,
     },
     resolve: {
       alias: {
-        'react-native': resolveFile('react-native-web-lite'),
+        'react-native': 'react-native-web-lite',
+        'react-native-safe-area-context': '@vxrn/safe-area',
       },
     },
     build: {

package/src/utils/getHtml.ts

@@ -0,0 +1,12 @@
+export function getHtml({
+  template,
+  props,
+  appHtml,
+  headHtml,
+  css,
+}: { css?: string; template: string; props: Object; appHtml: string; headHtml: string }) {
+  const propsHtml = `\n<script>globalThis['__vxrnProps']=${JSON.stringify(props)}</script>`
+  return template
+    .replace(`<!--ssr-outlet-->`, appHtml + propsHtml)
+    .replace(`<!--head-outlet-->`, `${headHtml}\n${css ? `<style>${css}</style>` : ``}`)
+}

package/src/utils/getVitePath.ts

@@ -1,5 +1,6 @@
 import { join, relative, dirname } from 'node:path'
 
+// @ts-ignore
 import resolve from 'esm-resolve'
 import FSExtra from 'fs-extra'
 

package/src/utils/readVXRNConfig.ts

@@ -23,6 +23,11 @@ export async function readVXRNConfig(): Promise<VXRNConfig> {
     await vite.close()
     return 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)
+    }
+
     const requireFile = jiti(process.cwd(), {
       esmResolve: true,
     })

package/types/constants.d.ts

@@ -1,2 +1,15 @@
 export declare const DEFAULT_PORT = 8081;
+export declare const depsToOptimize: string[];
+export declare const needsInterop: string[];
+export declare const ssrDepsToOptimize: string[];
+export declare const nativeExtensions: string[];
+export declare const webExtensions: string[];
+export declare const ssrOptimizeDeps: {
+    include: string[];
+    extensions: string[];
+    needsInterop: string[];
+    esbuildOptions: {
+        resolveExtensions: string[];
+    };
+};
 //# sourceMappingURL=constants.d.ts.map

package/types/exports/dev.d.ts

@@ -1,7 +1,5 @@
 /// <reference types="node" />
-import { type UserConfig } from 'vite';
 import type { VXRNConfig } from '../types';
-import { type VXRNConfigFilled } from '../utils/getOptionsFilled';
 export declare const resolveFile: (path: string) => string;
 export declare const dev: (optionsIn: VXRNConfig) => Promise<{
     server: import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>;
@@ -12,8 +10,4 @@ export declare const dev: (optionsIn: VXRNConfig) => Promise<{
     stop: () => Promise<void>;
 }>;
 export declare function bindKeypressInput(): void;
-export declare function getViteServerConfig({ root, host, webConfig, cacheDir }: VXRNConfigFilled): Promise<{
-    serverConfig: UserConfig;
-    hotUpdateCache: Map<string, string>;
-}>;
 //# sourceMappingURL=dev.d.ts.map

package/types/types.d.ts

@@ -6,7 +6,7 @@ export type VXRNConfig = {
     host?: string;
     port?: number;
     webConfig?: InlineConfig;
-    buildConfig?: InlineConfig;
+    nativeConfig?: InlineConfig;
     flow?: FlowOptions;
 };
 export type HMRListener = (update: {

package/types/utils/getHtml.d.ts

@@ -0,0 +1,8 @@
+export declare function getHtml({ template, props, appHtml, headHtml, css, }: {
+    css?: string;
+    template: string;
+    props: Object;
+    appHtml: string;
+    headHtml: string;
+}): string;
+//# sourceMappingURL=getHtml.d.ts.map

package/types/utils/getOptionsFilled.d.ts

@@ -12,7 +12,7 @@ export declare function getOptionsFilled(options: VXRNConfig): Promise<{
     port: number;
     entryNative?: string | undefined;
     webConfig?: import("vite").InlineConfig | undefined;
-    buildConfig?: import("vite").InlineConfig | undefined;
+    nativeConfig?: import("vite").InlineConfig | undefined;
     flow?: import("@vxrn/vite-flow").Options | undefined;
 }>;
 type State = {

package/types/vendor/createExpoServer.d.ts

@@ -1,5 +1,7 @@
 import { type App } from 'h3';
 import type { ViteDevServer } from 'vite';
-export declare function createExpoServer(root: string, app: App, vite: ViteDevServer): void;
+export declare function createExpoServer({ root }: {
+    root: string;
+}, app: App, vite: ViteDevServer): void;
 export declare function getRoutePaths(cwd: string): string[];
 //# sourceMappingURL=createExpoServer.d.ts.map

package/dist/cjs/build.js

@@ -1,145 +0,0 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf, __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: !0 });
-}, __copyProps = (to, from, except, desc) => {
-  if (from && typeof from == "object" || typeof from == "function")
-    for (let key of __getOwnPropNames(from))
-      !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: !0 }) : target,
-  mod
-)), __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
-var build_exports = {};
-__export(build_exports, {
-  build: () => build,
-  resolveFile: () => resolveFile
-});
-module.exports = __toCommonJS(build_exports);
-var import_import_meta_resolve = require("import-meta-resolve"), import_node_fs = __toESM(require("node:fs"), 1), import_node_path = __toESM(require("node:path"), 1), import_vite = require("vite"), import_fs_extra = __toESM(require("fs-extra"), 1), import_clientBundleTreeShakePlugin = require("./plugins/clientBundleTreeShakePlugin"), import_getBaseViteConfig = require("./utils/getBaseViteConfig"), import_getOptionsFilled = require("./utils/getOptionsFilled");
-const import_meta = {}, resolveFile = (path2) => {
-  try {
-    return (0, import_import_meta_resolve.resolve)(path2, import_meta.url).replace("file://", "");
-  } catch {
-    return require.resolve(path2);
-  }
-}, { ensureDir, existsSync, readFile } = import_fs_extra.default, extensions = [
-  ".web.tsx",
-  ".tsx",
-  ".web.ts",
-  ".ts",
-  ".web.jsx",
-  ".jsx",
-  ".web.js",
-  ".js",
-  ".css",
-  ".json"
-], build = async (optionsIn) => {
-  const options = await (0, import_getOptionsFilled.getOptionsFilled)(optionsIn), depsToOptimize = [
-    "react",
-    "react-dom",
-    "@react-native/normalize-color",
-    "@react-navigation/native",
-    "expo-constants",
-    "expo-modules-core",
-    "expo-status-bar"
-  ];
-  let buildConfig = (0, import_vite.mergeConfig)(
-    (0, import_getBaseViteConfig.getBaseViteConfig)({
-      mode: "production"
-    }),
-    {
-      root: options.root,
-      clearScreen: !1,
-      optimizeDeps: {
-        include: depsToOptimize,
-        esbuildOptions: {
-          resolveExtensions: extensions
-        }
-      }
-    }
-  );
-  options.webConfig && (buildConfig = (0, import_vite.mergeConfig)(buildConfig, options.webConfig)), console.info("build client"), await (0, import_vite.build)(
-    (0, import_vite.mergeConfig)(buildConfig, {
-      plugins: [(0, import_clientBundleTreeShakePlugin.clientBundleTreeShakePlugin)({})],
-      build: {
-        ssrManifest: !0,
-        outDir: "dist/client"
-      }
-    })
-  ), console.info("build server");
-  const { output } = await (0, import_vite.build)(
-    (0, import_vite.mergeConfig)(buildConfig, {
-      resolve: {
-        alias: {
-          "react-native": "react-native-web-lite"
-        }
-      },
-      optimizeDeps: {
-        esbuildOptions: {
-          format: "cjs"
-        }
-      },
-      ssr: {
-        noExternal: !0
-      },
-      build: {
-        // we want one big file of css
-        cssCodeSplit: !1,
-        ssr: "src/entry-server.tsx",
-        outDir: "dist/server",
-        rollupOptions: {
-          external: []
-        }
-      }
-    })
-  );
-  console.info("generating static pages"), await generateStaticPages(options, output);
-};
-async function generateStaticPages(options, serverOutput) {
-  const toAbsolute = (p) => import_node_path.default.resolve(options.root, p), staticDir = toAbsolute("dist/static");
-  await ensureDir(staticDir);
-  const template = import_node_fs.default.readFileSync(toAbsolute("index.html"), "utf-8"), render = (await import(`${options.root}/dist/server/entry-server.js`)).render, entry = serverOutput.find(
-    (x) => x.type === "chunk" && x.facadeModuleId?.includes("entry-server")
-  ), assets = [], allRoutes = (await Promise.all(
-    serverOutput.flatMap(async (output) => {
-      if (output.type === "asset")
-        return assets.push(output), [];
-      const id = output.facadeModuleId || "", file = import_node_path.default.basename(id), name = file.replace(/\.[^/.]+$/, "");
-      if (!id || file[0] === "_" || file.includes("entry-server"))
-        return [];
-      const result = (await (await import(import_node_path.default.join(options.root, "dist/server", output.fileName))).generateStaticParams?.() || [{}]).map((params) => getUrl(params));
-      function getUrl(params = {}) {
-        return name === "index" ? "/" : `/${name.split("/").map((part) => {
-          if (part[0] === "[") {
-            const found = params[part.slice(1, part.length - 1)];
-            return found || console.warn("not found", { params, part }), found;
-          }
-          return part;
-        }).join("/")}`;
-      }
-      return result;
-    })
-  )).flat(), cssString = assets.filter((x) => x.name?.endsWith(".css")).map((x) => x.source).join(`
-
-`);
-  for (const path2 of allRoutes) {
-    const { appHtml, headHtml } = await render({ path: path2 }), slashFileName = `${path2 === "/" ? "/index" : path2}.html`, clientHtmlPath = toAbsolute(`dist/client${slashFileName}`), html = ((existsSync(clientHtmlPath) ? await readFile(clientHtmlPath, "utf-8") : null) || template).replace("<!--ssr-outlet-->", appHtml).replace(
-      "<!--head-outlet-->",
-      `${headHtml}
-${cssString ? `<style>${cssString}</style>` : ""}`
-    ), filePath = toAbsolute(`dist/static${slashFileName}`);
-    import_node_fs.default.writeFileSync(toAbsolute(filePath), html);
-  }
-}
-//# sourceMappingURL=build.js.map

package/dist/cjs/build.js.map

@@ -1,6 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../src/build.ts"],
-  "mappings": "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",
-  "names": ["path", "importMetaResolve", "FSExtra", "viteBuild", "fs"]
-}