minista 2.0.0-alpha.13 → 2.0.0-alpha.16

package/README.md

@@ -72,9 +72,9 @@ Open `package.json` and add the following scripts:
 
 ```js
 // minista.config.ts
-import { defineMinistaUserConfig } from "minista"
+import { defineConfig } from "minista"
 
-export default defineMinistaUserConfig({
+export default defineConfig({
   entry: undefined, // string | string[] | { [key: string]: string }
   outDir: "dist", // string
   publicDir: "public", // string

package/dist/build.d.ts

@@ -1,6 +1,6 @@
 import type { Options as MdxOptions } from "@mdx-js/esbuild";
 import type { InlineConfig } from "vite";
-import type { RootStaticContent, RootJsxContent, GlobalStaticData, GetGlobalStaticData, PageJsxContent, StaticData, StaticDataItem, GetStaticData } from "./types.js";
+import type { MinistaConfig, RootStaticContent, RootJsxContent, GlobalStaticData, GetGlobalStaticData, PageJsxContent, StaticData, StaticDataItem, GetStaticData } from "./types.js";
 export declare function buildTempPages(entryPoints: string[], buildOptions: {
     outbase: string;
     outdir: string;
@@ -27,4 +27,9 @@ export declare function buildAssetsTagStr(entryPoints: string[], buildOptions: {
     outbase: string;
     outdir: string;
 }): Promise<string>;
+export declare function buildViteImporterRoots(config: MinistaConfig): Promise<void>;
+export declare function buildViteImporterRoutes(config: MinistaConfig): Promise<void>;
+export declare function buildViteImporterAssets(config: MinistaConfig, entry: {
+    [key: string]: string;
+}): Promise<void>;
 export declare function buildCopyDir(targetDir: string, outDir: string, log?: "public" | "assets"): Promise<void>;

package/dist/build.js

@@ -213,6 +213,78 @@ async function buildAssetsTagStr(entryPoints, buildOptions) {
   const assetsTagStr = assetsTags.join("");
   return assetsTagStr;
 }
+async function buildViteImporterRoots(config) {
+  const outFile = config.tempViteImporterDir + "/roots.js";
+  const rootFileDir = config.rootFileDir;
+  const rootFileName = config.rootFileName;
+  const rootFileExtStr = config.rootFileExt.join();
+  const template = `export const getRoots = () => {
+  const ROOTS = import.meta.globEager("/${rootFileDir}/${rootFileName}.{${rootFileExtStr}}")
+  const roots =
+    Object.keys(ROOTS).length === 0
+      ? [{ RootComponent: Fragment, getGlobalStaticData: undefined }]
+      : Object.keys(ROOTS).map((root) => {
+          return {
+            RootComponent: ROOTS[root].default ? ROOTS[root].default : Fragment,
+            getGlobalStaticData: ROOTS[root].getStaticData
+              ? ROOTS[root].getStaticData
+              : undefined,
+          }
+        })
+  return roots
+}`;
+  await fs.outputFile(outFile, template).catch((err) => {
+    console.error(err);
+  });
+}
+async function buildViteImporterRoutes(config) {
+  const outFile = config.tempViteImporterDir + "/routes.js";
+  const pagesDir = config.pagesDir;
+  const pagesExtStr = config.pagesExt.join();
+  const pagesDirRegStr = config.pagesDir.replace(/\//g, "\\/");
+  const replaceArray = config.pagesExt.map((ext) => {
+    return `.replace(/\\/${pagesDirRegStr}|index|\\.${ext}$/g, "")`;
+  });
+  const replaceArrayStr = replaceArray.join("\n      ");
+  const template = `export const getRoutes = () => {
+  const ROUTES = import.meta.globEager("/${pagesDir}/**/[a-z[]*.{${pagesExtStr}}")
+  const routes = Object.keys(ROUTES).map((route) => {
+    const routePath = route
+      ${replaceArrayStr}
+      .replace(/\\[\\.{3}.+\\]/, "*")
+      .replace(/\\[(.+)\\]/, ":$1")
+    return {
+      routePath: routePath,
+      PageComponent: ROUTES[route].default,
+      getStaticData: ROUTES[route].getStaticData
+        ? ROUTES[route].getStaticData
+        : undefined,
+      frontmatter: ROUTES[route].frontmatter
+        ? ROUTES[route].frontmatter
+        : undefined,
+    }
+  })
+  return routes
+}`;
+  await fs.outputFile(outFile, template).catch((err) => {
+    console.error(err);
+  });
+}
+async function buildViteImporterAssets(config, entry) {
+  const outFile = config.tempViteImporterDir + "/assets.js";
+  const assetsPathArray = Object.values(entry);
+  const filteredAssetsPathArray = assetsPathArray.filter((path2) => path2.match(/\.(js|cjs|mjs|jsx|ts|tsx)$/));
+  const importArray = filteredAssetsPathArray.map((path2) => {
+    return `import("/${path2}")`;
+  });
+  const importArrayStr = importArray.join("\n  ");
+  const template = `export const getAssets = () => {
+  ${importArrayStr}
+}`;
+  await fs.outputFile(outFile, template).catch((err) => {
+    console.error(err);
+  });
+}
 async function buildCopyDir(targetDir, outDir, log) {
   const checkTargetDir = await fs.pathExists(targetDir);
   if (checkTargetDir) {
@@ -240,5 +312,8 @@ export {
   buildStaticPage,
   buildStaticPages,
   buildTempAssets,
-  buildTempPages
+  buildTempPages,
+  buildViteImporterAssets,
+  buildViteImporterRoots,
+  buildViteImporterRoutes
 };

package/dist/cli.js

@@ -5,18 +5,18 @@ import { getUserConfig } from "./user.js";
 import { getConfig } from "./config.js";
 import { getViteConfig } from "./vite.js";
 import { getMdxConfig } from "./mdx.js";
-import { getFilePath, getFilePaths, getSameFilePaths } from "./path.js";
 import { emptyResolveDir } from "./empty.js";
-import { cleanHtmlPages } from "./clean.js";
-import { optimizeCommentOutStyleImport } from "./optimize.js";
 import { createDevServer } from "./server.js";
 import {
-  buildTempPages,
-  buildStaticPages,
-  buildCopyDir,
-  buildTempAssets,
-  buildAssetsTagStr
-} from "./build.js";
+  generateViteImporters,
+  generateTempRoot,
+  generateTempPages,
+  generateAssets,
+  generateNoStyleTemp,
+  generateHtmlPages,
+  generatePublic,
+  generateCleanHtml
+} from "./generate.js";
 import { previewLocal } from "./preview.js";
 function printVersion() {
   const pkgURL = new URL("../package.json", import.meta.url);
@@ -28,8 +28,11 @@ const cli = cac("minista");
 cli.command("[root]").alias("dev").action(async () => {
   try {
     const userConfig = await getUserConfig();
+    const config = await getConfig(userConfig);
     const mdxConfig = await getMdxConfig(userConfig);
     const viteConfig = await getViteConfig(userConfig, mdxConfig);
+    await Promise.all([emptyResolveDir(config.tempViteImporterDir)]);
+    await generateViteImporters(config, userConfig);
     await createDevServer(viteConfig);
   } catch (err) {
     console.log(err);
@@ -42,51 +45,6 @@ cli.command("build [root]").action(async () => {
     const config = await getConfig(userConfig);
     const mdxConfig = await getMdxConfig(userConfig);
     const viteConfig = await getViteConfig(userConfig, mdxConfig);
-    const generateTempRoot = async () => {
-      const srcRootFilePaths = await getSameFilePaths(config.rootFileDir, config.rootFileName, config.rootFileExt);
-      if (srcRootFilePaths.length > 0) {
-        await buildTempPages([srcRootFilePaths[0]], {
-          outbase: config.rootFileDir,
-          outdir: config.tempRootFileDir,
-          mdxConfig
-        });
-      }
-    };
-    const generateTempPages = async () => {
-      const srcPageFilePaths = await getFilePaths(config.pagesDir, config.pagesExt);
-      await buildTempPages(srcPageFilePaths, {
-        outbase: config.pagesDir,
-        outdir: config.tempPagesDir,
-        mdxConfig
-      });
-    };
-    const generateAssets = async () => {
-      await buildTempAssets(viteConfig, {
-        fileName: config.autoAssetsName,
-        outdir: config.tempAssetsDir,
-        assetDir: config.assetsDir
-      });
-      await buildCopyDir(config.tempAssetsDir, `${config.outDir}/${config.assetsDir}`, "assets");
-    };
-    const generateHtmlPages = async () => {
-      const tempPageFilePaths = await getFilePaths(config.tempPagesDir, "mjs");
-      const tempRootFilePath = getFilePath(config.tempRootFileDir, config.rootFileName, "mjs");
-      const tempAssetsFilePaths = await getFilePaths(config.tempAssetsDir, [
-        "css",
-        "js"
-      ]);
-      const assetsTagStr = await buildAssetsTagStr(tempAssetsFilePaths, {
-        outbase: config.tempAssetsDir,
-        outdir: config.assetsDir
-      });
-      await buildStaticPages(tempPageFilePaths, tempRootFilePath, {
-        outbase: config.tempPagesDir,
-        outdir: config.outDir
-      }, assetsTagStr);
-    };
-    const generatePublic = async () => {
-      await buildCopyDir(config.publicDir, config.outDir, "public");
-    };
     await Promise.all([
       emptyResolveDir(config.tempRootFileDir),
       emptyResolveDir(config.tempAssetsDir),
@@ -94,15 +52,13 @@ cli.command("build [root]").action(async () => {
       emptyResolveDir(config.outDir)
     ]);
     await Promise.all([
-      generateTempRoot(),
-      generateTempPages(),
-      generateAssets()
+      generateTempRoot(config, mdxConfig),
+      generateTempPages(config, mdxConfig),
+      generateAssets(config, viteConfig)
     ]);
-    const tempMjsFiles = await getFilePaths(config.tempDir, "mjs");
-    await optimizeCommentOutStyleImport(tempMjsFiles);
-    await Promise.all([generateHtmlPages(), generatePublic()]);
-    const htmlPageFilePaths = await getFilePaths(config.outDir, "html");
-    await cleanHtmlPages(htmlPageFilePaths);
+    await Promise.all([generateNoStyleTemp(config)]);
+    await Promise.all([generateHtmlPages(config), generatePublic(config)]);
+    await Promise.all([generateCleanHtml(config)]);
   } catch (err) {
     console.log(err);
     process.exit(1);

package/dist/config.d.ts

@@ -11,6 +11,7 @@ export declare const defaultConfig: {
     pagesExt: string[];
     tempDir: string;
     tempConfigDir: string;
+    tempViteImporterDir: string;
     tempAssetsDir: string;
     tempRootFileDir: string;
     tempPagesDir: string;
@@ -27,6 +28,7 @@ export declare function getConfig(userConfig: MinistaUserConfig): Promise<{
     pagesExt: string[];
     tempDir: string;
     tempConfigDir: string;
+    tempViteImporterDir: string;
     tempAssetsDir: string;
     tempRootFileDir: string;
     tempPagesDir: string;

package/dist/config.js

@@ -25,11 +25,12 @@ const defaultConfig = {
   autoAssetsName: "bundle",
   rootFileDir: "src",
   rootFileName: "root",
-  rootFileExt: ["js", "jsx", "ts", "tsx"],
+  rootFileExt: ["jsx", "tsx"],
   pagesDir: "src/pages",
-  pagesExt: ["js", "jsx", "ts", "tsx", "md", "mdx"],
+  pagesExt: ["jsx", "tsx", "md", "mdx"],
   tempDir: "node_modules/.minista",
   tempConfigDir: "node_modules/.minista/optimized-config",
+  tempViteImporterDir: "node_modules/.minista/vite-importer",
   tempAssetsDir: "node_modules/.minista/bundled-react-assets",
   tempRootFileDir: "node_modules/.minista/bundled-react-root",
   tempPagesDir: "node_modules/.minista/bundled-react-pages"

package/dist/define.d.ts

@@ -1,2 +1,2 @@
 import type { MinistaUserConfig } from "./types.js";
-export declare function defineMinistaUserConfig(config: MinistaUserConfig): MinistaUserConfig;
+export declare function defineConfig(config: MinistaUserConfig): MinistaUserConfig;

package/dist/define.js

@@ -1,7 +1,7 @@
 import React from "react";
-function defineMinistaUserConfig(config) {
+function defineConfig(config) {
   return config;
 }
 export {
-  defineMinistaUserConfig
+  defineConfig
 };

package/dist/empty.js

@@ -3,7 +3,7 @@ import fs from "fs-extra";
 import path from "path";
 async function emptyResolveDir(targetDir) {
   const targetUserDir = path.resolve(targetDir);
-  fs.emptyDir(targetUserDir);
+  return fs.emptyDir(targetUserDir);
 }
 export {
   emptyResolveDir

package/dist/generate.d.ts

@@ -0,0 +1,11 @@
+import type { Options as MdxOptions } from "@mdx-js/esbuild";
+import type { InlineConfig } from "vite";
+import { MinistaConfig, MinistaUserConfig } from "./types.js";
+export declare function generateViteImporters(config: MinistaConfig, userConfig: MinistaUserConfig): Promise<void>;
+export declare function generateTempRoot(config: MinistaConfig, mdxConfig: MdxOptions): Promise<void>;
+export declare function generateTempPages(config: MinistaConfig, mdxConfig: MdxOptions): Promise<void>;
+export declare function generateAssets(config: MinistaConfig, viteConfig: InlineConfig): Promise<void>;
+export declare function generateNoStyleTemp(config: MinistaConfig): Promise<void>;
+export declare function generateHtmlPages(config: MinistaConfig): Promise<void>;
+export declare function generatePublic(config: MinistaConfig): Promise<void>;
+export declare function generateCleanHtml(config: MinistaConfig): Promise<void>;

package/dist/generate.js

@@ -0,0 +1,86 @@
+import React from "react";
+import { getFilePath, getFilePaths, getSameFilePaths } from "./path.js";
+import {
+  buildTempPages,
+  buildStaticPages,
+  buildCopyDir,
+  buildTempAssets,
+  buildAssetsTagStr,
+  buildViteImporterRoots,
+  buildViteImporterRoutes,
+  buildViteImporterAssets
+} from "./build.js";
+import { optimizeCommentOutStyleImport } from "./optimize.js";
+import { cleanHtmlPages } from "./clean.js";
+async function generateViteImporters(config, userConfig) {
+  var _a, _b, _c, _d, _e, _f;
+  const viteEntry = typeof userConfig.vite === "object" ? ((_c = (_b = (_a = userConfig.vite) == null ? void 0 : _a.build) == null ? void 0 : _b.rollupOptions) == null ? void 0 : _c.input) ? (_f = (_e = (_d = userConfig.vite) == null ? void 0 : _d.build) == null ? void 0 : _e.rollupOptions) == null ? void 0 : _f.input : {} : {};
+  await Promise.all([
+    buildViteImporterRoots(config),
+    buildViteImporterRoutes(config),
+    typeof viteEntry === "object" && !Array.isArray(viteEntry) && buildViteImporterAssets(config, viteEntry)
+  ]);
+}
+async function generateTempRoot(config, mdxConfig) {
+  const srcRootFilePaths = await getSameFilePaths(config.rootFileDir, config.rootFileName, config.rootFileExt);
+  if (srcRootFilePaths.length > 0) {
+    await buildTempPages([srcRootFilePaths[0]], {
+      outbase: config.rootFileDir,
+      outdir: config.tempRootFileDir,
+      mdxConfig
+    });
+  }
+}
+async function generateTempPages(config, mdxConfig) {
+  const srcPageFilePaths = await getFilePaths(config.pagesDir, config.pagesExt);
+  await buildTempPages(srcPageFilePaths, {
+    outbase: config.pagesDir,
+    outdir: config.tempPagesDir,
+    mdxConfig
+  });
+}
+async function generateAssets(config, viteConfig) {
+  await buildTempAssets(viteConfig, {
+    fileName: config.autoAssetsName,
+    outdir: config.tempAssetsDir,
+    assetDir: config.assetsDir
+  });
+  await buildCopyDir(config.tempAssetsDir, `${config.outDir}/${config.assetsDir}`, "assets");
+}
+async function generateNoStyleTemp(config) {
+  const tempMjsFiles = await getFilePaths(config.tempDir, "mjs");
+  await optimizeCommentOutStyleImport(tempMjsFiles);
+}
+async function generateHtmlPages(config) {
+  const tempPageFilePaths = await getFilePaths(config.tempPagesDir, "mjs");
+  const tempRootFilePath = getFilePath(config.tempRootFileDir, config.rootFileName, "mjs");
+  const tempAssetsFilePaths = await getFilePaths(config.tempAssetsDir, [
+    "css",
+    "js"
+  ]);
+  const assetsTagStr = await buildAssetsTagStr(tempAssetsFilePaths, {
+    outbase: config.tempAssetsDir,
+    outdir: config.assetsDir
+  });
+  await buildStaticPages(tempPageFilePaths, tempRootFilePath, {
+    outbase: config.tempPagesDir,
+    outdir: config.outDir
+  }, assetsTagStr);
+}
+async function generatePublic(config) {
+  await buildCopyDir(config.publicDir, config.outDir, "public");
+}
+async function generateCleanHtml(config) {
+  const htmlPageFilePaths = await getFilePaths(config.outDir, "html");
+  await cleanHtmlPages(htmlPageFilePaths);
+}
+export {
+  generateAssets,
+  generateCleanHtml,
+  generateHtmlPages,
+  generateNoStyleTemp,
+  generatePublic,
+  generateTempPages,
+  generateTempRoot,
+  generateViteImporters
+};

package/dist/pages.js

@@ -1,25 +1,35 @@
 import React from "react";
-import { Fragment } from "react";
+import { useState, useEffect, Fragment } from "react";
 import { BrowserRouter, Routes, Route } from "react-router-dom";
 import { Page } from "./page.js";
 const Pages = () => {
-  const ROOTS = import.meta.globEager("/src/root.{js,jsx,ts,tsx}");
-  const roots = Object.keys(ROOTS).length === 0 ? [{ RootComponent: Fragment, getGlobalStaticData: void 0 }] : Object.keys(ROOTS).map((root) => {
-    return {
-      RootComponent: ROOTS[root].default ? ROOTS[root].default : Fragment,
-      getGlobalStaticData: ROOTS[root].getStaticData ? ROOTS[root].getStaticData : void 0
+  const [roots, setRoots] = useState([
+    { RootComponent: Fragment, getGlobalStaticData: void 0 }
+  ]);
+  const [routes, setRoutes] = useState([]);
+  useEffect(() => {
+    const data = async () => {
+      const { getRoots } = await import(
+        //@ts-ignore
+        "/@minista-temp/vite-importer/roots.js"
+      );
+      const { getRoutes } = await import(
+        //@ts-ignore
+        "/@minista-temp/vite-importer/routes.js"
+      );
+      try {
+        const { getAssets } = await import(
+          //@ts-ignore
+          "/@minista-temp/vite-importer/assets.js"
+        );
+        getAssets();
+      } catch (err) {
+      }
+      setRoots(getRoots);
+      setRoutes(getRoutes);
     };
-  });
-  const ROUTES = import.meta.globEager("/src/pages/**/[a-z[]*.{js,jsx,ts,tsx,md,mdx}");
-  const routes = Object.keys(ROUTES).map((route) => {
-    const routePath = route.replace(/\/src\/pages|index|\.js$/g, "").replace(/\/src\/pages|index|\.jsx$/g, "").replace(/\/src\/pages|index|\.ts$/g, "").replace(/\/src\/pages|index|\.tsx$/g, "").replace(/\/src\/pages|index|\.md$/g, "").replace(/\/src\/pages|index|\.mdx$/g, "").replace(/\[\.{3}.+\]/, "*").replace(/\[(.+)\]/, ":$1");
-    return {
-      routePath,
-      PageComponent: ROUTES[route].default,
-      getStaticData: ROUTES[route].getStaticData ? ROUTES[route].getStaticData : void 0,
-      frontmatter: ROUTES[route].frontmatter ? ROUTES[route].frontmatter : void 0
-    };
-  });
+    data();
+  }, []);
   return /* @__PURE__ */ React.createElement(Fragment, null, routes.length > 0 && /* @__PURE__ */ React.createElement(BrowserRouter, null, /* @__PURE__ */ React.createElement(Routes, null, routes == null ? void 0 : routes.map(({
     routePath,
     PageComponent = Fragment,

package/dist/types.d.ts

@@ -1,6 +1,23 @@
 import type { ExoticComponent } from "react";
 import type vite from "vite";
 import type { Options as MdxOptions } from "@mdx-js/esbuild";
+export declare type MinistaConfig = {
+    outDir: string;
+    publicDir: string;
+    assetsDir: string;
+    autoAssetsName: string;
+    rootFileDir: string;
+    rootFileName: string;
+    rootFileExt: string[];
+    pagesDir: string;
+    pagesExt: string[];
+    tempDir: string;
+    tempConfigDir: string;
+    tempViteImporterDir: string;
+    tempAssetsDir: string;
+    tempRootFileDir: string;
+    tempPagesDir: string;
+};
 export declare type MinistaUserConfig = {
     entry?: string | string[] | {
         [key: string]: string;

package/dist/vite.js

@@ -49,6 +49,10 @@ const defaultViteConfig = defineConfig({
         find: "/@minista",
         replacement: path.resolve(__dirname + "/../")
       },
+      {
+        find: "/@minista-temp",
+        replacement: path.resolve("node_modules/.minista/")
+      },
       {
         find: "react/jsx-runtime",
         replacement: "react/jsx-runtime.js"
@@ -112,7 +116,7 @@ function getAssetsTagStr(input) {
       return tags.push(tag);
     });
   }
-  const sortedTags = tags.sort((a, b) => a < b ? -1 : 1);
+  const sortedTags = tags.length >= 2 ? tags.filter((item) => !!item).sort((a, b) => a < b ? -1 : 1) : tags;
   return sortedTags.join("\n");
 }
 function getAssetsTag(input) {
@@ -120,7 +124,7 @@ function getAssetsTag(input) {
   if (input.match(/\.(css|sass|scss)$/)) {
     return `<link rel="stylesheet" href="/${input}">`;
   } else if (input.match(/\.(js|cjs|mjs|jsx|ts|tsx)$/)) {
-    return `<script defer type="module" src="/${input}"><\/script>`;
+    return;
   } else {
     console.log("Could not insert the entry [vite.build.rollupOptions.input] into the dev server.");
     return "";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "minista",
   "description": "Next.js Like Development with 100% Static Generate",
-  "version": "2.0.0-alpha.13",
+  "version": "2.0.0-alpha.16",
   "bin": {
     "minista": "./bin/minista.js"
   },
@@ -53,7 +53,7 @@
     "test:v": "cd ./test && npx minista -v",
     "test:h": "cd ./test && npx minista -h",
     "prepublishOnly": "npm run build:all",
-    "clean": "trash ./dist ./test/dist ./test/node_modules/.minista"
+    "clean": "trash ./dist ./test/dist ./test/node_modules/.minista ./test/node_modules/.vite"
   },
   "prettier": {
     "semi": false
@@ -68,10 +68,10 @@
     "@mdx-js/rollup": "^2.0.0",
     "@vitejs/plugin-react": "^1.2.0",
     "cac": "^6.7.12",
-    "esbuild": "^0.14.23",
+    "esbuild": "^0.14.25",
     "fs-extra": "^10.0.1",
     "js-beautify": "^1.14.0",
-    "node-fetch": "^3.2.1",
+    "node-fetch": "^3.2.3",
     "picocolors": "^1.0.0",
     "react-helmet": "^6.1.0",
     "react-router-dom": "^6.2.2",
@@ -86,12 +86,12 @@
     "@types/fs-extra": "^9.0.13",
     "@types/js-beautify": "^1.13.3",
     "@types/node": "^17.0.21",
-    "@types/react": "^17.0.39",
-    "@types/react-dom": "^17.0.12",
+    "@types/react": "^17.0.40",
+    "@types/react-dom": "^17.0.13",
     "@types/react-helmet": "^6.1.5",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "tsup": "^5.11.13",
+    "tsup": "^5.12.1",
     "typescript": "^4.6.2"
   }
 }