-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: support cjs and esm both by tshy
BREAKING CHANGE: drop Node.js < 18.19.0 support part of eggjs/egg#3644 eggjs/egg#5257
- Loading branch information
Showing
42 changed files
with
649 additions
and
421 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,6 @@ | ||
| { | ||
| "extends": "eslint-config-egg" | ||
| "extends": [ | ||
| "eslint-config-egg/typescript", | ||
| "eslint-config-egg/lib/rules/enforce-node-prefix" | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| import path from 'node:path'; | ||
| import fs from 'node:fs/promises'; | ||
| import debounce from 'debounce'; | ||
| import multimatch from 'multimatch'; | ||
| import { exists } from 'utility'; | ||
| import type { ILifecycleBoot, EggCore } from '@eggjs/core'; | ||
| import { isTimingFile } from './utils.js'; | ||
|
|
||
| export default class AgentBoot implements ILifecycleBoot { | ||
| #agent: EggCore; | ||
|
|
||
| constructor(agent: EggCore) { | ||
| this.#agent = agent; | ||
| } | ||
|
|
||
| async didLoad() { | ||
| // clean all timing json | ||
| const rundir = this.#agent.config.rundir; | ||
| const stat = await exists(rundir); | ||
| if (!stat) return; | ||
| const files = await fs.readdir(rundir); | ||
| for (const file of files) { | ||
| if (!isTimingFile(file)) continue; | ||
| await fs.rm(path.join(rundir, file), { force: true, recursive: true }); | ||
| } | ||
| } | ||
|
|
||
| async serverDidReady() { | ||
| const agent = this.#agent; | ||
| // single process mode don't watch and reload | ||
| if (agent.options && Reflect.get(agent.options, 'mode') === 'single') { | ||
| return; | ||
| } | ||
|
|
||
| const logger = agent.logger; | ||
| const baseDir = agent.config.baseDir; | ||
| const config = agent.config.development; | ||
|
|
||
| let watchDirs = config.overrideDefault ? [] : [ | ||
| 'app', | ||
| 'config', | ||
| 'mocks', | ||
| 'mocks_proxy', | ||
| 'app.js', | ||
| ]; | ||
|
|
||
| watchDirs = watchDirs.concat(config.watchDirs).map(dir => path.resolve(baseDir, dir)); | ||
|
|
||
| let ignoreReloadFileDirs = config.overrideIgnore ? [] : [ | ||
| 'app/views', | ||
| 'app/view', | ||
| 'app/assets', | ||
| 'app/public', | ||
| 'app/web', | ||
| ]; | ||
|
|
||
| ignoreReloadFileDirs = ignoreReloadFileDirs.concat(config.ignoreDirs).map(dir => path.resolve(baseDir, dir)); | ||
|
|
||
| const reloadFile = debounce(function(info) { | ||
| logger.warn(`[agent:development] reload worker because ${info.path} ${info.event}`); | ||
|
|
||
| process.send!({ | ||
| to: 'master', | ||
| action: 'reload-worker', | ||
| }); | ||
| }, 200); | ||
|
|
||
| // watch dirs to reload worker, will debounce 200ms | ||
| /** | ||
| * reload app worker: | ||
| * [AgentWorker] - on file change | ||
| * |-> emit reload-worker | ||
| * [Master] - receive reload-worker event | ||
| * |-> TODO: Mark worker will die | ||
| * |-> Fork new worker | ||
| * |-> kill old worker | ||
| * | ||
| * @param {Object} info - changed fileInfo | ||
| */ | ||
| agent.watcher.watch(watchDirs, info => { | ||
| if (!config.reloadOnDebug) { | ||
| return; | ||
| } | ||
|
|
||
| if (isAssetsDir(info.path) || info.isDirectory) { | ||
| return; | ||
| } | ||
|
|
||
| // don't reload if don't match | ||
| if (config.reloadPattern && multimatch(info.path, config.reloadPattern).length === 0) { | ||
| return; | ||
| } | ||
|
|
||
| reloadFile(info); | ||
| }); | ||
|
|
||
| function isAssetsDir(filepath: string) { | ||
| for (const ignorePath of ignoreReloadFileDirs) { | ||
| if (filepath.startsWith(ignorePath)) { | ||
| return true; | ||
| } | ||
| } | ||
| return false; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| import type { ILifecycleBoot, EggCore } from '@eggjs/core'; | ||
|
|
||
| export default class AppBoot implements ILifecycleBoot { | ||
| #app: EggCore; | ||
|
|
||
| constructor(app: EggCore) { | ||
| this.#app = app; | ||
| // if true, then don't need to wait at local development mode | ||
| if (app.config.development.fastReady) { | ||
| process.nextTick(() => this.#app.ready(true)); | ||
| } | ||
| } | ||
|
|
||
| async configWillLoad() { | ||
| this.#app.config.coreMiddleware.push('eggLoaderTrace'); | ||
| } | ||
| } |
Oops, something went wrong.