buner 1.0.7 → 1.0.9

package/dist/buner.js

@@ -1,26 +1,48 @@
 #!/usr/bin/env node
 import path from "path";
-import { execSync, spawn } from "child_process";
 import { fileURLToPath } from "url";
 import { Command } from "commander";
 import chalk from "chalk";
 import fetch from "node-fetch";
 import prompts from "prompts";
+import { build } from "vite";
+import { runStyles } from "./styles.js";
+import { runStates } from "./states.js";
+import { runServer } from "./server.js";
+import { runPrerender } from "./prerender.js";
+import { runIntegration } from "./integration.js";
+import validateProjectName from "validate-npm-package-name";
 import fs from "fs";
+import { execSync } from "child_process";
 import fs$1 from "fs/promises";
 import os from "os";
 import { globby } from "globby";
 import { exec } from "node:child_process";
-import validateProjectName from "validate-npm-package-name";
+import "chokidar";
+import "sass";
+import "slash";
+import "debounce";
+import "glob";
+import "postcss";
+import "autoprefixer";
+import "cssnano";
+import "node:fs";
+import "node:path";
+import "express";
+import "serve-static";
+import "cheerio";
+import "js-beautify";
+import "node:crypto";
+import "lodash";
 const name = "buner";
-const version = "1.0.7";
+const version = "1.0.9";
 const description = "Frontend build toolkit for Vite + React SSR projects — SCSS pipeline, prerender, SSR dev server, and backend integration.";
 const type = "module";
 const license = "MIT";
 const repository = { "type": "git", "url": "https://github.com/precise-alloy/buner.git" };
 const homepage = "https://www.npmjs.com/package/buner";
 const keywords = ["vite", "react", "ssr", "scss", "prerender", "frontend", "build-tool", "cli"];
-const bin$1 = { "buner": "./dist/buner.js" };
+const bin = { "buner": "./dist/buner.js" };
 const files = ["dist", "xpack", "public", "vite.config.ts", "index.html", "tsconfig.json", "eslint.config.mjs", "types.d.ts", ".env", ".env.development", ".env.eshn", "README.md"];
 const scripts = { "start": "bun run dev", "predev": "bun upgrade", "dev": 'concurrently --kill-others "bun styles.ts --watch" "bun states.ts --watch" "cross-env scriptOnly=true vite build --mode development --watch" "bun server.ts --mode development"', "serve": "bun server.ts", "watch": "bun server.ts", "build": "bun run build:static && bun run build:server", "build:eshn": "bun run build:static:eshn && bun run build:server:eshn", "preview": "vite preview", "build:server": "vite build --ssr src/entry-server.tsx --outDir dist/server", "build:server:eshn": "vite build --ssr src/entry-server.tsx --outDir dist/server --mode eshn", "build:static": "vite build --outDir dist/static", "build:static:eshn": "vite build --outDir dist/static --mode eshn", "generate": "bun states.ts && bun run styles && bun run build && bun prerender.ts --add-hash", "eshn": "bun states.ts && bun run styles && bun run build:eshn && bun prerender.ts --add-hash --mode eshn", "inte": "bun run styles && bun run build && bun prerender.ts && bun integration.ts", "styles": "bun styles.ts", "format": "prettier --write .", "lint": "eslint --fix", "cli:start": "vite build -c vite.cli.config.ts --watch", "cli:build": "vite build -c vite.cli.config.ts" };
 const engines = { "node": ">=20.0.0" };
@@ -37,7 +59,7 @@ const packageJson = {
   repository,
   homepage,
   keywords,
-  bin: bin$1,
+  bin,
   files,
   scripts,
   engines,
@@ -46,6 +68,16 @@ const packageJson = {
   devDependencies,
   msw
 };
+function validateNpmName(name2) {
+  const nameValidation = validateProjectName(name2);
+  if (nameValidation.validForNewPackages && !name2.startsWith("-")) {
+    return { valid: true };
+  }
+  return {
+    valid: false,
+    problems: [...nameValidation.errors || [], ...nameValidation.warnings || []]
+  };
+}
 const isWriteable = async (directory) => {
   try {
     await fs.promises.access(directory, fs.constants.W_OK);
@@ -418,55 +450,35 @@ Creating a new app in ${green$1(root)}.`);
   console.log(`
 ${green$1("Success!")} Created ${appName} at ${appPath}`);
 };
-function validateNpmName(name2) {
-  const nameValidation = validateProjectName(name2);
-  if (nameValidation.validForNewPackages && !name2.startsWith("-")) {
-    return { valid: true };
-  }
-  return {
-    valid: false,
-    problems: [...nameValidation.errors || [], ...nameValidation.warnings || []]
-  };
-}
 const { green, yellow, bold, cyan, red } = chalk;
 const packageName = "buner";
 const packageDir = path.dirname(fileURLToPath(import.meta.url));
-const pkg = (file) => path.join(packageDir, file);
-const bin = (name2) => {
-  const ext = process.platform === "win32" ? ".cmd" : "";
-  const pkgRoot = path.resolve(packageDir, "..");
-  const local = path.join(pkgRoot, "node_modules", ".bin", name2 + ext);
-  try {
-    if (require("fs").existsSync(local)) return local;
-  } catch {
+const viteConfigPath = () => path.resolve(packageDir, "..", "vite.config.ts");
+const viteBuild = async (opts) => {
+  const prevMode = process.env.BUNER_MODE;
+  if (opts.mode) {
+    process.env.BUNER_MODE = opts.mode;
+  }
+  const config = {
+    configFile: viteConfigPath(),
+    build: {
+      outDir: opts.outDir,
+      ...opts.ssr ? { ssr: opts.ssr } : {},
+      ...opts.watch ? { watch: {} } : {}
+    }
+  };
+  if (opts.mode) {
+    config.mode = opts.mode;
   }
-  const consumerBin = path.join(process.cwd(), "node_modules", ".bin", name2 + ext);
   try {
-    if (require("fs").existsSync(consumerBin)) return consumerBin;
-  } catch {
+    await build(config);
+  } finally {
+    if (prevMode === void 0) {
+      delete process.env.BUNER_MODE;
+    } else {
+      process.env.BUNER_MODE = prevMode;
+    }
   }
-  return name2;
-};
-const run = (cmd, args = [], options = {}) => {
-  return new Promise((resolve, reject) => {
-    const child = spawn(cmd, args, {
-      stdio: "inherit",
-      shell: true,
-      cwd: process.cwd(),
-      ...options
-    });
-    child.on("close", (code) => {
-      if (code !== 0) {
-        reject(new Error(`Command "${cmd} ${args.join(" ")}" exited with code ${code}`));
-      } else {
-        resolve();
-      }
-    });
-    child.on("error", reject);
-  });
-};
-const runSync = (cmd) => {
-  execSync(cmd, { stdio: "inherit", cwd: process.cwd() });
 };
 const onPromptState = (state) => {
   if (state?.aborted) {
@@ -530,62 +542,45 @@ For example:
   await notifyUpdate();
 });
 program.command("dev").description("Start development mode with all watchers").action(async () => {
-  const viteConfig = path.resolve(packageDir, "..", "vite.config.ts");
-  await run(bin("concurrently"), [
-    "--kill-others",
-    `"node ${pkg("styles.js")} --watch"`,
-    `"node ${pkg("states.js")} --watch"`,
-    `"${bin("cross-env")} scriptOnly=true ${bin("vite")} build --config ${viteConfig} --mode development --watch"`,
-    `"node ${pkg("server.js")} --mode development"`
-  ]);
+  runStyles({ watch: true });
+  runStates({ watch: true });
+  process.env.scriptOnly = "true";
+  viteBuild({ outDir: "dist/static", mode: "development", watch: true });
+  runServer({ mode: "development" });
 });
 program.command("serve").description("Start the SSR dev server").option("--mode <mode>", "server mode", "development").action(async (opts) => {
-  await run("node", [pkg("server.js"), "--mode", opts.mode]);
+  runServer({ mode: opts.mode });
 });
 program.command("build").description("Build the project (static + SSR)").action(async () => {
-  const viteConfig = path.resolve(packageDir, "..", "vite.config.ts");
-  runSync(`${bin("vite")} build --config ${viteConfig} --outDir dist/static`);
-  runSync(`${bin("vite")} build --config ${viteConfig} --ssr src/entry-server.tsx --outDir dist/server`);
+  await viteBuild({ outDir: "dist/static" });
+  await viteBuild({ outDir: "dist/server", ssr: "src/entry-server.tsx" });
 });
 program.command("generate").description("Full static site generation (states + styles + build + prerender)").option("--mode <mode>", "build mode", "production").action(async (opts) => {
-  const viteConfig = path.resolve(packageDir, "..", "vite.config.ts");
-  runSync(`node ${pkg("states.js")}`);
-  runSync(`node ${pkg("styles.js")}`);
-  if (opts.mode === "production") {
-    runSync(`${bin("vite")} build --config ${viteConfig} --outDir dist/static`);
-    runSync(`${bin("vite")} build --config ${viteConfig} --ssr src/entry-server.tsx --outDir dist/server`);
-  } else {
-    runSync(`${bin("vite")} build --config ${viteConfig} --outDir dist/static --mode ${opts.mode}`);
-    runSync(`${bin("vite")} build --config ${viteConfig} --ssr src/entry-server.tsx --outDir dist/server --mode ${opts.mode}`);
-  }
-  runSync(`node ${pkg("prerender.js")} --add-hash --mode ${opts.mode}`);
+  runStates();
+  runStyles();
+  await viteBuild({ outDir: "dist/static", mode: opts.mode !== "production" ? opts.mode : void 0 });
+  await viteBuild({ outDir: "dist/server", ssr: "src/entry-server.tsx", mode: opts.mode !== "production" ? opts.mode : void 0 });
+  await runPrerender({ addHash: true, mode: opts.mode });
 });
 program.command("eshn").description("Generate with --mode eshn").action(async () => {
-  const viteConfig = path.resolve(packageDir, "..", "vite.config.ts");
-  runSync(`node ${pkg("states.js")}`);
-  runSync(`node ${pkg("styles.js")}`);
-  runSync(`${bin("vite")} build --config ${viteConfig} --outDir dist/static --mode eshn`);
-  runSync(`${bin("vite")} build --config ${viteConfig} --ssr src/entry-server.tsx --outDir dist/server --mode eshn`);
-  runSync(`node ${pkg("prerender.js")} --add-hash --mode eshn`);
+  runStates();
+  runStyles();
+  await viteBuild({ outDir: "dist/static", mode: "eshn" });
+  await viteBuild({ outDir: "dist/server", ssr: "src/entry-server.tsx", mode: "eshn" });
+  await runPrerender({ addHash: true, mode: "eshn" });
 });
 program.command("inte").description("Build and integrate with backend (styles + build + prerender + integration)").action(async () => {
-  const viteConfig = path.resolve(packageDir, "..", "vite.config.ts");
-  runSync(`node ${pkg("styles.js")}`);
-  runSync(`${bin("vite")} build --config ${viteConfig} --outDir dist/static`);
-  runSync(`${bin("vite")} build --config ${viteConfig} --ssr src/entry-server.tsx --outDir dist/server`);
-  runSync(`node ${pkg("prerender.js")}`);
-  runSync(`node ${pkg("integration.js")}`);
+  runStyles();
+  await viteBuild({ outDir: "dist/static" });
+  await viteBuild({ outDir: "dist/server", ssr: "src/entry-server.tsx" });
+  await runPrerender();
+  runIntegration();
 });
 program.command("styles").description("Compile SCSS").option("--watch", "Watch for changes").action(async (opts) => {
-  const args = [pkg("styles.js")];
-  if (opts.watch) args.push("--watch");
-  await run("node", args);
+  runStyles({ watch: opts.watch });
 });
 program.command("prerender").description("Pre-render HTML files").option("--add-hash", "Add content hashes to asset URLs").option("--mode <mode>", "build mode", "production").action(async (opts) => {
-  const args = [pkg("prerender.js")];
-  if (opts.addHash) args.push("--add-hash");
-  args.push("--mode", opts.mode);
-  await run("node", args);
+  await runPrerender({ addHash: opts.addHash, mode: opts.mode });
 });
 program.parseAsync(process.argv).catch(async (error) => {
   console.log(red(error));

package/dist/integration.js

@@ -6,125 +6,135 @@ import slash from "slash";
 import { glob } from "glob";
 import { loadEnv } from "vite";
 import chalk from "chalk";
-const argvModeIndex = process.argv.indexOf("--mode");
-const mode = argvModeIndex >= 0 && argvModeIndex < process.argv.length - 1 && !process.argv[argvModeIndex + 1].startsWith("-") ? process.argv[argvModeIndex + 1] : "production";
-const projectRoot = process.cwd();
-const xpackEnv = loadEnv(mode, projectRoot);
-const toAbsolute = (p) => slash(path.resolve(projectRoot, p));
-const log = console.log.bind(console);
-const hashes = /* @__PURE__ */ new Map();
-const staticBasePath = toAbsolute("dist/static");
-const srcBasePath = toAbsolute("dist/static/assets");
-const destBasePath = toAbsolute(xpackEnv.VITE_INTE_ASSET_DIR);
-const patternPath = xpackEnv.VITE_INTE_PATTERN_DIR ? toAbsolute(xpackEnv.VITE_INTE_PATTERN_DIR) : void 0;
-if (patternPath && fs.existsSync(patternPath)) {
-  fs.rmSync(patternPath, { recursive: true, force: true });
-  fs.mkdirSync(patternPath, { recursive: true });
-}
-const copyItems = [
-  { from: "css" },
-  { from: "fonts" },
-  { from: "images" },
-  { from: "js" },
-  { from: "vendors" },
-  { from: "hashes.json" },
-  { from: "pages", to: patternPath }
-];
-const hashItems = ["css", "images", "js"];
-copyItems.forEach((item) => {
-  const srcPath = slash(path.join(srcBasePath, item.from));
-  const destPath = slash(item.to ?? path.join(destBasePath, item.from));
-  if (!fs.existsSync(srcPath)) {
-    return;
+const runIntegration = (options = {}) => {
+  const mode = options.mode ?? "production";
+  const projectRoot = process.cwd();
+  const xpackEnv = loadEnv(mode, projectRoot);
+  const toAbsolute = (p) => slash(path.resolve(projectRoot, p));
+  const log = console.log.bind(console);
+  const hashes = /* @__PURE__ */ new Map();
+  const staticBasePath = toAbsolute("dist/static");
+  const srcBasePath = toAbsolute("dist/static/assets");
+  const destBasePath = toAbsolute(xpackEnv.VITE_INTE_ASSET_DIR);
+  const patternPath = xpackEnv.VITE_INTE_PATTERN_DIR ? toAbsolute(xpackEnv.VITE_INTE_PATTERN_DIR) : void 0;
+  if (patternPath && fs.existsSync(patternPath)) {
+    fs.rmSync(patternPath, { recursive: true, force: true });
+    fs.mkdirSync(patternPath, { recursive: true });
   }
-  log(`Copy file ${srcPath} to ${destPath}`);
-  if (fs.statSync(srcPath).isDirectory()) {
-    if (fs.existsSync(destPath)) {
-      fs.rmSync(destPath, { recursive: true, force: true });
-    }
-    fs.mkdirSync(destPath, { recursive: true });
-    fs.cpSync(srcPath, destPath, { recursive: true, force: true });
-  } else {
-    const destDirPath = path.dirname(destPath);
-    if (!fs.existsSync(destDirPath)) {
-      fs.mkdirSync(destDirPath);
+  const copyItems = [
+    { from: "css" },
+    { from: "fonts" },
+    { from: "images" },
+    { from: "js" },
+    { from: "vendors" },
+    { from: "hashes.json" },
+    { from: "pages", to: patternPath }
+  ];
+  const hashItems = ["css", "images", "js"];
+  copyItems.forEach((item) => {
+    const srcPath = slash(path.join(srcBasePath, item.from));
+    const destPath = slash(item.to ?? path.join(destBasePath, item.from));
+    if (!fs.existsSync(srcPath)) {
+      return;
     }
-    fs.copyFileSync(srcPath, destPath);
-  }
-});
-hashItems.forEach((item) => {
-  const srcPath = slash(path.join(srcBasePath, item));
-  const files = glob.sync(srcPath + "/**/*.{css,js,svg}");
-  files.forEach((file) => {
-    const relativePath = slash(file.substring(staticBasePath.length));
-    if (!/\.0x[a-z0-9_-]{8,12}\.\w+$/gi.test(file)) {
-      const content = fs.readFileSync(file);
-      const sha1Hash = crypto.createHash("sha1");
-      sha1Hash.update(content);
-      const hash = sha1Hash.digest("base64url").substring(0, 10);
-      hashes.set(relativePath, hash);
+    log(`Copy file ${srcPath} to ${destPath}`);
+    if (fs.statSync(srcPath).isDirectory()) {
+      if (fs.existsSync(destPath)) {
+        fs.rmSync(destPath, { recursive: true, force: true });
+      }
+      fs.mkdirSync(destPath, { recursive: true });
+      fs.cpSync(srcPath, destPath, { recursive: true, force: true });
     } else {
-      hashes.set(relativePath, "");
+      const destDirPath = path.dirname(destPath);
+      if (!fs.existsSync(destDirPath)) {
+        fs.mkdirSync(destDirPath);
+      }
+      fs.copyFileSync(srcPath, destPath);
     }
   });
-});
-const sortedHashes = Array.from(hashes).sort((a, b) => a[0].localeCompare(b[0])).reduce(
-  (obj, [key, value]) => {
-    obj[key] = value;
-    return obj;
-  },
-  {}
-);
-fs.writeFileSync(path.join(destBasePath, "hashes.json"), JSON.stringify(sortedHashes, null, "  "));
-if (patternPath) {
-  fs.mkdirSync(patternPath, { recursive: true });
-  glob.sync("./dist/static/{atoms,molecules,organisms,templates,pages}/**/*.*").forEach((p) => {
-    let basename = "";
-    const segments = slash(p).split("/");
-    if (segments.length < 4) return;
-    switch (segments.length) {
-      case 4:
-        basename = path.basename(slash(p).replaceAll(/(atoms|molecules|organisms|templates|pages)\/([\w._-]+)$/gi, "$1-$2"));
-        fs.copyFileSync(p, resolve(patternPath, basename));
-        break;
-      default:
-        segments.splice(0, 2);
-        fs$1.cpSync(p, resolve(patternPath, segments.join("-")), { recursive: true });
-        break;
-    }
+  hashItems.forEach((item) => {
+    const srcPath = slash(path.join(srcBasePath, item));
+    const files = glob.sync(srcPath + "/**/*.{css,js,svg}");
+    files.forEach((file) => {
+      const relativePath = slash(file.substring(staticBasePath.length));
+      if (!/\.0x[a-z0-9_-]{8,12}\.\w+$/gi.test(file)) {
+        const content = fs.readFileSync(file);
+        const sha1Hash = crypto.createHash("sha1");
+        sha1Hash.update(content);
+        const hash = sha1Hash.digest("base64url").substring(0, 10);
+        hashes.set(relativePath, hash);
+      } else {
+        hashes.set(relativePath, "");
+      }
+    });
   });
-  glob.sync(slash(path.resolve(patternPath + "/**/*.{htm,html}"))).forEach((p) => {
-    const text = fs.readFileSync(p, "utf-8");
-    const newText = text.replaceAll(/react-loader\.0x[a-z0-9_-]{8,12}\.js/gi, "react-loader.0x00000000.js").replaceAll(/\.svg\?v=[a-z0-9_-]+/gi, ".svg");
-    if (text !== newText) {
-      fs.writeFileSync(p, newText);
+  const sortedHashes = Array.from(hashes).sort((a, b) => a[0].localeCompare(b[0])).reduce(
+    (obj, [key, value]) => {
+      obj[key] = value;
+      return obj;
+    },
+    {}
+  );
+  fs.writeFileSync(path.join(destBasePath, "hashes.json"), JSON.stringify(sortedHashes, null, "  "));
+  if (patternPath) {
+    fs.mkdirSync(patternPath, { recursive: true });
+    glob.sync("./dist/static/{atoms,molecules,organisms,templates,pages}/**/*.*").forEach((p) => {
+      let basename = "";
+      const segments = slash(p).split("/");
+      if (segments.length < 4) return;
+      switch (segments.length) {
+        case 4:
+          basename = path.basename(slash(p).replaceAll(/(atoms|molecules|organisms|templates|pages)\/([\w._-]+)$/gi, "$1-$2"));
+          fs.copyFileSync(p, resolve(patternPath, basename));
+          break;
+        default:
+          segments.splice(0, 2);
+          fs$1.cpSync(p, resolve(patternPath, segments.join("-")), { recursive: true });
+          break;
+      }
+    });
+    glob.sync(slash(path.resolve(patternPath + "/**/*.{htm,html}"))).forEach((p) => {
+      const text = fs.readFileSync(p, "utf-8");
+      const newText = text.replaceAll(/react-loader\.0x[a-z0-9_-]{8,12}\.js/gi, "react-loader.0x00000000.js").replaceAll(/\.svg\?v=[a-z0-9_-]+/gi, ".svg");
+      if (text !== newText) {
+        fs.writeFileSync(p, newText);
+      }
+    });
+  }
+  const checkExistFileList = [
+    { fileName: "hashes.json" },
+    { fileName: /react-loader\.0x[a-z0-9_-]{8,12}\.js/gi, folder: "js" },
+    { fileName: "main.js", folder: "js" }
+  ];
+  let isAllExist = true;
+  checkExistFileList.forEach((file) => {
+    if (typeof file.fileName === "string") {
+      const destPath = slash(path.join(destBasePath, file.folder ?? "", file.fileName.toString()));
+      if (!fs.existsSync(destPath)) {
+        log(chalk.yellow(`Cannot find: ${destPath}`));
+        isAllExist = false;
+      }
+    } else {
+      const fileName = file.fileName;
+      const folderFiles = slash(path.join(destBasePath, file.folder ?? ""));
+      const files = fs.readdirSync(folderFiles);
+      const found = files.find((f) => fileName.test(f));
+      if (!found) {
+        log(chalk.yellow(`Cannot find: ${slash(path.join(folderFiles, fileName.toString()))}`));
+        isAllExist = false;
+      }
     }
   });
-}
-const checkExistFileList = [
-  { fileName: "hashes.json" },
-  { fileName: /react-loader\.0x[a-z0-9_-]{8,12}\.js/gi, folder: "js" },
-  { fileName: "main.js", folder: "js" }
-];
-let isAllExist = true;
-checkExistFileList.forEach((file) => {
-  if (typeof file.fileName === "string") {
-    const destPath = slash(path.join(destBasePath, file.folder ?? "", file.fileName.toString()));
-    if (!fs.existsSync(destPath)) {
-      log(chalk.yellow(`Cannot find: ${destPath}`));
-      isAllExist = false;
-    }
-  } else {
-    const fileName = file.fileName;
-    const folderFiles = slash(path.join(destBasePath, file.folder ?? ""));
-    const files = fs.readdirSync(folderFiles);
-    const found = files.find((f) => fileName.test(f));
-    if (!found) {
-      log(chalk.yellow(`Cannot find: ${slash(path.join(folderFiles, fileName.toString()))}`));
-      isAllExist = false;
-    }
+  if (!isAllExist) {
+    process.exit(1);
   }
-});
-if (!isAllExist) {
-  process.exit(1);
+};
+const isDirectRun = process.argv[1]?.endsWith("integration.js") || process.argv[1]?.endsWith("integration.ts");
+if (isDirectRun) {
+  const argvModeIndex = process.argv.indexOf("--mode");
+  const mode = argvModeIndex >= 0 && argvModeIndex < process.argv.length - 1 && !process.argv[argvModeIndex + 1].startsWith("-") ? process.argv[argvModeIndex + 1] : "production";
+  runIntegration({ mode });
 }
+export {
+  runIntegration
+};