minista 2.5.0 → 2.6.0

package/README.md

@@ -139,6 +139,24 @@ export default defineConfig({
     },
   },
   vite: {}, // https://ja.vitejs.dev/config/
+  resolve: {
+    alias: [], // { [key: string]: string } | { find: string, replacement: string }[]
+  },
+  css: {
+    modules: {
+      cache: true,
+      scopeBehaviour: "local",
+      globalModulePaths: [],
+      generateScopedName: undefined,
+      hashPrefix: "",
+      localsConvention: "camelCaseOnly",
+    }, // https://ja.vitejs.dev/config/#css-modules
+    preprocessorOptions: {
+      scss: {},
+      less: {},
+      stylus: {},
+    }, // https://ja.vitejs.dev/config/#css-preprocessoroptions
+  },
   markdown: {
     syntaxHighlighter: "highlight", // "highlight" | "none"
     highlightOptions: {}, // https://github.com/rehypejs/rehype-highlight#options
@@ -155,26 +173,11 @@ export default defineConfig({
       max_preserve_newlines: 0,
       indent_inner_html: true,
       extra_liners: [],
-      inline: ["span", "b", "br", "code", "del", "s", "small", "strong", "wbr"],
+      inline: ["span", "strong", "b", "small", "del", "s", "code", "br", "wbr"],
     }, // https://github.com/beautify-web/js-beautify#css--html
     cssOptions: {}, // https://github.com/beautify-web/js-beautify#css--html
     jsOptions: {}, // https://github.com/beautify-web/js-beautify#options
   },
-  css: {
-    modules: {
-      generateScopedName: undefined,
-      globalModulePaths: [],
-      hashPrefix: "",
-      localsConvention: "camelCaseOnly",
-      scopeBehaviour: "local",
-      cache: true,
-    }, // https://ja.vitejs.dev/config/#css-modules
-    preprocessorOptions: {
-      scss: {},
-      less: {},
-      stylus: {},
-    }, // https://ja.vitejs.dev/config/#css-preprocessoroptions
-  },
 })
 ```
 

package/dist/build.d.ts

@@ -1,10 +1,11 @@
 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, PartialModules, CssOptions } from "./types.js";
+import type { MinistaResolveConfig, MinistaResolveAlias, RootStaticContent, RootJsxContent, GlobalStaticData, GetGlobalStaticData, PageJsxContent, StaticData, StaticDataItem, GetStaticData, PartialModules, CssOptions } from "./types.js";
 export declare function buildTempPages(entryPoints: string[], buildOptions: {
     outBase: string;
     outDir: string;
+    alias: MinistaResolveAlias;
     mdxConfig: MdxOptions;
     svgrOptions: SvgrOptions;
     cssOptions: CssOptions;
@@ -43,6 +44,7 @@ export declare function buildPartialStringIndex(partialModules: PartialModules,
 }): Promise<void>;
 export declare function buildPartialStringBundle(entryPoint: string, buildOptions: {
     outFile: string;
+    alias: MinistaResolveAlias;
     mdxConfig: MdxOptions;
     svgrOptions: SvgrOptions;
     cssOptions: CssOptions;

package/dist/build.js

@@ -33,6 +33,7 @@ import {
 import { systemConfig } from "./system.js";
 import { getFilePath } from "./path.js";
 import {
+  getEsbuildAlias,
   resolvePlugin,
   svgrPlugin,
   rawPlugin,
@@ -71,11 +72,18 @@ const esbuildLoaders = {
   ".woff": "file",
   ".woff2": "file"
 };
+const esbuildAlias = [
+  {
+    find: "react/jsx-runtime",
+    replacement: "react/jsx-runtime.js"
+  }
+];
 const userPkgHasPreact = [
   ...Object.keys(userPkg.dependencies || {}),
   ...Object.keys(userPkg.devDependencies || {})
 ].includes("preact");
 async function buildTempPages(entryPoints, buildOptions) {
+  const alias = getEsbuildAlias([esbuildAlias, buildOptions.alias]);
   await esBuild({
     entryPoints,
     outbase: buildOptions.outBase,
@@ -91,11 +99,9 @@ async function buildTempPages(entryPoints, buildOptions) {
     external: esbuildExternals,
     loader: esbuildLoaders,
     plugins: [
+      resolvePlugin(alias),
       CssModulePlugin(buildOptions.cssOptions),
       mdx(buildOptions.mdxConfig),
-      resolvePlugin({
-        "react/jsx-runtime": "react/jsx-runtime.js"
-      }),
       svgrPlugin(buildOptions.svgrOptions),
       rawPlugin(),
       partialHydrationPlugin()
@@ -420,6 +426,7 @@ export { ${tmpExportsStr} }`;
   });
 }
 async function buildPartialStringBundle(entryPoint, buildOptions) {
+  const alias = getEsbuildAlias([esbuildAlias, buildOptions.alias]);
   await esBuild({
     entryPoints: [entryPoint],
     outfile: buildOptions.outFile,
@@ -432,11 +439,9 @@ async function buildPartialStringBundle(entryPoint, buildOptions) {
     external: esbuildExternals,
     loader: esbuildLoaders,
     plugins: [
+      resolvePlugin(alias),
       CssModulePlugin(buildOptions.cssOptions),
       mdx(buildOptions.mdxConfig),
-      resolvePlugin({
-        "react/jsx-runtime": "react/jsx-runtime.js"
-      }),
       svgrPlugin(buildOptions.svgrOptions),
       rawPlugin()
     ]

package/dist/config.d.ts

@@ -1,5 +1,7 @@
-import type { MinistaConfig, MinistaUserConfig, MinistaResolveConfig } from "./types.js";
+import type { AliasOptions as ViteAliasOptions } from "vite";
+import type { MinistaConfig, MinistaUserConfig, MinistaResolveConfig, MinistaResolveAliasInput, MinistaResolveAlias } from "./types.js";
 export declare const defaultConfig: MinistaConfig;
 export declare function mergeConfig(userConfig: MinistaUserConfig): Promise<MinistaConfig>;
+export declare function mergeAlias(configAlias: MinistaResolveAliasInput, viteConfigAlias: ViteAliasOptions): Promise<MinistaResolveAlias>;
 export declare function resolveConfig(config: MinistaConfig): Promise<MinistaResolveConfig>;
 export declare function getConfig(userConfig: MinistaUserConfig): Promise<MinistaResolveConfig>;

package/dist/config.js

@@ -83,6 +83,24 @@ const defaultConfig = {
     }
   },
   vite: {},
+  resolve: {
+    alias: []
+  },
+  css: {
+    modules: {
+      cache: true,
+      scopeBehaviour: "local",
+      globalModulePaths: [],
+      generateScopedName: void 0,
+      hashPrefix: "",
+      localsConvention: "camelCaseOnly"
+    },
+    preprocessorOptions: {
+      scss: {},
+      less: {},
+      stylus: {}
+    }
+  },
   markdown: {
     syntaxHighlighter: "highlight",
     highlightOptions: {},
@@ -99,25 +117,10 @@ const defaultConfig = {
       max_preserve_newlines: 0,
       indent_inner_html: true,
       extra_liners: [],
-      inline: ["span", "b", "br", "code", "del", "s", "small", "strong", "wbr"]
+      inline: ["span", "strong", "b", "small", "del", "s", "code", "br", "wbr"]
     },
     cssOptions: {},
     jsOptions: {}
-  },
-  css: {
-    modules: {
-      generateScopedName: void 0,
-      globalModulePaths: [],
-      hashPrefix: "",
-      localsConvention: "camelCaseOnly",
-      scopeBehaviour: "local",
-      cache: true
-    },
-    preprocessorOptions: {
-      scss: {},
-      less: {},
-      stylus: {}
-    }
   }
 };
 async function mergeConfig(userConfig) {
@@ -127,8 +130,40 @@ async function mergeConfig(userConfig) {
   const mergedConfig = customDeepmerge(defaultConfig, userConfig);
   return mergedConfig;
 }
+async function mergeAlias(configAlias, viteConfigAlias) {
+  const alias = [];
+  async function getAlias(input) {
+    if (!input) {
+      return;
+    } else if (Array.isArray(input) && input.length > 0) {
+      await Promise.all(input.map(async (item) => {
+        const pattern = {
+          find: item.find,
+          replacement: item.replacement
+        };
+        return alias.push(pattern);
+      }));
+    } else if (typeof input === "object") {
+      await Promise.all(Object.entries(input).map((item) => {
+        const pattern = {
+          find: item[0],
+          replacement: item[1]
+        };
+        return alias.push(pattern);
+      }));
+    }
+  }
+  await getAlias(configAlias);
+  await getAlias(viteConfigAlias);
+  return alias;
+}
 async function resolveConfig(config) {
+  var _a;
+  const configAlias = config.resolve.alias;
+  const viteConfigAlias = ((_a = config.vite.resolve) == null ? void 0 : _a.alias) || {};
+  const alias = await mergeAlias(configAlias, viteConfigAlias);
   const resolvedConfig = __spreadProps(__spreadValues({}, config), {
+    alias,
     rootSrcDir: noSlashEnd(config.root.srcDir),
     pagesSrcDir: noSlashEnd(config.pages.srcDir),
     publicOutDir: noSlashEnd(config.out),
@@ -153,6 +188,7 @@ async function getConfig(userConfig) {
 export {
   defaultConfig,
   getConfig,
+  mergeAlias,
   mergeConfig,
   resolveConfig
 };

package/dist/css.js

@@ -18,8 +18,8 @@ var __spreadValues = (a, b) => {
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 import React from "react";
-import path from "path";
 import fs from "fs-extra";
+import path from "path";
 import postcss from "postcss";
 import postcssModules from "postcss-modules";
 var PreprocessLang = /* @__PURE__ */ ((PreprocessLang2) => {

package/dist/esbuild.d.ts

@@ -1,5 +1,9 @@
 import type { Plugin } from "esbuild";
 import type { Config as SvgrOptions } from "@svgr/core";
+import type { MinistaResolveAlias } from "./types.js";
+export declare function getEsbuildAlias(aliasArray: MinistaResolveAlias[]): {
+    [key: string]: string;
+};
 /*! Fork: esbuild-plugin-resolve | https://github.com/markwylde/esbuild-plugin-resolve */
 export declare function resolvePlugin(options: {
     [key: string]: string;

package/dist/esbuild.js

@@ -19,6 +19,13 @@ import fs from "fs-extra";
 import path from "path";
 import { v4 as uuidv4 } from "uuid";
 import { systemConfig } from "./system.js";
+function getEsbuildAlias(aliasArray) {
+  const alias = [...aliasArray].flat();
+  const result = Object.assign({}, ...alias.map((item) => ({
+    [item.find]: item.replacement
+  })));
+  return result;
+}
 /*! Fork: esbuild-plugin-resolve | https://github.com/markwylde/esbuild-plugin-resolve */
 function resolvePlugin(options) {
   function resolvePluginIntercept(build, moduleName, moduleTarget) {
@@ -120,6 +127,7 @@ function partialHydrationPlugin() {
   };
 }
 export {
+  getEsbuildAlias,
   partialHydrationPlugin,
   rawPlugin,
   resolvePlugin,

package/dist/generate.js

@@ -46,6 +46,7 @@ async function generateTempRoot(config, mdxConfig) {
     await buildTempPages([srcRootFilePaths[0]], {
       outBase: config.rootSrcDir,
       outDir: systemConfig.temp.root.outDir,
+      alias: config.alias,
       mdxConfig,
       svgrOptions: config.assets.svgr.svgrOptions,
       cssOptions: config.css
@@ -57,6 +58,7 @@ async function generateTempPages(config, mdxConfig) {
   await buildTempPages(srcPageFilePaths, {
     outBase: config.pagesSrcDir,
     outDir: systemConfig.temp.pages.outDir,
+    alias: config.alias,
     mdxConfig,
     svgrOptions: config.assets.svgr.svgrOptions,
     cssOptions: config.css
@@ -92,6 +94,7 @@ async function generatePartialHydration(config, mdxConfig, viteConfig) {
   await buildPartialStringBundle(stringIndex, {
     outFile: stringBundle,
     mdxConfig,
+    alias: config.alias,
     svgrOptions: config.assets.svgr.svgrOptions,
     cssOptions: config.css
   });

package/dist/path.js

@@ -1,22 +1,22 @@
 import React from "react";
 import fs from "fs-extra";
+import fg from "fast-glob";
 import path from "path";
-import glob from "tiny-glob";
 function getFilePath(targetDir, fileName, extension) {
   const filePath = `${targetDir}/${fileName}.${extension}`;
   const file = fs.existsSync(path.resolve(filePath)) ? path.resolve(filePath) : "";
   return file;
 }
 async function getFilePaths(targetDir, extensions) {
-  const strExtension = typeof extensions === "string" ? extensions : extensions.join();
-  const globPattern = `${targetDir}/**/*.{${strExtension}}`;
-  const files = await glob(globPattern);
+  const strExtension = typeof extensions === "string" ? extensions : extensions.join("|");
+  const globPattern = `${targetDir}/**/*.+(${strExtension})`;
+  const files = await fg(globPattern, { extglob: true });
   return files;
 }
 async function getSameFilePaths(targetDir, fileName, extensions) {
-  const strExtension = typeof extensions === "string" ? extensions : extensions.join();
-  const globPattern = `${targetDir}/${fileName}.{${strExtension}}`;
-  const files = await glob(globPattern);
+  const strExtension = typeof extensions === "string" ? extensions : extensions.join("|");
+  const globPattern = `${targetDir}/${fileName}.+(${strExtension})`;
+  const files = await fg(globPattern, { extglob: true });
   return files;
 }
 export {

package/dist/types.d.ts

@@ -1,6 +1,7 @@
 import type { ExoticComponent } from "react";
 import type { UserConfig as ViteUserConfig, CorsOptions as ViteCorsOptions } from "vite";
 import type { Config as SvgrOptions } from "@svgr/core";
+import type { SvgstoreAddOptions } from "@qrac/svgstore";
 import type { Options as HighlightOptions } from "rehype-highlight";
 import type { Options as MdxOptions } from "@mdx-js/esbuild";
 import type { HTMLBeautifyOptions, CSSBeautifyOptions, JSBeautifyOptions } from "js-beautify";
@@ -58,7 +59,7 @@ export declare type MinistaConfig = {
             srcDir: string;
             outDir: string;
             outName: string;
-            svgstoreOptions: MinistaSvgstoreOptions;
+            svgstoreOptions: SvgstoreAddOptions;
         };
         download: {
             useRemote: boolean;
@@ -68,6 +69,10 @@ export declare type MinistaConfig = {
         };
     };
     vite: ViteUserConfig;
+    resolve: {
+        alias: MinistaResolveAliasInput;
+    };
+    css: CssOptions;
     markdown: {
         syntaxHighlighter: "highlight" | "none";
         highlightOptions: HighlightOptions;
@@ -80,7 +85,6 @@ export declare type MinistaConfig = {
         cssOptions: CSSBeautifyOptions;
         jsOptions: JSBeautifyOptions;
     };
-    css: CssOptions;
 };
 export declare type MinistaUserConfig = {
     base?: string;
@@ -134,7 +138,7 @@ export declare type MinistaUserConfig = {
             srcDir?: string;
             outDir?: string;
             outName?: string;
-            svgstoreOptions?: MinistaSvgstoreOptions;
+            svgstoreOptions?: SvgstoreAddOptions;
         };
         download?: {
             useRemote?: boolean;
@@ -144,6 +148,10 @@ export declare type MinistaUserConfig = {
         };
     };
     vite?: ViteUserConfig;
+    resolve?: {
+        alias?: MinistaResolveAliasInput;
+    };
+    css?: CssUserOptions;
     markdown?: {
         syntaxHighlighter?: "highlight" | "none";
         highlightOptions?: HighlightOptions;
@@ -156,21 +164,21 @@ export declare type MinistaUserConfig = {
         cssOptions?: CSSBeautifyOptions;
         jsOptions?: JSBeautifyOptions;
     };
-    css?: CssUserOptions;
 };
-export declare type MinistaSvgstoreOptions = {
-    cleanDefs?: Boolean | string[];
-    cleanSymbols?: Boolean | string[];
-    svgAttrs?: Boolean | {
-        [key: string]: string;
-    };
-    symbolAttrs?: Boolean | {
-        [key: string]: string;
-    };
-    copyAttrs?: Boolean | string[];
-    renameDefs?: Boolean;
+export declare type MinistaResolveConfig = MinistaConfig & MinistaResolveAliasConfig & MinistaResolvePathConfig;
+export declare type MinistaResolveAliasInput = {
+    [key: string]: string;
+} | {
+    find: string;
+    replacement: string;
+}[];
+export declare type MinistaResolveAlias = {
+    find: string;
+    replacement: string;
+}[];
+export declare type MinistaResolveAliasConfig = {
+    alias: MinistaResolveAlias;
 };
-export declare type MinistaResolveConfig = MinistaConfig & MinistaResolvePathConfig;
 export declare type MinistaResolvePathConfig = {
     rootSrcDir: string;
     pagesSrcDir: string;
@@ -275,14 +283,6 @@ export declare type PartialModules = {
 export declare type PartialString = {
     [key: string]: string;
 };
-export declare type CSSModulesOptions = {
-    cache: boolean;
-    scopeBehaviour: "global" | "local";
-    globalModulePaths: RegExp[];
-    generateScopedName: undefined | string | ((name: string, filename: string, css: string) => string);
-    hashPrefix: string;
-    localsConvention: "camelCase" | "camelCaseOnly" | "dashes" | "dashesOnly";
-};
 export declare type CssOptions = {
     modules: CSSModulesOptions | false;
     preprocessorOptions: {
@@ -299,3 +299,11 @@ export declare type CssUserOptions = {
         stylus?: Stylus.RenderOptions;
     };
 };
+export declare type CSSModulesOptions = {
+    cache: boolean;
+    scopeBehaviour: "global" | "local";
+    globalModulePaths: RegExp[];
+    generateScopedName: undefined | string | ((name: string, filename: string, css: string) => string);
+    hashPrefix: string;
+    localsConvention: "camelCase" | "camelCaseOnly" | "dashes" | "dashesOnly";
+};

package/dist/vite.d.ts

@@ -1,10 +1,11 @@
 import type { UserConfig as ViteConfig, Plugin } from "vite";
 import type { Config as SvgrOptions } from "@svgr/core";
 import type { Options as MdxOptions } from "@mdx-js/esbuild";
-import type { MinistaResolveConfig, MinistaSvgstoreOptions, MinistaCliDevOptions, MinistaCliPreviewOptions } from "./types.js";
+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 vitePluginMinistaVirtualHtml(): Plugin;
 /*! Fork: vite-plugin-svgr | https://github.com/pd4d10/vite-plugin-svgr */
 export declare function vitePluginMinistaSvgr(svgrOptions: SvgrOptions): Plugin;
-export declare function vitePluginMinistaSvgSpriteIcons(srcDir: string, options: MinistaSvgstoreOptions | undefined, output: string, tempOutput: string): Plugin;
+export declare function vitePluginMinistaSvgSpriteIcons(srcDir: string, options: SvgstoreAddOptions | undefined, output: string, tempOutput: string): Plugin;

package/dist/vite.js

@@ -12,7 +12,7 @@ import {
 } from "vite";
 import react from "@vitejs/plugin-react";
 import mdx from "@mdx-js/rollup";
-import svgstore from "svgstore";
+import svgstore from "@qrac/svgstore";
 import { systemConfig } from "./system.js";
 import { getFilePaths } from "./path.js";
 import { getFilename, getFilenameObject } from "./utils.js";
@@ -92,6 +92,11 @@ async function getViteConfig(config, mdxConfig, cliOptions) {
     css: config.css
   });
   const mergedViteConfig = mergeViteConfig(defaultViteConfig, config.vite);
+  if (config.alias.length > 0) {
+    await Promise.all(config.alias.map(async (item) => {
+      return mergedViteConfig.resolve.alias.push(item);
+    }));
+  }
   const svgrPlugin = vitePluginMinistaSvgr(config.assets.svgr.svgrOptions);
   mergedViteConfig.plugins.push(svgrPlugin);
   if (config.assets.icons.useSprite) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "minista",
   "description": "Next.js Like Development with 100% Static Generate",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "bin": {
     "minista": "./bin/minista.js"
   },
@@ -87,18 +87,20 @@
   "dependencies": {
     "@mdx-js/esbuild": "^2.1.1",
     "@mdx-js/rollup": "^2.1.1",
+    "@qrac/svgstore": "^3.0.3",
     "@svgr/core": "^6.2.1",
     "@vitejs/plugin-react": "^1.3.2",
     "cac": "^6.7.12",
     "deepmerge-ts": "^4.0.3",
-    "esbuild": "^0.14.39",
+    "esbuild": "^0.14.42",
+    "fast-glob": "^3.2.11",
     "fs-extra": "^10.1.0",
     "js-beautify": "^1.14.3",
     "mime-types": "^2.1.35",
-    "node-fetch": "^3.2.4",
+    "node-fetch": "^3.2.5",
     "node-html-parser": "^5.3.3",
     "picocolors": "^1.0.0",
-    "postcss": "^8.4.13",
+    "postcss": "^8.4.14",
     "postcss-modules": "^4.3.1",
     "react-helmet": "^6.1.0",
     "react-router-dom": "^6.3.0",
@@ -107,8 +109,6 @@
     "remark-gfm": "^3.0.1",
     "remark-mdx-frontmatter": "^1.1.1",
     "srcset": "^5.0.0",
-    "svgstore": "^3.0.1",
-    "tiny-glob": "^0.2.9",
     "uuid": "^8.3.2",
     "vite": "^2.9.9"
   },
@@ -117,7 +117,7 @@
     "@types/js-beautify": "^1.13.3",
     "@types/less": "^3.0.3",
     "@types/mime-types": "^2.1.1",
-    "@types/node": "^17.0.34",
+    "@types/node": "^17.0.39",
     "@types/react": "^17.0.45",
     "@types/react-dom": "^17.0.16",
     "@types/react-helmet": "^6.1.5",
@@ -126,10 +126,10 @@
     "less": "^4.1.2",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "sass": "^1.51.0",
-    "stylus": "^0.57.0",
-    "tsup": "^5.12.8",
-    "typescript": "^4.6.4",
-    "vitest": "^0.12.6"
+    "sass": "^1.52.2",
+    "stylus": "^0.58.1",
+    "tsup": "^6.0.1",
+    "typescript": "^4.7.3",
+    "vitest": "^0.13.1"
   }
 }