minista 3.1.3 → 3.1.5

package/dist/cli/build.js

@@ -1,4 +1,5 @@
 import path from "node:path";
+import { pathToFileURL } from "node:url";
 import fs from "fs-extra";
 import {
   defineConfig as defineViteConfig,
@@ -95,7 +96,8 @@ async function build(inlineConfig = {}) {
     const ssgPath = path.join(tempDir, "ssg.mjs");
     const ssgData = ssgItems[0].source || ssgItems[0].code || "";
     await fs.outputFile(ssgPath, ssgData);
-    const { runSsg } = await import(ssgPath);
+    const ssgUrl = pathToFileURL(ssgPath).href;
+    const { runSsg } = await import(ssgUrl);
     ssgPages = await runSsg(config);
   }
   if (ssgPages.length > 0) {

package/dist/config/user.js

@@ -1,4 +1,5 @@
 import path from "node:path";
+import { fileURLToPath, pathToFileURL } from "node:url";
 import fs from "fs-extra";
 import { normalizePath } from "vite";
 import { build as esBuild } from "esbuild";
@@ -33,8 +34,10 @@ async function resolveUserConfig(inlineConfig) {
       ".minista",
       "minista.config.mjs"
     );
+    const entryPointUrl = pathToFileURL(path.resolve(configPath));
+    const entryPointPath = fileURLToPath(entryPointUrl);
     await esBuild({
-      entryPoints: [configPath],
+      entryPoints: [entryPointPath],
       outfile: compiledConfigPath,
       bundle: true,
       format: "esm",
@@ -45,17 +48,19 @@ async function resolveUserConfig(inlineConfig) {
           name: "minista-esbuild-plugin:external",
           setup(build) {
             let filter = /^[^.\/]|^\.[^.\/]|^\.\.[^\/]/;
-            build.onResolve({ filter }, (args) => ({
-              path: args.path,
-              external: true
-            }));
+            build.onResolve({ filter }, (args) => {
+              if (args.path === entryPointPath) {
+                return { path: args.path, external: false };
+              }
+              return { path: args.path, external: true };
+            });
           }
         }
       ]
     }).catch((err) => {
       console.error(err);
     });
-    const { default: compiledUserConfig } = await import(compiledConfigPath);
+    const { default: compiledUserConfig } = await import(pathToFileURL(compiledConfigPath).href);
     const customDeepmerge = deepmergeCustom({
       mergeArrays: false
     });

package/dist/generate/page.js

@@ -40,6 +40,9 @@ async function generatePages({
         hydrateEl?.remove();
       }
       data = parsedHtml.toString();
+      data = data.replace(/src="([^"]+)"/g, (match, p1) => {
+        return `src="${p1.replace(/\\/g, "/")}"`;
+      });
       if (useHtml) {
         data = beautify.html(data, htmlOptions);
       }

package/dist/server/story.js

@@ -18,7 +18,7 @@ function getStories(config) {
   const jsStories = Object.keys(JS_STORIES).map((storyFileKey) => {
     const storyFile = JS_STORIES[storyFileKey];
     const storyMeta = storyFile.default;
-    if (!storyMeta?.id || !storyMeta?.title) {
+    if (!storyMeta?.id && !storyMeta?.title) {
       return [];
     }
     const storyBase = "/" + config.main.storyapp.outDir;

package/dist/transform/tag.js

@@ -17,7 +17,7 @@ function getLinkTag({
     assetPath = path.join("/", "@minista-project-root", input);
     return `<link rel="stylesheet"${attrs} href="${assetPath}">`;
   }
-  assetPath = path.join(resolvedBase, assets.outDir, name + ".css");
+  assetPath = `${resolvedBase}${assets.outDir}/${name}.css`;
   assetPath = assetPath.replace(/-ministaDuplicateName\d*/, "");
   return `<link rel="stylesheet"${attrs} href="${assetPath}" ${flags.entried}>`;
 }
@@ -35,10 +35,10 @@ function getScriptTag({
   attrs = attributes ? " " + attributes : ` type="module"`;
   attrs = attributes === false ? "" : attrs;
   if (command === "serve") {
-    assetPath = path.join("/", "@minista-project-root", input);
+    assetPath = `/@minista-project-root/${input}`;
     return `<script${attrs} src="${assetPath}"></script>`;
   }
-  assetPath = path.join(resolvedBase, assets.outDir, name + ".js");
+  assetPath = `${resolvedBase}${assets.outDir}/${name}.js`;
   assetPath = assetPath.replace(/-ministaDuplicateName\d*/, "");
   return `<script${attrs} src="${assetPath}" ${flags.entried}></script>`;
 }
@@ -105,16 +105,8 @@ function transformTags({
     hydrateHeadScriptTag = `<script type="module" src="${hydratePath}"></script>`;
   }
   if (command === "build") {
-    const bundlePath = path.join(
-      resolvedBase,
-      assets.outDir,
-      assets.bundle.outName + ".css"
-    );
-    const hydratePath = path.join(
-      resolvedBase,
-      assets.outDir,
-      assets.partial.outName + ".js"
-    );
+    const bundlePath = `${resolvedBase}${assets.outDir}/${assets.bundle.outName}.css`;
+    const hydratePath = `${resolvedBase}${assets.outDir}/${assets.partial.outName}.js`;
     bundleHeadLinkTag = `<link rel="stylesheet" href="${bundlePath}" ${flags.entried} ${flags.bundle}>`;
     hydrateHeadScriptTag = `<script type="module" src="${hydratePath}" ${flags.entried} ${flags.hydrate}></script>`;
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "minista",
   "description": "Static site generator with 100% static export from React and Vite",
-  "version": "3.1.3",
+  "version": "3.1.5",
   "type": "module",
   "engines": {
     "node": ">=14.15.0"
@@ -52,7 +52,7 @@
     "build:src": "tsx ../../scripts/build-sources.ts",
     "build:type": "tsc",
     "clean": "rimraf ./dist",
-    "prepublishOnly": "npm run clean && npm run build"
+    "prepublishOnly": "npm run build"
   },
   "peerDependencies": {
     "less": "*",
@@ -82,15 +82,15 @@
     "cac": "^6.7.14",
     "dayjs": "^1.11.9",
     "deepmerge-ts": "^5.1.0",
-    "esbuild": "^0.18.15",
-    "fast-glob": "^3.3.0",
+    "esbuild": "^0.18.17",
+    "fast-glob": "^3.3.1",
     "fs-extra": "^11.1.1",
     "iconv-lite": "^0.6.3",
     "image-size": "^1.0.2",
     "js-beautify": "^1.14.9",
     "mime-types": "^2.1.35",
     "mojigiri": "^0.3.0",
-    "node-fetch": "^3.3.1",
+    "node-fetch": "^3.3.2",
     "node-html-parser": "^6.1.5",
     "picocolors": "^1.0.0",
     "picomatch": "^2.3.1",
@@ -106,6 +106,6 @@
     "remark-rehype": "^10.1.0",
     "sharp": "^0.32.4",
     "unified": "^10.1.2",
-    "vite": "^4.4.6"
+    "vite": "^4.4.7"
   }
 }