mirror of
https://github.com/Koenkk/zigbee2mqtt.git
synced 2026-10-15 02:30:05 +00:00
fix(ignore): import using node: prefix for built-in (#25248)
This commit is contained in:
+1
-1
@@ -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';
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
import events from 'events';
|
||||
import events from 'node:events';
|
||||
|
||||
import logger from './util/logger';
|
||||
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import assert from 'assert';
|
||||
import assert from 'node:assert';
|
||||
|
||||
import bind from 'bind-decorator';
|
||||
import debounce from 'debounce';
|
||||
|
||||
+1
-1
@@ -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';
|
||||
|
||||
+1
-1
@@ -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';
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
import fs from 'fs';
|
||||
import fs from 'node:fs';
|
||||
|
||||
import objectAssignDeep from 'object-assign-deep';
|
||||
|
||||
|
||||
Vendored
+1
-1
@@ -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<string, unknown>): RequestHandler;
|
||||
}
|
||||
|
||||
+1
-1
@@ -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'));
|
||||
|
||||
+3
-3
@@ -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';
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import path from 'path';
|
||||
import path from 'node:path';
|
||||
|
||||
import Ajv, {ValidateFunction} from 'ajv';
|
||||
import objectAssignDeep from 'object-assign-deep';
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import {copyFileSync, writeFileSync} from 'fs';
|
||||
import {copyFileSync, writeFileSync} from 'node:fs';
|
||||
|
||||
import data from './data';
|
||||
import * as settings from './settings';
|
||||
|
||||
+3
-3
@@ -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';
|
||||
|
||||
+2
-2
@@ -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';
|
||||
|
||||
+1
-1
@@ -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';
|
||||
|
||||
@@ -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';
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
import path from 'path';
|
||||
import path from 'node:path';
|
||||
|
||||
import tmp from 'tmp';
|
||||
|
||||
|
||||
@@ -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';
|
||||
|
||||
|
||||
@@ -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';
|
||||
|
||||
|
||||
@@ -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';
|
||||
|
||||
|
||||
@@ -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';
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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';
|
||||
|
||||
|
||||
@@ -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';
|
||||
|
||||
|
||||
@@ -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';
|
||||
|
||||
+3
-3
@@ -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';
|
||||
|
||||
+3
-3
@@ -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<typeof yaml.read> {
|
||||
}
|
||||
|
||||
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,
|
||||
}));
|
||||
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@ export type EventHandler = (...args: unknown[]) => unknown;
|
||||
export type JestMockAny = jest.Mock<any, any, any>;
|
||||
|
||||
export function flushPromises(): Promise<void> {
|
||||
return new Promise(jest.requireActual('timers').setImmediate);
|
||||
return new Promise(jest.requireActual('node:timers').setImmediate);
|
||||
}
|
||||
|
||||
// https://github.com/jestjs/jest/issues/6028#issuecomment-567669082
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -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';
|
||||
|
||||
|
||||
+2
-2
@@ -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';
|
||||
|
||||
|
||||
Reference in New Issue
Block a user