gemi 0.108.0 → 0.109.0

package/dist/app/index.js

@@ -1,4 +1,4 @@
 // @bun
-import{za as a}from"../chunk-wsftnxzs.js";import"../chunk-82hpq0bq.js";import"../chunk-3s3awh38.js";export{a as App};
+import{za as a}from"../chunk-q8k7f11z.js";import"../chunk-hf32yq23.js";import"../chunk-wvwee7dn.js";export{a as App};
 
 //# debugId=EB7487A2EF3436A164756E2164756E21

package/dist/bin/gemi.js

@@ -36067,8 +36067,8 @@ function exportedType(ts, checker, sourceFile, reference) {
   return { type: checker.getTypeOfSymbolAtLocation(symbol, sourceFile), name: symbol.getName() };
 }
 function specifier(from, to) {
-  const relative4 = path7.relative(path7.dirname(from), to).split(path7.sep).join("/").replace(/(\.d)?\.(ts|tsx|mts|cts)$/, "");
-  return relative4.startsWith(".") ? relative4 : `./${relative4}`;
+  const relative5 = path7.relative(path7.dirname(from), to).split(path7.sep).join("/").replace(/(\.d)?\.(ts|tsx|mts|cts)$/, "");
+  return relative5.startsWith(".") ? relative5 : `./${relative5}`;
 }
 function isFrameworkJsonValue(type) {
   const alias = type.aliasSymbol;
@@ -36748,8 +36748,16 @@ async function createRollupInput_default(appDir) {
       continue;
     if (/\.(test|spec)\.tsx$/.test(file))
       continue;
+    if (/\.island\.tsx$/.test(file))
+      continue;
     entries.add(`/app/views/${file}`);
   }
+  const islandGlob = new Glob("**/*.island.{ts,tsx,js,jsx,mts,mjs}");
+  for await (const file of islandGlob.scan({ cwd: appDir })) {
+    if (file.split("/").includes("node_modules"))
+      continue;
+    entries.add(`/app/${file}`);
+  }
   return Array.from(entries);
 }
 
@@ -40088,6 +40096,55 @@ function documentBase(base) {
   return base.startsWith("/") || /^[a-z][a-z\d+.-]*:\/\//i.test(base) ? normalizeAssetBase(base) : DEFAULT_ASSET_BASE;
 }
 
+// vite/islandPlugin.ts
+import { realpathSync } from "fs";
+import { relative, sep } from "path";
+var ISLAND_LOADER = /\(\s*\)\s*=>\s*import\(\s*(["'])([^"'\n]+?\.island(?:\.[cm]?[jt]sx?)?)\1\s*\)/g;
+function realPath(path3) {
+  try {
+    return realpathSync(path3);
+  } catch {
+    return path3;
+  }
+}
+function gemiIslandPlugin() {
+  let root = process.cwd();
+  return {
+    name: "gemi-plugin-islands",
+    enforce: "pre",
+    configResolved(config) {
+      root = realPath(config.root);
+    },
+    async transform(code, id, options) {
+      if (id.includes("/node_modules/") || id.startsWith("\x00"))
+        return null;
+      if (!/\.[cm]?[jt]sx?$/.test(id.split("?")[0]))
+        return null;
+      if (!code.includes(".island"))
+        return null;
+      const ssr = Boolean(options?.ssr) || this.environment?.config?.consumer === "server";
+      const s = new MagicString(code);
+      let changed = false;
+      for (const match of code.matchAll(ISLAND_LOADER)) {
+        const [whole, quote, specifier] = match;
+        const resolved = await this.resolve(specifier, id);
+        if (!resolved || resolved.external)
+          continue;
+        const file = realPath(resolved.id.split("?")[0]);
+        const key = relative(root, file).split(sep).join("/");
+        if (key.startsWith(".."))
+          continue;
+        const loader = ssr ? `() => Promise.reject(new Error("Island modules load in the browser."))` : `() => import(${quote}${specifier}${quote})`;
+        s.overwrite(match.index, match.index + whole.length, `Object.assign(${loader}, { gemiIsland: ${JSON.stringify(key)} })`);
+        changed = true;
+      }
+      if (!changed)
+        return null;
+      return { code: s.toString(), map: s.generateMap({ hires: true }) };
+    }
+  };
+}
+
 // vite/index.ts
 var gemi = async () => {
   const userConfig = await loadGemiConfig(process.cwd());
@@ -40106,7 +40163,7 @@ var gemi = async () => {
             ssrEmitAssets: true,
             sourcemap: true,
             rollupOptions: {
-              input: Array.from(JSON.parse(process.env.GEMI_INPUT ?? "[]")),
+              input: Array.from(JSON.parse(process.env.GEMI_INPUT ?? "[]")).filter((entry) => !(env.isSsrBuild && /\.island\.[cm]?[jt]sx?$/.test(entry))),
               preserveEntrySignatures: "strict",
               ...env.isSsrBuild ? { external: isGemiExternal } : {}
             }
@@ -40124,6 +40181,7 @@ var gemi = async () => {
       config: () => userViteConfig
     },
     gemiAssetBasePlugin(assetBase),
+    gemiIslandPlugin(),
     {
       name: "gemi-plugin-hot-reload",
       handleHotUpdate({ server, modules }) {
@@ -40140,7 +40198,7 @@ var vite_default = gemi;
 
 // vite/previousAssets.ts
 import { copyFile, lstat, mkdir as mkdir2, readdir, readFile, stat, writeFile as writeFile2 } from "fs/promises";
-import { dirname as dirname2, isAbsolute, join as join4, relative, resolve, sep } from "path";
+import { dirname as dirname2, isAbsolute, join as join4, relative as relative2, resolve, sep as sep2 } from "path";
 var PREVIOUS_ASSETS_RECORD = ".vite/previous-assets.json";
 var DEFAULT_RETAINED_RELEASES = 2;
 var DEFAULT_RETAINED_MAX_AGE_SECONDS = 7 * 24 * 60 * 60;
@@ -40274,8 +40332,8 @@ function isCarriable(file) {
 }
 function inside(root, file) {
   const path3 = resolve(root, file);
-  const rel2 = relative(root, path3);
-  return rel2 && !rel2.startsWith("..") && !isAbsolute(rel2) && rel2.split(sep)[0] === ASSETS_DIR ? path3 : null;
+  const rel2 = relative2(root, path3);
+  return rel2 && !rel2.startsWith("..") && !isAbsolute(rel2) && rel2.split(sep2)[0] === ASSETS_DIR ? path3 : null;
 }
 async function isDirectory(path3) {
   try {
@@ -40427,15 +40485,15 @@ var {
 
 // bin/check-models.ts
 import { statSync as statSync2 } from "fs";
-import { relative as relative3, resolve as resolve2 } from "path";
+import { relative as relative4, resolve as resolve2 } from "path";
 
 // support/discover.ts
 import { existsSync as existsSync3, readdirSync as readdirSync2 } from "fs";
-import { join as join6, relative as relative2 } from "path";
+import { join as join6, relative as relative3 } from "path";
 function sourceFiles(dir, ignore = []) {
   const out = [];
   const ignored = (path3) => {
-    const rel2 = relative2(dir, path3).split("\\").join("/");
+    const rel2 = relative3(dir, path3).split("\\").join("/");
     return ignore.some((pattern) => rel2 === pattern || rel2.startsWith(`${pattern}/`));
   };
   const walk3 = (current) => {
@@ -40539,7 +40597,7 @@ async function declaredModules(rootDir) {
   try {
     ({ default: Kernel } = await import(path3));
   } catch (error) {
-    throw new CheckModelsError(`Could not load ${relative3(rootDir, path3)}:
+    throw new CheckModelsError(`Could not load ${relative4(rootDir, path3)}:
     ${error.message}`);
   }
   return new Kernel().models ?? [];
@@ -40592,8 +40650,8 @@ ${error.message}`);
   const paths = modelFiles(modelsDir, ignore);
   const files = [];
   for (const path3 of paths) {
-    const label = relative3(rootDir, path3);
-    const specifier = `./${relative3(modelsDir, path3).split("\\").join("/").replace(/\.tsx?$/, "")}`;
+    const label = relative4(rootDir, path3);
+    const specifier = `./${relative4(modelsDir, path3).split("\\").join("/").replace(/\.tsx?$/, "")}`;
     try {
       files.push({
         label,
@@ -41126,11 +41184,11 @@ function hashDirectory(dir) {
     const entries = readdirSync3(current, { withFileTypes: true }).sort((a, b) => a.name < b.name ? -1 : a.name > b.name ? 1 : 0);
     for (const entry of entries) {
       const full = path5.join(current, entry.name);
-      const relative4 = prefix ? `${prefix}/${entry.name}` : entry.name;
+      const relative5 = prefix ? `${prefix}/${entry.name}` : entry.name;
       if (entry.isDirectory()) {
-        walk3(full, relative4);
+        walk3(full, relative5);
       } else if (entry.isFile()) {
-        hash.update(relative4);
+        hash.update(relative5);
         hash.update("\x00");
         hash.update(readFileSync3(full));
         hash.update("\x00");
@@ -41666,5 +41724,5 @@ program.command("app:route-manifest").action(async () => {
 });
 program.parse();
 
-//# debugId=45F966AEDDDBFC5864756E2164756E21
+//# debugId=C2424D7419BD4C9164756E2164756E21
 //# sourceMappingURL=gemi.js.map