From 758ab34747baeaf62e7a1552cd452c4445279ff1 Mon Sep 17 00:00:00 2001 From: Nerivec <62446222+Nerivec@users.noreply.github.com> Date: Wed, 18 Dec 2024 22:19:33 +0100 Subject: [PATCH] fix(ignore): import using `node:` prefix for built-in (#25248) --- lib/controller.ts | 2 +- lib/eventBus.ts | 2 +- lib/extension/availability.ts | 2 +- lib/extension/bind.ts | 2 +- lib/extension/bridge.ts | 2 +- lib/extension/externalJS.ts | 6 +++--- lib/extension/frontend.ts | 16 ++++++++-------- lib/extension/groups.ts | 2 +- lib/extension/homeassistant.ts | 2 +- lib/extension/otaUpdate.ts | 4 ++-- lib/extension/receive.ts | 2 +- lib/model/device.ts | 2 +- lib/mqtt.ts | 2 +- lib/state.ts | 2 +- lib/types/zigbee2mqtt-frontend.d.ts | 2 +- lib/util/data.ts | 2 +- lib/util/logger.ts | 6 +++--- lib/util/settings.ts | 2 +- lib/util/settingsMigration.ts | 2 +- lib/util/utils.ts | 6 +++--- lib/util/yaml.ts | 4 ++-- lib/zigbee.ts | 2 +- test/controller.test.ts | 4 ++-- test/data.test.ts | 2 +- test/extensions/availability.test.ts | 2 +- test/extensions/bridge.test.ts | 6 +++--- test/extensions/externalConverters.test.ts | 4 ++-- test/extensions/externalExtensions.test.ts | 4 ++-- test/extensions/frontend.test.ts | 6 +++--- test/extensions/homeassistant.test.ts | 2 +- test/extensions/networkMap.test.ts | 4 ++-- test/extensions/otaUpdate.test.ts | 2 +- test/logger.test.ts | 6 +++--- test/mocks/data.ts | 6 +++--- test/mocks/utils.ts | 2 +- test/mocks/zigbeeHerdsman.ts | 2 +- test/settings.test.ts | 2 +- test/settingsMigration.test.ts | 2 +- test/utils.test.ts | 4 ++-- 39 files changed, 67 insertions(+), 67 deletions(-) diff --git a/lib/controller.ts b/lib/controller.ts index 7afdb0c36..afeebe4fe 100644 --- a/lib/controller.ts +++ b/lib/controller.ts @@ -3,7 +3,7 @@ import type * as SdNotify from 'sd-notify'; import type {Zigbee2MQTTAPI} from './types/api'; -import assert from 'assert'; +import assert from 'node:assert'; import bind from 'bind-decorator'; import stringify from 'json-stable-stringify-without-jsonify'; diff --git a/lib/eventBus.ts b/lib/eventBus.ts index d0b5adfda..33c695947 100644 --- a/lib/eventBus.ts +++ b/lib/eventBus.ts @@ -1,4 +1,4 @@ -import events from 'events'; +import events from 'node:events'; import logger from './util/logger'; diff --git a/lib/extension/availability.ts b/lib/extension/availability.ts index 52c63f9d3..82e33a99d 100644 --- a/lib/extension/availability.ts +++ b/lib/extension/availability.ts @@ -1,6 +1,6 @@ import type {Zigbee2MQTTAPI} from 'lib/types/api'; -import assert from 'assert'; +import assert from 'node:assert'; import bind from 'bind-decorator'; import debounce from 'debounce'; diff --git a/lib/extension/bind.ts b/lib/extension/bind.ts index 62ebfefd4..8a0808235 100755 --- a/lib/extension/bind.ts +++ b/lib/extension/bind.ts @@ -1,6 +1,6 @@ import type {Zigbee2MQTTAPI, Zigbee2MQTTResponseEndpoints} from 'lib/types/api'; -import assert from 'assert'; +import assert from 'node:assert'; import bind from 'bind-decorator'; import debounce from 'debounce'; diff --git a/lib/extension/bridge.ts b/lib/extension/bridge.ts index 4e0a85996..71fc6c9b6 100644 --- a/lib/extension/bridge.ts +++ b/lib/extension/bridge.ts @@ -1,6 +1,6 @@ import type {Zigbee2MQTTAPI, Zigbee2MQTTDevice, Zigbee2MQTTResponse, Zigbee2MQTTResponseEndpoints} from 'lib/types/api'; -import fs from 'fs'; +import fs from 'node:fs'; import bind from 'bind-decorator'; import stringify from 'json-stable-stringify-without-jsonify'; diff --git a/lib/extension/externalJS.ts b/lib/extension/externalJS.ts index d50f0f306..438659de5 100644 --- a/lib/extension/externalJS.ts +++ b/lib/extension/externalJS.ts @@ -1,8 +1,8 @@ import type {Zigbee2MQTTAPI, Zigbee2MQTTResponse} from 'lib/types/api'; -import fs from 'fs'; -import path from 'path'; -import {Context, runInNewContext} from 'vm'; +import fs from 'node:fs'; +import path from 'node:path'; +import {Context, runInNewContext} from 'node:vm'; import bind from 'bind-decorator'; import stringify from 'json-stable-stringify-without-jsonify'; diff --git a/lib/extension/frontend.ts b/lib/extension/frontend.ts index 291b33e07..ceb4d7519 100644 --- a/lib/extension/frontend.ts +++ b/lib/extension/frontend.ts @@ -1,12 +1,12 @@ -import type {IncomingMessage, Server, ServerResponse} from 'http'; -import type {Socket} from 'net'; +import type {IncomingMessage, Server, ServerResponse} from 'node:http'; +import type {Socket} from 'node:net'; -import assert from 'assert'; -import {existsSync, readFileSync} from 'fs'; -import {createServer} from 'http'; -import {createServer as createSecureServer} from 'https'; -import {posix} from 'path'; -import {parse} from 'url'; +import assert from 'node:assert'; +import {existsSync, readFileSync} from 'node:fs'; +import {createServer} from 'node:http'; +import {createServer as createSecureServer} from 'node:https'; +import {posix} from 'node:path'; +import {parse} from 'node:url'; import bind from 'bind-decorator'; import expressStaticGzip, {RequestHandler} from 'express-static-gzip'; diff --git a/lib/extension/groups.ts b/lib/extension/groups.ts index b062c19de..43446b292 100644 --- a/lib/extension/groups.ts +++ b/lib/extension/groups.ts @@ -1,6 +1,6 @@ import type {Zigbee2MQTTAPI, Zigbee2MQTTResponseEndpoints} from 'lib/types/api'; -import assert from 'assert'; +import assert from 'node:assert'; import bind from 'bind-decorator'; import equals from 'fast-deep-equal/es6'; diff --git a/lib/extension/homeassistant.ts b/lib/extension/homeassistant.ts index 22c107562..8b6a02327 100644 --- a/lib/extension/homeassistant.ts +++ b/lib/extension/homeassistant.ts @@ -1,4 +1,4 @@ -import assert from 'assert'; +import assert from 'node:assert'; import bind from 'bind-decorator'; import stringify from 'json-stable-stringify-without-jsonify'; diff --git a/lib/extension/otaUpdate.ts b/lib/extension/otaUpdate.ts index 60f374f33..5dfaddeea 100644 --- a/lib/extension/otaUpdate.ts +++ b/lib/extension/otaUpdate.ts @@ -1,8 +1,8 @@ import type {Zigbee2MQTTAPI} from 'lib/types/api'; import type {Ota} from 'zigbee-herdsman-converters'; -import assert from 'assert'; -import path from 'path'; +import assert from 'node:assert'; +import path from 'node:path'; import bind from 'bind-decorator'; import stringify from 'json-stable-stringify-without-jsonify'; diff --git a/lib/extension/receive.ts b/lib/extension/receive.ts index 9982f2015..fc3e8474f 100755 --- a/lib/extension/receive.ts +++ b/lib/extension/receive.ts @@ -1,4 +1,4 @@ -import assert from 'assert'; +import assert from 'node:assert'; import bind from 'bind-decorator'; import debounce from 'debounce'; diff --git a/lib/model/device.ts b/lib/model/device.ts index 51b45728d..1b5f28118 100644 --- a/lib/model/device.ts +++ b/lib/model/device.ts @@ -1,4 +1,4 @@ -import assert from 'assert'; +import assert from 'node:assert'; import * as zhc from 'zigbee-herdsman-converters'; import {CustomClusters} from 'zigbee-herdsman/dist/zspec/zcl/definition/tstype'; diff --git a/lib/mqtt.ts b/lib/mqtt.ts index 715198992..49d6b7c47 100644 --- a/lib/mqtt.ts +++ b/lib/mqtt.ts @@ -2,7 +2,7 @@ import type {IClientOptions, IClientPublishOptions, MqttClient} from 'mqtt'; import type {Zigbee2MQTTAPI} from './types/api'; -import fs from 'fs'; +import fs from 'node:fs'; import bind from 'bind-decorator'; import {connectAsync} from 'mqtt'; diff --git a/lib/state.ts b/lib/state.ts index 612314086..27600583b 100644 --- a/lib/state.ts +++ b/lib/state.ts @@ -1,4 +1,4 @@ -import fs from 'fs'; +import fs from 'node:fs'; import objectAssignDeep from 'object-assign-deep'; diff --git a/lib/types/zigbee2mqtt-frontend.d.ts b/lib/types/zigbee2mqtt-frontend.d.ts index a38c2f128..b0eeff4fb 100644 --- a/lib/types/zigbee2mqtt-frontend.d.ts +++ b/lib/types/zigbee2mqtt-frontend.d.ts @@ -10,7 +10,7 @@ declare module 'http' { } declare module 'express-static-gzip' { - import {IncomingMessage, ServerResponse} from 'http'; + import {IncomingMessage, ServerResponse} from 'node:http'; export type RequestHandler = (req: IncomingMessage, res: ServerResponse, finalhandler: (err: unknown) => void) => void; export default function expressStaticGzip(root: string, options?: Record): RequestHandler; } diff --git a/lib/util/data.ts b/lib/util/data.ts index 8480778c6..ef78006cc 100644 --- a/lib/util/data.ts +++ b/lib/util/data.ts @@ -1,4 +1,4 @@ -import path from 'path'; +import path from 'node:path'; function setPath(): string { return process.env.ZIGBEE2MQTT_DATA ? process.env.ZIGBEE2MQTT_DATA : path.normalize(path.join(__dirname, '..', '..', 'data')); diff --git a/lib/util/logger.ts b/lib/util/logger.ts index 4b6816fec..d2945ef6c 100644 --- a/lib/util/logger.ts +++ b/lib/util/logger.ts @@ -1,6 +1,6 @@ -import assert from 'assert'; -import fs from 'fs'; -import path from 'path'; +import assert from 'node:assert'; +import fs from 'node:fs'; +import path from 'node:path'; import moment from 'moment'; import {rimrafSync} from 'rimraf'; diff --git a/lib/util/settings.ts b/lib/util/settings.ts index b5448ac12..84112e563 100644 --- a/lib/util/settings.ts +++ b/lib/util/settings.ts @@ -1,4 +1,4 @@ -import path from 'path'; +import path from 'node:path'; import Ajv, {ValidateFunction} from 'ajv'; import objectAssignDeep from 'object-assign-deep'; diff --git a/lib/util/settingsMigration.ts b/lib/util/settingsMigration.ts index 6573aa835..101f79d64 100644 --- a/lib/util/settingsMigration.ts +++ b/lib/util/settingsMigration.ts @@ -1,4 +1,4 @@ -import {copyFileSync, writeFileSync} from 'fs'; +import {copyFileSync, writeFileSync} from 'node:fs'; import data from './data'; import * as settings from './settings'; diff --git a/lib/util/utils.ts b/lib/util/utils.ts index d72d0f8f4..e67a26a6c 100644 --- a/lib/util/utils.ts +++ b/lib/util/utils.ts @@ -1,9 +1,9 @@ import type {Zigbee2MQTTAPI, Zigbee2MQTTResponse, Zigbee2MQTTResponseEndpoints, Zigbee2MQTTScene} from 'lib/types/api'; import type * as zhc from 'zigbee-herdsman-converters'; -import assert from 'assert'; -import fs from 'fs'; -import path from 'path'; +import assert from 'node:assert'; +import fs from 'node:fs'; +import path from 'node:path'; import equals from 'fast-deep-equal/es6'; import humanizeDuration from 'humanize-duration'; diff --git a/lib/util/yaml.ts b/lib/util/yaml.ts index b3aed6016..877decab0 100644 --- a/lib/util/yaml.ts +++ b/lib/util/yaml.ts @@ -1,5 +1,5 @@ -import assert from 'assert'; -import fs from 'fs'; +import assert from 'node:assert'; +import fs from 'node:fs'; import equals from 'fast-deep-equal/es6'; import yaml, {YAMLException} from 'js-yaml'; diff --git a/lib/zigbee.ts b/lib/zigbee.ts index 1579d8ac9..e558d03aa 100644 --- a/lib/zigbee.ts +++ b/lib/zigbee.ts @@ -1,4 +1,4 @@ -import {randomInt} from 'crypto'; +import {randomInt} from 'node:crypto'; import bind from 'bind-decorator'; import stringify from 'json-stable-stringify-without-jsonify'; diff --git a/test/controller.test.ts b/test/controller.test.ts index 2f511a312..67a65851d 100644 --- a/test/controller.test.ts +++ b/test/controller.test.ts @@ -4,8 +4,8 @@ import {mockMQTT, mockMQTTConnectAsync, events as mockMQTTEvents} from './mocks/ import {flushPromises, JestMockAny} from './mocks/utils'; import {devices, mockController as mockZHController, events as mockZHEvents, returnDevices} from './mocks/zigbeeHerdsman'; -import fs from 'fs'; -import path from 'path'; +import fs from 'node:fs'; +import path from 'node:path'; import stringify from 'json-stable-stringify-without-jsonify'; import tmp from 'tmp'; diff --git a/test/data.test.ts b/test/data.test.ts index 6b9b41b43..88148f0b4 100644 --- a/test/data.test.ts +++ b/test/data.test.ts @@ -1,4 +1,4 @@ -import path from 'path'; +import path from 'node:path'; import tmp from 'tmp'; diff --git a/test/extensions/availability.test.ts b/test/extensions/availability.test.ts index ba5c749c4..b89edae17 100644 --- a/test/extensions/availability.test.ts +++ b/test/extensions/availability.test.ts @@ -4,7 +4,7 @@ import {mockMQTT, events as mockMQTTEvents} from '../mocks/mqtt'; import {flushPromises} from '../mocks/utils'; import {devices, events as mockZHEvents, returnDevices} from '../mocks/zigbeeHerdsman'; -import assert from 'assert'; +import assert from 'node:assert'; import stringify from 'json-stable-stringify-without-jsonify'; diff --git a/test/extensions/bridge.test.ts b/test/extensions/bridge.test.ts index 314d573a5..1753b12a3 100644 --- a/test/extensions/bridge.test.ts +++ b/test/extensions/bridge.test.ts @@ -7,9 +7,9 @@ import {CUSTOM_CLUSTERS, devices, groups, mockController as mockZHController, ev import type Bridge from '../../lib/extension/bridge'; -import assert from 'assert'; -import fs from 'fs'; -import path from 'path'; +import assert from 'node:assert'; +import fs from 'node:fs'; +import path from 'node:path'; import stringify from 'json-stable-stringify-without-jsonify'; diff --git a/test/extensions/externalConverters.test.ts b/test/extensions/externalConverters.test.ts index 8c6126051..6322bc833 100644 --- a/test/extensions/externalConverters.test.ts +++ b/test/extensions/externalConverters.test.ts @@ -6,8 +6,8 @@ import {devices, mockController as mockZHController, returnDevices} from '../moc import type Device from '../../lib/model/device'; -import fs from 'fs'; -import path from 'path'; +import fs from 'node:fs'; +import path from 'node:path'; import stringify from 'json-stable-stringify-without-jsonify'; diff --git a/test/extensions/externalExtensions.test.ts b/test/extensions/externalExtensions.test.ts index 4e1244ee4..0190208a6 100644 --- a/test/extensions/externalExtensions.test.ts +++ b/test/extensions/externalExtensions.test.ts @@ -4,8 +4,8 @@ import {mockMQTT, events as mockMQTTEvents} from '../mocks/mqtt'; import {flushPromises} from '../mocks/utils'; import {devices, mockController as mockZHController, returnDevices} from '../mocks/zigbeeHerdsman'; -import fs from 'fs'; -import path from 'path'; +import fs from 'node:fs'; +import path from 'node:path'; import stringify from 'json-stable-stringify-without-jsonify'; diff --git a/test/extensions/frontend.test.ts b/test/extensions/frontend.test.ts index b9b7c93c1..15ed616dc 100644 --- a/test/extensions/frontend.test.ts +++ b/test/extensions/frontend.test.ts @@ -4,7 +4,7 @@ import {mockMQTT} from '../mocks/mqtt'; import {EventHandler, flushPromises} from '../mocks/utils'; import {devices} from '../mocks/zigbeeHerdsman'; -import path from 'path'; +import path from 'node:path'; import stringify from 'json-stable-stringify-without-jsonify'; import ws from 'ws'; @@ -65,7 +65,7 @@ const mockNodeStatic = jest.fn(); const mockFinalHandler = jest.fn(); -jest.mock('http', () => ({ +jest.mock('node:http', () => ({ createServer: jest.fn().mockImplementation((onRequest) => { mockHTTPOnRequest = onRequest; return mockHTTP; @@ -73,7 +73,7 @@ jest.mock('http', () => ({ Agent: jest.fn(), })); -jest.mock('https', () => ({ +jest.mock('node:https', () => ({ createServer: jest.fn().mockImplementation((onRequest) => { mockHTTPSOnRequest = onRequest; return mockHTTPS; diff --git a/test/extensions/homeassistant.test.ts b/test/extensions/homeassistant.test.ts index 091b07125..d77bb83b1 100644 --- a/test/extensions/homeassistant.test.ts +++ b/test/extensions/homeassistant.test.ts @@ -5,7 +5,7 @@ import * as mockSleep from '../mocks/sleep'; import {flushPromises} from '../mocks/utils'; import {devices, groups, events as mockZHEvents} from '../mocks/zigbeeHerdsman'; -import assert from 'assert'; +import assert from 'node:assert'; import stringify from 'json-stable-stringify-without-jsonify'; diff --git a/test/extensions/networkMap.test.ts b/test/extensions/networkMap.test.ts index d03794c3a..00fe54dae 100644 --- a/test/extensions/networkMap.test.ts +++ b/test/extensions/networkMap.test.ts @@ -5,8 +5,8 @@ import * as mockSleep from '../mocks/sleep'; import {flushPromises} from '../mocks/utils'; import {devices, events as mockZHEvents, returnDevices} from '../mocks/zigbeeHerdsman'; -import fs from 'fs'; -import path from 'path'; +import fs from 'node:fs'; +import path from 'node:path'; import stringify from 'json-stable-stringify-without-jsonify'; diff --git a/test/extensions/otaUpdate.test.ts b/test/extensions/otaUpdate.test.ts index 906bb4d99..6646d2fb5 100644 --- a/test/extensions/otaUpdate.test.ts +++ b/test/extensions/otaUpdate.test.ts @@ -5,7 +5,7 @@ import * as mockSleep from '../mocks/sleep'; import {flushPromises} from '../mocks/utils'; import {devices, events as mockZHEvents} from '../mocks/zigbeeHerdsman'; -import path from 'path'; +import path from 'node:path'; import stringify from 'json-stable-stringify-without-jsonify'; import OTAUpdate from 'lib/extension/otaUpdate'; diff --git a/test/logger.test.ts b/test/logger.test.ts index 98973d1ab..3ef48f1eb 100644 --- a/test/logger.test.ts +++ b/test/logger.test.ts @@ -1,8 +1,8 @@ import * as data from './mocks/data'; -import fs from 'fs'; -import {platform} from 'os'; -import path from 'path'; +import fs from 'node:fs'; +import {platform} from 'node:os'; +import path from 'node:path'; import {rimrafSync} from 'rimraf'; import tmp from 'tmp'; diff --git a/test/mocks/data.ts b/test/mocks/data.ts index 6375a4bac..245419f7b 100644 --- a/test/mocks/data.ts +++ b/test/mocks/data.ts @@ -1,5 +1,5 @@ -import fs from 'fs'; -import path from 'path'; +import fs from 'node:fs'; +import path from 'node:path'; import stringify from 'json-stable-stringify-without-jsonify'; import tmp from 'tmp'; @@ -291,7 +291,7 @@ export function read(): ReturnType { } jest.mock('../../lib/util/data', () => ({ - joinPath: (file: string): string => jest.requireActual('path').join(mockDir, file), + joinPath: (file: string): string => jest.requireActual('node:path').join(mockDir, file), getPath: (): string => mockDir, })); diff --git a/test/mocks/utils.ts b/test/mocks/utils.ts index 95bee98d6..5aa87ed7c 100644 --- a/test/mocks/utils.ts +++ b/test/mocks/utils.ts @@ -4,7 +4,7 @@ export type EventHandler = (...args: unknown[]) => unknown; export type JestMockAny = jest.Mock; export function flushPromises(): Promise { - return new Promise(jest.requireActual('timers').setImmediate); + return new Promise(jest.requireActual('node:timers').setImmediate); } // https://github.com/jestjs/jest/issues/6028#issuecomment-567669082 diff --git a/test/mocks/zigbeeHerdsman.ts b/test/mocks/zigbeeHerdsman.ts index 48caa4fb7..89186d01e 100644 --- a/test/mocks/zigbeeHerdsman.ts +++ b/test/mocks/zigbeeHerdsman.ts @@ -1,4 +1,4 @@ -import assert from 'assert'; +import assert from 'node:assert'; import {Zcl} from 'zigbee-herdsman'; import {CoordinatorVersion, DeviceType, NetworkParameters, StartResult} from 'zigbee-herdsman/dist/adapter/tstype'; diff --git a/test/settings.test.ts b/test/settings.test.ts index c9642bb03..720b44fb9 100644 --- a/test/settings.test.ts +++ b/test/settings.test.ts @@ -1,7 +1,7 @@ // side-effect ensures using mock paths import './mocks/data'; -import fs from 'fs'; +import fs from 'node:fs'; import yaml from 'js-yaml'; import objectAssignDeep from 'object-assign-deep'; diff --git a/test/settingsMigration.test.ts b/test/settingsMigration.test.ts index 45ad7b628..ceaddbea4 100644 --- a/test/settingsMigration.test.ts +++ b/test/settingsMigration.test.ts @@ -1,7 +1,7 @@ // side-effect ensures using mock paths import * as data from './mocks/data'; -import {existsSync, readFileSync, rmSync} from 'fs'; +import {existsSync, readFileSync, rmSync} from 'node:fs'; import objectAssignDeep from 'object-assign-deep'; diff --git a/test/utils.test.ts b/test/utils.test.ts index 94cd8c33d..96e5eafdb 100644 --- a/test/utils.test.ts +++ b/test/utils.test.ts @@ -1,5 +1,5 @@ -import fs from 'fs'; -import path from 'path'; +import fs from 'node:fs'; +import path from 'node:path'; import utils from '../lib/util/utils';