minista 3.1.1 → 3.1.3

package/dist/cli/build.js

@@ -42,9 +42,15 @@ async function build(inlineConfig = {}) {
   const { assets, search, delivery } = config.main;
   const { partial } = assets;
   const resolvedOut = path.join(resolvedRoot, config.main.out);
-  const bundleCssName = path.join(assets.outDir, assets.bundle.outName + ".css");
+  const bundleCssName = path.join(
+    assets.outDir,
+    assets.outName.replace(/\[name\]/, assets.bundle.outName) + ".css"
+  );
   const bugBundleCssName = path.join(assets.outDir, "bundle.css");
-  const hydrateJsName = path.join(assets.outDir, assets.partial.outName + ".js");
+  const hydrateJsName = path.join(
+    assets.outDir,
+    assets.outName.replace(/\[name\]/, assets.partial.outName) + ".js"
+  );
   let ssgResult;
   let assetsResult;
   let hydrateResult;
@@ -83,7 +89,7 @@ async function build(inlineConfig = {}) {
   );
   ssgResult = await viteBuild(ssgConfig);
   ssgItems = ssgResult.output.filter((item) => {
-    return item.fileName.match(/__minista_plugin_ssg\.js$/);
+    return item.fileName.match(/__minista_plugin_ssg.*\.js$/);
   });
   if (ssgItems.length > 0) {
     const ssgPath = path.join(tempDir, "ssg.mjs");
@@ -191,10 +197,10 @@ async function build(inlineConfig = {}) {
     hydrateResult = { output: [] };
   }
   assetItems = assetsResult.output.filter((item) => {
-    return !item.fileName.match(/__minista_plugin_bundle\.js$/);
+    return !item.fileName.match(/__minista_plugin_bundle.*\.js$/);
   });
   hydrateItems = hydrateResult.output.filter((item) => {
-    return item.fileName.match(/__minista_plugin_hydrate\.js$/);
+    return item.fileName.match(/__minista_plugin_hydrate.*\.js$/);
   });
   hasBundleCss = assetsResult.output.some((item) => {
     return item.fileName === bundleCssName || item.fileName === bugBundleCssName;
@@ -210,8 +216,8 @@ async function build(inlineConfig = {}) {
   cssNameBugFix = { ...cssNameBugFix, ...{ [bugBundleCssName]: bundleCssName } };
   createAssets = [...assetItems, ...hydrateItems].map((item) => {
     const isCss = item.fileName.match(/.*\.css$/);
-    const isBundleCss = item.fileName.match(/__minista_plugin_bundle\.css$/);
-    const isHydrateJs = item.fileName.match(/__minista_plugin_hydrate\.js$/);
+    const isBundleCss = item.fileName.match(/__minista_plugin_bundle.*\.css$/);
+    const isHydrateJs = item.fileName.match(/__minista_plugin_hydrate.*\.js$/);
     let fileName = item.fileName;
     isBundleCss && (fileName = bundleCssName);
     isHydrateJs && (fileName = hydrateJsName);

package/dist/server/story.js

@@ -18,12 +18,12 @@ function getStories(config) {
   const jsStories = Object.keys(JS_STORIES).map((storyFileKey) => {
     const storyFile = JS_STORIES[storyFileKey];
     const storyMeta = storyFile.default;
-    const storyBase = "/" + config.main.storyapp.outDir;
-    const storyId = (storyMeta.id || storyMeta.title || "").split("/").map((id) => id.trim().toLowerCase()).join("/");
-    const storyTitle = (storyMeta.title || "").split("/").map((title) => title.trim()).join(" / ");
-    if (!storyId || !storyTitle) {
+    if (!storyMeta?.id || !storyMeta?.title) {
       return [];
     }
+    const storyBase = "/" + config.main.storyapp.outDir;
+    const storyId = (storyMeta.id || storyMeta.title).split("/").map((id) => id.trim().toLowerCase()).join("/");
+    const storyTitle = storyMeta.title.split("/").map((title) => title.trim()).join(" / ");
     const storyList = Object.keys(storyFile).filter((key) => !["default", "metadata", "frontmatter"].includes(key)).map((key) => ({ storyKey: key, storyObj: storyFile[key] }));
     return storyList.map((item) => {
       const currentObj = item.storyObj;

package/dist/transform/remote.js

@@ -1,5 +1,4 @@
 import path from "node:path";
-import { parse as parseUrl } from "node:url";
 import fetch from "node-fetch";
 import fs from "fs-extra";
 import fg from "fast-glob";
@@ -8,7 +7,7 @@ import { generateRemoteCache, generateRemotes } from "../generate/remote.js";
 import { getElements } from "../utility/element.js";
 import { getUniquePaths } from "../utility/path.js";
 function getRemoteExt(url) {
-  const pathname = parseUrl(url).pathname || "";
+  const pathname = new URL(url).pathname || "";
   const parsedName = path.parse(pathname);
   return parsedName.ext.replace(/^\./, "") || "";
 }

package/dist/utility/path.js

@@ -1,5 +1,4 @@
 import path from "node:path";
-import { parse as parseUrl } from "node:url";
 import fs from "fs-extra";
 function getHtmlPath(pathname) {
   let fileName = pathname.endsWith("/") ? path.join(pathname, "index.html") : pathname + ".html";
@@ -22,9 +21,14 @@ function getUniquePaths(paths, excludes) {
   }
 }
 function isLocalPath(root, url) {
-  const isAbsolute = parseUrl(url).protocol;
-  if (!url || isAbsolute) {
+  if (!url)
     return false;
+  try {
+    const { protocol } = new URL(url);
+    if (protocol) {
+      return false;
+    }
+  } catch (_) {
   }
   const filePath = path.join(root, url);
   return fs.existsSync(filePath);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "minista",
   "description": "Static site generator with 100% static export from React and Vite",
-  "version": "3.1.1",
+  "version": "3.1.3",
   "type": "module",
   "engines": {
     "node": ">=14.15.0"
@@ -77,17 +77,17 @@
     "@qrac/svgstore": "^3.0.3",
     "@svgr/core": "^8.0.0",
     "@svgr/plugin-jsx": "^8.0.1",
-    "@vitejs/plugin-react": "^4.0.0",
+    "@vitejs/plugin-react": "^4.0.3",
     "archiver": "^5.3.1",
     "cac": "^6.7.14",
-    "dayjs": "^1.11.7",
+    "dayjs": "^1.11.9",
     "deepmerge-ts": "^5.1.0",
-    "esbuild": "^0.17.19",
-    "fast-glob": "^3.2.12",
+    "esbuild": "^0.18.15",
+    "fast-glob": "^3.3.0",
     "fs-extra": "^11.1.1",
     "iconv-lite": "^0.6.3",
     "image-size": "^1.0.2",
-    "js-beautify": "^1.14.7",
+    "js-beautify": "^1.14.9",
     "mime-types": "^2.1.35",
     "mojigiri": "^0.3.0",
     "node-fetch": "^3.3.1",
@@ -95,7 +95,7 @@
     "picocolors": "^1.0.0",
     "picomatch": "^2.3.1",
     "react-helmet-async": "^1.3.0",
-    "react-router-dom": "^6.11.2",
+    "react-router-dom": "^6.14.2",
     "rehype-highlight": "^6.0.0",
     "rehype-raw": "^6.1.1",
     "rehype-react": "^7.2.0",
@@ -104,8 +104,8 @@
     "remark-mdx-frontmatter": "^3.0.0",
     "remark-parse": "^10.0.2",
     "remark-rehype": "^10.1.0",
-    "sharp": "^0.32.1",
+    "sharp": "^0.32.4",
     "unified": "^10.1.2",
-    "vite": "^4.3.9"
+    "vite": "^4.4.6"
   }
 }