Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ignore): import using node: prefix for built-in #25248

Merged
merged 1 commit into from
Dec 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion lib/eventBus.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import events from 'events';
import events from 'node:events';

import logger from './util/logger';

Expand Down
2 changes: 1 addition & 1 deletion lib/extension/availability.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion lib/extension/bind.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion lib/extension/bridge.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
6 changes: 3 additions & 3 deletions lib/extension/externalJS.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
18 changes: 9 additions & 9 deletions lib/extension/frontend.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import type {IncomingMessage, Server, ServerResponse} from 'http';
import type {Socket} from '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 type {IncomingMessage, Server, ServerResponse} from 'node:http';
import type {Socket} from 'node:net';

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';
Expand Down
2 changes: 1 addition & 1 deletion lib/extension/groups.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion lib/extension/homeassistant.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
4 changes: 2 additions & 2 deletions lib/extension/otaUpdate.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion lib/extension/receive.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import assert from 'assert';
import assert from 'node:assert';

import bind from 'bind-decorator';
import debounce from 'debounce';
Expand Down
2 changes: 1 addition & 1 deletion lib/model/device.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion lib/mqtt.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion lib/state.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import fs from 'fs';
import fs from 'node:fs';

import objectAssignDeep from 'object-assign-deep';

Expand Down
2 changes: 1 addition & 1 deletion lib/types/zigbee2mqtt-frontend.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
2 changes: 1 addition & 1 deletion lib/util/data.ts
Original file line number Diff line number Diff line change
@@ -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'));
Expand Down
6 changes: 3 additions & 3 deletions lib/util/logger.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion lib/util/settings.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import path from 'path';
import path from 'node:path';

import Ajv, {ValidateFunction} from 'ajv';
import objectAssignDeep from 'object-assign-deep';
Expand Down
2 changes: 1 addition & 1 deletion lib/util/settingsMigration.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {copyFileSync, writeFileSync} from 'fs';
import {copyFileSync, writeFileSync} from 'node:fs';

import data from './data';
import * as settings from './settings';
Expand Down
6 changes: 3 additions & 3 deletions lib/util/utils.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
4 changes: 2 additions & 2 deletions lib/util/yaml.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion lib/zigbee.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
4 changes: 2 additions & 2 deletions test/controller.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion test/data.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import path from 'path';
import path from 'node:path';

import tmp from 'tmp';

Expand Down
2 changes: 1 addition & 1 deletion test/extensions/availability.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
6 changes: 3 additions & 3 deletions test/extensions/bridge.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
4 changes: 2 additions & 2 deletions test/extensions/externalConverters.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
4 changes: 2 additions & 2 deletions test/extensions/externalExtensions.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
6 changes: 3 additions & 3 deletions test/extensions/frontend.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -65,15 +65,15 @@ const mockNodeStatic = jest.fn();

const mockFinalHandler = jest.fn();

jest.mock('http', () => ({
jest.mock('node:http', () => ({
createServer: jest.fn().mockImplementation((onRequest) => {
mockHTTPOnRequest = onRequest;
return mockHTTP;
}),
Agent: jest.fn(),
}));

jest.mock('https', () => ({
jest.mock('node:https', () => ({
createServer: jest.fn().mockImplementation((onRequest) => {
mockHTTPSOnRequest = onRequest;
return mockHTTPS;
Expand Down
2 changes: 1 addition & 1 deletion test/extensions/homeassistant.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
4 changes: 2 additions & 2 deletions test/extensions/networkMap.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion test/extensions/otaUpdate.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
6 changes: 3 additions & 3 deletions test/logger.test.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
6 changes: 3 additions & 3 deletions test/mocks/data.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -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,
}));

Expand Down
2 changes: 1 addition & 1 deletion test/mocks/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/mocks/zigbeeHerdsman.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion test/settings.test.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion test/settingsMigration.test.ts
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
4 changes: 2 additions & 2 deletions test/utils.test.ts
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
Loading