diff options
| -rw-r--r-- | packages/taler-util/package.json | 6 | ||||
| -rw-r--r-- | packages/taler-util/src/index.browser.ts | 21 | ||||
| -rw-r--r-- | packages/taler-util/src/index.node.ts | 2 | ||||
| -rw-r--r-- | packages/taler-util/src/index.ts | 24 | ||||
| -rw-r--r-- | packages/taler-wallet-cli/src/index.ts | 1 | ||||
| -rw-r--r-- | packages/taler-wallet-cli/src/integrationtests/sync.ts | 4 | ||||
| -rw-r--r-- | packages/taler-wallet-embedded/package.json | 1 | ||||
| -rw-r--r-- | packages/taler-wallet-embedded/tsconfig.json | 10 | ||||
| -rw-r--r-- | pnpm-lock.yaml | 2 |
9 files changed, 39 insertions, 32 deletions
diff --git a/packages/taler-util/package.json b/packages/taler-util/package.json index b4bc32214..4cbd829b9 100644 --- a/packages/taler-util/package.json +++ b/packages/taler-util/package.json @@ -5,10 +5,10 @@ "exports": { ".": "./lib/index.js" }, - "module": "./lib/index.node.js", - "main": "./lib/index.node.js", + "module": "./lib/index.js", + "main": "./lib/index.js", "browser": { - "./lib/index.node.js": "./lib/index.js" + "./lib/index.js": "./lib/index.browser.js" }, "type": "module", "types": "./lib/index.d.ts", diff --git a/packages/taler-util/src/index.browser.ts b/packages/taler-util/src/index.browser.ts new file mode 100644 index 000000000..a4b5cc8db --- /dev/null +++ b/packages/taler-util/src/index.browser.ts @@ -0,0 +1,21 @@ +import { TalerErrorCode } from "./taler-error-codes.js"; + +export { TalerErrorCode }; + +export * from "./amounts.js"; +export * from "./backupTypes.js"; +export * from "./codec.js"; +export * from "./helpers.js"; +export * from "./libtool-version.js"; +export * from "./notifications.js"; +export * from "./payto.js"; +export * from "./ReserveStatus.js"; +export * from "./ReserveTransaction.js"; +export * from "./talerTypes.js"; +export * from "./taleruri.js"; +export * from "./time.js"; +export * from "./transactionsTypes.js"; +export * from "./walletTypes.js"; +export * from "./i18n.js"; +export * from "./logging.js"; +export * from "./url.js";
\ No newline at end of file diff --git a/packages/taler-util/src/index.node.ts b/packages/taler-util/src/index.node.ts deleted file mode 100644 index f0c805982..000000000 --- a/packages/taler-util/src/index.node.ts +++ /dev/null @@ -1,2 +0,0 @@ -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 a4b5cc8db..06951231e 100644 --- a/packages/taler-util/src/index.ts +++ b/packages/taler-util/src/index.ts @@ -1,21 +1,3 @@ -import { TalerErrorCode } from "./taler-error-codes.js"; - -export { TalerErrorCode }; - -export * from "./amounts.js"; -export * from "./backupTypes.js"; -export * from "./codec.js"; -export * from "./helpers.js"; -export * from "./libtool-version.js"; -export * from "./notifications.js"; -export * from "./payto.js"; -export * from "./ReserveStatus.js"; -export * from "./ReserveTransaction.js"; -export * from "./talerTypes.js"; -export * from "./taleruri.js"; -export * from "./time.js"; -export * from "./transactionsTypes.js"; -export * from "./walletTypes.js"; -export * from "./i18n.js"; -export * from "./logging.js"; -export * from "./url.js";
\ No newline at end of file +export * from "./index.browser.js"; +export * from "./talerconfig.js"; +export * from "./globbing/minimatch.js"; diff --git a/packages/taler-wallet-cli/src/index.ts b/packages/taler-wallet-cli/src/index.ts index 68e42bd08..2d50e226b 100644 --- a/packages/taler-wallet-cli/src/index.ts +++ b/packages/taler-wallet-cli/src/index.ts @@ -40,7 +40,6 @@ import { codecForString, Logger, Configuration, - getTimestampNow, } from "@gnu-taler/taler-util"; import { NodeHttpLib, diff --git a/packages/taler-wallet-cli/src/integrationtests/sync.ts b/packages/taler-wallet-cli/src/integrationtests/sync.ts index 90e6c1391..fccff715f 100644 --- a/packages/taler-wallet-cli/src/integrationtests/sync.ts +++ b/packages/taler-wallet-cli/src/integrationtests/sync.ts @@ -22,12 +22,8 @@ import * as fs from "fs"; import * as util from "util"; import { GlobalTestState, - DbInfo, pingProc, ProcessWrapper, - runCommand, - setupDb, - sh, } from "./harness"; import { Configuration } from "@gnu-taler/taler-util"; diff --git a/packages/taler-wallet-embedded/package.json b/packages/taler-wallet-embedded/package.json index 8ddfc72a0..6be21a50d 100644 --- a/packages/taler-wallet-embedded/package.json +++ b/packages/taler-wallet-embedded/package.json @@ -41,6 +41,7 @@ }, "dependencies": { "@gnu-taler/taler-wallet-core": "workspace:*", + "@gnu-taler/taler-util": "workspace:*", "tslib": "^2.1.0" } } diff --git a/packages/taler-wallet-embedded/tsconfig.json b/packages/taler-wallet-embedded/tsconfig.json index 62be133ef..fa759bdaa 100644 --- a/packages/taler-wallet-embedded/tsconfig.json +++ b/packages/taler-wallet-embedded/tsconfig.json @@ -24,5 +24,13 @@ "rootDir": "./src", "typeRoots": ["./node_modules/@types"] }, - "include": ["src/**/*"] + "include": ["src/**/*"], + "references": [ + { + "path": "../taler-wallet-core/" + }, + { + "path": "../taler-util/" + } + ] } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8bdd7542c..a5338b7e7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -170,6 +170,7 @@ importers: packages/taler-wallet-embedded: specifiers: + '@gnu-taler/taler-util': workspace:* '@gnu-taler/taler-wallet-core': workspace:* '@rollup/plugin-commonjs': ^17.0.0 '@rollup/plugin-json': ^4.1.0 @@ -184,6 +185,7 @@ importers: tslib: ^2.1.0 typescript: ^4.2.3 dependencies: + '@gnu-taler/taler-util': link:../taler-util '@gnu-taler/taler-wallet-core': link:../taler-wallet-core tslib: 2.2.0 devDependencies: |