create-minista 2.8.2 → 3.0.0-alpha.32

package/README.md

@@ -20,29 +20,16 @@
 
 ```bash
 # Interactive
-$ npm init minista@latest
+$ npm create minista@latest
 
 # Shortcut
-$ npm init minista@latest my-minista-project -- --template ts
+$ npm create minista@latest my-minista-project -- --template minimal-ts
 ```
 
-| テンプレート | 内容                                                                      |
-| ------------ | ------------------------------------------------------------------------- |
-| `basic`      | 静的サイト制作用 / 基本のコンポーネント構成（TypeScript）                 |
-| `basic-saas` | SaaS テンプレート制作用 / 納品用の目次, 納品用 Zip コマンド（TypeScript） |
-| `ts`         | TypeScript を使った最低限の構成                                           |
-| `js`         | JavaScript を使った最低限の構成                                           |
-
-```bash
-# You can also use any GitHub repository
-npm init minista my-minista-project -- --template qrac/minista-blog-with-rest-api
-```
-
-## Fork & Respect
-
-- [astro/packages/create-astro at main · withastro/astro](https://github.com/withastro/astro/tree/main/packages/create-astro)
-- [vite/packages/create-vite at main · vitejs/vite](https://github.com/vitejs/vite/tree/main/packages/create-vite)
-- [vite/cli.ts at main · vitejs/vite](https://github.com/vitejs/vite/blob/main/packages/vite/src/node/cli.ts)
+| テンプレート | 内容                            |
+| ------------ | ------------------------------- |
+| `minimal-js` | JavaScript を使った最低限の構成 |
+| `minimal-ts` | TypeScript を使った最低限の構成 |
 
 ## License
 

package/bin/create-minista.js

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

package/dist/index.js

@@ -1,112 +1,99 @@
-import fs from "fs";
-import path from "path";
-import { bold, cyan, gray, green, red, reset } from "kleur/colors";
+import fs from "node:fs";
+import path from "node:path";
+import pc from "picocolors";
+import { cac } from "cac";
 import prompts from "prompts";
 import degit from "degit";
-import yargs from "yargs-parser";
-import replace from "replace-in-file";
-import { TEMPLATES } from "./templates.js";
-const cleanArgv = process.argv.filter((arg) => arg !== "--");
-const args = yargs(cleanArgv);
-prompts.override(args);
-const { version } = JSON.parse(fs.readFileSync(new URL("../package.json", import.meta.url), "utf-8"));
-const POSTPROCESS_FILES = ["package.json", "project.json", "README.md"];
-export function mkdirp(dir) {
-    try {
-        fs.mkdirSync(dir, { recursive: true });
-    }
-    catch (e) {
-        if (e.code === "EEXIST")
-            return;
-        throw e;
-    }
+const TEMPLATES = [
+  {
+    title: "Minimal (JavaScript)",
+    value: "minimal-js"
+  },
+  {
+    title: "Minimal (Typescript)",
+    value: "minimal-ts"
+  }
+];
+function pkgVersion() {
+  const pkgURL = new URL("../package.json", import.meta.url);
+  const pkg = JSON.parse(fs.readFileSync(pkgURL, "utf8"));
+  return pkg.version;
 }
-export async function main() {
-    console.log(`\n${bold("create-minista")} ${gray(`(v${version})`)}`);
-    const cwd = args["_"][2] || ".";
-    const defaultProjectName = cwd === "." ? "minista-project" : cwd;
-    const officialTemplatesPath = "qrac/create-minista/templates";
-    if (fs.existsSync(cwd)) {
-        if (fs.readdirSync(cwd).length > 0) {
-            const response = await prompts({
-                type: "confirm",
-                name: "forceOverwrite",
-                message: "Directory not empty. Continue [force overwrite]?",
-                initial: false,
-            });
-            if (!response.forceOverwrite) {
-                process.exit(1);
-            }
-            mkdirp(cwd);
-        }
-    }
-    else {
-        mkdirp(cwd);
-    }
-    const options = await prompts([
-        {
-            type: "text",
-            name: "projectName",
-            message: reset("Project name (in the file):"),
-            initial: defaultProjectName,
-        },
-        {
-            type: "select",
-            name: "template",
-            message: "Which template would you like to use?",
-            choices: TEMPLATES,
-        },
-    ]);
-    if (!options.template) {
-        process.exit(1);
-    }
-    const projectName = options.projectName
-        ? options.projectName
-        : defaultProjectName;
-    const hash = args.commit ? `#${args.commit}` : "";
-    const templateTarget = options.template.includes("/")
-        ? options.template
-        : `${officialTemplatesPath}/${options.template}`;
-    const emitter = degit(`${templateTarget}${hash}`, {
-        cache: false,
-        force: true,
-        verbose: false,
-    });
-    try {
-        console.log(`${green(`>`)} ${gray(`Copying project files...`)}`);
-        await emitter.clone(cwd);
+function mkdirp(dir) {
+  try {
+    fs.mkdirSync(dir, { recursive: true });
+  } catch (e) {
+    if (e.code === "EEXIST")
+      return;
+    throw e;
+  }
+}
+async function main(root, options) {
+  console.log(`
+${pc.bold("create-minista")} ${pc.gray(`(v${pkgVersion()})`)}`);
+  const cwd = root || ".";
+  const current = cwd === ".";
+  const repo = "qrac/minista/packages/create-minista/templates";
+  const template = options.template || "";
+  const tag = options.tag ? "#" + options.tag : "";
+  const questions = {
+    overwrite: {
+      type: "confirm",
+      name: "overwrite",
+      message: "Directory not empty. Continue [force overwrite]?",
+      initial: false
+    },
+    template: {
+      type: "select",
+      name: "template",
+      message: "Which template would you like to use?",
+      choices: TEMPLATES
     }
-    catch (err) {
-        console.error(red(err.message));
+  };
+  if (fs.existsSync(cwd)) {
+    if (fs.readdirSync(cwd).length > 0) {
+      const { overwrite } = await prompts(questions.overwrite);
+      if (!overwrite) {
         process.exit(1);
+      }
+      !current && mkdirp(cwd);
     }
-    if (projectName !== "minista-project" && !options.template.includes("/")) {
-        await Promise.all(POSTPROCESS_FILES.map(async (file) => {
-            const fileLoc = path.resolve(path.join(cwd, file));
-            if (fs.existsSync(fileLoc)) {
-                try {
-                    replace.sync({
-                        files: fileLoc,
-                        from: /minista-project/g,
-                        to: projectName,
-                    });
-                    //console.log("Replacement:", results)
-                }
-                catch (err) {
-                    console.error("Error occurred:", err);
-                }
-            }
-        }));
-    }
-    console.log(bold(green("✔") + " Done!"));
-    console.log("\nNext steps:");
-    let i = 1;
-    const relative = path.relative(process.cwd(), cwd);
-    if (relative !== "") {
-        console.log(`  ${i++}: ${bold(cyan(`cd ${relative}`))}`);
-    }
-    console.log(`  ${i++}: ${bold(cyan("npm install"))} (or pnpm install, yarn, etc)`);
-    console.log(`  ${i++}: ${bold(cyan('git init && git add -A && git commit -m "Initial commit"'))} (optional step)`);
-    console.log(`  ${i++}: ${bold(cyan("npm run dev"))} (or pnpm, yarn, etc)`);
-    console.log(`\nTo close the dev server, hit ${bold(cyan("Ctrl-C"))}`);
+  } else {
+    !current && mkdirp(cwd);
+  }
+  const configs = {
+    ...template ? { template } : await prompts(questions.template)
+  };
+  const target = `${path.join(repo, configs.template)}${tag}`;
+  const emitter = degit(target, { cache: false, force: true, verbose: false });
+  try {
+    console.log(`${pc.green(`>`)} ${pc.gray(`Copying project files...`)}`);
+    await emitter.clone(cwd);
+  } catch (err) {
+    console.error(pc.red(err.message));
+    process.exit(1);
+  }
+  console.log(pc.bold(pc.green("\u2714") + " Done!"));
+  console.log("\nNext steps:");
+  let step = 1;
+  const relative = path.relative(process.cwd(), cwd);
+  if (relative !== "") {
+    console.log(`  ${step++}: ${pc.bold(pc.cyan(`cd ${relative}`))}`);
+  }
+  console.log(`  ${step++}: ${pc.bold(pc.cyan("npm install"))}`);
+  console.log(`  ${step++}: ${pc.bold(pc.cyan("npm run dev"))}`);
+  console.log(`
+To close the dev server, hit ${pc.bold(pc.cyan("Ctrl + C"))}`);
 }
+const cli = cac("create-minista");
+cli.command("[root]", "Scaffolding for minista projects").option("--template <template>", "[string] template direcroty").option("--tag <tag>", "[string] branch | tag | hash").action(async (root, options) => {
+  try {
+    await main(root, options);
+  } catch (err) {
+    console.log(err);
+    process.exit(1);
+  }
+});
+cli.help();
+cli.version(pkgVersion());
+cli.parse();

package/dist/types/index.d.ts

@@ -1,2 +1 @@
-export declare function mkdirp(dir: string): void;
-export declare function main(): Promise<void>;
+export {};

package/package.json

@@ -1,23 +1,24 @@
 {
   "name": "create-minista",
   "description": "Scaffolding for minista projects",
-  "version": "2.8.2",
+  "version": "3.0.0-alpha.32",
   "type": "module",
   "bin": {
-    "create-minista": "./cli.mjs"
+    "create-minista": "./bin/create-minista.js"
   },
   "files": [
     "dist",
     "cli.js"
   ],
   "license": "MIT",
-  "homepage": "https://github.com/qrac/create-minista",
+  "homepage": "https://minista.qranoko.jp",
   "repository": {
     "type": "git",
-    "url": "https://github.com/qrac/create-minista"
+    "url": "https://github.com/qrac/minista",
+    "directory": "packages/create-minista"
   },
   "bugs": {
-    "url": "https://github.com/qrac/create-minista/issues"
+    "url": "https://github.com/qrac/minista/issues"
   },
   "keywords": [
     "static-site-generator",
@@ -27,7 +28,8 @@
     "jsx",
     "tsx",
     "typescript",
-    "webpack",
+    "esbuild",
+    "vite",
     "japanese",
     "minista"
   ],
@@ -40,25 +42,16 @@
     "url": "https://qranoko.jp"
   },
   "scripts": {
-    "build": "tsc",
-    "prepublishOnly": "npm run build",
-    "test": "cd test && node ../cli.mjs",
-    "clean": "trash ./dist"
-  },
-  "prettier": {
-    "semi": false
+    "build": "npm run clean && npm run build:src && npm run build:type",
+    "build:src": "tsx ../../scripts/build-sources.ts",
+    "build:type": "tsc",
+    "clean": "rimraf ./dist",
+    "prepublishOnly": "npm run clean && npm run build"
   },
   "dependencies": {
+    "cac": "^6.7.14",
     "degit": "^2.8.4",
-    "kleur": "^4.1.4",
-    "prompts": "^2.4.2",
-    "replace-in-file": "^6.3.2",
-    "yargs-parser": "^21.0.1"
-  },
-  "devDependencies": {
-    "@types/degit": "^2.8.3",
-    "@types/prompts": "^2.0.14",
-    "@types/yargs-parser": "^21.0.0",
-    "typescript": "^4.6.4"
+    "picocolors": "^1.0.0",
+    "prompts": "^2.4.2"
   }
 }

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2022 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/cli.mjs

@@ -1,3 +0,0 @@
-#!/usr/bin/env node
-"use strict"
-import("./dist/index.js").then(({ main }) => main())

package/dist/templates.js

@@ -1,18 +0,0 @@
-export const TEMPLATES = [
-    {
-        title: "Basic Site (Typescript)",
-        value: "basic",
-    },
-    {
-        title: "SaaS Template (Typescript)",
-        value: "basic-saas",
-    },
-    {
-        title: "Minimal (Typescript)",
-        value: "ts",
-    },
-    {
-        title: "Minimal (JavaScript)",
-        value: "js",
-    },
-];

package/dist/types/templates.d.ts

@@ -1,4 +0,0 @@
-export declare const TEMPLATES: {
-    title: string;
-    value: string;
-}[];