minista 2.1.0 → 2.3.0

package/README.md

@@ -105,6 +105,9 @@ export default defineConfig({
       outDir: "assets/fonts", // string
       outName: "[name]", // string
     },
+    svgr: {
+      svgrOptions: {}, // https://react-svgr.com/docs/options/
+    },
     icons: {
       useSprite: true, // boolean
       srcDir: "src/assets/icons", // string

package/client.d.ts

@@ -1,3 +1,21 @@
+declare module "*.mdx" {
+  import { MDXProps } from "mdx/types"
+  export default function MDXContent(props: MDXProps): JSX.Element
+}
+
+declare module "*.md" {
+  export { default } from "*.mdx"
+}
+
+declare module "*.svg" {
+  import * as React from "react"
+
+  const ReactComponent: React.FunctionComponent<
+    React.SVGProps<SVGSVGElement> & { title?: string }
+  >
+  export default ReactComponent
+}
+
 declare module "*?raw" {
   const src: string
   export default src

package/dist/build.d.ts

@@ -1,10 +1,12 @@
 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 } from "./types.js";
 export declare function buildTempPages(entryPoints: string[], buildOptions: {
     outBase: string;
     outDir: string;
     mdxConfig: MdxOptions;
+    svgrOptions: SvgrOptions;
 }): Promise<void>;
 export declare function buildStaticPages(entryPoints: string[], tempRootFilePath: string, buildOptions: {
     outBase: string;

package/dist/build.js

@@ -27,7 +27,7 @@ import { build as esBuild } from "esbuild";
 import mdx from "@mdx-js/esbuild";
 import { build as viteBuild, mergeConfig as mergeViteConfig } from "vite";
 import { systemConfig } from "./system.js";
-import { resolvePlugin, rawPlugin } from "./esbuild.js";
+import { resolvePlugin, svgrPlugin, rawPlugin } from "./esbuild.js";
 import { renderHtml } from "./render.js";
 import { slashEnd } from "./utils.js";
 const __filename = url.fileURLToPath(import.meta.url);
@@ -66,6 +66,7 @@ async function buildTempPages(entryPoints, buildOptions) {
       resolvePlugin({
         "react/jsx-runtime": "react/jsx-runtime.js"
       }),
+      svgrPlugin(buildOptions.svgrOptions),
       rawPlugin()
     ]
   }).catch(() => process.exit(1));

package/dist/cli.js

@@ -1,3 +1,19 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
 import React from "react";
 import fs from "fs-extra";
 import { cac } from "cac";
@@ -20,19 +36,25 @@ import {
   generateDownload,
   generateBeautify
 } from "./generate.js";
+const cli = cac("minista");
+function cleanOptions(options) {
+  const ret = __spreadValues({}, options);
+  delete ret["--"];
+  return ret;
+}
 function printVersion() {
   const pkgURL = new URL("../package.json", import.meta.url);
   const pkg = JSON.parse(fs.readFileSync(pkgURL, "utf8"));
   const pkgVersion = pkg.version;
   return pkgVersion;
 }
-const cli = cac("minista");
-cli.command("[root]").alias("dev").action(async () => {
+cli.command("[root]", "start dev server").alias("dev").option("--host [host]", `[string] specify hostname`).option("--port <port>", `[number] specify port`).option("--strictPort", `[boolean] exit if specified port is already in use`).option("--https", `[boolean] use TLS + HTTP/2`).option("--open [path]", `[boolean | string] open browser on startup`).option("--cors", `[boolean] enable CORS`).action(async (root, options) => {
   try {
+    const cliOptions = cleanOptions(options);
     const userConfig = await getUserConfig();
     const config = await getConfig(userConfig);
     const mdxConfig = await getMdxConfig(config);
-    const viteConfig = await getViteConfig(config, mdxConfig);
+    const viteConfig = await getViteConfig(config, mdxConfig, cliOptions);
     await Promise.all([
       emptyResolveDir(systemConfig.temp.viteImporter.outDir),
       emptyResolveDir(systemConfig.temp.icons.outDir)
@@ -44,7 +66,7 @@ cli.command("[root]").alias("dev").action(async () => {
     process.exit(1);
   }
 });
-cli.command("build [root]").action(async () => {
+cli.command("build [root]", "build for production").action(async () => {
   try {
     const userConfig = await getUserConfig();
     const config = await getConfig(userConfig);
@@ -76,12 +98,13 @@ cli.command("build [root]").action(async () => {
     process.exit(1);
   }
 });
-cli.command("preview [root]").action(async () => {
+cli.command("preview [root]", "locally preview production build").option("--host [host]", `[string] specify hostname`).option("--port <port>", `[number] specify port`).option("--strictPort", `[boolean] exit if specified port is already in use`).option("--https", `[boolean] use TLS + HTTP/2`).option("--open [path]", `[boolean | string] open browser on startup`).action(async (root, options) => {
   try {
+    const cliOptions = cleanOptions(options);
     const userConfig = await getUserConfig();
     const config = await getConfig(userConfig);
     const mdxConfig = await getMdxConfig(config);
-    const viteConfig = await getViteConfig(config, mdxConfig);
+    const viteConfig = await getViteConfig(config, mdxConfig, cliOptions);
     await previewLocal(viteConfig);
   } catch (err) {
     console.log(err);

package/dist/config.js

@@ -49,6 +49,9 @@ const defaultConfig = {
       outDir: "assets/fonts",
       outName: "[name]"
     },
+    svgr: {
+      svgrOptions: {}
+    },
     icons: {
       useSprite: true,
       srcDir: "src/assets/icons",

package/dist/esbuild.d.ts

@@ -1,7 +1,10 @@
 import type { Plugin } from "esbuild";
+import type { Config as SvgrOptions } from "@svgr/core";
 /*! Fork: esbuild-plugin-resolve | https://github.com/markwylde/esbuild-plugin-resolve */
 export declare function resolvePlugin(options: {
     [key: string]: string;
 }): Plugin;
+/*! Fork: esbuild-plugin-svgr | https://github.com/kazijawad/esbuild-plugin-svgr */
+export declare function svgrPlugin(options: SvgrOptions): Plugin;
 /*! Fork: esbuild-plugin-resolve | https://github.com/hannoeru/esbuild-plugin-raw */
 export declare function rawPlugin(): Plugin;

package/dist/esbuild.js

@@ -1,6 +1,22 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
 import React from "react";
+import fs from "fs-extra";
 import path from "path";
-import { readFile } from "fs/promises";
 /*! Fork: esbuild-plugin-resolve | https://github.com/markwylde/esbuild-plugin-resolve */
 function resolvePlugin(options) {
   return {
@@ -35,6 +51,23 @@ function resolvePluginIntercept(build, moduleName, moduleTarget) {
     return { contents: importerCode, resolveDir: args.pluginData.resolveDir };
   });
 }
+/*! Fork: esbuild-plugin-svgr | https://github.com/kazijawad/esbuild-plugin-svgr */
+function svgrPlugin(options) {
+  return {
+    name: "esbuild-svgr",
+    setup(build) {
+      build.onLoad({ filter: /\.svg$/ }, async (args) => {
+        const { transform: transformSvgr } = await import("@svgr/core");
+        const svg = await fs.promises.readFile(args.path, "utf8");
+        const contents = await transformSvgr(svg, __spreadValues({}, options), { filePath: args.path });
+        return {
+          contents,
+          loader: options.typescript ? "tsx" : "jsx"
+        };
+      });
+    }
+  };
+}
 /*! Fork: esbuild-plugin-resolve | https://github.com/hannoeru/esbuild-plugin-raw */
 function rawPlugin() {
   return {
@@ -48,7 +81,7 @@ function rawPlugin() {
       });
       build.onLoad({ filter: /\?raw$/, namespace: "raw-loader" }, async (args) => {
         return {
-          contents: await readFile(args.path.replace(/\?raw$/, "")),
+          contents: await fs.promises.readFile(args.path.replace(/\?raw$/, "")),
           loader: "text"
         };
       });
@@ -57,5 +90,6 @@ function rawPlugin() {
 }
 export {
   rawPlugin,
-  resolvePlugin
+  resolvePlugin,
+  svgrPlugin
 };

package/dist/generate.js

@@ -35,7 +35,8 @@ async function generateTempRoot(config, mdxConfig) {
     await buildTempPages([srcRootFilePaths[0]], {
       outBase: config.rootSrcDir,
       outDir: systemConfig.temp.root.outDir,
-      mdxConfig
+      mdxConfig,
+      svgrOptions: config.assets.svgr.svgrOptions
     });
   }
 }
@@ -44,7 +45,8 @@ async function generateTempPages(config, mdxConfig) {
   await buildTempPages(srcPageFilePaths, {
     outBase: config.pagesSrcDir,
     outDir: systemConfig.temp.pages.outDir,
-    mdxConfig
+    mdxConfig,
+    svgrOptions: config.assets.svgr.svgrOptions
   });
 }
 async function generateAssets(config, viteConfig) {

package/dist/types.d.ts

@@ -1,5 +1,6 @@
 import type { ExoticComponent } from "react";
-import type { UserConfig as ViteUserConfig } from "vite";
+import type { UserConfig as ViteUserConfig, CorsOptions as ViteCorsOptions } from "vite";
+import type { Config as SvgrOptions } from "@svgr/core";
 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";
@@ -33,6 +34,9 @@ export declare type MinistaConfig = {
             outDir: string;
             outName: string;
         };
+        svgr: {
+            svgrOptions: SvgrOptions;
+        };
         icons: {
             useSprite: boolean;
             srcDir: string;
@@ -91,6 +95,9 @@ export declare type MinistaUserConfig = {
             outDir?: string;
             outName?: string;
         };
+        svgr?: {
+            svgrOptions?: SvgrOptions;
+        };
         icons?: {
             useSprite?: boolean;
             srcDir?: string;
@@ -170,6 +177,21 @@ export declare type MinistaSystemConfig = {
         };
     };
 };
+export declare type MinistaCliDevOptions = {
+    host?: string | boolean;
+    port?: number;
+    strictPort?: boolean;
+    https?: boolean;
+    open?: boolean | string;
+    cors?: boolean | ViteCorsOptions;
+};
+export declare type MinistaCliPreviewOptions = {
+    host?: string | boolean;
+    port?: number;
+    strictPort?: boolean;
+    https?: boolean;
+    open?: boolean | string;
+};
 export declare type MinistaLocation = {
     pathname: string;
 };

package/dist/vite.d.ts

@@ -1,7 +1,10 @@
 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 } from "./types.js";
-export declare function getViteConfig(config: MinistaResolveConfig, mdxConfig: MdxOptions): Promise<ViteConfig>;
+import type { MinistaResolveConfig, MinistaSvgstoreOptions, 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;

package/dist/vite.js

@@ -7,7 +7,8 @@ import {
   defineConfig as defineViteConfig,
   searchForWorkspaceRoot,
   createLogger,
-  mergeConfig as mergeViteConfig
+  mergeConfig as mergeViteConfig,
+  transformWithEsbuild
 } from "vite";
 import react from "@vitejs/plugin-react";
 import mdx from "@mdx-js/rollup";
@@ -17,11 +18,11 @@ import { getFilePaths } from "./path.js";
 import { getFilename, getFilenameObject } from "./utils.js";
 const __filename = url.fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
-async function getViteConfig(config, mdxConfig) {
+async function getViteConfig(config, mdxConfig, cliOptions) {
   var _a, _b, _c, _d, _e;
   const imgExt = ["jpg", "jpeg", "gif", "png", "webp", "svg"];
   const fontExt = ["woff", "woff2", "eot", "ttf", "otf"];
-  const viteConfig = defineViteConfig({
+  const defaultViteConfig = defineViteConfig({
     base: config.base || "/",
     publicDir: config.public || "public",
     build: {
@@ -89,7 +90,9 @@ async function getViteConfig(config, mdxConfig) {
     },
     customLogger: createLogger("info", { prefix: "[minista]" })
   });
-  const mergedViteConfig = mergeViteConfig(viteConfig, config.vite);
+  const mergedViteConfig = mergeViteConfig(defaultViteConfig, config.vite);
+  const svgrPlugin = vitePluginMinistaSvgr(config.assets.svgr.svgrOptions);
+  mergedViteConfig.plugins.push(svgrPlugin);
   if (config.assets.icons.useSprite) {
     const iconsPlugin = vitePluginMinistaSvgSpriteIcons(config.vitePluginSvgSpriteIconsSrcDir, config.assets.icons.svgstoreOptions, config.out + config.vitePluginSvgSpriteIconsOutput, config.vitePluginSvgSpriteIconsTempOutput);
     const iconsResolveAlias = {
@@ -101,7 +104,7 @@ async function getViteConfig(config, mdxConfig) {
   }
   const mdxPlugin = mdx(mdxConfig);
   mergedViteConfig.plugins.push(mdxPlugin);
-  return mergedViteConfig;
+  return cliOptions ? mergeViteConfig(mergedViteConfig, { server: cliOptions }) : mergedViteConfig;
 }
 function resolveEntry(entry) {
   const result1 = typeof entry === "object" ? entry : typeof entry === "string" ? { [getFilename(entry)]: entry } : Array.isArray(entry) ? getFilenameObject(entry) : {};
@@ -166,6 +169,29 @@ function vitePluginMinistaVirtualHtml() {
     }
   };
 }
+/*! Fork: vite-plugin-svgr | https://github.com/pd4d10/vite-plugin-svgr */
+function vitePluginMinistaSvgr(svgrOptions) {
+  return {
+    name: "vite-plugin-minista-svgr",
+    async transform(code, id) {
+      if (id.endsWith(".svg")) {
+        const { transform: transformSvgr } = await import("@svgr/core");
+        const svgCode = await fs.promises.readFile(id, "utf8");
+        const componentCode = await transformSvgr(svgCode, svgrOptions, {
+          componentName: "ReactComponent",
+          filePath: id
+        });
+        const res = await transformWithEsbuild(componentCode, id, {
+          loader: "jsx"
+        });
+        return {
+          code: res.code,
+          map: null
+        };
+      }
+    }
+  };
+}
 function vitePluginMinistaSvgSpriteIcons(srcDir, options = {}, output, tempOutput) {
   async function getSvgSpriteFile(spriteOutput) {
     const svgFiles = await getFilePaths(srcDir, "svg");
@@ -223,5 +249,6 @@ export {
   getViteConfig,
   resolveEntry,
   vitePluginMinistaSvgSpriteIcons,
+  vitePluginMinistaSvgr,
   vitePluginMinistaVirtualHtml
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "minista",
   "description": "Next.js Like Development with 100% Static Generate",
-  "version": "2.1.0",
+  "version": "2.3.0",
   "bin": {
     "minista": "./bin/minista.js"
   },
@@ -51,8 +51,10 @@
     "test:dev": "vitest watch",
     "user": "cd ./user && npx minista",
     "user:dev": "cd ./user && npx minista",
+    "user:dev-h": "cd ./user && npx minista --host",
     "user:build": "cd ./user && npx minista build",
     "user:preview": "cd ./user && npx minista preview",
+    "user:preview-h": "cd ./user && npx minista preview --host",
     "user:v": "cd ./user && npx minista -v",
     "user:h": "cd ./user && npx minista -h",
     "prepublishOnly": "npm run clean:dist && npm run build:all",
@@ -72,6 +74,7 @@
     "@mdx-js/esbuild": "^2.1.1",
     "@mdx-js/react": "^2.1.1",
     "@mdx-js/rollup": "^2.1.1",
+    "@svgr/core": "^6.2.1",
     "@vitejs/plugin-react": "^1.3.0",
     "cac": "^6.7.12",
     "deepmerge-ts": "^4.0.2",