minista 2.8.1 → 2.8.3

package/README.md

@@ -80,6 +80,10 @@ import { defineConfig } from "minista"
 
 export default defineConfig({
   base: "/", // string
+  // Absolute URL pathname, e.g. "/foo/"
+  // Full URL, e.g. "https://foo.com/"
+  // Empty string or "./" (for embedded deployment)
+  // https://ja.vitejs.dev/config/shared-options.html#base
   public: "public", // string
   out: "dist", // string
   root: {

package/dist/build.d.ts

@@ -1,7 +1,7 @@
 import type { Options as MdxOptions } from "@mdx-js/esbuild";
 import type { Config as SvgrOptions } from "@svgr/core";
 import type { InlineConfig } from "vite";
-import type { MinistaResolveConfig, RootStaticContent, RootJsxContent, GlobalStaticData, GetGlobalStaticData, PageJsxContent, StaticData, StaticDataItem, GetStaticData, AliasArray, PartialModules, CssOptions, EntryObject } from "./types.js";
+import type { MinistaResolveConfig, RootStaticContent, RootJsxContent, GlobalStaticData, GetGlobalStaticData, PageJsxContent, StaticData, StaticDataItem, GetStaticData, AliasArray, PartialModules, CssOptions, EntryObject, AssetsTagObject } from "./types.js";
 export declare function buildTempPages(entryPoints: string[], buildOptions: {
     outBase: string;
     outDir: string;
@@ -15,10 +15,7 @@ export declare function buildStaticPages({ entryPoints, tempRootFilePath, outBas
     tempRootFilePath: string;
     outBase: string;
     outDir: string;
-    assetsTagArray: {
-        pattern: string[];
-        tag: string;
-    }[];
+    assetsTagArray: AssetsTagObject[];
     showLog: boolean;
 }): Promise<void>;
 export declare function buildRootEsmContent(tempRootFilePath: string): Promise<{
@@ -30,10 +27,7 @@ export declare function buildStaticPage({ entryPoint, outFile, rootStaticContent
     entryPoint: string;
     outFile: string;
     rootStaticContent: RootStaticContent;
-    assetsTagArray: {
-        pattern: string[];
-        tag: string;
-    }[];
+    assetsTagArray: AssetsTagObject[];
     outDir: string;
     showLog: boolean;
 }): Promise<void>;
@@ -43,10 +37,7 @@ export declare function buildHtmlPage({ pageJsxContent, staticDataItem, routePat
     staticDataItem: StaticDataItem;
     routePath: string;
     rootStaticContent: RootStaticContent;
-    assetsTagArray: {
-        pattern: string[];
-        tag: string;
-    }[];
+    assetsTagArray: AssetsTagObject[];
     frontmatter: any;
     outDir: string;
     showLog: boolean;
@@ -65,16 +56,10 @@ outBase, hrefBase, entryPattern, bundlePattern, partialPattern, }: {
     entryPattern?: EntryObject[];
     bundlePattern?: EntryObject[];
     partialPattern?: EntryObject[];
-}): {
-    pattern: string[];
-    tag: string;
-}[];
+}): AssetsTagObject[];
 export declare function buildAssetsTagStr({ pathname, assetsTagArray, }: {
     pathname: string;
-    assetsTagArray: {
-        pattern: string[];
-        tag: string;
-    }[];
+    assetsTagArray: AssetsTagObject[];
 }): string;
 export declare function buildViteImporterRoots(config: MinistaResolveConfig): Promise<void>;
 export declare function buildViteImporterRoutes(config: MinistaResolveConfig): Promise<void>;

package/dist/build.js

@@ -336,18 +336,34 @@ function buildAssetsTagArray({
     const assetPath = entryPoint.replace(outBase, hrefBase).replace(winOutBase, hrefBase).replaceAll("\\", "/");
     const name = getFilename(assetPath);
     if (assetPath.endsWith(".css")) {
-      return { name, tag: `<link rel="stylesheet" href="${assetPath}">` };
+      return {
+        name,
+        assetTag: `<link rel="stylesheet" href="${assetPath}">`,
+        assetPath
+      };
     } else {
-      return { name, tag: `<script defer src="${assetPath}"><\/script>` };
+      return {
+        name,
+        assetTag: `<script defer src="${assetPath}"><\/script>`,
+        assetPath
+      };
     }
   });
   const patterns = [...entryPattern, ...bundlePattern, ...partialPattern];
   const result = assets.map((asset) => {
     const targetPattern = patterns.find((pattern) => pattern.name === asset.name);
     if (targetPattern) {
-      return { pattern: targetPattern.insertPages, tag: asset.tag };
+      return {
+        pattern: targetPattern.insertPages,
+        assetTag: asset.assetTag,
+        assetPath: asset.assetPath
+      };
     } else {
-      return { pattern: ["**/*"], tag: asset.tag };
+      return {
+        pattern: ["**/*"],
+        assetTag: asset.assetTag,
+        assetPath: asset.assetPath
+      };
     }
   });
   return result;
@@ -361,11 +377,22 @@ function buildAssetsTagStr({
   }
   const result = assetsTagArray.map((item) => {
     const check = picomatch.isMatch(pathname, item.pattern);
-    if (check) {
-      return item.tag;
-    } else {
+    if (!check) {
       return "";
     }
+    if (!item.assetPath.startsWith("./")) {
+      return item.assetTag;
+    }
+    const slashArray = pathname.match(/\//g);
+    const slashCount = slashArray ? slashArray.length : 1;
+    if (slashCount >= 2) {
+      const upStr = [...Array(slashCount - 1)].map(() => "../").join("");
+      const relativePath = item.assetPath.replace(/^\.\//, upStr);
+      const relativeAssetTag = item.assetTag.replace(new RegExp(item.assetPath), relativePath);
+      return relativeAssetTag;
+    } else {
+      return item.assetTag;
+    }
   }).join("");
   return result;
 }
@@ -412,6 +439,7 @@ async function buildViteImporterRoutes(config) {
       ${replaceFileNameArrayStr}
       .replace(/\\[\\.{3}.+\\]/, "*")
       .replace(/\\[(.+)\\]/, ":$1")
+      .replace(/^.\\//, "/")
     return {
       routePath: routePath,
       PageComponent: ROUTES[route].default,
@@ -734,7 +762,7 @@ async function buildSearchJson({
       blockTextElements: { script: false, style: false, pre: false }
     });
     const regTrimPath = new RegExp(`^${entryBase}|index|.html`, "g");
-    const path2 = filePath.replace(regTrimPath, "");
+    const routePath = path.join(config.base, filePath.replace(regTrimPath, ""));
     const regTrimTitle = new RegExp(trimTitle);
     const pTitle = parsedHtml.querySelector("title");
     const title = pTitle ? pTitle.rawText.replace(regTrimTitle, "") : "";
@@ -743,7 +771,7 @@ async function buildSearchJson({
     if (!targetContent) {
       tempWords.push(title);
       tempPages.push({
-        path: path2,
+        path: routePath,
         toc: [],
         title: titleArray,
         content: []
@@ -787,7 +815,7 @@ async function buildSearchJson({
     tempWords.push(title);
     tempWords.push(body);
     tempPages.push({
-      path: path2,
+      path: routePath,
       toc,
       title: titleArray,
       content: contentArray.flat()
@@ -809,7 +837,7 @@ async function buildSearchJson({
   });
   const pages = [];
   await Promise.all(tempPages.map(async (page) => {
-    const path2 = page.path;
+    const routePath = page.path;
     const toc = page.toc;
     const title = page.title.map((word) => {
       return sortedWords.indexOf(word);
@@ -817,7 +845,7 @@ async function buildSearchJson({
     const content = page.content.map((word) => {
       return sortedWords.indexOf(word);
     });
-    pages.push({ path: path2, title, toc, content });
+    pages.push({ path: routePath, title, toc, content });
   }));
   const sortedPages = pages.sort((a, b) => {
     const pathA = a.path.toUpperCase();

package/dist/types.d.ts

@@ -219,6 +219,11 @@ export declare type UserEntryObject = {
         exclude?: string[];
     };
 };
+export declare type AssetsTagObject = {
+    pattern: string[];
+    assetTag: string;
+    assetPath: string;
+};
 export declare type MinistaResolveAliasInput = AliasObject | AliasArray;
 export declare type MinistaResolveAliasConfig = {
     alias: AliasArray;

package/package.json

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