minista 2.2.1 → 2.3.2

package/dist/build.js

@@ -33,10 +33,12 @@ import { slashEnd } from "./utils.js";
 const __filename = url.fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 async function buildTempPages(entryPoints, buildOptions) {
-  const ministaPkgURL = new URL(path.resolve(__dirname + "/../package.json"), import.meta.url);
-  const ministaPkg = JSON.parse(fs.readFileSync(ministaPkgURL, "utf8"));
-  const userPkgURL = new URL(path.resolve("package.json"), import.meta.url);
-  const userPkg = JSON.parse(fs.readFileSync(userPkgURL, "utf8"));
+  const ministaPkgUrl = path.resolve(__dirname + "/../package.json");
+  const ministaPkgUrlRelative = path.relative(".", ministaPkgUrl);
+  const ministaPkg = JSON.parse(fs.readFileSync(ministaPkgUrlRelative, "utf8"));
+  const userPkgPath = path.resolve("package.json");
+  const userPkgFilePath = path.relative(process.cwd(), userPkgPath);
+  const userPkg = JSON.parse(fs.readFileSync(userPkgFilePath, "utf8"));
   const esbuildExternal = [
     ...Object.keys(ministaPkg.dependencies || {}),
     ...Object.keys(ministaPkg.devDependencies || {}),
@@ -73,10 +75,11 @@ async function buildTempPages(entryPoints, buildOptions) {
 }
 async function buildStaticPages(entryPoints, tempRootFilePath, buildOptions, assetsTagStr) {
   const rootStaticContent = await buildRootEsmContent(tempRootFilePath);
+  const winOutBase = buildOptions.outBase.replaceAll("/", "\\");
   await Promise.all(entryPoints.map(async (entryPoint) => {
     const extname = path.extname(entryPoint);
     const basename = path.basename(entryPoint, extname);
-    const dirname = path.dirname(entryPoint).replace(buildOptions.outBase, buildOptions.outDir);
+    const dirname = path.dirname(entryPoint).replace(buildOptions.outBase, buildOptions.outDir).replace(winOutBase, buildOptions.outDir);
     const filename = path.join(dirname, basename + ".html");
     await buildStaticPage(entryPoint, filename, rootStaticContent, assetsTagStr, buildOptions.outDir);
   }));
@@ -89,7 +92,8 @@ async function buildRootEsmContent(tempRootFilePath) {
   if (!tempRootFilePath) {
     return defaultRootEsmContent;
   } else {
-    const rootEsmContent = await import(tempRootFilePath);
+    const targetFilePath = url.pathToFileURL(tempRootFilePath).href;
+    const rootEsmContent = await import(targetFilePath);
     const rootJsxContent = rootEsmContent.default ? rootEsmContent.default : Fragment;
     const staticData = rootEsmContent.getStaticData ? await buildGlobalStaticData(rootEsmContent.getStaticData) : { props: {} };
     return { component: rootJsxContent, staticData };
@@ -100,7 +104,8 @@ async function buildGlobalStaticData(getGlobalStaticData) {
   return response;
 }
 async function buildStaticPage(entryPoint, outFile, rootStaticContent, assetsTagStr, outDir) {
-  const pageEsmContent = await import(path.resolve(entryPoint));
+  const targetFilePath = url.pathToFileURL(entryPoint).href;
+  const pageEsmContent = await import(targetFilePath);
   const pageJsxContent = pageEsmContent.default;
   const frontmatter = pageEsmContent.frontmatter ? pageEsmContent.frontmatter : void 0;
   const defaultStaticDataItem = { props: {}, paths: {} };
@@ -217,8 +222,9 @@ async function buildTempAssets(viteConfig, buildOptions) {
   }
 }
 async function buildAssetsTagStr(entryPoints, buildOptions) {
+  const winOutBase = buildOptions.outBase.replaceAll("/", "\\");
   const assetsTags = entryPoints.map((entryPoint) => {
-    const assetPath = entryPoint.replace(buildOptions.outBase, buildOptions.outDir);
+    const assetPath = entryPoint.replace(buildOptions.outBase, buildOptions.outDir).replace(winOutBase, buildOptions.outDir).replaceAll("\\", "/");
     if (assetPath.endsWith(".css")) {
       return `<link rel="stylesheet" href="${assetPath}">`;
     } else if (assetPath.endsWith(".js")) {

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/types.d.ts

@@ -1,5 +1,5 @@
 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";
@@ -177,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/user.js

@@ -1,5 +1,6 @@
 import React from "react";
 import path from "path";
+import url from "url";
 import { build as esBuild } from "esbuild";
 import { systemConfig } from "./system.js";
 import { getSameFilePaths } from "./path.js";
@@ -22,7 +23,9 @@ async function getUserConfig(cofigPath = ".") {
       format: "esm",
       platform: "node"
     }).catch(() => process.exit(1));
-    const { default: userConfig } = await import(path.resolve(`${systemConfig.temp.config.outDir}/minista.config.mjs`));
+    const userConfigPath = path.resolve(`${systemConfig.temp.config.outDir}/minista.config.mjs`);
+    const userConfigFilePath = url.pathToFileURL(userConfigPath).href;
+    const { default: userConfig } = await import(userConfigFilePath);
     return userConfig || {};
   } else {
     return {};

package/dist/vite.d.ts

@@ -1,8 +1,8 @@
 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 */

package/dist/vite.js

@@ -18,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: {
@@ -90,7 +90,7 @@ 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) {
@@ -104,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) : {};
@@ -153,8 +153,9 @@ function vitePluginMinistaVirtualHtml() {
     configureServer(server) {
       return () => {
         var _a, _b;
-        const ministaHtmlURL = new URL(path.resolve(__dirname + "/../lib/index.html"), import.meta.url);
-        const ministaHtml = fs.readFileSync(ministaHtmlURL, "utf8");
+        const ministaHtmlUrl = path.resolve(__dirname + "/../lib/index.html");
+        const ministaHtmlUrlRelative = path.relative(".", ministaHtmlUrl);
+        const ministaHtml = fs.readFileSync(ministaHtmlUrlRelative, "utf8");
         const assetTagStr = getAssetsTagStr((_b = (_a = server.config.inlineConfig.build) == null ? void 0 : _a.rollupOptions) == null ? void 0 : _b.input);
         const ministaReplacedHtml = ministaHtml.replace("<!-- VIRTUAL_HTML_ASSETS_TAG -->", assetTagStr);
         server.middlewares.use((req, res, next) => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "minista",
   "description": "Next.js Like Development with 100% Static Generate",
-  "version": "2.2.1",
+  "version": "2.3.2",
   "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",