mvframe 1.1.15 → 1.1.16

package/dist/vendor.js

@@ -13917,7 +13917,7 @@ const Hr = (a, o = {}) => {
 }, Jr = {
   name: "Matt Avias Frame",
   copyright: "©2026",
-  version: "1.1.15",
+  version: "1.1.16",
   author: "Matt Avias",
   date: "2026-02-26",
   /** 默认语言 key，与 `$getLang`、localStorage `lang` 一致；业务在 app.use(mvframe, { config }) 里覆盖 */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mvframe",
   "packageManager": "yarn@4.4.1",
-  "version": "1.1.15",
+  "version": "1.1.16",
   "author": "matt avis",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -67,7 +67,9 @@
     "dist/assets/*",
     "src/style/chip/mixin.scss",
     "scripts/build-host.js",
+    "scripts/dev-vite-server.js",
     "scripts/dev-with-notify.js",
+    "scripts/flag-assets.js",
     "scripts/init-rules.js",
     "scripts/install-codex-agents.js",
     "scripts/copy-flag-assets.js",

package/scripts/build-host.js

@@ -13,6 +13,7 @@
 const { spawnSync } = require("child_process");
 const fs = require("fs");
 const path = require("path");
+const { copyFlagAssetsTo } = require("./flag-assets.js");
 const SERVE_JSON = `{
   "rewrites": [{
     "source": "**",
@@ -85,6 +86,13 @@ function resolveViteCli(cwd) {
   );
 }
 
+function copyFlagAssets(outAbs) {
+  const dest = path.join(outAbs, "assets", "flags");
+
+  copyFlagAssetsTo(dest);
+  console.log(`[mvframe-b] 已复制 ${path.relative(outAbs, dest)}`);
+}
+
 function main() {
   const cwd = process.cwd();
   const { mode, outDir } = parseArgs(process.argv);
@@ -100,6 +108,7 @@ function main() {
   }
   const outAbs = path.resolve(cwd, outDir);
   fs.mkdirSync(outAbs, { recursive: true });
+  copyFlagAssets(outAbs);
   const servePath = path.join(outAbs, "serve.json");
   fs.writeFileSync(servePath, `${SERVE_JSON}\n`, "utf8");
   console.log(`[mvframe-b] 已写入 ${path.relative(cwd, servePath)}`);

package/scripts/dev-vite-server.js

@@ -0,0 +1,200 @@
+#!/usr/bin/env node
+const { spawn } = require("child_process");
+const fs = require("fs");
+const path = require("path");
+const { pathToFileURL } = require("url");
+const { createRequire } = require("module");
+const { createTempFlagAssets } = require("./flag-assets.js");
+
+let child = null;
+let cleanupTemp = null;
+let shuttingDown = false;
+
+function resolveViteCli(cwd) {
+  let vpkg = "";
+  try {
+    const projectRequire = createRequire(path.join(cwd, "package.json"));
+    vpkg = projectRequire.resolve("vite/package.json");
+  } catch {
+    // Fall back to node_modules for non-PnP projects.
+  }
+
+  if (!vpkg) {
+    vpkg = path.join(cwd, "node_modules", "vite", "package.json");
+  }
+
+  if (fs.existsSync(vpkg)) {
+    const p = require(vpkg);
+    const bin = typeof p.bin === "string" ? p.bin : p.bin && p.bin.vite;
+    if (bin) {
+      const cli = path.join(path.dirname(vpkg), bin);
+      if (fs.existsSync(cli)) return cli;
+    }
+  }
+  throw new Error(
+    "未在当前项目找到 Vite（请先安装依赖；宿主项目可执行 yarn install 后再运行 mvframe-d）",
+  );
+}
+
+function resolvePackageManager(cwd) {
+  const pkgPath = path.join(cwd, "package.json");
+  if (fs.existsSync(pkgPath)) {
+    const pkg = require(pkgPath);
+    const packageManager = String(pkg.packageManager || "");
+    if (packageManager.startsWith("pnpm@")) return "pnpm";
+    if (packageManager.startsWith("npm@")) return "npx";
+    return "yarn";
+  }
+  return "yarn";
+}
+
+function findHostViteConfig(cwd) {
+  const names = [
+    "vite.config.ts",
+    "vite.config.mts",
+    "vite.config.js",
+    "vite.config.mjs",
+    "vite.config.cjs",
+    "vite.config.cts",
+  ];
+  return names.map((name) => path.join(cwd, name)).find(fs.existsSync) || "";
+}
+
+function createWrapperConfig({ cwd, flagsRoot, tmpRoot }) {
+  const hostConfig = findHostViteConfig(cwd);
+  const hostImport = hostConfig
+    ? `import hostConfig from ${JSON.stringify(pathToFileURL(hostConfig).href)};`
+    : "const hostConfig = {};";
+  const source = `
+import fs from "node:fs";
+import path from "node:path";
+${hostImport}
+
+function createFlagAssetsPlugin(flagsRoot) {
+  return {
+    name: "mvframe-host-flag-assets",
+    configureServer(server) {
+      server.middlewares.use((req, res, next) => {
+        const pathname = req.url?.split("?")[0] || "";
+        if (!pathname.startsWith("/assets/flags/")) {
+          next();
+          return;
+        }
+
+        const relativePath = decodeURIComponent(
+          pathname.replace(/^\\/assets\\/flags\\//, ""),
+        );
+        const normalized = path.posix.normalize(relativePath);
+        if (
+          normalized.startsWith("../") ||
+          !/^(1x1|4x3)\\/[a-z0-9-]+\\.svg$/.test(normalized)
+        ) {
+          res.statusCode = 404;
+          res.end();
+          return;
+        }
+
+        const filePath = path.join(flagsRoot, normalized);
+        fs.readFile(filePath, (err, content) => {
+          if (err) {
+            res.statusCode = 404;
+            res.end();
+            return;
+          }
+          res.setHeader("Content-Type", "image/svg+xml");
+          res.end(content);
+        });
+      });
+    },
+  };
+}
+
+function toArray(value) {
+  if (!value) return [];
+  return Array.isArray(value) ? value : [value];
+}
+
+export default async function mvframeWrappedConfig(configEnv) {
+  const loaded =
+    typeof hostConfig === "function" ? await hostConfig(configEnv) : hostConfig;
+  const base = loaded || {};
+  const server = { ...(base.server || {}) };
+  if (server.host == null) {
+    server.host = "0.0.0.0";
+  }
+
+  return {
+    ...base,
+    root: base.root || ${JSON.stringify(cwd)},
+    server,
+    plugins: [
+      ...toArray(base.plugins),
+      createFlagAssetsPlugin(${JSON.stringify(flagsRoot)}),
+    ],
+  };
+}
+`;
+  const configPath = path.join(tmpRoot, "mvframe-vite.config.mjs");
+  fs.writeFileSync(configPath, source, "utf8");
+  return configPath;
+}
+
+function shutdown(code = 0) {
+  if (shuttingDown) return;
+  shuttingDown = true;
+  if (child && !child.killed) {
+    child.kill("SIGTERM");
+  }
+  if (cleanupTemp) {
+    cleanupTemp();
+  }
+  setTimeout(() => process.exit(code), 200);
+}
+
+process.on("SIGINT", () => shutdown(0));
+process.on("SIGTERM", () => shutdown(0));
+
+function main() {
+  const cwd = process.cwd();
+  const viteEntry = resolveViteCli(cwd);
+  const tempFlags = createTempFlagAssets();
+  cleanupTemp = tempFlags.cleanup;
+  const configPath = createWrapperConfig({
+    cwd,
+    flagsRoot: tempFlags.flagsRoot,
+    tmpRoot: tempFlags.tmpRoot,
+  });
+
+  child = spawn(
+    viteEntry.includes(".zip/") ? resolvePackageManager(cwd) : process.execPath,
+    viteEntry.includes(".zip/")
+      ? ["vite", "--host", "0.0.0.0", "--config", configPath]
+      : [viteEntry, "--host", "0.0.0.0", "--config", configPath],
+    {
+      cwd,
+      env: process.env,
+      stdio: "inherit",
+      shell: false,
+    },
+  );
+
+  child.on("exit", (code, signal) => {
+    if (shuttingDown) return;
+    if (cleanupTemp) {
+      cleanupTemp();
+    }
+    process.exit(code === null ? (signal ? 1 : 0) : code);
+  });
+
+  child.on("error", (error) => {
+    console.error(`[mvframe-d] failed to start vite: ${error.message}`);
+    shutdown(1);
+  });
+}
+
+try {
+  main();
+} catch (error) {
+  console.error(`[mvframe-d] failed to start vite: ${error.message}`);
+  process.exit(1);
+}

package/scripts/dev-with-notify.js

@@ -6,8 +6,6 @@
  */
 const { spawn } = require("child_process");
 const path = require("path");
-const fs = require("fs");
-const { createRequire } = require("module");
 
 const children = new Set();
 let shuttingDown = false;
@@ -56,37 +54,7 @@ process.on("SIGTERM", () => shutdown(0));
 
 const notifyArgs = process.argv.slice(2);
 const notifyScript = path.join(__dirname, "notify-server.js");
-
-function resolveViteCli(cwd) {
-  let vpkg = "";
-  try {
-    const projectRequire = createRequire(path.join(cwd, "package.json"));
-    vpkg = projectRequire.resolve("vite/package.json");
-  } catch {
-    // Fall back to node_modules for non-PnP projects.
-  }
-
-  if (!vpkg) {
-    vpkg = path.join(cwd, "node_modules", "vite", "package.json");
-  }
-
-  if (fs.existsSync(vpkg)) {
-    const p = require(vpkg);
-    const bin = typeof p.bin === "string" ? p.bin : p.bin && p.bin.vite;
-    if (bin) {
-      const cli = path.join(path.dirname(vpkg), bin);
-      if (fs.existsSync(cli)) return cli;
-    }
-  }
-  throw new Error(
-    "未在当前项目找到 Vite（请先安装依赖；宿主项目可执行 yarn install 后再运行 mvframe-d）",
-  );
-}
+const viteScript = path.join(__dirname, "dev-vite-server.js");
 
 spawnChild("notify", process.execPath, [notifyScript, ...notifyArgs]);
-try {
-  const viteEntry = resolveViteCli(process.cwd());
-  spawnChild("vite", process.execPath, [viteEntry, "--host", "0.0.0.0"]);
-} catch {
-  spawnChild("vite", "yarn", ["vite", "--host", "0.0.0.0"]);
-}
+spawnChild("vite", process.execPath, [viteScript]);

package/scripts/flag-assets.js

@@ -0,0 +1,85 @@
+const { execFileSync } = require("child_process");
+const fs = require("fs");
+const os = require("os");
+const path = require("path");
+const { createRequire } = require("module");
+
+const root = path.resolve(__dirname, "..");
+const pnpPath = path.join(root, ".pnp.cjs");
+
+if (fs.existsSync(pnpPath)) {
+  require(pnpPath).setup();
+}
+
+function resolveFlagSource() {
+  const projectRequire = createRequire(path.join(root, "package.json"));
+  const flagPackagePath = projectRequire.resolve("flag-icons/package.json");
+  const flagRoot = path.dirname(flagPackagePath);
+  return path.join(flagRoot, "flags");
+}
+
+function copyFromZip(zipBackedPath, target, tmpParent) {
+  const marker = ".zip/";
+  const splitAt = zipBackedPath.indexOf(marker);
+  if (splitAt < 0) return false;
+
+  const zipPath = zipBackedPath.slice(0, splitAt + ".zip".length);
+  const innerPath = zipBackedPath.slice(splitAt + marker.length);
+  const tmp = fs.mkdtempSync(path.join(tmpParent, ".tmp-flag-icons-"));
+
+  try {
+    execFileSync("unzip", ["-q", zipPath, `${innerPath}/*`, "-d", tmp], {
+      stdio: "ignore",
+    });
+    const extracted = path.join(tmp, innerPath);
+    fs.cpSync(extracted, target, { recursive: true });
+  } finally {
+    fs.rmSync(tmp, { recursive: true, force: true });
+  }
+
+  return true;
+}
+
+function copyFlagAssetsTo(dest, options = {}) {
+  const src = resolveFlagSource();
+  const clean = options.clean !== false;
+  const tmpParent = options.tmpParent || path.dirname(dest);
+
+  if (clean) {
+    fs.rmSync(dest, { recursive: true, force: true });
+  }
+  fs.mkdirSync(path.dirname(dest), { recursive: true });
+  fs.mkdirSync(tmpParent, { recursive: true });
+
+  if (src.includes(".zip/")) {
+    copyFromZip(src, dest, tmpParent);
+  } else if (fs.existsSync(src)) {
+    fs.cpSync(src, dest, { recursive: true });
+  } else {
+    throw new Error(`[flag-assets] flag-icons assets not found: ${src}`);
+  }
+
+  return dest;
+}
+
+function createTempFlagAssets() {
+  const tmpRoot = fs.mkdtempSync(path.join(os.tmpdir(), "mvframe-flags-"));
+  const flagsRoot = path.join(tmpRoot, "flags");
+
+  copyFlagAssetsTo(flagsRoot, {
+    tmpParent: tmpRoot,
+  });
+
+  return {
+    flagsRoot,
+    tmpRoot,
+    cleanup() {
+      fs.rmSync(tmpRoot, { recursive: true, force: true });
+    },
+  };
+}
+
+module.exports = {
+  copyFlagAssetsTo,
+  createTempFlagAssets,
+};