@adonisjs/assembler 8.0.0-next.0 → 8.0.0-next.1

package/build/index.js

@@ -331,6 +331,7 @@ var Bundler = class {
 };
 
 // src/dev_server.ts
+import { relative as relative4 } from "path";
 import { cliui as cliui2 } from "@poppinss/cliui";
 import prettyHrtime from "pretty-hrtime";
 import { fileURLToPath as fileURLToPath4 } from "url";
@@ -564,7 +565,12 @@ var DevServer = class {
   constructor(cwd, options) {
     this.cwd = cwd;
     this.options = options;
+    this.#cwdPath = fileURLToPath4(this.cwd);
   }
+  /**
+   * File path computed from the cwd
+   */
+  #cwdPath;
   /**
    * External listeners that are invoked when child process
    * gets an error or closes
@@ -663,15 +669,24 @@ var DevServer = class {
   /**
    * Handles file change event
    */
-  #handleFileChange(filePath, action, hotReplaced) {
-    const file = this.#fileSystem.inspect(filePath);
-    if (!file) {
+  #handleFileChange(filePath, action, info) {
+    if ((action === "add" || action === "delete") && this.mode === "hmr") {
+      debug_default("ignoring add and delete actions in HMR mode %s", filePath);
       return;
     }
-    if (hotReplaced) {
+    if (info && info.source === "hot-hook" && info.hotReloaded) {
+      debug_default("hot reloading %s, info %O", filePath, info);
       this.ui.logger.log(`${this.ui.colors.green("invalidated")} ${filePath}`);
       return;
     }
+    if (info && !info.fullReload) {
+      debug_default("ignoring full reload", filePath, info);
+      return;
+    }
+    const file = this.#fileSystem.inspect(filePath);
+    if (!file) {
+      return;
+    }
     if (file.reloadServer) {
       this.#clearScreen();
       this.ui.logger.log(`${this.ui.colors.green(action)} ${filePath}`);
@@ -688,7 +703,7 @@ var DevServer = class {
     this.#hooks.add("fileAdded", (filePath) => this.#handleFileChange(filePath, "add"));
     this.#hooks.add(
       "fileChanged",
-      (filePath, hotReplaced) => this.#handleFileChange(filePath, "update", hotReplaced)
+      (filePath, info) => this.#handleFileChange(filePath, "update", info)
     );
     this.#hooks.add("fileRemoved", (filePath) => this.#handleFileChange(filePath, "delete"));
   }
@@ -708,24 +723,50 @@ var DevServer = class {
       });
       this.#httpServer.on("message", async (message) => {
         if (this.#isAdonisJSReadyMessage(message)) {
+          debug_default("received http server ready message %O", message);
           await this.#postServerReady(message);
           resolve();
         } else if (this.#mode === "hmr" && this.#isHotHookMessage(message)) {
+          debug_default("received hot-hook message %O", message);
           if (message.type === "hot-hook:file-changed") {
             switch (message.action) {
               case "add":
-                this.#hooks.runner("fileAdded").run(string3.toUnixSlash(message.path), this);
+                this.#hooks.runner("fileAdded").run(string3.toUnixSlash(relative4(this.#cwdPath, message.path)), this);
                 break;
               case "change":
-                this.#hooks.runner("fileChanged").run(string3.toUnixSlash(message.path), false, this);
+                this.#hooks.runner("fileChanged").run(
+                  string3.toUnixSlash(relative4(this.#cwdPath, message.path)),
+                  {
+                    source: "hot-hook",
+                    fullReload: false,
+                    hotReloaded: false
+                  },
+                  this
+                );
                 break;
               case "unlink":
-                this.#hooks.runner("fileRemoved").run(string3.toUnixSlash(message.path), this);
+                this.#hooks.runner("fileRemoved").run(string3.toUnixSlash(relative4(this.#cwdPath, message.path)), this);
             }
           } else if (message.type === "hot-hook:full-reload") {
-            this.#hooks.runner("fileChanged").run(string3.toUnixSlash(message.path), false, this);
+            this.#hooks.runner("fileChanged").run(
+              string3.toUnixSlash(relative4(this.#cwdPath, message.path)),
+              {
+                source: "hot-hook",
+                fullReload: true,
+                hotReloaded: false
+              },
+              this
+            );
           } else if (message.type === "hot-hook:invalidated") {
-            this.#hooks.runner("fileChanged").run(string3.toUnixSlash(message.path), true, this);
+            this.#hooks.runner("fileChanged").run(
+              string3.toUnixSlash(relative4(this.#cwdPath, message.path)),
+              {
+                source: "hot-hook",
+                fullReload: false,
+                hotReloaded: true
+              },
+              this
+            );
           }
         }
       });
@@ -742,7 +783,6 @@ var DevServer = class {
           this.ui.logger.info("Underlying HTTP server died. Still watching for changes");
         }
       }).finally(() => {
-        console.log("ere>>");
         resolve();
       });
     });
@@ -798,7 +838,7 @@ var DevServer = class {
         ...this.options.env,
         HOT_HOOK_INCLUDE: this.#fileSystem.includes.join(","),
         HOT_HOOK_IGNORE: this.#fileSystem.excludes.join(","),
-        HOT_HOOK_RESTART: (this.options.metaFiles ?? []).map(({ pattern }) => pattern).join(",")
+        HOT_HOOK_RESTART: (this.options.metaFiles ?? []).filter(({ reloadServer }) => !!reloadServer).map(({ pattern }) => pattern).join(",")
       };
     }
     this.#clearScreen();
@@ -829,7 +869,7 @@ var DevServer = class {
     await this.#startHTTPServer(this.#stickyPort);
     this.#watcher = watch({
       usePolling: options?.poll ?? false,
-      cwd: fileURLToPath4(this.cwd),
+      cwd: this.#cwdPath,
       ignoreInitial: true,
       ignored: (file, stats) => {
         if (!stats) {
@@ -856,7 +896,15 @@ var DevServer = class {
     );
     this.#watcher.on(
       "change",
-      (filePath) => this.#hooks.runner("fileChanged").run(string3.toUnixSlash(filePath), false, this)
+      (filePath) => this.#hooks.runner("fileChanged").run(
+        string3.toUnixSlash(filePath),
+        {
+          source: "watcher",
+          fullReload: true,
+          hotReloaded: false
+        },
+        this
+      )
     );
     this.#watcher.on(
       "unlink",
@@ -1142,7 +1190,15 @@ var TestRunner = class {
     );
     this.#watcher.on(
       "change",
-      (filePath) => this.#hooks.runner("fileChanged").run(string4.toUnixSlash(filePath), false, this)
+      (filePath) => this.#hooks.runner("fileChanged").run(
+        string4.toUnixSlash(filePath),
+        {
+          source: "watcher",
+          fullReload: true,
+          hotReloaded: false
+        },
+        this
+      )
     );
     this.#watcher.on(
       "unlink",

package/build/src/types/hooks.d.ts

@@ -13,7 +13,11 @@ export type WatcherHooks = {
     /**
      * The hook is executed after a file has been changed in the watch mode.
      */
-    fileChanged: LazyImport<(filePath: string, hotReplaced: boolean, server: DevServer | TestRunner) => AsyncOrSync<void>>[];
+    fileChanged: LazyImport<(filePath: string, info: {
+        source: 'hot-hook' | 'watcher';
+        hotReloaded: boolean;
+        fullReload: boolean;
+    }, server: DevServer | TestRunner) => AsyncOrSync<void>>[];
     /**
      * The hook is executed after a file has been added.
      */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@adonisjs/assembler",
   "description": "Provides utilities to run AdonisJS development server and build project for production",
-  "version": "8.0.0-next.0",
+  "version": "8.0.0-next.1",
   "engines": {
     "node": ">=24.0.0"
   },
@@ -30,7 +30,7 @@
     "release": "release-it",
     "version": "npm run build",
     "prepublishOnly": "npm run build",
-    "quick:test": "node --enable-source-maps --import=@poppinss/ts-exec bin/test.ts"
+    "quick:test": "cross-env NODE_DEBUG=adonisjs:assembler node --enable-source-maps --import=@poppinss/ts-exec bin/test.ts"
   },
   "devDependencies": {
     "@adonisjs/eslint-config": "^3.0.0-next.0",
@@ -46,6 +46,7 @@
     "@types/picomatch": "^4.0.0",
     "@types/pretty-hrtime": "^1.0.3",
     "c8": "^10.1.3",
+    "cross-env": "^7.0.3",
     "del-cli": "^6.0.0",
     "eslint": "^9.28.0",
     "hot-hook": "^0.4.1-next.0",