minista 3.1.4 → 4.0.0-alpha.0

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 Qrac
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,17 +1,5 @@
 # minista
 
-<p>
-  <a aria-label="Made by QRANOKO" href="https://qranoko.jp">
-    <img src="https://img.shields.io/badge/MADE%20BY%20QRANOKO-212121.svg?style=for-the-badge&labelColor=212121">
-  </a>
-  <a aria-label="NPM version" href="https://www.npmjs.com/package/minista">
-    <img alt="" src="https://img.shields.io/npm/v/minista.svg?style=for-the-badge&labelColor=212121">
-  </a>
-  <a aria-label="License" href="https://github.com/qrac/minista/blob/master/LICENSE">
-    <img alt="" src="https://img.shields.io/npm/l/minista.svg?style=for-the-badge&labelColor=212121">
-  </a>
-</p>
-
 ## Site & Documentation
 
 https://minista.qranoko.jp
@@ -20,6 +8,8 @@ https://minista.qranoko.jp
 
 minista（ミニスタ）は React の JSX から綺麗な HTML を作る日本製のスタティックサイトジェネレーターです。
 
+`minista` 本体パッケージは Vite に指示を出すラッパーです。Vite と異なる主な特徴は、ビルド時に自動で Vite に「SSR ビルド＋通常ビルド」の指示を出し、HTML の書き出しを簡略化している点です。
+
 ## How To Use
 
 ### Automatic Setup
@@ -31,10 +21,20 @@ $ npm create minista@latest
 ### Manual Setup
 
 ```sh
-$ npm install --save-dev minista react react-dom
+$ npm install --save-dev minista minista-plugin-ssg vite react react-dom
+$ touch ./minista.config.js
 $ touch ./src/pages/index.jsx
 ```
 
+```js
+// ./minista.config.js
+import { pluginSsg } from "minista-plugin-ssg"
+
+export default {
+  plugins: [pluginSsg()],
+}
+```
+
 ```js
 // ./src/pages/index.jsx
 export default function () {
@@ -54,11 +54,21 @@ export default function () {
 
 ## Commands
 
-| コマンド          | 内容                            |
-| ----------------- | ------------------------------- |
-| `minista`         | 開発モード（`Ctrl + C` で停止） |
-| `minista build`   | 静的書き出し                    |
-| `minista preview` | 静的書き出し後の動作確認        |
+[Vite の CLI コマンドとオプション](https://ja.vitejs.dev/guide/cli.html)がすべて使えます。
+
+| コマンド                 | 内容                            |
+| ------------------------ | ------------------------------- |
+| `minista [root]`         | 開発モード（`Ctrl + C` で停止） |
+| `minista build [root]`   | 静的書き出し                    |
+| `minista preview [root]` | 静的書き出し後の動作確認        |
+
+| minista 独自のオプション | 内容                              |
+| ------------------------ | --------------------------------- |
+| `--oneBuild`             | minista のビルドを 1 回に制限する |
+
+## Settings
+
+[Vite の 設定](https://ja.vitejs.dev/config/)がすべて使えます。コンフィグファイルは `minista.config.{ts|js}` または `vite.config.{ts|js}` のどちらでも動作します。
 
 ## License
 

package/bin/minista.js

@@ -1,4 +1,2 @@
 #!/usr/bin/env node
-"use strict"
-
-import("../dist/cli/index.js")
+import("../dist/node/cli.js")

package/client.d.ts

@@ -1,30 +1 @@
 /// <reference types="vite/client" />
-
-// MDX
-declare module "*.mdx" {
-  import { MDXProps } from "mdx/types"
-
-  export default function MDXContent(props: MDXProps): JSX.Element
-}
-declare module "*.md" {
-  import { MDXProps } from "mdx/types"
-
-  export default function MDXContent(props: MDXProps): JSX.Element
-}
-
-// SVGR
-declare module "*.svg" {
-  import * as React from "react"
-
-  export const ReactComponent: React.FunctionComponent<
-    React.SVGProps<SVGSVGElement> & { title?: string }
-  >
-}
-
-// Partial Hydration
-declare module "*?ph" {
-  import * as React from "react"
-
-  const ph: React.FunctionComponent<React.PropsWithChildren>
-  export default ph
-}

package/dist/node/cli.js

@@ -0,0 +1,25 @@
+"use strict";
+import { checkDeno, getCwd } from "minista-shared-utils";
+import {
+  getArgs,
+  findArgsRoot,
+  checkArgsOneBuild,
+  resolveArgsConfig,
+  resolveArgsOneBuild,
+  resolveArgsSsr
+} from "./utils.js";
+import { findConfigFile } from "./config.js";
+import { runViteCommands } from "./command.js";
+const isDeno = checkDeno();
+const cwd = getCwd(isDeno);
+let args = getArgs(isDeno);
+let rootArg = "";
+let configFile = "";
+let isOneBuild = false;
+rootArg = findArgsRoot(args);
+configFile = findConfigFile(cwd, rootArg);
+isOneBuild = checkArgsOneBuild(args);
+args = resolveArgsConfig(args, configFile);
+args = resolveArgsOneBuild(args, isOneBuild);
+args = resolveArgsSsr(args, isOneBuild);
+await runViteCommands(args, isOneBuild);

package/dist/node/command.js

@@ -0,0 +1,27 @@
+"use strict";
+import { spawn } from "node:child_process";
+function runViteCommand(args) {
+  return new Promise((resolve, reject) => {
+    const process = spawn("vite", args, { stdio: "inherit" });
+    process.on("close", (code) => {
+      if (code === 0) {
+        resolve(code);
+      } else {
+        reject(new Error(`Process exited with code ${code}`));
+      }
+    });
+  });
+}
+export async function runViteCommands(args, isOneBuild) {
+  const isBuild = args.includes("build");
+  try {
+    if (isBuild) {
+      !isOneBuild && await runViteCommand([...args, "--ssr"]);
+      await runViteCommand(args);
+    } else {
+      await runViteCommand(args);
+    }
+  } catch (error) {
+    console.error(error);
+  }
+}

package/dist/node/config.js

@@ -0,0 +1,29 @@
+"use strict";
+import fs from "node:fs";
+import path from "node:path";
+const DEFAULT_CONFIG_FILES = [
+  "minista.config.js",
+  "minista.config.cjs",
+  "minista.config.mjs",
+  "minista.config.ts",
+  "minista.config.cts",
+  "minista.config.mts"
+];
+export function findConfigFile(cwd, rootArg) {
+  let configFile = "";
+  for (const fileName of DEFAULT_CONFIG_FILES) {
+    const filePath = path.join(cwd, fileName);
+    if (fs.existsSync(filePath)) {
+      configFile = fileName;
+    }
+  }
+  if (rootArg) {
+    for (const fileName of DEFAULT_CONFIG_FILES) {
+      const filePath = path.join(cwd, rootArg, fileName);
+      if (fs.existsSync(filePath)) {
+        configFile = path.join(rootArg, fileName);
+      }
+    }
+  }
+  return configFile;
+}

package/dist/node/define.js

@@ -0,0 +1,3 @@
+"use strict";
+import { defineConfig as defineViteConfig } from "vite";
+export const defineConfig = defineViteConfig;

package/dist/node/index.js

@@ -0,0 +1,2 @@
+"use strict";
+export * from "./define.js";

package/dist/node/utils.js

@@ -0,0 +1,58 @@
+"use strict";
+export function getArgs(isDeno) {
+  return isDeno ? globalThis.Deno.args : process.argv.slice(2);
+}
+export function findArgsRoot(args) {
+  if (!args.length) {
+    return "";
+  }
+  const commands = /^(dev|build|optimize|preview)$/;
+  if (!args[0].startsWith("-") && !args[0].match(commands)) {
+    return args[0];
+  }
+  if (args.length >= 2 && args[0].match(commands) && !args[1].startsWith("-")) {
+    return args[1];
+  }
+  return "";
+}
+export function checkArgsOneBuild(args) {
+  if (!args.length) {
+    return false;
+  }
+  if (args.includes("--oneBuild")) {
+    return true;
+  }
+  return false;
+}
+export function resolveArgsConfig(args, configFile) {
+  if (args.includes("--config") || args.includes("-c")) {
+    return args;
+  }
+  if (configFile) {
+    return [...args, "--config", configFile];
+  }
+  return args;
+}
+export function resolveArgsOneBuild(args, isOneBuild) {
+  if (!args.length) {
+    return args;
+  }
+  if (isOneBuild) {
+    const oneBuildIndex = args.indexOf("--oneBuild");
+    return args.filter((_, index) => index !== oneBuildIndex);
+  }
+  return args;
+}
+export function resolveArgsSsr(args, isOneBuild) {
+  if (!args.length || isOneBuild) {
+    return args;
+  }
+  if (args.includes("build") && args.includes("--ssr")) {
+    const ssrIndex = args.indexOf("--ssr");
+    const hasSsrFile = !(args[ssrIndex + 1] || "").startsWith("-");
+    return args.filter(
+      (_, index) => hasSsrFile ? index !== ssrIndex && index !== ssrIndex + 1 : index !== ssrIndex
+    );
+  }
+  return args;
+}

package/dist/types/@types/node.d.ts

@@ -0,0 +1 @@
+export * from "../node/index.js";

package/dist/types/node/command.d.ts

@@ -0,0 +1 @@
+export declare function runViteCommands(args: string[], isOneBuild?: boolean): Promise<void>;

package/dist/types/node/config.d.ts

@@ -0,0 +1 @@
+export declare function findConfigFile(cwd: string, rootArg?: string): string;

package/dist/types/node/define.d.ts

@@ -0,0 +1,2 @@
+import { defineConfig as defineViteConfig } from "vite";
+export declare const defineConfig: typeof defineViteConfig;

package/dist/types/node/index.d.ts

@@ -0,0 +1 @@
+export * from "./define.js";

package/dist/types/node/utils.d.ts

@@ -0,0 +1,6 @@
+export declare function getArgs(isDeno: boolean): string[];
+export declare function findArgsRoot(args: string[]): string;
+export declare function checkArgsOneBuild(args: string[]): boolean;
+export declare function resolveArgsConfig(args: string[], configFile?: string): string[];
+export declare function resolveArgsOneBuild(args: string[], isOneBuild?: boolean): string[];
+export declare function resolveArgsSsr(args: string[], isOneBuild?: boolean): string[];

package/package.json

@@ -1,16 +1,24 @@
 {
   "name": "minista",
-  "description": "Static site generator with 100% static export from React and Vite",
-  "version": "3.1.4",
+  "version": "4.0.0-alpha.0",
   "type": "module",
   "engines": {
-    "node": ">=14.15.0"
+    "node": "^18.0.0 || >=20.0.0"
   },
   "bin": {
     "minista": "./bin/minista.js"
   },
-  "main": "dist/shared/index.js",
-  "types": "dist/types/@types/index.d.ts",
+  "types": "dist/types/@types/node.d.ts",
+  "main": "dist/node/index.js",
+  "exports": {
+    ".": {
+      "types": "./dist/types/@types/node.d.ts",
+      "default": "./dist/node/index.js"
+    },
+    "./client": {
+      "types": "./client.d.ts"
+    }
+  },
   "files": [
     "bin",
     "dist",
@@ -48,64 +56,16 @@
     "url": "https://qranoko.jp"
   },
   "scripts": {
-    "build": "npm run clean && npm run build:src && npm run build:type",
-    "build:src": "tsx ../../scripts/build-sources.ts",
-    "build:type": "tsc",
+    "build": "npm run clean && npm run build-src && npm run build-type",
+    "build-src": "esbuild ./src/node/*.ts --outbase=src --outdir=dist",
+    "build-type": "tsc",
     "clean": "rimraf ./dist",
     "prepublishOnly": "npm run build"
   },
   "peerDependencies": {
-    "less": "*",
-    "react": "^17.0.2 || ^18.0.0",
-    "react-dom": "^17.0.2 || ^18.0.0",
-    "sass": "*",
-    "stylus": "*"
-  },
-  "peerDependenciesMeta": {
-    "less": {
-      "optional": true
-    },
-    "sass": {
-      "optional": true
-    },
-    "stylus": {
-      "optional": true
-    }
+    "vite": ">=5.0.0"
   },
   "dependencies": {
-    "@mdx-js/rollup": "^2.3.0",
-    "@qrac/svgstore": "^3.0.3",
-    "@svgr/core": "^8.0.0",
-    "@svgr/plugin-jsx": "^8.0.1",
-    "@vitejs/plugin-react": "^4.0.3",
-    "archiver": "^5.3.1",
-    "cac": "^6.7.14",
-    "dayjs": "^1.11.9",
-    "deepmerge-ts": "^5.1.0",
-    "esbuild": "^0.18.17",
-    "fast-glob": "^3.3.1",
-    "fs-extra": "^11.1.1",
-    "iconv-lite": "^0.6.3",
-    "image-size": "^1.0.2",
-    "js-beautify": "^1.14.9",
-    "mime-types": "^2.1.35",
-    "mojigiri": "^0.3.0",
-    "node-fetch": "^3.3.2",
-    "node-html-parser": "^6.1.5",
-    "picocolors": "^1.0.0",
-    "picomatch": "^2.3.1",
-    "react-helmet-async": "^1.3.0",
-    "react-router-dom": "^6.14.2",
-    "rehype-highlight": "^6.0.0",
-    "rehype-raw": "^6.1.1",
-    "rehype-react": "^7.2.0",
-    "remark-frontmatter": "^4.0.1",
-    "remark-gfm": "^3.0.1",
-    "remark-mdx-frontmatter": "^3.0.0",
-    "remark-parse": "^10.0.2",
-    "remark-rehype": "^10.1.0",
-    "sharp": "^0.32.4",
-    "unified": "^10.1.2",
-    "vite": "^4.4.7"
+    "minista-shared-utils": "^4.0.0-alpha.0"
   }
 }