@rpcbase/vite 0.74.0 → 0.76.0

package/index.js

@@ -1,8 +1,7 @@
 import "./dotEnvExpand.js"
 
 import path from "path"
-import { createRequire } from "module"
-import { existsSync, readFileSync } from "node:fs"
+import fs from "node:fs"
 
 import nocache from "nocache"
 import {
@@ -16,100 +15,45 @@ import react from "@vitejs/plugin-react"
 import { createHtmlPlugin } from "vite-plugin-html"
 import { glob } from "glob"
 
+import { resolveIntegratedPackagePath } from "./resolveIntegratedPackagePath.js"
 import { posthogSourcemapsPlugin } from "./posthogSourcemapsPlugin.js"
 
 
-const require = createRequire(import.meta.url)
+const ensureEnvPolyfillInjectPath = () => {
+  const injectDir = path.resolve(process.cwd(), "node_modules/.rpcbase")
+  const injectPath = path.join(injectDir, "rb-env-polyfill-inject.js")
+  const injectContents = "import \"@rpcbase/env/polyfill\"\n"
 
-const splitPackageSpecifier = (specifier) => {
-  if (!specifier) return { pkgName: specifier, subpath: "" }
-
-  if (specifier.startsWith("@")) {
-    const segments = specifier.split("/")
-    if (segments.length < 2) return { pkgName: specifier, subpath: "" }
-    return {
-      pkgName: `${segments[0]}/${segments[1]}`,
-      subpath: segments.slice(2).join("/"),
+  fs.mkdirSync(injectDir, { recursive: true })
+  try {
+    const existing = fs.readFileSync(injectPath, "utf8")
+    if (existing === injectContents) {
+      return injectPath
     }
+  } catch {
+    // file does not exist yet
   }
 
-  const [pkgName, ...rest] = specifier.split("/")
-  return { pkgName, subpath: rest.join("/") }
+  fs.writeFileSync(injectPath, injectContents, "utf8")
+  return injectPath
 }
 
-const resolvePackageRoot = (pkg) => {
-  const { pkgName } = splitPackageSpecifier(pkg)
-  if (!pkgName) return pkg
-
-  // 1) chemin rapide: si le package exporte son package.json
-  try {
-    const pkgJson = require.resolve(`${pkgName}/package.json`)
-    return path.dirname(pkgJson)
-  } catch (err) {
-    // 2) fallback: résoudre l'entrée du package puis remonter jusqu'à sa racine
-    const entry = require.resolve(pkgName) // ex: .../node_modules/<pkg>/dist/...
-    let dir = path.dirname(entry)
-
-    // remonter jusqu'à un package.json dont "name" === pkg
-    while (true) {
-      const pkgJsonPath = path.join(dir, "package.json")
-      if (existsSync(pkgJsonPath)) {
-        try {
-          const json = JSON.parse(readFileSync(pkgJsonPath, "utf8"))
-          if (json && json.name === pkgName) return dir
-        } catch {
-          // ignore parsing errors
+const esbuildInjectPath = ensureEnvPolyfillInjectPath()
+const esbuildInject = [esbuildInjectPath]
+const esbuildInjectPlugins = [
+  {
+    name: "rb-env-polyfill-inject",
+    setup(build) {
+      build.onResolve({ filter: /.*/ }, (args) => {
+        if (args.path === esbuildInjectPath) {
+          return { path: esbuildInjectPath, namespace: "file" }
         }
-      }
-      const parent = path.dirname(dir)
-      if (parent === dir) break
-      dir = parent
-    }
-
-    // 3) dernier recours: reconstruire depuis le segment node_modules (ok avec pnpm)
-    const nmMarker = `${path.sep}node_modules${path.sep}`
-    const idx = entry.lastIndexOf(nmMarker)
-    if (idx !== -1) {
-      const nmRoot = entry.slice(0, idx + nmMarker.length)
-      return path.join(nmRoot, pkgName)
-    }
-
-    // si vraiment rien trouvé, relancer l'erreur d'origine
-    throw err
-  }
-}
-
-const withTrailingSep = p => (p.endsWith(path.sep) ? p : p + path.sep)
-
-const resolveIntegratedPackagePath = (specifier) => {
-  const { pkgName, subpath } = splitPackageSpecifier(specifier)
-  if (!pkgName) return specifier
-
-  const root = resolvePackageRoot(pkgName)
-  if (!subpath) {
-    return withTrailingSep(root)
-  }
 
-  const subDir = path.join(root, subpath)
-  const pkgJsonPath = path.join(subDir, "package.json")
-  if (existsSync(pkgJsonPath)) {
-    try {
-      const pkgJson = JSON.parse(readFileSync(pkgJsonPath, "utf8"))
-      const entry = pkgJson.module || pkgJson.main
-      if (entry) {
-        return path.join(subDir, entry)
-      }
-    } catch {
-      // ignore parsing errors
-    }
-  }
-
-  try {
-    return require.resolve(specifier)
-  } catch {
-    return withTrailingSep(subDir)
-  }
-}
+        return undefined
+      })
+    },
+  },
+]
 
 
 // const isCI = process.env.CI === "true"
@@ -163,6 +107,15 @@ integratedPackages.forEach(pkg => {
 
 export {resolveAliases}
 
+const rbPackagesNeedingEnvPolyfill = [
+  "@rpcbase/auth",
+  "@rpcbase/env",
+  "@rpcbase/env/polyfill",
+  "@rpcbase/server",
+  "@rpcbase/client",
+  "@rpcbase/form",
+  "@rpcbase/router",
+]
 
 // https://vite.dev/config/
 const getBaseConfig = ({ command, mode, isSsrBuild, isPreview }) => {
@@ -185,9 +138,9 @@ const getBaseConfig = ({ command, mode, isSsrBuild, isPreview }) => {
       isProduction && posthogSourcemapsPlugin({}),
     ].filter(Boolean),
     define: {
-      __vite_env__: {
+      "globalThis.__rb_env__": JSON.stringify({
         ...env,
-      },
+      }),
     },
     envPrefix: ALLOWED_ENV_PREFIXES,
     publicDir: path.join(process.cwd(), "./src/client/public"),
@@ -225,25 +178,33 @@ const getBaseConfig = ({ command, mode, isSsrBuild, isPreview }) => {
         // "react", "react-dom",
         "cookie",
       ],
-      // noExternal: ["react-hook-form"],
+      noExternal: [
+        ...rbPackagesNeedingEnvPolyfill,
+        "react-use",
+      ],
     },
     optimizeDeps: {
       include: [
+        // Force RPC Base packages through esbuild so rb-env-polyfill injects before their dist code touches globalThis.__rb_env__
+        ...rbPackagesNeedingEnvPolyfill,
         // "react", "react-dom", "react-dom/server"
         // "cookie"
       ],
       exclude: [
-        "@rpcbase/auth",
-        "@rpcbase/env",
-        "@rpcbase/form",
-        "@rpcbase/router",
         "@radix-ui/*",
         // TMP only in sample app?
         // "react", "react-dom/server",
         // "react-hook-form",
         // "react-dom"
       ],
+      esbuildOptions: {
+        inject: esbuildInject,
+        plugins: esbuildInjectPlugins,
+      },
     },
+    // future: {
+    //   removeSsrLoadModule: true
+    // },
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/vite",
-  "version": "0.74.0",
+  "version": "0.76.0",
   "type": "module",
   "main": "./index.js",
   "scripts": {

package/resolveIntegratedPackagePath.js

@@ -0,0 +1,96 @@
+import path from "path"
+import { createRequire } from "module"
+import { existsSync, readFileSync } from "node:fs"
+
+
+const require = createRequire(import.meta.url)
+
+const splitPackageSpecifier = (specifier) => {
+  if (!specifier) return { pkgName: specifier, subpath: "" }
+
+  if (specifier.startsWith("@")) {
+    const segments = specifier.split("/")
+    if (segments.length < 2) return { pkgName: specifier, subpath: "" }
+    return {
+      pkgName: `${segments[0]}/${segments[1]}`,
+      subpath: segments.slice(2).join("/"),
+    }
+  }
+
+  const [pkgName, ...rest] = specifier.split("/")
+  return { pkgName, subpath: rest.join("/") }
+}
+
+const withTrailingSep = p => (p.endsWith(path.sep) ? p : p + path.sep)
+
+const resolvePackageRoot = (pkg) => {
+  const { pkgName } = splitPackageSpecifier(pkg)
+  if (!pkgName) return pkg
+
+  // 1) chemin rapide: si le package exporte son package.json
+  try {
+    const pkgJson = require.resolve(`${pkgName}/package.json`)
+    return path.dirname(pkgJson)
+  } catch (err) {
+    // 2) fallback: résoudre l'entrée du package puis remonter jusqu'à sa racine
+    const entry = require.resolve(pkgName) // ex: .../node_modules/<pkg>/dist/...
+    let dir = path.dirname(entry)
+
+    // remonter jusqu'à un package.json dont "name" === pkg
+    while (true) {
+      const pkgJsonPath = path.join(dir, "package.json")
+      if (existsSync(pkgJsonPath)) {
+        try {
+          const json = JSON.parse(readFileSync(pkgJsonPath, "utf8"))
+          if (json && json.name === pkgName) return dir
+        } catch {
+          // ignore parsing errors
+        }
+      }
+      const parent = path.dirname(dir)
+      if (parent === dir) break
+      dir = parent
+    }
+
+    // 3) dernier recours: reconstruire depuis le segment node_modules (ok avec pnpm)
+    const nmMarker = `${path.sep}node_modules${path.sep}`
+    const idx = entry.lastIndexOf(nmMarker)
+    if (idx !== -1) {
+      const nmRoot = entry.slice(0, idx + nmMarker.length)
+      return path.join(nmRoot, pkgName)
+    }
+
+    // si vraiment rien trouvé, relancer l'erreur d'origine
+    throw err
+  }
+}
+
+export const resolveIntegratedPackagePath = (specifier) => {
+  const { pkgName, subpath } = splitPackageSpecifier(specifier)
+  if (!pkgName) return specifier
+
+  const root = resolvePackageRoot(pkgName)
+  if (!subpath) {
+    return withTrailingSep(root)
+  }
+
+  const subDir = path.join(root, subpath)
+  const pkgJsonPath = path.join(subDir, "package.json")
+  if (existsSync(pkgJsonPath)) {
+    try {
+      const pkgJson = JSON.parse(readFileSync(pkgJsonPath, "utf8"))
+      const entry = pkgJson.module || pkgJson.main
+      if (entry) {
+        return path.join(subDir, entry)
+      }
+    } catch {
+      // ignore parsing errors
+    }
+  }
+
+  try {
+    return require.resolve(specifier)
+  } catch {
+    return withTrailingSep(subDir)
+  }
+}