commit 6fd80d6ca429bf316ec40c74f52f35f34b4d4dd0 parent 49dbbc83768ee94f245f86feaf550d8129f85596 Author: Mikolai Gütschow <mikolai.guetschow@tu-dresden.de> Date: Mon, 16 Dec 2024 14:34:56 +0100 Merge branch 'dev/mikolai-guetschow/node-prefix' Diffstat:
29 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/packages/anastasis-cli/build-node.mjs b/packages/anastasis-cli/build-node.mjs @@ -16,8 +16,8 @@ */ import esbuild from "esbuild"; -import path from "path"; -import fs from "fs"; +import path from "node:path"; +import fs from "node:fs"; const BASE = process.cwd(); diff --git a/packages/anastasis-cli/src/index.ts b/packages/anastasis-cli/src/index.ts @@ -5,7 +5,7 @@ import { getRecoveryStartState, reduceAction, } from "@gnu-taler/anastasis-core"; -import fs from "fs"; +import fs from "node:fs"; import { j2s } from "@gnu-taler/taler-util"; export const reducerCli = clk.program("anastasis-cli", { diff --git a/packages/merchant-backend-ui/build.mjs b/packages/merchant-backend-ui/build.mjs @@ -16,8 +16,8 @@ */ import esbuild from "esbuild"; -import path from "path"; -import fs from "fs"; +import path from "node:path"; +import fs from "node:fs"; import linaria from '@linaria/esbuild' // eslint-disable-next-line no-undef diff --git a/packages/merchant-backend-ui/src/render-examples.ts b/packages/merchant-backend-ui/src/render-examples.ts @@ -19,7 +19,7 @@ * @author Sebastian Javier Marchano (sebasjm) */ -import fs from "fs"; +import fs from "node:fs"; import mustache from "mustache"; import { createDateToStringFunction, createDurationToStringFunction, createNonEmptyFunction } from "./utils.js" import { exampleData as ShowOrderDetailsExamples } from "./pages/ShowOrderDetails.examples.js"; diff --git a/packages/pogen/src/dumpTree.ts b/packages/pogen/src/dumpTree.ts @@ -23,7 +23,7 @@ "use strict"; -import { readFileSync } from "fs"; +import { readFileSync } from "node:fs"; import { execSync } from "child_process"; import * as ts from "typescript"; diff --git a/packages/pogen/src/po2ts.ts b/packages/pogen/src/po2ts.ts @@ -20,7 +20,7 @@ // @ts-ignore import * as po2jsonLib from "po2json"; -import * as fs from "fs"; +import * as fs from "node:fs"; import glob = require("glob"); //types defined by the po2json library diff --git a/packages/pogen/src/pogen.ts b/packages/pogen/src/pogen.ts @@ -1,6 +1,6 @@ import { potextract } from "./potextract.js"; import * as child_process from "child_process"; -import * as fs from "fs"; +import * as fs from "node:fs"; import glob = require("glob"); import { po2ts } from "./po2ts.js"; diff --git a/packages/pogen/src/potextract.ts b/packages/pogen/src/potextract.ts @@ -18,8 +18,8 @@ * Imports. */ import * as ts from "typescript"; -import * as fs from "fs"; -import * as path from "path"; +import * as fs from "node:fs"; +import * as path from "node:path"; const DEFAULT_PO_HEADER = `# SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER diff --git a/packages/taler-harness/build.mjs b/packages/taler-harness/build.mjs @@ -16,8 +16,8 @@ */ import esbuild from "esbuild"; -import fs from "fs"; -import path from "path"; +import fs from "node:fs"; +import path from "node:path"; const BASE = process.cwd(); diff --git a/packages/taler-harness/src/harness/environments.ts b/packages/taler-harness/src/harness/environments.ts @@ -83,7 +83,7 @@ import { WithAuthorization, } from "./harness.js"; -import * as fs from "fs"; +import * as fs from "node:fs"; const logger = new Logger("helpers.ts"); diff --git a/packages/taler-harness/src/harness/faultInjection.ts b/packages/taler-harness/src/harness/faultInjection.ts @@ -24,7 +24,7 @@ * Imports */ import * as http from "http"; -import { URL } from "url"; +import { URL } from "node:url"; import { ExchangeService, ExchangeServiceInterface, diff --git a/packages/taler-harness/src/harness/harness.ts b/packages/taler-harness/src/harness/harness.ts @@ -77,10 +77,10 @@ import { } from "@gnu-taler/taler-wallet-core/remote"; import { deepStrictEqual } from "assert"; import { ChildProcess, spawn } from "child_process"; -import * as fs from "fs"; +import * as fs from "node:fs"; import * as http from "http"; import * as net from "node:net"; -import * as path from "path"; +import * as path from "node:path"; import * as readline from "readline"; import { CoinConfig } from "./denomStructures.js"; diff --git a/packages/taler-harness/src/harness/sync.ts b/packages/taler-harness/src/harness/sync.ts @@ -18,7 +18,7 @@ * Imports. */ import { URL } from "@gnu-taler/taler-util"; -import * as fs from "fs"; +import * as fs from "node:fs"; import * as util from "util"; import { GlobalTestState, diff --git a/packages/taler-harness/src/index.ts b/packages/taler-harness/src/index.ts @@ -62,11 +62,11 @@ import { topupReserveWithBank, } from "@gnu-taler/taler-wallet-core/dbless"; import { deepStrictEqual } from "assert"; -import fs from "fs"; +import fs from "node:fs"; import { AML_PROGRAM_FROM_ATTRIBUTES_TO_CONTEXT } from "integrationtests/test-kyc-skip-expiration.js"; import { AML_PROGRAM_NEXT_MEASURE_FORM } from "integrationtests/test-kyc-two-forms.js"; -import os from "os"; -import path from "path"; +import os from "node:os"; +import path from "node:path"; import { runBench1 } from "./bench1.js"; import { runBench2 } from "./bench2.js"; import { runBench3 } from "./bench3.js"; diff --git a/packages/taler-harness/src/integrationtests/test-claim-loop.ts b/packages/taler-harness/src/integrationtests/test-claim-loop.ts @@ -18,7 +18,7 @@ * Imports. */ import { WalletApiOperation } from "@gnu-taler/taler-wallet-core"; -import { URL } from "url"; +import { URL } from "node:url"; import { GlobalTestState } from "../harness/harness.js"; import { createSimpleTestkudosEnvironmentV3, diff --git a/packages/taler-harness/src/integrationtests/test-merchant-exchange-confusion.ts b/packages/taler-harness/src/integrationtests/test-merchant-exchange-confusion.ts @@ -28,7 +28,7 @@ import { TypedTalerErrorDetail, } from "@gnu-taler/taler-util"; import { WalletApiOperation } from "@gnu-taler/taler-wallet-core"; -import { URL } from "url"; +import { URL } from "node:url"; import { defaultCoinConfig } from "../harness/denomStructures.js"; import { createWalletDaemonWithClient, diff --git a/packages/taler-harness/src/integrationtests/test-tos-format.ts b/packages/taler-harness/src/integrationtests/test-tos-format.ts @@ -22,7 +22,7 @@ import { GlobalTestState } from "../harness/harness.js"; import { createSimpleTestkudosEnvironmentV2, } from "../harness/environments.js"; -import * as fs from "fs"; +import * as fs from "node:fs"; /** * Run test for basic, bank-integrated withdrawal and payment. diff --git a/packages/taler-harness/src/integrationtests/testrunner.ts b/packages/taler-harness/src/integrationtests/testrunner.ts @@ -17,10 +17,10 @@ import { CancellationToken, Logger, minimatch } from "@gnu-taler/taler-util"; import * as child_process from "child_process"; import { spawnSync } from "child_process"; -import * as fs from "fs"; -import * as os from "os"; -import * as path from "path"; -import url from "url"; +import * as fs from "node:fs"; +import * as os from "node:os"; +import * as path from "node:path"; +import url from "node:url"; import { getSharedTestDir } from "../harness/environments.js"; import { GlobalTestState, diff --git a/packages/taler-harness/src/lint.ts b/packages/taler-harness/src/lint.ts @@ -37,7 +37,7 @@ import { Configuration, decodeCrock, } from "@gnu-taler/taler-util"; -import { URL } from "url"; +import { URL } from "node:url"; import { spawn } from "child_process"; import { delayMs } from "./harness/harness.js"; import { diff --git a/packages/taler-util/src/prng-node.ts b/packages/taler-util/src/prng-node.ts @@ -15,7 +15,7 @@ */ import { setPRNG } from "./nacl-fast.js"; -import cr from "crypto"; +import cr from "node:crypto"; export function initNodePrng() { // Initialize PRNG if environment provides CSPRNG. diff --git a/packages/taler-util/src/talerconfig.ts b/packages/taler-util/src/talerconfig.ts @@ -26,9 +26,9 @@ import { AmountJson, Amounts } from "./amounts.js"; import { Logger } from "./logging.js"; -import nodejs_fs from "fs"; -import nodejs_os from "os"; -import nodejs_path from "path"; +import nodejs_fs from "node:fs"; +import nodejs_os from "node:os"; +import nodejs_path from "node:path"; const logger = new Logger("talerconfig.ts"); diff --git a/packages/taler-wallet-cli/build-node.mjs b/packages/taler-wallet-cli/build-node.mjs @@ -16,8 +16,8 @@ */ import esbuild from "esbuild"; -import path from "path"; -import fs from "fs"; +import path from "node:path"; +import fs from "node:fs"; const BASE = process.cwd(); diff --git a/packages/taler-wallet-cli/build-qtart.mjs b/packages/taler-wallet-cli/build-qtart.mjs @@ -16,8 +16,8 @@ */ import esbuild from "esbuild"; -import path from "path"; -import fs from "fs"; +import path from "node:path"; +import fs from "node:fs"; const BASE = process.cwd(); diff --git a/packages/taler-wallet-core/src/crypto/workers/nodeThreadWorker.ts b/packages/taler-wallet-core/src/crypto/workers/nodeThreadWorker.ts @@ -18,8 +18,8 @@ * Imports */ import { Logger } from "@gnu-taler/taler-util"; -import os from "os"; -import url from "url"; +import os from "node:os"; +import url from "node:url"; import { nativeCryptoR } from "../cryptoImplementation.js"; import { CryptoWorkerFactory } from "./crypto-dispatcher.js"; import { CryptoWorker } from "./cryptoWorkerInterface.js"; diff --git a/packages/taler-wallet-core/src/host-impl.node.ts b/packages/taler-wallet-core/src/host-impl.node.ts @@ -36,7 +36,7 @@ import { WalletRunConfig, } from "@gnu-taler/taler-util"; import { createPlatformHttpLib } from "@gnu-taler/taler-util/http"; -import * as fs from "fs"; +import * as fs from "node:fs"; import { NodeThreadCryptoWorkerFactory } from "./crypto/workers/nodeThreadWorker.js"; import { SynchronousCryptoWorkerFactoryPlain } from "./crypto/workers/synchronousWorkerFactoryPlain.js"; import { diff --git a/packages/taler-wallet-embedded/build.mjs b/packages/taler-wallet-embedded/build.mjs @@ -16,8 +16,8 @@ */ import esbuild from "esbuild"; -import path from "path"; -import fs from "fs"; +import path from "node:path"; +import fs from "node:fs"; const BASE = process.cwd(); diff --git a/packages/web-util/build.mjs b/packages/web-util/build.mjs @@ -16,8 +16,8 @@ */ import esbuild from "esbuild"; -import path from "path"; -import fs from "fs"; +import path from "node:path"; +import fs from "node:fs"; // eslint-disable-next-line no-undef const BASE = process.cwd(); diff --git a/packages/web-util/src/index.build.ts b/packages/web-util/src/index.build.ts @@ -1,7 +1,7 @@ import esbuild, { PluginBuild } from "esbuild"; import linaria from "@linaria/esbuild"; -import fs from "fs"; -import path from "path"; +import fs from "node:fs"; +import path from "node:path"; import postcss from "postcss"; import sass from "sass"; import postcssrc from "postcss-load-config"; diff --git a/packages/web-util/src/serve.ts b/packages/web-util/src/serve.ts @@ -3,14 +3,14 @@ import chokidar from "chokidar"; import express from "express"; import https from "https"; import http from "http"; -import { parse } from "url"; +import { parse } from "node:url"; import WebSocket from "ws"; // import locahostCrt from "./keys/localhost.crt"; // import locahostKey from "./keys/localhost.key"; import storiesHtml from "./stories.html"; -import path from "path"; +import path from "node:path"; const httpServerOptions = { // key: locahostKey,