diff --git a/.eslintignore b/.eslintignore deleted file mode 100644 index dacb55c46c..0000000000 --- a/.eslintignore +++ /dev/null @@ -1,5 +0,0 @@ -test/fixtures -examples/**/app/public -logs -run -docs/node_modules diff --git a/.eslintrc b/.eslintrc deleted file mode 100644 index c799fe5327..0000000000 --- a/.eslintrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "eslint-config-egg" -} diff --git a/app/extend/context.js b/app/extend/context.js index 8c5277235a..83bef2499b 100644 --- a/app/extend/context.js +++ b/app/extend/context.js @@ -1,6 +1,6 @@ 'use strict'; -const { performance } = require('perf_hooks'); +const { performance } = require('node:perf_hooks'); const delegate = require('delegates'); const { assign } = require('utility'); const eggUtils = require('egg-core').utils; diff --git a/app/extend/helper.js b/app/extend/helper.js index 3120944d25..5b86eaef89 100644 --- a/app/extend/helper.js +++ b/app/extend/helper.js @@ -1,6 +1,6 @@ 'use strict'; -const url = require('url'); +const url = require('node:url'); module.exports = { diff --git a/app/extend/request.js b/app/extend/request.js index 7dccdd353a..c496351beb 100644 --- a/app/extend/request.js +++ b/app/extend/request.js @@ -1,6 +1,6 @@ 'use strict'; -const querystring = require('querystring'); +const querystring = require('node:querystring'); const accepts = require('accepts'); const _querycache = Symbol('_querycache'); diff --git a/app/middleware/meta.js b/app/middleware/meta.js index 9e5283f53c..5ef169092d 100644 --- a/app/middleware/meta.js +++ b/app/middleware/meta.js @@ -2,7 +2,7 @@ * meta middleware, should be the first middleware */ -const { performance } = require('perf_hooks'); +const { performance } = require('node:perf_hooks'); module.exports = options => { return async function meta(ctx, next) { diff --git a/app/middleware/site_file.js b/app/middleware/site_file.js index 4e3ff16b2c..cb403d9a97 100644 --- a/app/middleware/site_file.js +++ b/app/middleware/site_file.js @@ -1,6 +1,6 @@ 'use strict'; -const path = require('path'); +const path = require('node:path'); module.exports = options => { return async function siteFile(ctx, next) { diff --git a/config/config.default.js b/config/config.default.js index 534fba9891..cd002b95d8 100644 --- a/config/config.default.js +++ b/config/config.default.js @@ -1,7 +1,7 @@ 'use strict'; -const fs = require('fs'); -const path = require('path'); +const fs = require('node:fs'); +const path = require('node:path'); /** * The configuration of egg application, can be access by `app.config` diff --git a/eslint.config.mjs b/eslint.config.mjs new file mode 100644 index 0000000000..2ef684b895 --- /dev/null +++ b/eslint.config.mjs @@ -0,0 +1,25 @@ +import { fixupConfigRules } from '@eslint/compat'; +import { FlatCompat } from '@eslint/eslintrc'; +import path from 'node:path'; +import { fileURLToPath } from 'node:url'; + +const __filename = fileURLToPath(import.meta.url); +const __dirname = path.dirname(__filename); + +const compat = new FlatCompat({ + baseDirectory: __dirname, +}); + +export default [ + { + ignores: [ + 'test/fixtures/**', + 'examples/**/app/public/**', + 'logs/**', + 'run/**', + 'docs/node_modules/**', + 'site/**', + ], + }, + ...fixupConfigRules(compat.extends('eslint-config-egg')), +]; diff --git a/lib/agent.js b/lib/agent.js index bfb3edf59c..0e3013db8d 100644 --- a/lib/agent.js +++ b/lib/agent.js @@ -1,6 +1,6 @@ 'use strict'; -const path = require('path'); +const path = require('node:path'); const ms = require('ms'); const EggApplication = require('./egg'); const AgentWorkerLoader = require('./loader').AgentWorkerLoader; diff --git a/lib/application.js b/lib/application.js index eac56c9c0a..c13dfa8854 100644 --- a/lib/application.js +++ b/lib/application.js @@ -1,11 +1,11 @@ 'use strict'; -const path = require('path'); -const fs = require('fs'); +const path = require('node:path'); +const fs = require('node:fs'); const ms = require('ms'); const is = require('is-type-of'); const graceful = require('graceful'); -const http = require('http'); +const http = require('node:http'); const cluster = require('cluster-client'); const onFinished = require('on-finished'); const { assign } = require('utility'); diff --git a/lib/core/base_hook_class.js b/lib/core/base_hook_class.js index 2bda13bf60..b0e65ce77d 100644 --- a/lib/core/base_hook_class.js +++ b/lib/core/base_hook_class.js @@ -1,6 +1,6 @@ 'use strict'; -const assert = require('assert'); +const assert = require('node:assert'); const INSTANCE = Symbol('BaseHookClass#instance'); class BaseHookClass { diff --git a/lib/core/fetch_factory.js b/lib/core/fetch_factory.js index cfc3bed858..0b67e9e5c7 100644 --- a/lib/core/fetch_factory.js +++ b/lib/core/fetch_factory.js @@ -1,4 +1,4 @@ -const debug = require('util').debuglog('egg:lib:core:fetch_factory'); +const debug = require('node:util').debuglog('egg:lib:core:fetch_factory'); const mainNodejsVersion = parseInt(process.versions.node.split('.')[0]); let FetchFactory; diff --git a/lib/core/httpclient_next.js b/lib/core/httpclient_next.js index 580709b01d..7c80b78277 100644 --- a/lib/core/httpclient_next.js +++ b/lib/core/httpclient_next.js @@ -1,4 +1,4 @@ -const debug = require('util').debuglog('egg:lib:core:httpclient_next'); +const debug = require('node:util').debuglog('egg:lib:core:httpclient_next'); const ms = require('humanize-ms'); const SSRF_HTTPCLIENT = Symbol('SSRF_HTTPCLIENT'); diff --git a/lib/core/messenger/ipc.js b/lib/core/messenger/ipc.js index e758d6dd2c..155c8fe9df 100644 --- a/lib/core/messenger/ipc.js +++ b/lib/core/messenger/ipc.js @@ -1,10 +1,10 @@ 'use strict'; -const debug = require('util').debuglog('egg:util:messenger:ipc'); +const debug = require('node:util').debuglog('egg:util:messenger:ipc'); const is = require('is-type-of'); -const workerThreads = require('worker_threads'); +const workerThreads = require('node:worker_threads'); const sendmessage = require('sendmessage'); -const EventEmitter = require('events'); +const EventEmitter = require('node:events'); /** * Communication between app worker and agent worker by IPC channel diff --git a/lib/core/messenger/local.js b/lib/core/messenger/local.js index 7be992e0ee..65a9688424 100644 --- a/lib/core/messenger/local.js +++ b/lib/core/messenger/local.js @@ -1,8 +1,8 @@ 'use strict'; -const debug = require('util').debuglog('egg:util:messenger:local'); +const debug = require('node:util').debuglog('egg:util:messenger:local'); const is = require('is-type-of'); -const EventEmitter = require('events'); +const EventEmitter = require('node:events'); /** * Communication between app worker and agent worker with EventEmitter diff --git a/lib/core/singleton.js b/lib/core/singleton.js index d0b9c29e27..7931557e73 100644 --- a/lib/core/singleton.js +++ b/lib/core/singleton.js @@ -1,6 +1,6 @@ 'use strict'; -const assert = require('assert'); +const assert = require('node:assert'); const is = require('is-type-of'); class Singleton { @@ -112,7 +112,7 @@ class Singleton { } extendable.createInstance = this.createInstance.bind(this); extendable.createInstanceAsync = this.createInstanceAsync.bind(this); - } catch (err) { + } catch { this.app.logger.warn('egg:singleton %s dynamic create is disabled because of client is unextensible', this.name); } } diff --git a/lib/core/utils.js b/lib/core/utils.js index cb563b79a1..657d3952f2 100644 --- a/lib/core/utils.js +++ b/lib/core/utils.js @@ -1,8 +1,8 @@ 'use strict'; -const util = require('util'); +const util = require('node:util'); const is = require('is-type-of'); -const URL = require('url').URL; +const URL = require('node:url').URL; module.exports = { convertObject, @@ -87,7 +87,7 @@ function convertValue(key, value, ignore, ignoreKeyPaths, keyPath) { function safeParseURL(url) { try { return new URL(url); - } catch (err) { + } catch { return null; } } diff --git a/lib/egg.js b/lib/egg.js index 9dfee22184..4b462d8ec5 100644 --- a/lib/egg.js +++ b/lib/egg.js @@ -1,8 +1,8 @@ -const { performance } = require('perf_hooks'); -const path = require('path'); -const fs = require('fs'); +const { performance } = require('node:perf_hooks'); +const path = require('node:path'); +const fs = require('node:fs'); const ms = require('ms'); -const http = require('http'); +const http = require('node:http'); const EggCore = require('egg-core').EggCore; const cluster = require('cluster-client'); const extend = require('extend2'); @@ -119,7 +119,7 @@ class EggApplication extends EggCore { isLeader: this.type === 'agent', logger: this.coreLogger, // debug mode does not check heartbeat - isCheckHeartbeat: this.config.env === 'prod' ? true : require('inspector').url() === undefined, + isCheckHeartbeat: this.config.env === 'prod' ? true : require('node:inspector').url() === undefined, }); const client = cluster(clientClass, options); this._patchClusterClient(client); @@ -413,14 +413,14 @@ class EggApplication extends EggCore { try { // support array and set ignoreList = Array.from(this.config.dump.ignore); - } catch (_) { + } catch { ignoreList = []; } let ignoreKeyPaths; try { ignoreKeyPaths = this.config.dump.ignoreKeyPaths; - } catch (e) { + } catch { ignoreKeyPaths = {}; } @@ -520,7 +520,6 @@ class EggApplication extends EggCore { this.deprecate('please use app.config.proxy instead'); return this.config.proxy; } - /* eslint no-empty-function: off */ set proxy(_) { } /** diff --git a/lib/start.js b/lib/start.js index 478c086d13..28dde70ab3 100644 --- a/lib/start.js +++ b/lib/start.js @@ -1,6 +1,6 @@ 'use strict'; -const path = require('path'); +const path = require('node:path'); module.exports = async (options = {}) => { @@ -11,7 +11,7 @@ module.exports = async (options = {}) => { if (!options.framework) { try { options.framework = require(path.join(options.baseDir, 'package.json')).egg.framework; - } catch (_) { + } catch { // ignore } } diff --git a/package.json b/package.json index 209e9d52cb..0fa5e7e782 100644 --- a/package.json +++ b/package.json @@ -76,8 +76,12 @@ "egg-plugin-puml": "^2.4.0", "egg-tracer": "^2.0.0", "egg-view-nunjucks": "^2.3.0", - "eslint": "^8.23.1", - "eslint-config-egg": "^12.0.0", + "@eslint/compat": "^2.0.3", + "@eslint/eslintrc": "^3.3.5", + "@eslint/js": "^9.39.4", + "eslint": "^9.39.4", + "eslint-config-egg": "^14.1.0", + "globals": "^16.2.0", "formstream": "^1.1.1", "jsdoc": "^3.6.11", "koa": "^2.13.4", diff --git a/test/agent.test.js b/test/agent.test.js index 5cd9a2ae01..e850131b06 100644 --- a/test/agent.test.js +++ b/test/agent.test.js @@ -1,8 +1,8 @@ 'use strict'; -const assert = require('assert'); +const assert = require('node:assert'); const mock = require('egg-mock'); -const path = require('path'); +const path = require('node:path'); const utils = require('./utils'); describe('test/agent.test.js', () => { diff --git a/test/app/extend/agent.test.js b/test/app/extend/agent.test.js index e15682f8a7..2699b5824d 100644 --- a/test/app/extend/agent.test.js +++ b/test/app/extend/agent.test.js @@ -1,6 +1,6 @@ 'use strict'; -const assert = require('assert'); +const assert = require('node:assert'); const mm = require('egg-mock'); const utils = require('../../utils'); diff --git a/test/app/extend/application.test.js b/test/app/extend/application.test.js index 4b93626fa7..e1d636bdde 100644 --- a/test/app/extend/application.test.js +++ b/test/app/extend/application.test.js @@ -1,7 +1,7 @@ -const assert = require('assert'); -const fs = require('fs'); -const path = require('path'); +const assert = require('node:assert'); +const fs = require('node:fs'); +const path = require('node:path'); const utils = require('../../utils'); describe('test/app/extend/application.test.js', () => { diff --git a/test/app/extend/context.test.js b/test/app/extend/context.test.js index 57aa32d4a5..7d14f254f0 100644 --- a/test/app/extend/context.test.js +++ b/test/app/extend/context.test.js @@ -1,7 +1,7 @@ -const fs = require('fs'); -const path = require('path'); +const fs = require('node:fs'); +const path = require('node:path'); const mm = require('egg-mock'); -const assert = require('assert'); +const assert = require('node:assert'); const utils = require('../../utils'); describe('test/app/extend/context.test.js', () => { diff --git a/test/app/extend/request.test.js b/test/app/extend/request.test.js index ca54d6fdbb..a4806e6e01 100644 --- a/test/app/extend/request.test.js +++ b/test/app/extend/request.test.js @@ -1,6 +1,6 @@ 'use strict'; -const assert = require('assert'); +const assert = require('node:assert'); const mm = require('egg-mock'); const urllib = require('urllib'); const utils = require('../../utils'); diff --git a/test/app/extend/response.test.js b/test/app/extend/response.test.js index 6c38dc21c2..f40ff893fe 100644 --- a/test/app/extend/response.test.js +++ b/test/app/extend/response.test.js @@ -1,6 +1,6 @@ 'use strict'; -const assert = require('assert'); +const assert = require('node:assert'); const mm = require('egg-mock'); const utils = require('../../utils'); diff --git a/test/app/middleware/body_parser.test.js b/test/app/middleware/body_parser.test.js index 04fefcf238..39ec54588f 100644 --- a/test/app/middleware/body_parser.test.js +++ b/test/app/middleware/body_parser.test.js @@ -1,5 +1,5 @@ -const assert = require('assert'); -const querystring = require('querystring'); +const assert = require('node:assert'); +const querystring = require('node:querystring'); const utils = require('../../utils'); describe('test/app/middleware/body_parser.test.js', () => { diff --git a/test/app/middleware/meta.test.js b/test/app/middleware/meta.test.js index 870b0f733b..f741bb4add 100644 --- a/test/app/middleware/meta.test.js +++ b/test/app/middleware/meta.test.js @@ -1,6 +1,6 @@ -const assert = require('assert'); +const assert = require('node:assert'); const mm = require('egg-mock'); -const fs = require('fs/promises'); +const fs = require('node:fs/promises'); const utils = require('../../utils'); describe('test/app/middleware/meta.test.js', () => { diff --git a/test/app/middleware/site_file.test.js b/test/app/middleware/site_file.test.js index 180a628747..c858ea3815 100644 --- a/test/app/middleware/site_file.test.js +++ b/test/app/middleware/site_file.test.js @@ -1,6 +1,6 @@ 'use strict'; -const assert = require('assert'); +const assert = require('node:assert'); const utils = require('../../utils'); describe('test/app/middleware/site_file.test.js', () => { diff --git a/test/asyncSupport.test.js b/test/asyncSupport.test.js index d1b1e5d6c4..4b496fb232 100644 --- a/test/asyncSupport.test.js +++ b/test/asyncSupport.test.js @@ -1,6 +1,6 @@ 'use strict'; -const assert = require('assert'); +const assert = require('node:assert'); const mm = require('egg-mock'); const utils = require('./utils'); diff --git a/test/bench/server.js b/test/bench/server.js index d2d9508dc4..ba26ef6e5b 100644 --- a/test/bench/server.js +++ b/test/bench/server.js @@ -1,5 +1,5 @@ -const http = require('http'); -const path = require('path'); +const http = require('node:http'); +const path = require('node:path'); const mock = require('egg-mock'); const appName = process.argv[2]; diff --git a/test/index.test.js b/test/index.test.js index 6b52ae6fee..1949ff3f87 100644 --- a/test/index.test.js +++ b/test/index.test.js @@ -1,6 +1,6 @@ 'use strict'; -const assert = require('assert'); +const assert = require('node:assert'); const egg = require('..'); describe('test/index.test.js', () => { diff --git a/test/lib/agent.test.js b/test/lib/agent.test.js index 791bce8def..92f60e6055 100644 --- a/test/lib/agent.test.js +++ b/test/lib/agent.test.js @@ -1,9 +1,9 @@ 'use strict'; -const assert = require('assert'); -const fs = require('fs'); -const path = require('path'); -const execSync = require('child_process').execSync; +const assert = require('node:assert'); +const fs = require('node:fs'); +const path = require('node:path'); +const execSync = require('node:child_process').execSync; const mm = require('egg-mock'); const utils = require('../utils'); diff --git a/test/lib/application.test.js b/test/lib/application.test.js index e6ff7118bf..6f64ec4fb4 100644 --- a/test/lib/application.test.js +++ b/test/lib/application.test.js @@ -1,7 +1,7 @@ -const assert = require('assert'); +const assert = require('node:assert'); const mm = require('egg-mock'); -const fs = require('fs'); -const path = require('path'); +const fs = require('node:fs'); +const path = require('node:path'); const pedding = require('pedding'); const Application = require('../../lib/application'); const utils = require('../utils'); diff --git a/test/lib/cluster/app_worker.test.js b/test/lib/cluster/app_worker.test.js index 9e75d8817e..de13055155 100644 --- a/test/lib/cluster/app_worker.test.js +++ b/test/lib/cluster/app_worker.test.js @@ -1,5 +1,5 @@ -const net = require('net'); -const assert = require('assert'); +const net = require('node:net'); +const assert = require('node:assert'); const request = require('supertest'); const address = require('address'); const utils = require('../../utils'); diff --git a/test/lib/cluster/cluster-client-error.test.js b/test/lib/cluster/cluster-client-error.test.js index fc68029cca..83885fe0fe 100644 --- a/test/lib/cluster/cluster-client-error.test.js +++ b/test/lib/cluster/cluster-client-error.test.js @@ -1,6 +1,6 @@ -const { readFile } = require('fs/promises'); -const path = require('path'); -const assert = require('assert'); +const { readFile } = require('node:fs/promises'); +const path = require('node:path'); +const assert = require('node:assert'); const utils = require('../../utils'); describe('test/lib/cluster/cluster-client-error.test.js', () => { diff --git a/test/lib/cluster/cluster-client.test.js b/test/lib/cluster/cluster-client.test.js index 67154de93e..3447c8b2d2 100644 --- a/test/lib/cluster/cluster-client.test.js +++ b/test/lib/cluster/cluster-client.test.js @@ -1,7 +1,7 @@ 'use strict'; const mm = require('egg-mock'); -const assert = require('assert'); +const assert = require('node:assert'); const innerClient = require('cluster-client/lib/symbol').innerClient; const utils = require('../../utils'); diff --git a/test/lib/cluster/master.test.js b/test/lib/cluster/master.test.js index ef5f465979..9032945ef2 100644 --- a/test/lib/cluster/master.test.js +++ b/test/lib/cluster/master.test.js @@ -19,7 +19,7 @@ describe('test/lib/cluster/master.test.js', () => { try { await app.httpRequest() .get('/exit'); - } catch (_) { + } catch { // do nothing } @@ -37,7 +37,7 @@ describe('test/lib/cluster/master.test.js', () => { try { await app.httpRequest() .get('/uncaughtException'); - } catch (_) { + } catch { // do nothing } @@ -63,7 +63,7 @@ describe('test/lib/cluster/master.test.js', () => { try { await app.httpRequest() .get('/uncaughtException'); - } catch (_) { + } catch { // do nothing } @@ -78,7 +78,7 @@ describe('test/lib/cluster/master.test.js', () => { try { await app.httpRequest() .get('/uncaughtException'); - } catch (_) { + } catch { // do nothing } diff --git a/test/lib/core/config/config.cookies.test.js b/test/lib/core/config/config.cookies.test.js index 4b84004138..e518d1ab21 100644 --- a/test/lib/core/config/config.cookies.test.js +++ b/test/lib/core/config/config.cookies.test.js @@ -1,6 +1,6 @@ 'use strict'; -const assert = require('assert'); +const assert = require('node:assert'); const mm = require('egg-mock'); const utils = require('../../../utils'); diff --git a/test/lib/core/config/config.test.js b/test/lib/core/config/config.test.js index 9bd21dfda5..11041fa951 100644 --- a/test/lib/core/config/config.test.js +++ b/test/lib/core/config/config.test.js @@ -1,6 +1,6 @@ 'use strict'; -const assert = require('assert'); +const assert = require('node:assert'); const mm = require('egg-mock'); const utils = require('../../../utils'); diff --git a/test/lib/core/context_httpclient.test.js b/test/lib/core/context_httpclient.test.js index 17fd7b538d..4f9d31c9b8 100644 --- a/test/lib/core/context_httpclient.test.js +++ b/test/lib/core/context_httpclient.test.js @@ -1,6 +1,6 @@ 'use strict'; -const assert = require('assert'); +const assert = require('node:assert'); const utils = require('../../utils'); describe('test/lib/core/context_httpclient.test.js', () => { diff --git a/test/lib/core/context_httpclient_timeout.test.js b/test/lib/core/context_httpclient_timeout.test.js index a70a8f1d03..1d6321088d 100644 --- a/test/lib/core/context_httpclient_timeout.test.js +++ b/test/lib/core/context_httpclient_timeout.test.js @@ -1,4 +1,4 @@ -const assert = require('assert'); +const assert = require('node:assert'); const utils = require('../../utils'); describe('test/lib/core/context_httpclient_timeout.test.js', () => { diff --git a/test/lib/core/context_performance_starttime.test.js b/test/lib/core/context_performance_starttime.test.js index 4facda6a39..88c69cae79 100644 --- a/test/lib/core/context_performance_starttime.test.js +++ b/test/lib/core/context_performance_starttime.test.js @@ -1,6 +1,6 @@ 'use strict'; -const assert = require('assert'); +const assert = require('node:assert'); const utils = require('../../utils'); describe('test/lib/core/context_performance_starttime.test.js', () => { diff --git a/test/lib/core/cookies.test.js b/test/lib/core/cookies.test.js index 38860803c0..2618d6c7dc 100644 --- a/test/lib/core/cookies.test.js +++ b/test/lib/core/cookies.test.js @@ -1,10 +1,10 @@ 'use strict'; -const assert = require('assert'); +const assert = require('node:assert'); const mm = require('egg-mock'); const utils = require('../../utils'); -const fs = require('fs'); -const path = require('path'); +const fs = require('node:fs'); +const path = require('node:path'); describe('test/lib/core/cookies.test.js', () => { afterEach(mm.restore); diff --git a/test/lib/core/dns_resolver.test.js b/test/lib/core/dns_resolver.test.js index 37168891a1..fdf6ddfbde 100644 --- a/test/lib/core/dns_resolver.test.js +++ b/test/lib/core/dns_resolver.test.js @@ -1,8 +1,8 @@ const utils = require('../../utils'); const mm = require('egg-mock'); -const dns = require('dns'); -const dnsPromise = require('dns').promises; -const assert = require('assert'); +const dns = require('node:dns'); +const dnsPromise = require('node:dns').promises; +const assert = require('node:assert'); describe('test/lib/core/dns_resolver.test.js', () => { let app; diff --git a/test/lib/core/dnscache_httpclient.test.js b/test/lib/core/dnscache_httpclient.test.js index 4b80ff0058..29adb7365a 100644 --- a/test/lib/core/dnscache_httpclient.test.js +++ b/test/lib/core/dnscache_httpclient.test.js @@ -1,7 +1,7 @@ const mm = require('egg-mock'); -const assert = require('assert'); -const dns = require('dns').promises; -const urlparse = require('url').parse; +const assert = require('node:assert'); +const dns = require('node:dns').promises; +const urlparse = require('node:url').parse; const utils = require('../../utils'); describe('test/lib/core/dnscache_httpclient.test.js', () => { diff --git a/test/lib/core/fetch_tracer.test.js b/test/lib/core/fetch_tracer.test.js index 45c3b2dc06..c6208b57cd 100644 --- a/test/lib/core/fetch_tracer.test.js +++ b/test/lib/core/fetch_tracer.test.js @@ -1,5 +1,5 @@ const assert = require('node:assert'); -const http = require('http'); +const http = require('node:http'); const utils = require('../../utils'); describe('test/lib/core/fetch_tracer.test.js', () => { diff --git a/test/lib/core/httpclient_tracer_demo.test.js b/test/lib/core/httpclient_tracer_demo.test.js index 1ba8876363..31741b7231 100644 --- a/test/lib/core/httpclient_tracer_demo.test.js +++ b/test/lib/core/httpclient_tracer_demo.test.js @@ -1,4 +1,4 @@ -const assert = require('assert'); +const assert = require('node:assert'); const utils = require('../../utils'); describe('test/lib/core/httpclient_tracer_demo.test.js', () => { diff --git a/test/lib/core/loader/config_loader.test.js b/test/lib/core/loader/config_loader.test.js index 230531c98c..a77bf447cd 100644 --- a/test/lib/core/loader/config_loader.test.js +++ b/test/lib/core/loader/config_loader.test.js @@ -1,7 +1,7 @@ 'use strict'; -const assert = require('assert'); -const path = require('path'); +const assert = require('node:assert'); +const path = require('node:path'); const mm = require('egg-mock'); const utils = require('../../../utils'); diff --git a/test/lib/core/loader/load_app.test.js b/test/lib/core/loader/load_app.test.js index 1b449cd91e..7c83e90183 100644 --- a/test/lib/core/loader/load_app.test.js +++ b/test/lib/core/loader/load_app.test.js @@ -1,6 +1,6 @@ 'use strict'; -const assert = require('assert'); +const assert = require('node:assert'); const utils = require('../../../utils'); describe('test/lib/core/loader/load_app.test.js', () => { diff --git a/test/lib/core/loader/load_boot.test.js b/test/lib/core/loader/load_boot.test.js index ba3e8bf62e..795fef39c7 100644 --- a/test/lib/core/loader/load_boot.test.js +++ b/test/lib/core/loader/load_boot.test.js @@ -1,6 +1,6 @@ -const assert = require('assert'); -const path = require('path'); -const fs = require('fs/promises'); +const assert = require('node:assert'); +const path = require('node:path'); +const fs = require('node:fs/promises'); const utils = require('../../../utils'); describe('test/lib/core/loader/load_boot.test.js', () => { diff --git a/test/lib/core/loader/load_plugin.test.js b/test/lib/core/loader/load_plugin.test.js index 15f54cf786..502fccdd38 100644 --- a/test/lib/core/loader/load_plugin.test.js +++ b/test/lib/core/loader/load_plugin.test.js @@ -1,9 +1,9 @@ 'use strict'; -const path = require('path'); -const fs = require('fs'); +const path = require('node:path'); +const fs = require('node:fs'); const mm = require('egg-mock'); -const assert = require('assert'); +const assert = require('node:assert'); const AppWorkerLoader = require('../../../../').AppWorkerLoader; const AgentWorkerLoader = require('../../../../').AgentWorkerLoader; const utils = require('../../../utils'); diff --git a/test/lib/core/messenger/ipc.test.js b/test/lib/core/messenger/ipc.test.js index ab34031128..6dd6363fdf 100644 --- a/test/lib/core/messenger/ipc.test.js +++ b/test/lib/core/messenger/ipc.test.js @@ -1,4 +1,4 @@ -const assert = require('assert'); +const assert = require('node:assert'); const mm = require('egg-mock'); const utils = require('../../../utils'); const Messenger = require('../../../../lib/core/messenger/ipc'); diff --git a/test/lib/core/messenger/local.test.js b/test/lib/core/messenger/local.test.js index 4bf4ec9bdb..e28c715ffd 100644 --- a/test/lib/core/messenger/local.test.js +++ b/test/lib/core/messenger/local.test.js @@ -2,7 +2,7 @@ const utils = require('../../../utils'); const pedding = require('pedding'); -const assert = require('assert'); +const assert = require('node:assert'); const mm = require('egg-mock'); describe('test/lib/core/messenger/local.test.js', () => { diff --git a/test/lib/core/router.test.js b/test/lib/core/router.test.js index b56239e1cd..85fb58b2a0 100644 --- a/test/lib/core/router.test.js +++ b/test/lib/core/router.test.js @@ -1,6 +1,6 @@ 'use strict'; -const assert = require('assert'); +const assert = require('node:assert'); const mm = require('egg-mock'); const utils = require('../../utils'); diff --git a/test/lib/core/singleton.test.js b/test/lib/core/singleton.test.js index 94fda48911..ae60de2a55 100644 --- a/test/lib/core/singleton.test.js +++ b/test/lib/core/singleton.test.js @@ -1,4 +1,4 @@ -const assert = require('assert'); +const assert = require('node:assert'); const Singleton = require('../../../lib/core/singleton'); const { sleep } = require('../../utils'); class DataService { diff --git a/test/lib/core/utils.test.js b/test/lib/core/utils.test.js index 6d87c35a44..758aea1176 100644 --- a/test/lib/core/utils.test.js +++ b/test/lib/core/utils.test.js @@ -1,6 +1,6 @@ 'use strict'; -const assert = require('assert'); +const assert = require('node:assert'); const mm = require('egg-mock'); const utils = require('../../../lib/core/utils'); @@ -368,7 +368,7 @@ describe('test/lib/core/utils.test.js', () => { try { 'use strict'; proxy.bar = 2; - } catch (err) { + } catch { errorThrown = true; } assert(errorThrown || proxy.bar === undefined, 'Should not add property after preventExtensions'); diff --git a/test/lib/core/view.test.js b/test/lib/core/view.test.js index 381d50cd89..7a64266734 100644 --- a/test/lib/core/view.test.js +++ b/test/lib/core/view.test.js @@ -1,7 +1,7 @@ 'use strict'; -const assert = require('assert'); -const path = require('path'); +const assert = require('node:assert'); +const path = require('node:path'); const mock = require('egg-mock'); const utils = require('../../utils'); diff --git a/test/lib/egg.test.js b/test/lib/egg.test.js index 672a1ae97e..aea866fe33 100644 --- a/test/lib/egg.test.js +++ b/test/lib/egg.test.js @@ -1,7 +1,7 @@ const mm = require('egg-mock'); -const assert = require('assert'); -const path = require('path'); -const fs = require('fs'); +const assert = require('node:assert'); +const path = require('node:path'); +const fs = require('node:fs'); const spy = require('spy'); const Transport = require('egg-logger').Transport; const utils = require('../utils'); diff --git a/test/lib/plugins/depd.test.js b/test/lib/plugins/depd.test.js index b5051b5d52..999660373a 100644 --- a/test/lib/plugins/depd.test.js +++ b/test/lib/plugins/depd.test.js @@ -1,6 +1,6 @@ 'use strict'; -const assert = require('assert'); +const assert = require('node:assert'); const mm = require('egg-mock'); const utils = require('../../utils'); diff --git a/test/lib/plugins/development.test.js b/test/lib/plugins/development.test.js index a959823611..03ee13b5bb 100644 --- a/test/lib/plugins/development.test.js +++ b/test/lib/plugins/development.test.js @@ -1,5 +1,5 @@ -const fs = require('fs'); -const path = require('path'); +const fs = require('node:fs'); +const path = require('node:path'); const mm = require('egg-mock'); const utils = require('../../utils'); diff --git a/test/lib/plugins/logrotator.test.js b/test/lib/plugins/logrotator.test.js index a8f533d64a..36670cf929 100644 --- a/test/lib/plugins/logrotator.test.js +++ b/test/lib/plugins/logrotator.test.js @@ -1,8 +1,8 @@ 'use strict'; -const assert = require('assert'); +const assert = require('node:assert'); -const fs = require('fs').promises; +const fs = require('node:fs').promises; const utils = require('../../utils'); const sleep = async ms => new Promise(resolve => setTimeout(resolve, ms)); diff --git a/test/lib/plugins/multipart.test.js b/test/lib/plugins/multipart.test.js index a6b40c3bec..1ba041ea1b 100644 --- a/test/lib/plugins/multipart.test.js +++ b/test/lib/plugins/multipart.test.js @@ -1,7 +1,7 @@ 'use strict'; const request = require('supertest'); -const assert = require('assert'); +const assert = require('node:assert'); const formstream = require('formstream'); const urllib = require('urllib'); const utils = require('../../utils'); diff --git a/test/lib/plugins/schedule.test.js b/test/lib/plugins/schedule.test.js index a5dc447763..47f5962981 100644 --- a/test/lib/plugins/schedule.test.js +++ b/test/lib/plugins/schedule.test.js @@ -1,6 +1,6 @@ -const assert = require('assert'); -const path = require('path'); -const fs = require('fs'); +const assert = require('node:assert'); +const path = require('node:path'); +const fs = require('node:fs'); const utils = require('../../utils'); describe('test/lib/plugins/schedule.test.js', () => { diff --git a/test/lib/plugins/session.test.js b/test/lib/plugins/session.test.js index 97220457d0..6d02b44db5 100644 --- a/test/lib/plugins/session.test.js +++ b/test/lib/plugins/session.test.js @@ -1,6 +1,6 @@ 'use strict'; -const assert = require('assert'); +const assert = require('node:assert'); const mm = require('egg-mock'); const utils = require('../../utils'); diff --git a/test/lib/plugins/watcher.test.js b/test/lib/plugins/watcher.test.js index 28d5e414ae..125724a9a0 100644 --- a/test/lib/plugins/watcher.test.js +++ b/test/lib/plugins/watcher.test.js @@ -1,6 +1,6 @@ -const assert = require('assert'); +const assert = require('node:assert'); const mm = require('egg-mock'); -const fs = require('fs'); +const fs = require('node:fs'); const utils = require('../../utils'); const file_path1 = utils.getFilepath('apps/watcher-development-app/tmp.txt'); const file_path2 = utils.getFilepath('apps/watcher-development-app/tmp/tmp.txt'); diff --git a/test/lib/start.test.js b/test/lib/start.test.js index fc475ec546..42fcc304df 100644 --- a/test/lib/start.test.js +++ b/test/lib/start.test.js @@ -1,8 +1,8 @@ 'use strict'; const utils = require('../utils'); -const assert = require('assert'); -const path = require('path'); +const assert = require('node:assert'); +const path = require('node:path'); let app; diff --git a/test/ts/index.test.js b/test/ts/index.test.js index e6d6cb07b4..36935f5c44 100644 --- a/test/ts/index.test.js +++ b/test/ts/index.test.js @@ -1,6 +1,6 @@ -const assert = require('assert'); +const assert = require('node:assert'); const coffee = require('coffee'); -const path = require('path'); +const path = require('node:path'); const utils = require('../utils'); describe('test/ts/index.test.js', () => { diff --git a/test/utils.js b/test/utils.js index fb8c3a9394..f9858aae03 100644 --- a/test/utils.js +++ b/test/utils.js @@ -1,9 +1,9 @@ -const { readFileSync } = require('fs'); -const { rm } = require('fs/promises'); -const path = require('path'); +const { readFileSync } = require('node:fs'); +const { rm } = require('node:fs/promises'); +const path = require('node:path'); const mm = require('egg-mock'); const Koa = require('koa'); -const http = require('http'); +const http = require('node:http'); const request = require('supertest'); const egg = require('..');