minista 3.1.0 → 3.1.2

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

@@ -24,7 +24,7 @@ function getStories(config) {
     if (!storyId || !storyTitle) {
       return [];
     }
-    const storyList = Object.keys(storyFile).filter((key) => key !== "default").map((key) => ({ storyKey: key, storyObj: storyFile[key] }));
+    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;
       const currentId = item.storyKey.toLowerCase();
@@ -54,7 +54,9 @@ function getStories(config) {
         component,
         args,
         parameters,
-        decorators
+        decorators,
+        metadata: { ...{}, ...storyFile.metadata || {} },
+        frontmatter: { ...{}, ...storyFile.frontmatter || {} }
       };
     });
   });
@@ -91,7 +93,9 @@ function getStories(config) {
         component,
         args,
         parameters,
-        decorators
+        decorators,
+        metadata: { ...{}, ...storyFile.metadata || {} },
+        frontmatter: { ...{}, ...storyFile.frontmatter || {} }
       }
     ];
   });
@@ -110,14 +114,16 @@ function getStories(config) {
     }, baseComponent) : baseComponent;
     const metadata = {
       title: item.title,
-      draft: item.draft
+      draft: item.draft,
+      ...item.metadata,
+      ...item.frontmatter
     };
     return {
       path: item.path,
       component: decoratedComponent,
       getStaticData: void 0,
       metadata,
-      frontmatter: metadata
+      frontmatter: item.frontmatter
     };
   });
   return { storyPages, storyItems: [] };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "minista",
   "description": "Static site generator with 100% static export from React and Vite",
-  "version": "3.1.0",
+  "version": "3.1.2",
   "type": "module",
   "engines": {
     "node": ">=14.15.0"