diff options
author | Florian Dold <florian@dold.me> | 2022-10-13 14:52:18 +0200 |
---|---|---|
committer | Florian Dold <florian@dold.me> | 2022-10-13 14:52:18 +0200 |
commit | b0223d662add93bf1b2199b51d6290ba5dadf1e7 (patch) | |
tree | 6aeea758c3a9c009193c0e3a24da8c5f4e2ec1bb /packages | |
parent | 59dd754bc4e11a08b88f55e00c73d5fbdcee25fc (diff) |
use node16 module resolution for taler-util
Diffstat (limited to 'packages')
-rw-r--r-- | packages/anastasis-core/package.json | 13 | ||||
-rw-r--r-- | packages/anastasis-core/rollup.config.js | 56 | ||||
-rw-r--r-- | packages/idb-bridge/package.json | 8 | ||||
-rw-r--r-- | packages/taler-util/package.json | 23 | ||||
-rw-r--r-- | packages/taler-util/src/ReserveTransaction.ts | 2 | ||||
-rw-r--r-- | packages/taler-util/tsconfig.json | 2 | ||||
-rw-r--r-- | packages/taler-wallet-core/package.json | 2 |
7 files changed, 17 insertions, 89 deletions
diff --git a/packages/anastasis-core/package.json b/packages/anastasis-core/package.json index 64f113bcd..aa9e66cf2 100644 --- a/packages/anastasis-core/package.json +++ b/packages/anastasis-core/package.json @@ -6,8 +6,8 @@ "module": "./lib/index.js", "types": "./lib/index.d.ts", "scripts": { - "prepare": "tsc && rollup -c", - "compile": "tsc && rollup -c", + "prepare": "tsc", + "compile": "tsc", "pretty": "prettier --write src", "test": "tsc && ava", "coverage": "tsc && nyc ava", @@ -17,20 +17,15 @@ "license": "AGPL-3-or-later", "type": "module", "devDependencies": { - "@rollup/plugin-commonjs": "^22.0.2", - "@rollup/plugin-json": "^4.1.0", - "@rollup/plugin-node-resolve": "^13.3.0", "ava": "^4.3.3", "rimraf": "^3.0.2", - "rollup": "^2.79.0", - "rollup-plugin-sourcemaps": "^0.6.3", "source-map-support": "^0.5.21", "typescript": "^4.8.4" }, "dependencies": { "@gnu-taler/taler-util": "workspace:*", "fetch-ponyfill": "^7.1.0", - "fflate": "^0.7.3", + "fflate": "^0.7.4", "hash-wasm": "^4.9.0", "node-fetch": "^3.2.0", "tslib": "^2.4.0" @@ -40,4 +35,4 @@ "lib/**/*test.*" ] } -}
\ No newline at end of file +} diff --git a/packages/anastasis-core/rollup.config.js b/packages/anastasis-core/rollup.config.js deleted file mode 100644 index a9af1d3b5..000000000 --- a/packages/anastasis-core/rollup.config.js +++ /dev/null @@ -1,56 +0,0 @@ -// rollup.config.js -import commonjs from "@rollup/plugin-commonjs"; -import nodeResolve from "@rollup/plugin-node-resolve"; -import json from "@rollup/plugin-json"; -import builtins from "builtin-modules"; -import sourcemaps from "rollup-plugin-sourcemaps"; - -const cli = { - input: "lib/index.node.js", - output: { - file: "dist/anastasis-cli.js", - format: "es", - sourcemap: true, - }, - external: builtins, - plugins: [ - nodeResolve({ - preferBuiltins: true, - }), - - sourcemaps(), - - commonjs({ - sourceMap: true, - transformMixedEsModules: true, - }), - - json(), - ], -}; - -const standalone = { - input: "lib/cli-entry.js", - output: { - file: "dist/anastasis-cli-standalone.js", - format: "es", - sourcemap: true, - }, - external: [...builtins, "source-map-support"], - plugins: [ - nodeResolve({ - preferBuiltins: true, - }), - - sourcemaps(), - - commonjs({ - sourceMap: true, - transformMixedEsModules: true, - }), - - json(), - ], -}; - -export default [standalone, cli]; diff --git a/packages/idb-bridge/package.json b/packages/idb-bridge/package.json index a8872a191..b93ca9f0d 100644 --- a/packages/idb-bridge/package.json +++ b/packages/idb-bridge/package.json @@ -11,8 +11,8 @@ "private": false, "scripts": { "test": "tsc && ava", - "prepare": "tsc && rollup -c", - "compile": "tsc && rollup -c", + "prepare": "tsc", + "compile": "tsc", "clean": "rimraf dist lib tsconfig.tsbuildinfo", "pretty": "prettier --write src" }, @@ -22,15 +22,11 @@ } }, "devDependencies": { - "@rollup/plugin-commonjs": "^22.0.2", - "@rollup/plugin-json": "^4.1.0", - "@rollup/plugin-node-resolve": "^13.3.0", "@types/node": "^18.8.5", "ava": "^4.3.3", "esm": "^3.2.25", "prettier": "^2.5.1", "rimraf": "^3.0.2", - "rollup": "^2.79.0", "typescript": "^4.8.4" }, "dependencies": { diff --git a/packages/taler-util/package.json b/packages/taler-util/package.json index 718447d7f..5f7befc3e 100644 --- a/packages/taler-util/package.json +++ b/packages/taler-util/package.json @@ -2,25 +2,18 @@ "name": "@gnu-taler/taler-util", "version": "0.9.0-dev.1", "description": "Generic helper functionality for GNU Taler", - "module": "./lib/index.node.js", - "main": "./lib/index.node.js", - "browser": { - "./lib/index.node.js": "./lib/index.browser.js" - }, "type": "module", "types": "./lib/index.node.d.ts", - "typesVersions": { - "*": { - "lib/index.node.d.ts": [ - "lib/index.node.d.ts" - ], - "src/*": [], - "*": [] - } - }, "author": "Florian Dold", "license": "AGPL-3.0-or-later", "private": false, + "exports": { + ".": { + "node": "./lib/index.node.js", + "browser": "./lib/index.browser.js", + "default": "./lib/index.js" + } + }, "scripts": { "prepare": "tsc", "compile": "tsc", @@ -38,7 +31,7 @@ }, "dependencies": { "big-integer": "^1.6.51", - "fflate": "^0.7.3", + "fflate": "^0.7.4", "jed": "^1.1.1", "tslib": "^2.4.0" }, diff --git a/packages/taler-util/src/ReserveTransaction.ts b/packages/taler-util/src/ReserveTransaction.ts index 50610483f..8f3e16da2 100644 --- a/packages/taler-util/src/ReserveTransaction.ts +++ b/packages/taler-util/src/ReserveTransaction.ts @@ -37,7 +37,7 @@ import { EddsaSignatureString, EddsaPublicKeyString, CoinPublicKeyString, -} from "./talerTypes"; +} from "./talerTypes.js"; import { AbsoluteTime, codecForTimestamp, diff --git a/packages/taler-util/tsconfig.json b/packages/taler-util/tsconfig.json index 30cb65e1d..cbf393f5a 100644 --- a/packages/taler-util/tsconfig.json +++ b/packages/taler-util/tsconfig.json @@ -6,7 +6,7 @@ "declarationMap": false, "target": "ES6", "module": "ESNext", - "moduleResolution": "node", + "moduleResolution": "Node16", "sourceMap": true, "lib": ["es6"], "types": ["node"], diff --git a/packages/taler-wallet-core/package.json b/packages/taler-wallet-core/package.json index e79171d79..9b007a93d 100644 --- a/packages/taler-wallet-core/package.json +++ b/packages/taler-wallet-core/package.json @@ -66,7 +66,7 @@ "@types/node": "^18.8.5", "axios": "^0.27.2", "big-integer": "^1.6.51", - "fflate": "^0.7.3", + "fflate": "^0.7.4", "source-map-support": "^0.5.21", "tslib": "^2.4.0" }, |