minista 2.6.1 → 2.6.2

package/dist/build.d.ts

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

package/dist/build.js

@@ -33,16 +33,14 @@ import {
 import { systemConfig } from "./system.js";
 import { getFilePath } from "./path.js";
 import {
-  getEsbuildAlias,
   resolvePlugin,
-  aliasPlugin,
   svgrPlugin,
   rawPlugin,
   partialHydrationPlugin
 } from "./esbuild.js";
 import { renderHtml } from "./render.js";
 import { slashEnd, reactStylesToString } from "./utils.js";
-import { CssModulePlugin } from "./css.js";
+import { cssModulePlugin } from "./css.js";
 const __filename = url.fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const ministaPkgUrl = path.resolve(__dirname + "/../package.json");
@@ -78,7 +76,6 @@ const userPkgHasPreact = [
   ...Object.keys(userPkg.devDependencies || {})
 ].includes("preact");
 async function buildTempPages(entryPoints, buildOptions) {
-  const alias = getEsbuildAlias([buildOptions.alias]);
   await esBuild({
     entryPoints,
     outbase: buildOptions.outBase,
@@ -95,12 +92,11 @@ async function buildTempPages(entryPoints, buildOptions) {
     loader: esbuildLoaders,
     plugins: [
       resolvePlugin({ "react/jsx-runtime": "react/jsx-runtime.js" }),
-      aliasPlugin(alias),
-      CssModulePlugin(buildOptions.cssOptions),
+      cssModulePlugin(buildOptions.cssOptions, buildOptions.alias),
       mdx(buildOptions.mdxConfig),
       svgrPlugin(buildOptions.svgrOptions),
-      rawPlugin(),
-      partialHydrationPlugin()
+      rawPlugin(buildOptions.alias),
+      partialHydrationPlugin(buildOptions.alias)
     ]
   }).catch(() => process.exit(1));
 }
@@ -422,7 +418,6 @@ export { ${tmpExportsStr} }`;
   });
 }
 async function buildPartialStringBundle(entryPoint, buildOptions) {
-  const alias = getEsbuildAlias([buildOptions.alias]);
   await esBuild({
     entryPoints: [entryPoint],
     outfile: buildOptions.outFile,
@@ -436,11 +431,10 @@ async function buildPartialStringBundle(entryPoint, buildOptions) {
     loader: esbuildLoaders,
     plugins: [
       resolvePlugin({ "react/jsx-runtime": "react/jsx-runtime.js" }),
-      aliasPlugin(alias),
-      CssModulePlugin(buildOptions.cssOptions),
+      cssModulePlugin(buildOptions.cssOptions, buildOptions.alias),
       mdx(buildOptions.mdxConfig),
       svgrPlugin(buildOptions.svgrOptions),
-      rawPlugin()
+      rawPlugin(buildOptions.alias)
     ]
   }).catch(() => process.exit(1));
 }

package/dist/config.d.ts

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

package/dist/css.d.ts

@@ -1,3 +1,3 @@
 import type { Plugin } from "esbuild";
-import type { CssOptions } from "./types.js";
-export declare function CssModulePlugin(options: CssOptions): Plugin;
+import type { AliasArray, CssOptions } from "./types.js";
+export declare function cssModulePlugin(options: CssOptions, alias: AliasArray): Plugin;

package/dist/css.js

@@ -19,9 +19,9 @@ var __spreadValues = (a, b) => {
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 import React from "react";
 import fs from "fs-extra";
-import path from "path";
 import postcss from "postcss";
 import postcssModules from "postcss-modules";
+import { getEsbuildResolvePath } from "./esbuild.js";
 var PreprocessLang = /* @__PURE__ */ ((PreprocessLang2) => {
   PreprocessLang2["less"] = "less";
   PreprocessLang2["sass"] = "sass";
@@ -110,7 +110,7 @@ async function buildJs(filepath, options) {
   const classNames = JSON.stringify(cssModulesJSON);
   return `export default ${classNames};`;
 }
-function CssModulePlugin(options) {
+function cssModulePlugin(options, alias) {
   const filter = new RegExp(`\\.module${cssLangs}`);
   return {
     name: PLUGIN,
@@ -119,19 +119,19 @@ function CssModulePlugin(options) {
       build.onResolve({ filter, namespace: "file" }, async (args) => {
         if (!options.modules)
           return args;
-        const sourceFullPath = path.resolve(args.resolveDir, args.path);
-        if (results.has(sourceFullPath))
-          return results.get(sourceFullPath);
-        const content = await buildJs(sourceFullPath, options);
+        const resolvePath = getEsbuildResolvePath(args, alias);
+        if (results.has(resolvePath))
+          return results.get(resolvePath);
+        const content = await buildJs(resolvePath, options);
         const result = {
-          path: args.path,
+          path: resolvePath,
           namespace: PLUGIN,
           pluginData: {
             content
           }
         };
         if (options.modules.cache)
-          results.set(sourceFullPath, result);
+          results.set(resolvePath, result);
         return result;
       });
       build.onLoad({ filter, namespace: PLUGIN }, (args) => {
@@ -146,5 +146,5 @@ function CssModulePlugin(options) {
   };
 }
 export {
-  CssModulePlugin
+  cssModulePlugin
 };

package/dist/esbuild.d.ts

@@ -1,19 +1,11 @@
-import type { Plugin } from "esbuild";
+import type { Plugin, OnResolveArgs } 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;
-};
+import type { AliasObject, AliasArray } from "./types.js";
+export declare function getEsbuildResolvePath(args: OnResolveArgs, alias: AliasArray): string;
 /*! Fork: esbuild-plugin-resolve | https://github.com/markwylde/esbuild-plugin-resolve */
-export declare function resolvePlugin(options: {
-    [key: string]: string;
-}): Plugin;
-/*! Fork: esbuild-plugin-alias | https://github.com/igoradamenko/esbuild-plugin-alias */
-export declare function aliasPlugin(options: {
-    [key: string]: string;
-}): Plugin;
+export declare function resolvePlugin(alias: AliasObject): 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;
-export declare function partialHydrationPlugin(): Plugin;
+export declare function rawPlugin(alias: AliasArray): Plugin;
+export declare function partialHydrationPlugin(alias: AliasArray): Plugin;

package/dist/esbuild.js

@@ -19,15 +19,24 @@ 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) => ({
+function getEsbuildResolvePath(args, alias) {
+  const aliasObject = Object.assign({}, ...alias.map((item) => ({
     [item.find]: item.replacement
   })));
-  return result;
+  function escapeRegExp(find) {
+    return find.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  }
+  const aliasKeys = Object.keys(aliasObject);
+  const aliasReg = new RegExp(`^(${aliasKeys.map((x) => escapeRegExp(x)).join("|")})`);
+  const aliasPath = args.path.replace(aliasReg, function(match) {
+    return aliasObject[match];
+  });
+  const absolutePath = path.isAbsolute(aliasPath) ? aliasPath : path.join(args.resolveDir, aliasPath);
+  const replacedPath = absolutePath.replaceAll("\\", "/");
+  return replacedPath;
 }
 /*! Fork: esbuild-plugin-resolve | https://github.com/markwylde/esbuild-plugin-resolve */
-function resolvePlugin(options) {
+function resolvePlugin(alias) {
   function resolvePluginIntercept(build, moduleName, moduleTarget) {
     const filter = new RegExp("^" + moduleName + "(?:\\/.*)?$");
     build.onResolve({ filter }, async (args) => {
@@ -54,28 +63,12 @@ function resolvePlugin(options) {
   return {
     name: "esbuild-resolve",
     setup: (build) => {
-      for (const moduleName of Object.keys(options)) {
-        resolvePluginIntercept(build, moduleName, options[moduleName]);
+      for (const moduleName of Object.keys(alias)) {
+        resolvePluginIntercept(build, moduleName, alias[moduleName]);
       }
     }
   };
 }
-/*! Fork: esbuild-plugin-alias | https://github.com/igoradamenko/esbuild-plugin-alias */
-function aliasPlugin(options) {
-  function escapeRegExp(name) {
-    return name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-  }
-  const aliases = Object.keys(options);
-  const re = new RegExp(`^(${aliases.map((x) => escapeRegExp(x)).join("|")})$`);
-  return {
-    name: "esbuild-alias",
-    setup(build) {
-      build.onResolve({ filter: re }, (args) => ({
-        path: options[args.path]
-      }));
-    }
-  };
-}
 /*! Fork: esbuild-plugin-svgr | https://github.com/kazijawad/esbuild-plugin-svgr */
 function svgrPlugin(options) {
   return {
@@ -94,13 +87,14 @@ function svgrPlugin(options) {
   };
 }
 /*! Fork: esbuild-plugin-resolve | https://github.com/hannoeru/esbuild-plugin-raw */
-function rawPlugin() {
+function rawPlugin(alias) {
   return {
     name: "esbuild-raw",
     setup(build) {
       build.onResolve({ filter: /\?raw$/ }, (args) => {
+        const resolvePath = getEsbuildResolvePath(args, alias);
         return {
-          path: path.isAbsolute(args.path) ? args.path : path.join(args.resolveDir, args.path),
+          path: resolvePath,
           namespace: "raw-loader"
         };
       });
@@ -113,13 +107,14 @@ function rawPlugin() {
     }
   };
 }
-function partialHydrationPlugin() {
+function partialHydrationPlugin(alias) {
   return {
     name: "esbuild-partial-hydration",
     setup(build) {
       build.onResolve({ filter: /\?ph$/ }, (args) => {
+        const resolvePath = getEsbuildResolvePath(args, alias);
         return {
-          path: (path.isAbsolute(args.path) ? args.path : path.join(args.resolveDir, args.path)).replaceAll("\\", "/"),
+          path: resolvePath,
           namespace: "partial-hydration-loader"
         };
       });
@@ -143,8 +138,7 @@ function partialHydrationPlugin() {
   };
 }
 export {
-  aliasPlugin,
-  getEsbuildAlias,
+  getEsbuildResolvePath,
   partialHydrationPlugin,
   rawPlugin,
   resolvePlugin,

package/dist/types.d.ts

@@ -166,18 +166,9 @@ export declare type MinistaUserConfig = {
     };
 };
 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 MinistaResolveAliasInput = AliasObject | AliasArray;
 export declare type MinistaResolveAliasConfig = {
-    alias: MinistaResolveAlias;
+    alias: AliasArray;
 };
 export declare type MinistaResolvePathConfig = {
     rootSrcDir: string;
@@ -269,6 +260,13 @@ export declare type StaticDataCache = {
     key: [StaticDataList];
 } | {};
 export declare type GetStaticData = () => Promise<StaticData>;
+export declare type AliasObject = {
+    [key: string]: string;
+};
+export declare type AliasArray = {
+    find: string;
+    replacement: string;
+}[];
 export declare type PartialModules = {
     id: string;
     phId: string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "minista",
   "description": "Next.js Like Development with 100% Static Generate",
-  "version": "2.6.1",
+  "version": "2.6.2",
   "bin": {
     "minista": "./bin/minista.js"
   },