From 697fab234ec79835beca01aa68b281b9a3af05ae Mon Sep 17 00:00:00 2001 From: Florian Imdahl Date: Sun, 26 Nov 2023 21:17:39 +0100 Subject: [PATCH] fix: Remove ESM "node:" import --- packages/auto-approver/src/AutoApprover.ts | 2 +- packages/auto-approver/src/cli.ts | 4 ++-- packages/crates-updater/src/cli.ts | 2 +- packages/electron-icon-generator/src/cli.ts | 2 +- packages/electron-icon-generator/src/index.ts | 4 ++-- packages/electron-info/src/ElectronInfo.test.ts | 4 ++-- packages/electron-info/src/FileService.ts | 6 +++--- packages/electron-info/src/HTTPService.ts | 4 ++-- packages/electron-info/src/cli.ts | 2 +- packages/gh-open/src/RepositoryService.ts | 4 ++-- packages/gh-open/src/cli.ts | 4 ++-- packages/https-proxy/src/HttpsProxy.ts | 6 +++--- packages/https-proxy/src/cli.ts | 2 +- packages/jszip-cli/tsconfig.cjs.json | 4 ++-- packages/mock-udp/src/index.test.ts | 2 +- packages/mock-udp/src/index.ts | 2 +- packages/my-timezone/src/cli.ts | 2 +- packages/ntfy/src/NtfyClient.ts | 4 ++-- packages/ntpclient/src/cli.ts | 2 +- packages/pixelflut/src/index.ts | 4 ++-- packages/publish-flat/src/PublishFlat.ts | 6 +++--- packages/publish-flat/src/cli-copy.ts | 2 +- packages/publish-flat/src/copyJson.ts | 2 +- packages/scrabble-cheater/src/cli.ts | 2 +- packages/scrabble-cheater/src/index.ts | 6 +++--- packages/which-os/src/cli.ts | 4 ++-- packages/which-os/src/which-os.ts | 4 ++-- packages/windows-shortcut-maker/src/index.ts | 6 +++--- 28 files changed, 49 insertions(+), 49 deletions(-) diff --git a/packages/auto-approver/src/AutoApprover.ts b/packages/auto-approver/src/AutoApprover.ts index 021c42e5..247b8adb 100644 --- a/packages/auto-approver/src/AutoApprover.ts +++ b/packages/auto-approver/src/AutoApprover.ts @@ -1,6 +1,6 @@ import axios, {AxiosError, AxiosInstance} from 'axios'; import logdown from 'logdown'; -import {createRequire} from 'node:module'; +import {createRequire} from 'module'; interface PackageJson { bin: Record; diff --git a/packages/auto-approver/src/cli.ts b/packages/auto-approver/src/cli.ts index 3003297c..d99f6572 100644 --- a/packages/auto-approver/src/cli.ts +++ b/packages/auto-approver/src/cli.ts @@ -3,8 +3,8 @@ import {program as commander} from 'commander'; import {cosmiconfigSync} from 'cosmiconfig'; import logdown from 'logdown'; -import readline from 'node:readline'; -import {createRequire} from 'node:module'; +import readline from 'readline'; +import {createRequire} from 'module'; const require = createRequire(import.meta.url); import {ApproverConfig, AutoApprover, Repository} from './AutoApprover.js'; diff --git a/packages/crates-updater/src/cli.ts b/packages/crates-updater/src/cli.ts index af066d4e..d1e546a1 100644 --- a/packages/crates-updater/src/cli.ts +++ b/packages/crates-updater/src/cli.ts @@ -1,7 +1,7 @@ #!/usr/bin/env node import {program as commander} from 'commander'; -import {createRequire} from 'node:module'; +import {createRequire} from 'module'; const require = createRequire(import.meta.url); import * as CratesUpdater from './CratesUpdater.js'; diff --git a/packages/electron-icon-generator/src/cli.ts b/packages/electron-icon-generator/src/cli.ts index 51333e58..51c90a73 100644 --- a/packages/electron-icon-generator/src/cli.ts +++ b/packages/electron-icon-generator/src/cli.ts @@ -1,7 +1,7 @@ #!/usr/bin/env node import {program as commander} from 'commander'; -import {createRequire} from 'node:module'; +import {createRequire} from 'module'; const require = createRequire(import.meta.url); import {IconGenerator} from './index.js'; diff --git a/packages/electron-icon-generator/src/index.ts b/packages/electron-icon-generator/src/index.ts index 24cf4a1e..07a017b6 100644 --- a/packages/electron-icon-generator/src/index.ts +++ b/packages/electron-icon-generator/src/index.ts @@ -2,8 +2,8 @@ import * as fs from 'fs-extra'; import Jimp from 'jimp'; -import path from 'node:path'; -import {createRequire} from 'node:module'; +import path from 'path'; +import {createRequire} from 'module'; const require = createRequire(import.meta.url); const icongen = require('icon-gen'); diff --git a/packages/electron-info/src/ElectronInfo.test.ts b/packages/electron-info/src/ElectronInfo.test.ts index 03341703..6c45771d 100644 --- a/packages/electron-info/src/ElectronInfo.test.ts +++ b/packages/electron-info/src/ElectronInfo.test.ts @@ -2,8 +2,8 @@ import {expect, describe, test, beforeEach, beforeAll, afterAll, afterEach} from import {StatusCodes as HTTP_STATUS} from 'http-status-codes'; import nock from 'nock'; import * as fs from 'fs-extra'; -import path from 'node:path'; -import {fileURLToPath} from 'node:url'; +import path from 'path'; +import {fileURLToPath} from 'url'; import {randomUUID} from 'crypto'; import {ElectronInfo, RawReleaseInfo} from './ElectronInfo.js'; diff --git a/packages/electron-info/src/FileService.ts b/packages/electron-info/src/FileService.ts index 2334e8b1..807af992 100644 --- a/packages/electron-info/src/FileService.ts +++ b/packages/electron-info/src/FileService.ts @@ -1,9 +1,9 @@ import {isAfter as isAfterDate, sub as subtractDate} from 'date-fns'; -import {constants as fsConstants, promises as fs} from 'node:fs'; +import {constants as fsConstants, promises as fs} from 'fs'; import parseUrl from 'parse-url'; import logdown from 'logdown'; -import os from 'node:os'; -import path from 'node:path'; +import os from 'os'; +import path from 'path'; import type {Options, RawReleaseInfo} from './ElectronInfo.js'; import {HTTPService} from './HTTPService.js'; diff --git a/packages/electron-info/src/HTTPService.ts b/packages/electron-info/src/HTTPService.ts index 0098e4b3..3e4829dc 100644 --- a/packages/electron-info/src/HTTPService.ts +++ b/packages/electron-info/src/HTTPService.ts @@ -1,5 +1,5 @@ -import {promises as fs} from 'node:fs'; -import {inspect} from 'node:util'; +import {promises as fs} from 'fs'; +import {inspect} from 'util'; import axios from 'axios'; import logdown from 'logdown'; diff --git a/packages/electron-info/src/cli.ts b/packages/electron-info/src/cli.ts index c4732128..2d37ff65 100644 --- a/packages/electron-info/src/cli.ts +++ b/packages/electron-info/src/cli.ts @@ -1,7 +1,7 @@ #!/usr/bin/env node import {program as commander} from 'commander'; -import {createRequire} from 'node:module'; +import {createRequire} from 'module'; const require = createRequire(import.meta.url); import {ElectronInfo, RawDeps, SupportedDependencies} from './ElectronInfo.js'; diff --git a/packages/gh-open/src/RepositoryService.ts b/packages/gh-open/src/RepositoryService.ts index d5c8c92f..1db4c244 100755 --- a/packages/gh-open/src/RepositoryService.ts +++ b/packages/gh-open/src/RepositoryService.ts @@ -1,5 +1,5 @@ -import {promises as fsAsync} from 'node:fs'; -import path from 'node:path'; +import {promises as fsAsync} from 'fs'; +import path from 'path'; import logdown from 'logdown'; import {GitHubClient} from './GitHubClient.js'; diff --git a/packages/gh-open/src/cli.ts b/packages/gh-open/src/cli.ts index 2b9fb775..9075adaf 100644 --- a/packages/gh-open/src/cli.ts +++ b/packages/gh-open/src/cli.ts @@ -1,10 +1,10 @@ #!/usr/bin/env node -import path from 'node:path'; +import path from 'path'; import {program as commander} from 'commander'; import {findUp} from 'find-up'; import open from 'open'; -import {createRequire} from 'node:module'; +import {createRequire} from 'module'; const require = createRequire(import.meta.url); import {RepositoryService} from './RepositoryService.js'; diff --git a/packages/https-proxy/src/HttpsProxy.ts b/packages/https-proxy/src/HttpsProxy.ts index 408c816f..f0ffda75 100644 --- a/packages/https-proxy/src/HttpsProxy.ts +++ b/packages/https-proxy/src/HttpsProxy.ts @@ -1,9 +1,9 @@ import basicAuth from 'basic-auth'; -import http from 'node:http'; +import http from 'http'; import logdown from 'logdown'; -import net from 'node:net'; +import net from 'net'; import compare from 'tsscmp'; -import url from 'node:url'; +import url from 'url'; import {StatusCodes as HTTP_STATUS} from 'http-status-codes'; export interface Options { diff --git a/packages/https-proxy/src/cli.ts b/packages/https-proxy/src/cli.ts index 6d19e4f6..471ce7f0 100644 --- a/packages/https-proxy/src/cli.ts +++ b/packages/https-proxy/src/cli.ts @@ -1,7 +1,7 @@ #!/usr/bin/env node import {program as commander} from 'commander'; -import {createRequire} from 'node:module'; +import {createRequire} from 'module'; const require = createRequire(import.meta.url); import {HttpsProxy} from './HttpsProxy.js'; diff --git a/packages/jszip-cli/tsconfig.cjs.json b/packages/jszip-cli/tsconfig.cjs.json index 9c3082aa..c55221e4 100644 --- a/packages/jszip-cli/tsconfig.cjs.json +++ b/packages/jszip-cli/tsconfig.cjs.json @@ -3,8 +3,8 @@ "esModuleInterop": true, "outDir": "dist/cjs", "rootDir": "src", - "moduleResolution": "NodeNext", - "module": "NodeNext" + "moduleResolution": "Node", + "module": "ESNext" }, "exclude": ["dist", "node_modules", "src/*.test.ts"], "extends": "../../tsconfig.json" diff --git a/packages/mock-udp/src/index.test.ts b/packages/mock-udp/src/index.test.ts index 420d657f..a1e96738 100644 --- a/packages/mock-udp/src/index.test.ts +++ b/packages/mock-udp/src/index.test.ts @@ -1,7 +1,7 @@ /* eslint-disable no-magic-numbers */ import {assert, expect, describe, test, beforeEach} from 'vitest'; -import * as dgram from 'node:dgram'; +import * as dgram from 'dgram'; import * as mockudp from './index.js'; const buffer = Buffer.from('hello world'); diff --git a/packages/mock-udp/src/index.ts b/packages/mock-udp/src/index.ts index 224e41ff..9647304e 100644 --- a/packages/mock-udp/src/index.ts +++ b/packages/mock-udp/src/index.ts @@ -1,4 +1,4 @@ -import {Socket} from 'node:dgram'; +import {Socket} from 'dgram'; type SendCallback = (error: Error | null, bytes: number) => void; diff --git a/packages/my-timezone/src/cli.ts b/packages/my-timezone/src/cli.ts index 57fe607c..208894c3 100644 --- a/packages/my-timezone/src/cli.ts +++ b/packages/my-timezone/src/cli.ts @@ -1,7 +1,7 @@ #!/usr/bin/env node import {program as commander} from 'commander'; -import {createRequire} from 'node:module'; +import {createRequire} from 'module'; const require = createRequire(import.meta.url); import {MyTimezone} from './MyTimezone.js'; diff --git a/packages/ntfy/src/NtfyClient.ts b/packages/ntfy/src/NtfyClient.ts index cb695dce..7f5c941f 100644 --- a/packages/ntfy/src/NtfyClient.ts +++ b/packages/ntfy/src/NtfyClient.ts @@ -1,6 +1,6 @@ import axios, {AxiosHeaders, AxiosRequestConfig} from 'axios'; -import {URL} from 'node:url'; -import {promises as fs} from 'node:fs'; +import {URL} from 'url'; +import {promises as fs} from 'fs'; import type { AttachmentConfig, BroadcastAction, diff --git a/packages/ntpclient/src/cli.ts b/packages/ntpclient/src/cli.ts index 1b58b9d4..fd850315 100644 --- a/packages/ntpclient/src/cli.ts +++ b/packages/ntpclient/src/cli.ts @@ -1,7 +1,7 @@ #!/usr/bin/env node import {program as commander} from 'commander'; -import {createRequire} from 'node:module'; +import {createRequire} from 'module'; const require = createRequire(import.meta.url); import {NTPClient} from './index.js'; diff --git a/packages/pixelflut/src/index.ts b/packages/pixelflut/src/index.ts index 17c3929d..f24751a1 100644 --- a/packages/pixelflut/src/index.ts +++ b/packages/pixelflut/src/index.ts @@ -1,5 +1,5 @@ -import dgram from 'node:dgram'; -import net from 'node:net'; +import dgram from 'dgram'; +import net from 'net'; export class Pixelflut { public errors: string[] = []; diff --git a/packages/publish-flat/src/PublishFlat.ts b/packages/publish-flat/src/PublishFlat.ts index 2fe63781..0e8a2470 100644 --- a/packages/publish-flat/src/PublishFlat.ts +++ b/packages/publish-flat/src/PublishFlat.ts @@ -1,10 +1,10 @@ -import {execSync} from 'node:child_process'; +import {execSync} from 'child_process'; import Arborist from '@npmcli/arborist'; import fs from 'fs-extra'; import logdown from 'logdown'; import packlist from 'npm-packlist'; -import os from 'node:os'; -import path from 'node:path'; +import os from 'os'; +import path from 'path'; interface PackageJson { bin: Record | string; diff --git a/packages/publish-flat/src/cli-copy.ts b/packages/publish-flat/src/cli-copy.ts index 9ba199aa..7b0cd5d6 100644 --- a/packages/publish-flat/src/cli-copy.ts +++ b/packages/publish-flat/src/cli-copy.ts @@ -1,7 +1,7 @@ #!/usr/bin/env node import {program as commander} from 'commander'; -import {createRequire} from 'node:module'; +import {createRequire} from 'module'; const require = createRequire(import.meta.url); import {copyJson} from './copyJson.js'; diff --git a/packages/publish-flat/src/copyJson.ts b/packages/publish-flat/src/copyJson.ts index be493be1..0f5d19a6 100644 --- a/packages/publish-flat/src/copyJson.ts +++ b/packages/publish-flat/src/copyJson.ts @@ -1,5 +1,5 @@ import fs from 'fs-extra'; -import path from 'node:path'; +import path from 'path'; async function checkFile(filePath: string): Promise { try { diff --git a/packages/scrabble-cheater/src/cli.ts b/packages/scrabble-cheater/src/cli.ts index 9eaf16a4..1a6fe24c 100644 --- a/packages/scrabble-cheater/src/cli.ts +++ b/packages/scrabble-cheater/src/cli.ts @@ -1,7 +1,7 @@ #!/usr/bin/env node import {program as commander} from 'commander'; -import {createRequire} from 'node:module'; +import {createRequire} from 'module'; const require = createRequire(import.meta.url); import {Options, ScrabbleCheater} from './index.js'; diff --git a/packages/scrabble-cheater/src/index.ts b/packages/scrabble-cheater/src/index.ts index 05d18523..ca4b9483 100644 --- a/packages/scrabble-cheater/src/index.ts +++ b/packages/scrabble-cheater/src/index.ts @@ -1,7 +1,7 @@ import clipboard from 'clipboardy'; -import fs from 'node:fs'; -import readline from 'node:readline'; -import {promisify} from 'node:util'; +import fs from 'fs'; +import readline from 'readline'; +import {promisify} from 'util'; const readFileAsync = promisify(fs.readFile); export interface Options { diff --git a/packages/which-os/src/cli.ts b/packages/which-os/src/cli.ts index 9860b3d1..d26ea7dd 100644 --- a/packages/which-os/src/cli.ts +++ b/packages/which-os/src/cli.ts @@ -1,8 +1,8 @@ #!/usr/bin/env node import {program as commander} from 'commander'; -import {inspect} from 'node:util'; -import fs from 'node:fs'; +import {inspect} from 'util'; +import fs from 'fs'; import * as whichOS from './which-os.js'; diff --git a/packages/which-os/src/which-os.ts b/packages/which-os/src/which-os.ts index 5ad71775..3d9116c3 100644 --- a/packages/which-os/src/which-os.ts +++ b/packages/which-os/src/which-os.ts @@ -1,5 +1,5 @@ -import os from 'node:os'; -import process from 'node:process'; +import os from 'os'; +import process from 'process'; const platform = os.platform(); diff --git a/packages/windows-shortcut-maker/src/index.ts b/packages/windows-shortcut-maker/src/index.ts index 46ee5dfc..d0050d9f 100644 --- a/packages/windows-shortcut-maker/src/index.ts +++ b/packages/windows-shortcut-maker/src/index.ts @@ -1,6 +1,6 @@ -import {spawn, spawnSync} from 'node:child_process'; -import fs from 'node:fs'; -import path from 'node:path'; +import {spawn, spawnSync} from 'child_process'; +import fs from 'fs'; +import path from 'path'; export interface ShortcutOptions { /** the absolute path including the name of which file should the module make a shortcut (required). */