refa: timer as non-builtin plugin

cordiverse · Nov 2, 2024 · 6211121 · 6211121
1 parent f2804ab
commit 6211121
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/packages/cordis/package.json b/packages/cordis/package.json
@@ -79,7 +79,6 @@
     "@cordisjs/loader": "^0.13.1",
     "@cordisjs/logger": "^0.3.3",
     "@cordisjs/schema": "^0.1.1",
-    "@cordisjs/timer": "^0.3.2",
     "cac": "^6.7.14",
     "cosmokit": "^1.6.3",
     "kleur": "^4.1.5",

diff --git a/packages/cordis/src/index.ts b/packages/cordis/src/index.ts
@@ -1,12 +1,10 @@
 import * as core from '@cordisjs/core'
 import { Logger, LoggerService } from '@cordisjs/logger'
 import { SchemaService } from '@cordisjs/schema'
-import { TimerService } from '@cordisjs/timer'
 
 export * from '@cordisjs/core'
 export { Schema, z } from '@cordisjs/schema'
 export { Logger } from '@cordisjs/logger'
-export { TimerService } from '@cordisjs/timer'
 
 export interface Events<C extends Context = Context> extends core.Events<C> {}
 
@@ -22,10 +20,8 @@ export class Context extends core.Context {
     this.baseDir = globalThis.process?.cwd?.() || ''
 
     this.provide('logger', undefined, true)
-    this.provide('timer', undefined, true)
 
     this.plugin(LoggerService)
-    this.plugin(TimerService)
   }
 }
 

diff --git a/packages/core/src/context.ts b/packages/core/src/context.ts
@@ -64,7 +64,6 @@ export interface Context {
 export class Context {
   static readonly store: unique symbol = symbols.store as any
   static readonly events: unique symbol = symbols.events as any
-  static readonly static: unique symbol = symbols.static as any
   static readonly filter: unique symbol = symbols.filter as any
   static readonly isolate: unique symbol = symbols.isolate as any
   static readonly internal: unique symbol = symbols.internal as any

diff --git a/packages/core/src/utils.ts b/packages/core/src/utils.ts
@@ -16,7 +16,6 @@ export const symbols = {
   // context symbols
   store: Symbol.for('cordis.store') as typeof Context.store,
   events: Symbol.for('cordis.events') as typeof Context.events,
-  static: Symbol.for('cordis.static') as typeof Context.static,
   filter: Symbol.for('cordis.filter') as typeof Context.filter,
   isolate: Symbol.for('cordis.isolate') as typeof Context.isolate,
   internal: Symbol.for('cordis.internal') as typeof Context.internal,

diff --git a/packages/hmr/package.json b/packages/hmr/package.json
@@ -32,15 +32,22 @@
     "development"
   ],
   "cordis": {
+    "services": {
+      "required": [
+        "timer"
+      ]
+    },
     "description": {
       "en": "Hot Module Replacement",
       "zh": "模块热替换"
     }
   },
   "peerDependencies": {
+    "@cordisjs/plugin-timer": "^0.3.2",
     "cordis": "^3.18.1"
   },
   "devDependencies": {
+    "@cordisjs/plugin-timer": "^0.3.2",
     "@types/babel__code-frame": "^7.0.6",
     "cordis": "^3.18.1",
     "esbuild": "^0.23.1"

diff --git a/packages/hmr/src/index.ts b/packages/hmr/src/index.ts
@@ -4,7 +4,7 @@ import { ModuleJob, ModuleLoader } from 'cordis/loader'
 import { FSWatcher, watch, WatchOptions } from 'chokidar'
 import { relative, resolve } from 'path'
 import { handleError } from './error.ts'
-import {} from '@cordisjs/timer'
+import {} from '@cordisjs/plugin-timer'
 import { fileURLToPath, pathToFileURL } from 'url'
 import enUS from './locales/en-US.yml'
 import zhCN from './locales/zh-CN.yml'
@@ -37,7 +37,7 @@ interface Reload {
 }
 
 class Watcher extends Service {
-  static inject = ['loader']
+  static inject = ['loader', 'timer']
 
   private base: string
   private internal: ModuleLoader

diff --git a/packages/timer/package.json b/packages/timer/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@cordisjs/timer",
+  "name": "@cordisjs/plugin-timer",
   "description": "Timer service for cordis",
   "version": "0.3.2",
   "type": "module",

diff --git a/packages/timer/readme.md b/packages/timer/readme.md
@@ -1 +1 @@
-# @cordisjs/timer
+# @cordisjs/plugin-timer