buner 1.0.6 → 1.0.8

package/dist/prerender.js

@@ -8,151 +8,159 @@ import slash from "slash";
 import _ from "lodash";
 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) => path.resolve(projectRoot, p);
-const log = console.log.bind(console);
-const template = fs.readFileSync(toAbsolute(process.env.VITE_TEMPLATE ?? "dist/static/index.html"), "utf-8");
-const { render, routesToPrerender } = await import(pathToFileURL(toAbsolute("./dist/server/entry-server.js")).href);
-const beautifyOptions = {
-  indent_size: 2,
-  indent_char: " ",
-  keep_array_indentation: false,
-  break_chained_methods: false,
-  indent_scripts: "normal",
-  brace_style: "collapse",
-  space_before_conditional: true,
-  unescape_strings: false,
-  jslint_happy: false,
-  end_with_newline: false,
-  wrap_line_length: 0,
-  indent_inner_html: false,
-  comma_first: false,
-  e4x: false,
-  indent_empty_lines: false,
-  wrap_attributes: "force",
-  max_preserve_newlines: 5,
-  preserve_newlines: true
-};
-const updateResourcePath = ($, tagName, attr, addHash) => {
-  $(tagName).each((_2, el) => {
-    const href = $(el).attr(attr);
-    if (href && href.startsWith("/")) {
-      let newPath = href;
-      if (process.env.VITE_DOMAIN) {
-        newPath = process.env.VITE_DOMAIN + newPath;
-      }
-      if (href.startsWith(xpackEnv.VITE_BASE_URL) && !href.startsWith(xpackEnv.VITE_BASE_URL + "assets/vendors/") && [".css", ".ico", ".js", ".webmanifest", ".svg"].includes(path.extname(href).toLowerCase()) && !/\.0x[a-z0-9]{8}\.\w+$/gi.test(href)) {
-        const path2 = toAbsolute("dist/static/" + href.substring(xpackEnv.VITE_BASE_URL.length));
-        if (fs.existsSync(path2)) {
-          const content = fs.readFileSync(path2);
-          const sha1Hash = crypto.createHash("sha1");
-          sha1Hash.update(content);
-          const hash = sha1Hash.digest("base64url").substring(0, 10);
-          if (addHash) {
-            newPath += "?v=" + hash;
+const runPrerender = async (options = {}) => {
+  const mode = options.mode ?? "production";
+  const addHash = options.addHash ?? false;
+  const projectRoot = process.cwd();
+  const xpackEnv = loadEnv(mode, projectRoot);
+  const toAbsolute = (p) => path.resolve(projectRoot, p);
+  const log = console.log.bind(console);
+  const template = fs.readFileSync(toAbsolute(process.env.VITE_TEMPLATE ?? "dist/static/index.html"), "utf-8");
+  const { render, routesToPrerender } = await import(pathToFileURL(toAbsolute("./dist/server/entry-server.js")).href);
+  const beautifyOptions = {
+    indent_size: 2,
+    indent_char: " ",
+    keep_array_indentation: false,
+    break_chained_methods: false,
+    indent_scripts: "normal",
+    brace_style: "collapse",
+    space_before_conditional: true,
+    unescape_strings: false,
+    jslint_happy: false,
+    end_with_newline: false,
+    wrap_line_length: 0,
+    indent_inner_html: false,
+    comma_first: false,
+    e4x: false,
+    indent_empty_lines: false,
+    wrap_attributes: "force",
+    max_preserve_newlines: 5,
+    preserve_newlines: true
+  };
+  const updateResourcePath = ($, tagName, attr, addHash2) => {
+    $(tagName).each((_2, el) => {
+      const href = $(el).attr(attr);
+      if (href && href.startsWith("/")) {
+        let newPath = href;
+        if (process.env.VITE_DOMAIN) {
+          newPath = process.env.VITE_DOMAIN + newPath;
+        }
+        if (href.startsWith(xpackEnv.VITE_BASE_URL) && !href.startsWith(xpackEnv.VITE_BASE_URL + "assets/vendors/") && [".css", ".ico", ".js", ".webmanifest", ".svg"].includes(path.extname(href).toLowerCase()) && !/\.0x[a-z0-9]{8}\.\w+$/gi.test(href)) {
+          const path2 = toAbsolute("dist/static/" + href.substring(xpackEnv.VITE_BASE_URL.length));
+          if (fs.existsSync(path2)) {
+            const content = fs.readFileSync(path2);
+            const sha1Hash = crypto.createHash("sha1");
+            sha1Hash.update(content);
+            const hash = sha1Hash.digest("base64url").substring(0, 10);
+            if (addHash2) {
+              newPath += "?v=" + hash;
+            }
+          } else if (path2.endsWith("mock-api.js")) ;
+          else {
+            log(chalk.yellow("Cannot find:", path2));
           }
-        } else if (path2.endsWith("mock-api.js")) ;
-        else {
-          log(chalk.yellow("Cannot find:", path2));
+        }
+        if (newPath != href) {
+          $(el).attr(attr, newPath);
         }
       }
-      if (newPath != href) {
-        $(el).attr(attr, newPath);
+    });
+  };
+  const removeStyleBase = ($) => {
+    $('link[rel="stylesheet"]').each((_2, el) => {
+      const href = $(el).attr("href");
+      if (href?.includes("style-base")) {
+        $(el).remove();
       }
-    }
-  });
-};
-const removeStyleBase = ($) => {
-  $('link[rel="stylesheet"]').each((_2, el) => {
-    const href = $(el).attr("href");
-    if (href?.includes("style-base")) {
-      $(el).remove();
-    }
-  });
-};
-const removeDuplicateAssets = ($, selector, attr, paths) => {
-  $(selector).each((_2, el) => {
-    if ($(el).attr("data-pl-inplace") === "true") {
-      return;
-    }
-    const path2 = $(el).attr(attr);
-    if (!path2) {
-      return;
-    }
-    const index = $(el).index();
-    const parent = $(el).parent().clone();
-    const child = parent.children()[index];
-    parent.empty();
-    parent.append(child);
-    const html = parent.html();
-    $(el).after("\n<!-- " + html + " -->");
-    if (paths.includes(path2)) {
-      $(el).remove();
-      return;
-    }
-    paths.push(path2);
-    $(el).removeAttr("data-pl-require");
-    if ($(el).attr("type") === "module") {
-      const deferValue = $(el).attr("defer");
-      if ($(el).attr("defer") === "" || deferValue === "defer" || deferValue === "true") {
-        $(el).removeAttr("defer");
+    });
+  };
+  const removeDuplicateAssets = ($, selector, attr, paths) => {
+    $(selector).each((_2, el) => {
+      if ($(el).attr("data-pl-inplace") === "true") {
+        return;
       }
+      const path2 = $(el).attr(attr);
+      if (!path2) {
+        return;
+      }
+      const index = $(el).index();
+      const parent = $(el).parent().clone();
+      const child = parent.children()[index];
+      parent.empty();
+      parent.append(child);
+      const html = parent.html();
+      $(el).after("\n<!-- " + html + " -->");
+      if (paths.includes(path2)) {
+        $(el).remove();
+        return;
+      }
+      paths.push(path2);
+      $(el).removeAttr("data-pl-require");
+      if ($(el).attr("type") === "module") {
+        const deferValue = $(el).attr("defer");
+        if ($(el).attr("defer") === "" || deferValue === "defer" || deferValue === "true") {
+          $(el).removeAttr("defer");
+        }
+      }
+      $("head").append(el);
+    });
+  };
+  const viteAbsoluteUrl = (remain, addExtension = false) => {
+    const baseUrl = xpackEnv.VITE_BASE_URL;
+    const normalizedRemain = (remain?.startsWith("/") ? remain : "/" + remain) + (addExtension && !remain.endsWith("/") ? xpackEnv.VITE_PATH_EXTENSION ?? "" : "");
+    if (!baseUrl) {
+      return normalizedRemain;
     }
-    $("head").append(el);
-  });
-};
-const viteAbsoluteUrl = (remain, addExtension = false) => {
-  const baseUrl = xpackEnv.VITE_BASE_URL;
-  const normalizedRemain = (remain?.startsWith("/") ? remain : "/" + remain) + (addExtension && !remain.endsWith("/") ? xpackEnv.VITE_PATH_EXTENSION ?? "" : "");
-  if (!baseUrl) {
-    return normalizedRemain;
-  }
-  if (!baseUrl.endsWith("/")) {
-    return baseUrl + normalizedRemain;
-  }
-  const len = baseUrl.length;
-  return baseUrl.substring(0, len - 1) + normalizedRemain;
-};
-const renderPage = async (renderedPages, addHash) => {
-  for (const route of routesToPrerender) {
-    const output = await render(viteAbsoluteUrl(route.route, true));
-    const destLocalizedFolderPath = toAbsolute("dist/static");
-    let html = template.replace("<!--app-html-->", output.html ?? "").replace("@style.scss", "/assets/css/" + route.name + ".css");
-    const $ = cheerio.load(html);
-    const paths = [];
-    removeDuplicateAssets($, "link[data-pl-require][href]", "href", paths);
-    removeDuplicateAssets($, "script[data-pl-require][src]", "src", paths);
-    updateResourcePath($, "link", "href", addHash);
-    updateResourcePath($, "script", "src", addHash);
-    updateResourcePath($, "img", "src", addHash);
-    if (route.route === "/") {
-      removeStyleBase($);
+    if (!baseUrl.endsWith("/")) {
+      return baseUrl + normalizedRemain;
     }
-    $("head title").text(route.name);
-    const fileName = (route.route === "/" ? "/index" : route.route) + ".html";
-    const filePath = `${destLocalizedFolderPath}${fileName}`;
-    if (!fs.existsSync(path.dirname(filePath))) {
-      fs.mkdirSync(path.dirname(filePath), { recursive: true });
+    const len = baseUrl.length;
+    return baseUrl.substring(0, len - 1) + normalizedRemain;
+  };
+  const renderPage = async (renderedPages2, addHash2) => {
+    for (const route of routesToPrerender) {
+      const output = await render(viteAbsoluteUrl(route.route, true));
+      const destLocalizedFolderPath = toAbsolute("dist/static");
+      let html = template.replace("<!--app-html-->", output.html ?? "").replace("@style.scss", "/assets/css/" + route.name + ".css");
+      const $ = cheerio.load(html);
+      const paths = [];
+      removeDuplicateAssets($, "link[data-pl-require][href]", "href", paths);
+      removeDuplicateAssets($, "script[data-pl-require][src]", "src", paths);
+      updateResourcePath($, "link", "href", addHash2);
+      updateResourcePath($, "script", "src", addHash2);
+      updateResourcePath($, "img", "src", addHash2);
+      if (route.route === "/") {
+        removeStyleBase($);
+      }
+      $("head title").text(route.name);
+      const fileName = (route.route === "/" ? "/index" : route.route) + ".html";
+      const filePath = `${destLocalizedFolderPath}${fileName}`;
+      if (!fs.existsSync(path.dirname(filePath))) {
+        fs.mkdirSync(path.dirname(filePath), { recursive: true });
+      }
+      html = $.html();
+      html = jsBeautify.html_beautify(html, beautifyOptions);
+      html = html.replace("/* app-styles */", output.styles);
+      fs.writeFileSync(toAbsolute(filePath), html);
+      log("pre-rendered:", slash(filePath));
+      renderedPages2.push({
+        name: _.kebabCase(fileName.replaceAll(/\.\w+$/gi, "")),
+        url: `${process.env.VITE_DOMAIN ?? ""}${fileName}`,
+        fileName
+      });
     }
-    html = $.html();
-    html = jsBeautify.html_beautify(html, beautifyOptions);
-    html = html.replace("/* app-styles */", output.styles);
-    fs.writeFileSync(toAbsolute(filePath), html);
-    log("pre-rendered:", slash(filePath));
-    renderedPages.push({
-      name: _.kebabCase(fileName.replaceAll(/\.\w+$/gi, "")),
-      url: `${process.env.VITE_DOMAIN ?? ""}${fileName}`,
-      fileName
-    });
-  }
-};
-(async () => {
+  };
   const renderedPages = [];
   const pool = [];
-  const addHash = !!process.argv.includes("--add-hash");
   pool.push(renderPage(renderedPages, addHash));
   await Promise.all(pool);
-})();
+};
+const isDirectRun = process.argv[1]?.endsWith("prerender.js") || process.argv[1]?.endsWith("prerender.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";
+  runPrerender({ addHash: process.argv.includes("--add-hash"), mode });
+}
+export {
+  runPrerender
+};

package/dist/server.js

@@ -8,11 +8,11 @@ import fs from "fs";
 import path from "path";
 import * as cheerio from "cheerio";
 import jsBeautify from "js-beautify";
-const createViteDevServer = ({ root: root2, baseUrl, hmrPort, isTest: isTest2 }) => {
+const createViteDevServer = ({ root, baseUrl, hmrPort, isTest }) => {
   const server = createServer$1({
-    root: root2,
+    root,
     base: baseUrl,
-    logLevel: isTest2 ? "error" : "info",
+    logLevel: isTest ? "error" : "info",
     server: {
       middlewareMode: true,
       watch: {
@@ -121,17 +121,17 @@ const _useRenderer = ({ app, indexProd, isProd: isProd2, viteDevServer, resolve
     }
   });
 };
-const argvModeIndex$1 = process.argv.indexOf("--mode");
-const mode$1 = argvModeIndex$1 >= 0 && argvModeIndex$1 < process.argv.length - 1 && !process.argv[argvModeIndex$1 + 1].startsWith("-") ? process.argv[argvModeIndex$1 + 1] : "production";
+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";
 process.env.MY_CUSTOM_SECRET = "API_KEY_4c2928b5a14b475d94c3579cbea06178";
 const isProd = process.env.NODE_ENV === "production";
-const createServer = async ({ root: root2, hmrPort, baseUrl, isTest: isTest2 }) => {
-  const resolve = (p) => path$1.join(root2, p);
+const createServer = async ({ root, hmrPort, baseUrl, isTest }) => {
+  const resolve = (p) => path$1.join(root, p);
   const indexProd = isProd ? fs$1.readFileSync(resolve("index.html"), "utf-8") : "";
   const app = express();
   let viteDevServer;
   if (!isProd) {
-    viteDevServer = await createViteDevServer({ root: root2, baseUrl, hmrPort, isTest: isTest2 });
+    viteDevServer = await createViteDevServer({ root, baseUrl, hmrPort, isTest });
     app.use(viteDevServer.middlewares);
   }
   app.use("/assets/images", serveStatic(resolve("public/assets/images"), { index: false }));
@@ -147,25 +147,35 @@ const createServer = async ({ root: root2, hmrPort, baseUrl, isTest: isTest2 })
 const startServer = (props) => {
   createServer(props).then(({ app }) => {
     app.listen(props.port, () => {
-      const xpackEnv2 = loadEnv(mode$1, props.root);
-      console.log("Running on " + chalk.green("http://localhost:" + props.port + xpackEnv2.VITE_BASE_URL));
+      const xpackEnv = loadEnv(mode, props.root);
+      console.log("Running on " + chalk.green("http://localhost:" + props.port + xpackEnv.VITE_BASE_URL));
     });
   });
 };
-console.log("[INIT] server");
-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 root = process.cwd();
-const xpackEnv = loadEnv(mode, root);
-const isTest = !!xpackEnv.VITE_TEST_BUILD || process.env.NODE_ENV === "test";
-const port = xpackEnv.VITE_PORT ? parseInt(xpackEnv.VITE_PORT) : 5e3;
-if (!isTest) {
-  console.log(root);
-  startServer({
-    root,
-    isTest,
-    port,
-    hmrPort: port + 1,
-    baseUrl: xpackEnv.VITE_BASE_URL
-  });
+const runServer = (options = {}) => {
+  const mode2 = options.mode ?? "production";
+  console.log("[INIT] server");
+  const root = process.cwd();
+  const xpackEnv = loadEnv(mode2, root);
+  const isTest = !!xpackEnv.VITE_TEST_BUILD || process.env.NODE_ENV === "test";
+  const port = xpackEnv.VITE_PORT ? parseInt(xpackEnv.VITE_PORT) : 5e3;
+  if (!isTest) {
+    console.log(root);
+    startServer({
+      root,
+      isTest,
+      port,
+      hmrPort: port + 1,
+      baseUrl: xpackEnv.VITE_BASE_URL
+    });
+  }
+};
+const isDirectRun = process.argv[1]?.endsWith("server.js") || process.argv[1]?.endsWith("server.ts");
+if (isDirectRun) {
+  const argvModeIndex2 = process.argv.indexOf("--mode");
+  const mode2 = argvModeIndex2 >= 0 && argvModeIndex2 < process.argv.length - 1 && !process.argv[argvModeIndex2 + 1].startsWith("-") ? process.argv[argvModeIndex2 + 1] : "production";
+  runServer({ mode: mode2 });
 }
+export {
+  runServer
+};

package/dist/states.js

@@ -2,40 +2,49 @@ import fs from "fs";
 import chokidar from "chokidar";
 import debounce from "debounce";
 import { glob } from "glob";
-const isWatch = process.argv.includes("--watch");
-const log = console.log.bind(console);
-const states = {};
-const buildStates = debounce(() => {
-  const output = [];
-  const keys = Object.keys(states);
-  [].forEach.call(keys, (key) => {
-    const state = states[key];
-    if (!state) {
-      return;
-    }
-    try {
-      output.push(JSON.parse(state));
-    } catch (error) {
-      console.log(error);
-    }
-  });
-  const json = JSON.stringify(output, null, "  ");
-  fs.writeFileSync("public/pl-states.json", json);
-}, 500);
-const setStates = (statePath) => {
-  const state = fs.readFileSync(statePath, "utf-8");
-  states[statePath] = state;
-  buildStates();
+const runStates = (options = {}) => {
+  const isWatch = options.watch ?? false;
+  const log = console.log.bind(console);
+  const states = {};
+  const buildStates = debounce(() => {
+    const output = [];
+    const keys = Object.keys(states);
+    [].forEach.call(keys, (key) => {
+      const state = states[key];
+      if (!state) {
+        return;
+      }
+      try {
+        output.push(JSON.parse(state));
+      } catch (error) {
+        console.log(error);
+      }
+    });
+    const json = JSON.stringify(output, null, "  ");
+    fs.writeFileSync("public/pl-states.json", json);
+  }, 500);
+  const setStates = (statePath) => {
+    const state = fs.readFileSync(statePath, "utf-8");
+    states[statePath] = state;
+    buildStates();
+  };
+  const removeStates = (statePath) => {
+    delete states[statePath];
+    buildStates();
+  };
+  if (isWatch) {
+    const watcher = chokidar.watch("src/**/*.states.json");
+    watcher.on("ready", () => {
+      log("States are ready!");
+    }).on("add", (path) => setStates(path)).on("change", (path) => setStates(path)).on("unlink", (path) => removeStates(path));
+  } else {
+    glob.sync("src/**/*.states.json").forEach((path) => setStates(path));
+  }
 };
-const removeStates = (statePath) => {
-  delete states[statePath];
-  buildStates();
-};
-if (isWatch) {
-  const watcher = chokidar.watch("src/**/*.states.json");
-  watcher.on("ready", () => {
-    log("States are ready!");
-  }).on("add", (path) => setStates(path)).on("change", (path) => setStates(path)).on("unlink", (path) => removeStates(path));
-} else {
-  glob.sync("src/**/*.states.json").forEach((path) => setStates(path));
+const isDirectRun = process.argv[1]?.endsWith("states.js") || process.argv[1]?.endsWith("states.ts");
+if (isDirectRun) {
+  runStates({ watch: process.argv.includes("--watch") });
 }
+export {
+  runStates
+};