fix(loader): add node module entry, fix #1336

koishijs · Jan 18, 2024 · 9710a7e · 9710a7e
1 parent 1709f36
commit 9710a7e
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 10 deletions.
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -35,7 +35,7 @@
     "@koishijs/utils": "^7.1.2",
     "@minatojs/core": "^2.8.1",
     "@satorijs/core": "^3.4.1",
-    "cordis": "^3.6.0",
+    "cordis": "^3.6.1",
     "cosmokit": "^1.5.2",
     "fastest-levenshtein": "^1.0.16"
   }

diff --git a/packages/koishi/package.json b/packages/koishi/package.json
@@ -17,6 +17,7 @@
     },
     "./lib/cli": "./lib/cli/index.js",
     "./lib/worker": "./lib/worker/index.js",
+    "./src/*": "./src/*",
     "./package.json": "./package.json"
   },
   "files": [

diff --git a/packages/loader/package.json b/packages/loader/package.json
@@ -2,18 +2,22 @@
   "name": "@koishijs/loader",
   "description": "Config Loader for Koishi",
   "version": "4.3.4",
-  "main": "lib/index.js",
-  "module": "lib/shared.mjs",
+  "main": "lib/index.cjs",
+  "module": "lib/index.mjs",
   "types": "lib/index.d.ts",
   "exports": {
     ".": {
-      "require": "./lib/index.js",
-      "import": "./lib/shared.mjs",
+      "node": {
+        "import": "./lib/index.mjs",
+        "require": "./lib/index.cjs"
+      },
+      "browser": "./lib/shared.mjs",
       "types": "./lib/index.d.ts"
     },
     "./shared": {
-      "require": "./lib/shared.js",
-      "import": "./lib/shared.mjs"
+      "require": "./lib/shared.cjs",
+      "import": "./lib/shared.mjs",
+      "types": "./lib/shared.d.ts"
     },
     "./src/*": "./src/*",
     "./package.json": "./package.json"

diff --git a/packages/loader/src/index.ts b/packages/loader/src/index.ts
@@ -1,8 +1,8 @@
 import { Logger } from '@koishijs/core'
-import { Loader } from './shared'
 import { promises as fs } from 'fs'
 import * as dotenv from 'dotenv'
 import ns from 'ns-require'
+import Loader from './shared'
 
 export * from './shared'
 

diff --git a/packages/loader/src/shared.ts b/packages/loader/src/shared.ts
@@ -418,8 +418,10 @@ export abstract class Loader {
       if (!key) return
       this.logUpdate('unload', fork.parent, key)
       delete fork.parent.scope[Loader.kRecord][key]
-      // !fork.runtime.uid: fork is disposed by main scope (e.g. hmr plugin)
-      if (!fork.runtime.uid) return
+      // fork is disposed by main scope (e.g. hmr plugin)
+      // normal: ctx.dispose() -> fork / runtime dispose -> delete(plugin)
+      // hmr: delete(plugin) -> runtime dispose -> fork dispose
+      if (!app.registry.has(fork.runtime.plugin)) return
       rename(fork.parent.scope.config, key, '~' + key, fork.parent.scope.config[key])
       this.writeConfig()
     })
@@ -454,3 +456,5 @@ export abstract class Loader {
     return app
   }
 }
+
+export default Loader