@windwalker-io/fusion-next 0.1.4 → 0.1.5

package/dist/index.d.ts

@@ -72,6 +72,7 @@ export declare class ConfigBuilder {
     merge(override: UserConfig | ((config: UserConfig) => UserConfig)): this;
     private getDefaultOutput;
     private getChunkDir;
+    getAssetDefaultSubdir(assetInfo: PreRenderedAsset): string;
     private getChunkNameFromTask;
     ensurePath(path: string, def?: any): this;
     get(path: string): any;
@@ -295,6 +296,7 @@ declare type RunnerCliOptions = {
     v?: number;
     verbose?: number;
     serverFile?: string;
+    pidFile?: string;
     s?: string;
     hmr?: boolean;
 };

package/dist/index.js

@@ -5,7 +5,7 @@ import { basename, parse, resolve, normalize, dirname, relative, isAbsolute } fr
 import chalk from 'chalk';
 import require$$0 from 'util';
 import require$$0$1 from 'path';
-import fs$1, { writeFileSync, existsSync } from 'node:fs';
+import fs$1, { writeFileSync, existsSync, readFileSync, unlinkSync } from 'node:fs';
 import { mergeConfig } from 'vite';
 import { inspect } from 'node:util';
 import yargs from 'yargs';
@@ -6207,18 +6207,20 @@ class ConfigBuilder {
         }
         const chunkDir = this.getChunkDir();
         if (this.env.mode === "production" && this.fusionOptions.chunkNameObfuscation) {
-          return `${chunkDir}${serial}.js`;
+          return `${chunkDir}${serial}-[hash].js`;
         }
         return `${chunkDir}[name]-[hash].js`;
       },
       assetFileNames: (assetInfo) => {
+        const chunkDir = this.getChunkDir();
         for (const assetFileNamesCallback of this.assetFileNamesCallbacks) {
           const name = assetFileNamesCallback(assetInfo);
           if (name) {
             return name;
           }
         }
-        return "[name].[ext]";
+        const dir = this.getAssetDefaultSubdir(assetInfo);
+        return `${chunkDir}${dir}[name]-[hash].[ext]`;
       }
     };
   }
@@ -6233,6 +6235,19 @@ class ConfigBuilder {
     }
     return chunkDir;
   }
+  getAssetDefaultSubdir(assetInfo) {
+    let dir = "";
+    if (assetInfo.name && assetInfo.name.endsWith(".css")) {
+      dir = "css/";
+    }
+    if (assetInfo.name && /\.(woff2?|ttf|otf|eot)$/.test(assetInfo.name)) {
+      dir = "fonts/";
+    }
+    if (assetInfo.name && /\.(png|jpe?g|gif|svg|webp)$/.test(assetInfo.name)) {
+      dir = "images/";
+    }
+    return dir;
+  }
   getChunkNameFromTask(chunkInfo) {
     if (this.tasks.has(chunkInfo.name)) {
       const output = this.tasks.get(chunkInfo.name)?.output;
@@ -8837,6 +8852,7 @@ async function resolveTaskAsFlat(name, task, cache) {
 
 let params = parseArgv(getArgsAfterDoubleDashes(process.argv));
 prepareParams(params);
+let serverRunning = false;
 let builder;
 const originalTasks = params._;
 const extraVitePlugins = [];
@@ -8928,21 +8944,54 @@ function useFusion(fusionOptions = {}, tasks) {
         server.httpServer?.once("listening", async () => {
           const scheme = server.config.server.https ? "https" : "http";
           const address = server.httpServer?.address();
-          const host = address && typeof address !== "string" ? address.address : "localhost";
+          let host = address && typeof address !== "string" ? address.address : "localhost";
           const port = address && typeof address !== "string" ? address.port : 80;
+          if (host === "::1") {
+            host = `[${host}]`;
+          }
           const url = `${scheme}://${host}:${port}/`;
           const serverFile = resolve(
             server.config.root,
             resolvedOptions.cliParams?.serverFile ?? "tmp/vite-server"
           );
           const serverFileFull = resolve(server.config.root, serverFile);
-          if (existsSync(serverFileFull)) {
+          const pidFile = resolve(
+            server.config.root,
+            resolvedOptions.cliParams?.pidFile ?? "tmp/vite-pid"
+          );
+          const anotherServerRunning = existsSync(serverFileFull) || existsSync(pidFile);
+          await sleep(500);
+          if (!serverRunning && anotherServerRunning) {
             console.log(chalk.yellow(`There may be a dev server running!`));
-            console.log(`The server host file exists: ${chalk.cyan(serverFile)}`);
-            console.log(`If you want to start a new server, you need to remove this file first.`);
-            process.exit(1);
+            console.log(`The server host file: ${chalk.cyan(serverFile)} or PID file: ${chalk.cyan(pidFile)} exists.`);
+            console.log("Do you want to kill other process and start a new server? [N/y]");
+            const answer = await new Promise((resolve2) => {
+              process.stdin.once("data", (data) => {
+                resolve2(data.toString().trim());
+              });
+            });
+            if (answer.toLowerCase() === "y") {
+              if (existsSync(pidFile)) {
+                const pid = readFileSync(pidFile, "utf-8");
+                try {
+                  process.kill(parseInt(pid), "SIGTERM");
+                  console.log(`Killed process with PID: ${chalk.yellow(pid)}`);
+                } catch (err) {
+                  console.log(`Failed to kill process with PID: ${chalk.yellow(pid)}. It may have already exited.`);
+                }
+              }
+              unlinkSync(serverFileFull);
+              unlinkSync(pidFile);
+              console.log(`Start running new server on: ${chalk.green(url)} and PID: ${chalk.green(process.pid)}`);
+            } else {
+              console.log(chalk.yellow("Aborting server start."));
+              process.exit(0);
+            }
           }
+          serverRunning = true;
+          await sleep(300);
           writeFileSync(serverFileFull, url);
+          writeFileSync(pidFile, process.pid.toString());
           if (!exitHandlersBound) {
             process.on("exit", () => {
               for (const callback of builder.serverStopCallbacks) {
@@ -8951,6 +9000,9 @@ function useFusion(fusionOptions = {}, tasks) {
               if (fs$1.existsSync(serverFile)) {
                 fs$1.rmSync(serverFile);
               }
+              if (fs$1.existsSync(pidFile)) {
+                fs$1.rmSync(pidFile);
+              }
             });
             process.on("SIGINT", () => process.exit());
             process.on("SIGTERM", () => process.exit());
@@ -9165,6 +9217,9 @@ function fullReloads(...paths) {
   builder.watches.push(...paths);
   builder.watches = uniq(builder.watches);
 }
+function sleep(ms) {
+  return new Promise((resolve2) => setTimeout(() => resolve2(), ms));
+}
 const index = {
   ...fusion,
   useFusion,