aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Dold <florian@dold.me>2021-08-20 13:01:35 +0200
committerFlorian Dold <florian@dold.me>2021-08-20 13:18:55 +0200
commita3687d84ba011639f6bd1b25ea8ea906fcc5b1f3 (patch)
tree64bac5d5e0c5dc9dfabb23632d8b56b61d729d01
parent45f134699076b7708ff23b16e233e67dc866175e (diff)
separate node entry points
Signed-off-by: Florian Dold <florian@dold.me>
-rw-r--r--packages/taler-util/package.json7
-rw-r--r--packages/taler-util/src/globbing/minimatch.ts18
-rw-r--r--packages/taler-util/src/index.node.ts2
-rw-r--r--packages/taler-util/src/index.ts4
-rw-r--r--packages/taler-wallet-core/src/headless/helpers.ts30
5 files changed, 15 insertions, 46 deletions
diff --git a/packages/taler-util/package.json b/packages/taler-util/package.json
index 730e99e81..b4bc32214 100644
--- a/packages/taler-util/package.json
+++ b/packages/taler-util/package.json
@@ -5,8 +5,11 @@
"exports": {
".": "./lib/index.js"
},
- "module": "./lib/index.js",
- "main": "./lib/index.js",
+ "module": "./lib/index.node.js",
+ "main": "./lib/index.node.js",
+ "browser": {
+ "./lib/index.node.js": "./lib/index.js"
+ },
"type": "module",
"types": "./lib/index.d.ts",
"typesVersions": {
diff --git a/packages/taler-util/src/globbing/minimatch.ts b/packages/taler-util/src/globbing/minimatch.ts
index 54779623a..b23de4e92 100644
--- a/packages/taler-util/src/globbing/minimatch.ts
+++ b/packages/taler-util/src/globbing/minimatch.ts
@@ -7,27 +7,11 @@ purpose with or without fee is hereby granted, provided that the above
copyright notice and this permission notice appear in all copies.
*/
-
import { expand } from "./brace-expansion.js";
-const nodejs_path = (function () {
- let path: typeof import("path");
- return function () {
- if (!path) {
- /**
- * need to use an expression when doing a require if we want
- * webpack not to find out about the requirement
- */
- const _r = "require";
- path = module[_r]("path");
- }
- return path;
- };
-})();
-
let path = { sep: "/" };
try {
- path.sep = nodejs_path().sep;
+ path.sep = require("path").sep;
} catch (er) {}
const GLOBSTAR = {};
diff --git a/packages/taler-util/src/index.node.ts b/packages/taler-util/src/index.node.ts
new file mode 100644
index 000000000..f0c805982
--- /dev/null
+++ b/packages/taler-util/src/index.node.ts
@@ -0,0 +1,2 @@
+export * from "./index.js";
+export * from "./talerconfig.js";
diff --git a/packages/taler-util/src/index.ts b/packages/taler-util/src/index.ts
index e45e5dc02..a4b5cc8db 100644
--- a/packages/taler-util/src/index.ts
+++ b/packages/taler-util/src/index.ts
@@ -11,7 +11,6 @@ export * from "./notifications.js";
export * from "./payto.js";
export * from "./ReserveStatus.js";
export * from "./ReserveTransaction.js";
-export * from "./talerconfig.js";
export * from "./talerTypes.js";
export * from "./taleruri.js";
export * from "./time.js";
@@ -19,5 +18,4 @@ export * from "./transactionsTypes.js";
export * from "./walletTypes.js";
export * from "./i18n.js";
export * from "./logging.js";
-export * from "./url.js";
-export * from "./globbing/minimatch.js"; \ No newline at end of file
+export * from "./url.js"; \ No newline at end of file
diff --git a/packages/taler-wallet-core/src/headless/helpers.ts b/packages/taler-wallet-core/src/headless/helpers.ts
index a862dab4a..1867fab67 100644
--- a/packages/taler-wallet-core/src/headless/helpers.ts
+++ b/packages/taler-wallet-core/src/headless/helpers.ts
@@ -36,24 +36,10 @@ import { SynchronousCryptoWorkerFactory } from "../crypto/workers/synchronousWor
import type { IDBFactory } from "@gnu-taler/idb-bridge";
import { WalletNotification } from "@gnu-taler/taler-util";
import { Wallet } from "../wallet.js";
+import * as fs from "fs";
const logger = new Logger("headless/helpers.ts");
-const nodejs_fs = (function () {
- let fs: typeof import("fs");
- return function () {
- if (!fs) {
- /**
- * need to use an expression when doing a require if we want
- * webpack not to find out about the requirement
- */
- const _r = "require";
- fs = module[_r]("fs");
- }
- return fs;
- };
-})();
-
export interface DefaultNodeWalletArgs {
/**
* Location of the wallet database.
@@ -101,7 +87,7 @@ export async function getDefaultNodeWallet(
const storagePath = args.persistentStoragePath;
if (storagePath) {
try {
- const dbContentStr: string = nodejs_fs().readFileSync(storagePath, {
+ const dbContentStr: string = fs.readFileSync(storagePath, {
encoding: "utf-8",
});
const dbContent = JSON.parse(dbContentStr);
@@ -124,15 +110,11 @@ export async function getDefaultNodeWallet(
}
const tmpPath = `${args.persistentStoragePath}-${makeId(5)}.tmp`;
const dbContent = myBackend.exportDump();
- nodejs_fs().writeFileSync(
- tmpPath,
- JSON.stringify(dbContent, undefined, 2),
- {
- encoding: "utf-8",
- },
- );
+ fs.writeFileSync(tmpPath, JSON.stringify(dbContent, undefined, 2), {
+ encoding: "utf-8",
+ });
// Atomically move the temporary file onto the DB path.
- nodejs_fs().renameSync(tmpPath, args.persistentStoragePath);
+ fs.renameSync(tmpPath, args.persistentStoragePath);
};
}