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" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 035ceaa36..23ec58a94 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -19,35 +19,25 @@ importers: packages/anastasis-core: specifiers: '@gnu-taler/taler-util': workspace:* - '@rollup/plugin-commonjs': ^22.0.2 - '@rollup/plugin-json': ^4.1.0 - '@rollup/plugin-node-resolve': ^13.3.0 ava: ^4.3.3 fetch-ponyfill: ^7.1.0 - fflate: ^0.7.3 + fflate: ^0.7.4 hash-wasm: ^4.9.0 node-fetch: ^3.2.0 rimraf: ^3.0.2 - rollup: ^2.79.0 - rollup-plugin-sourcemaps: ^0.6.3 source-map-support: ^0.5.21 tslib: ^2.4.0 typescript: ^4.8.4 dependencies: '@gnu-taler/taler-util': link:../taler-util 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 devDependencies: - '@rollup/plugin-commonjs': 22.0.2_rollup@2.79.0 - '@rollup/plugin-json': 4.1.0_rollup@2.79.0 - '@rollup/plugin-node-resolve': 13.3.0_rollup@2.79.0 ava: 4.3.3 rimraf: 3.0.2 - rollup: 2.79.0 - rollup-plugin-sourcemaps: 0.6.3_rollup@2.79.0 source-map-support: 0.5.21 typescript: 4.8.4 @@ -169,7 +159,7 @@ importers: ava: ^4.3.3 big-integer: ^1.6.51 esbuild: ^0.14.21 - fflate: ^0.7.3 + fflate: ^0.7.4 jed: ^1.1.1 prettier: ^2.5.1 rimraf: ^3.0.2 @@ -177,7 +167,7 @@ importers: typescript: ^4.8.4 dependencies: big-integer: 1.6.51 - fflate: 0.7.3 + fflate: 0.7.4 jed: 1.1.1 tslib: 2.4.0 devDependencies: @@ -246,7 +236,7 @@ importers: eslint-plugin-jsx-a11y: ^6.5.1 eslint-plugin-react: ^7.28.0 eslint-plugin-react-hooks: ^4.3.0 - fflate: ^0.7.3 + fflate: ^0.7.4 jed: ^1.1.1 po2json: ^0.4.5 prettier: ^2.5.1 @@ -264,7 +254,7 @@ importers: '@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 devDependencies: @@ -689,7 +679,7 @@ packages: '@babel/traverse': 7.17.0 debug: 4.3.3 lodash.debounce: 4.0.8 - resolve: 1.22.0 + resolve: 1.22.1 semver: 6.3.0 transitivePeerDependencies: - supports-color @@ -7472,8 +7462,8 @@ packages: - encoding dev: false - /fflate/0.7.3: - resolution: {integrity: sha512-0Zz1jOzJWERhyhsimS54VTqOteCNwRtIlh8isdL0AXLo0g7xNTfTL7oWrkmCnPhZGocKIkWHBistBrrpoNH3aw==} + /fflate/0.7.4: + resolution: {integrity: sha512-5u2V/CDW15QM1XbbgS+0DfPxVB+jUKhWEKuuFuHncbk3tEEqzmoXL+2KyOFuKGqOnmdIy0/davWF1CkuwtibCw==} dev: false /figgy-pudding/3.5.2: @@ -7804,7 +7794,7 @@ packages: /fs-write-stream-atomic/1.0.10: resolution: {integrity: sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=} dependencies: - graceful-fs: 4.2.9 + graceful-fs: 4.2.10 iferr: 0.1.5 imurmurhash: 0.1.4 readable-stream: 2.3.7 @@ -9151,7 +9141,7 @@ packages: /jsonfile/4.0.0: resolution: {integrity: sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=} optionalDependencies: - graceful-fs: 4.2.9 + graceful-fs: 4.2.10 dev: true /jsonfile/6.1.0: @@ -9159,7 +9149,7 @@ packages: dependencies: universalify: 2.0.0 optionalDependencies: - graceful-fs: 4.2.9 + graceful-fs: 4.2.10 dev: true /jsonpointer/5.0.0: @@ -11793,7 +11783,7 @@ packages: resolution: {integrity: sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==} engines: {node: '>=0.10'} dependencies: - graceful-fs: 4.2.9 + graceful-fs: 4.2.10 micromatch: 3.1.10 readable-stream: 2.3.7 transitivePeerDependencies: @@ -12134,21 +12124,6 @@ packages: source-map-resolve: 0.6.0 dev: true - /rollup-plugin-sourcemaps/0.6.3_rollup@2.79.0: - resolution: {integrity: sha512-paFu+nT1xvuO1tPFYXGe+XnQvg4Hjqv/eIhG8i5EspfYYPBKL57X7iVbfv55aNVASg3dzWvES9dmWsL2KhfByw==} - engines: {node: '>=10.0.0'} - peerDependencies: - '@types/node': '>=10.0.0' - rollup: '>=0.31.2' - peerDependenciesMeta: - '@types/node': - optional: true - dependencies: - '@rollup/pluginutils': 3.1.0_rollup@2.79.0 - rollup: 2.79.0 - source-map-resolve: 0.6.0 - dev: true - /rollup-plugin-terser/7.0.2_rollup@2.79.0: resolution: {integrity: sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==} peerDependencies: