minista 2.7.2 → 2.7.5

package/dist/build.d.ts

@@ -75,7 +75,7 @@ export declare function buildPartialStringInitial(entryPoint: string, partialMod
 export declare function buildPartialHydrateIndex(partialModules: PartialModules, config: MinistaResolveConfig, buildOptions: {
     outFile: string;
 }): Promise<void>;
-export declare function buildPartialHydrateAssets(viteConfig: InlineConfig, buildOptions: {
+export declare function buildPartialHydrateAssets(viteConfig: InlineConfig, config: MinistaResolveConfig, buildOptions: {
     input: string;
     bundleOutName: string;
     outDir: string;

package/dist/build.js

@@ -40,6 +40,7 @@ import {
   rawPlugin,
   partialHydrationPlugin
 } from "./esbuild.js";
+import { resolveaAssetFileName } from "./vite.js";
 import { renderHtml } from "./render.js";
 import { slashEnd, reactStylesToString } from "./utils.js";
 import { cssModulePlugin } from "./css.js";
@@ -319,7 +320,7 @@ async function buildTempAssets(viteConfig, buildOptions) {
       if (item.fileName.match(/__minista_bundle_assets\.css/)) {
         const customFileName = slashEnd(buildOptions.outDir) + buildOptions.bundleOutName + ".css";
         return (item == null ? void 0 : item.source) && fs.outputFile(customFileName, item == null ? void 0 : item.source);
-      } else if (item.fileName.match(/__minista_bundle_assets\.js/)) {
+      } else if (item.fileName.match(/(__minista_bundle_assets\.js|\.svg$)/)) {
         return;
       } else {
         const customFileName = buildOptions.outDir + item.fileName.replace(buildOptions.assetDir, "");
@@ -566,13 +567,19 @@ ${tmpRendersStr}`;
     console.error(err);
   });
 }
-async function buildPartialHydrateAssets(viteConfig, buildOptions) {
+async function buildPartialHydrateAssets(viteConfig, config, buildOptions) {
   var _a;
   const activePreact = buildOptions.usePreact && userPkgHasPreact;
-  const resolveAliasPreact = {
-    react: "preact/compat",
-    "react-dom": "preact/compat"
-  };
+  const resolveAliasPreact = [
+    {
+      find: "react",
+      replacement: "preact/compat"
+    },
+    {
+      find: "react-dom",
+      replacement: "preact/compat"
+    }
+  ];
   const customConfig = defineViteConfig({
     base: viteConfig.base,
     build: {
@@ -584,25 +591,32 @@ async function buildPartialHydrateAssets(viteConfig, buildOptions) {
           __minista_bundle_assets: buildOptions.input
         },
         output: {
-          manualChunks: void 0
+          manualChunks: void 0,
+          assetFileNames: (chunkInfo) => resolveaAssetFileName(chunkInfo, config)
         }
       }
     },
     esbuild: viteConfig.esbuild,
     plugins: viteConfig.plugins,
     resolve: {
-      alias: activePreact ? resolveAliasPreact : {}
+      alias: activePreact ? resolveAliasPreact : []
     },
-    logLevel: "error"
+    logLevel: "error",
+    css: config.css
   });
   const mergedConfig = mergeViteConfig({}, customConfig);
+  if (config.alias.length > 0) {
+    await Promise.all(config.alias.map(async (item) => {
+      return mergedConfig.resolve.alias.push(item);
+    }));
+  }
   const result = await viteBuild(mergedConfig);
   const items = result.output;
   if (Array.isArray(items) && items.length > 0) {
     items.map((item) => {
-      if (item.fileName.match(/\.css/)) {
+      if (item.fileName.match(/(\.css|\.svg)$/)) {
         return;
-      } else if (item.fileName.match(/\.js/)) {
+      } else if (item.fileName.match(/(\.js)$/)) {
         const customFileName = slashEnd(buildOptions.outDir) + buildOptions.bundleOutName + ".js";
         return (item == null ? void 0 : item.code) && fs.outputFile(customFileName, item == null ? void 0 : item.code);
       } else {

package/dist/download.js

@@ -94,9 +94,15 @@ async function downloadFiles(entryPoints, remoteUrl, remoteName, downloadOutDir,
   }));
   await Promise.all(targetPages.map(async (targetPage) => {
     const html = await fs.readFile(targetPage.entryPoint, "utf8");
-    const reg = new RegExp(targetPage.remoteImgUrls.join("|"), "g");
+    const joinedUrl = targetPage.remoteImgUrls.map((url) => {
+      return url.replaceAll("&", "&").replaceAll("?", "\\?");
+    }).join("|");
+    const reg = new RegExp(joinedUrl, "g");
     function replacer(match) {
-      const replaceData = imgSrcList.find((item) => item.remoteImgUrl === match);
+      const replaceData = imgSrcList.find((item) => {
+        const unescapedMatch = match.replaceAll("&", "&");
+        return item.remoteImgUrl === unescapedMatch;
+      });
       const localImgUrl = (replaceData == null ? void 0 : replaceData.localImgUrl) || match;
       return localImgUrl;
     }

package/dist/generate.js

@@ -111,7 +111,7 @@ async function generatePartialHydration(config, mdxConfig, viteConfig) {
   await buildPartialHydrateIndex(partialModules, config, {
     outFile: hydrateIndex
   });
-  await buildPartialHydrateAssets(viteConfig, {
+  await buildPartialHydrateAssets(viteConfig, config, {
     input: hydrateIndex,
     bundleOutName: config.assets.partial.outName,
     outDir: systemConfig.temp.assets.outDir,

package/dist/vite.d.ts

@@ -1,10 +1,12 @@
 import type { UserConfig as ViteConfig, Plugin } from "vite";
+import type { PreRenderedAsset } from "rollup";
 import type { Config as SvgrOptions } from "@svgr/core";
 import type { Options as MdxOptions } from "@mdx-js/esbuild";
 import type { SvgstoreAddOptions } from "@qrac/svgstore";
 import type { MinistaResolveConfig, MinistaCliDevOptions, MinistaCliPreviewOptions } from "./types.js";
 export declare function getViteConfig(config: MinistaResolveConfig, mdxConfig: MdxOptions, cliOptions?: MinistaCliDevOptions | MinistaCliPreviewOptions): Promise<ViteConfig>;
 export declare function resolveEntry(entry: string | string[] | {}): {};
+export declare function resolveaAssetFileName(chunkInfo: PreRenderedAsset, config: MinistaResolveConfig): string;
 export declare function vitePluginMinistaVirtualHtml(): Plugin;
 /*! Fork: vite-plugin-svgr | https://github.com/pd4d10/vite-plugin-svgr */
 export declare function vitePluginMinistaSvgr(svgrOptions: SvgrOptions): Plugin;

package/dist/vite.js

@@ -20,8 +20,6 @@ const __filename = url.fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 async function getViteConfig(config, mdxConfig, cliOptions) {
   var _a, _b, _c, _d, _e;
-  const imgExt = ["jpg", "jpeg", "gif", "png", "webp", "svg"];
-  const fontExt = ["woff", "woff2", "eot", "ttf", "otf"];
   const defaultViteConfig = defineViteConfig({
     base: config.base || "/",
     publicDir: config.public || "public",
@@ -34,17 +32,7 @@ async function getViteConfig(config, mdxConfig, cliOptions) {
         output: {
           manualChunks: void 0,
           entryFileNames: `${config.assets.outDir}/${config.assets.outName}.js`,
-          assetFileNames: (chunkInfo) => {
-            const fileExtname = chunkInfo.name && path.extname(chunkInfo.name);
-            const fileExt = fileExtname && fileExtname.slice(1);
-            if (fileExt && imgExt.includes(fileExt)) {
-              return config.viteAssetsImagesOutput;
-            } else if (fileExt && fontExt.includes(fileExt)) {
-              return config.viteAssetsFontsOutput;
-            } else {
-              return config.viteAssetsOutput;
-            }
-          }
+          assetFileNames: (chunkInfo) => resolveaAssetFileName(chunkInfo, config)
         }
       }
     },
@@ -130,6 +118,19 @@ function resolveEntry(entry) {
   const result4 = Object.fromEntries(result3);
   return result4;
 }
+function resolveaAssetFileName(chunkInfo, config) {
+  const imgExt = ["jpg", "jpeg", "gif", "png", "webp"];
+  const fontExt = ["woff", "woff2", "eot", "ttf", "otf"];
+  const fileExtname = chunkInfo.name && path.extname(chunkInfo.name);
+  const fileExt = fileExtname && fileExtname.slice(1);
+  if (fileExt && imgExt.includes(fileExt)) {
+    return config.viteAssetsImagesOutput;
+  } else if (fileExt && fontExt.includes(fileExt)) {
+    return config.viteAssetsFontsOutput;
+  } else {
+    return config.viteAssetsOutput;
+  }
+}
 function vitePluginMinistaVirtualHtml() {
   function getAssetsTagStr(input) {
     !input && "";
@@ -262,6 +263,7 @@ function vitePluginMinistaSvgSpriteIcons(srcDir, options = {}, output, tempOutpu
 export {
   getViteConfig,
   resolveEntry,
+  resolveaAssetFileName,
   vitePluginMinistaSvgSpriteIcons,
   vitePluginMinistaSvgr,
   vitePluginMinistaVirtualHtml

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "minista",
   "description": "Next.js Like Development with 100% Static Generate",
-  "version": "2.7.2",
+  "version": "2.7.5",
   "bin": {
     "minista": "./bin/minista.js"
   },