aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2020-08-03 13:44:07 +0530
committerFlorian Dold <florian.dold@gmail.com>2020-08-03 13:44:07 +0530
commita8f03d3dd1ad04abf7f569cb44933b6dce6713e7 (patch)
treed651e2f8af71ad083c295d7c4be4087c29c875b0
parentef2af70a7cac398e3a58118b625ad412e983a887 (diff)
dependencies / build tasks
-rw-r--r--packages/taler-wallet-android/package.json5
-rw-r--r--packages/taler-wallet-android/tsconfig.json12
-rw-r--r--packages/taler-wallet-cli/package.json1
-rw-r--r--packages/taler-wallet-cli/tsconfig.json2
-rw-r--r--packages/taler-wallet-core/tsconfig.json3
-rw-r--r--pnpm-lock.yaml27
6 files changed, 19 insertions, 31 deletions
diff --git a/packages/taler-wallet-android/package.json b/packages/taler-wallet-android/package.json
index a24dbdbeb..61889cfc9 100644
--- a/packages/taler-wallet-android/package.json
+++ b/packages/taler-wallet-android/package.json
@@ -13,7 +13,7 @@
"author": "Florian Dold",
"license": "GPL-3.0",
"scripts": {
- "compile": "rollup -c && tsc",
+ "compile": "tsc && rollup -c",
"pretty": "prettier --config ../../.prettierrc --write src",
"test": "tsc && ava",
"coverage": "tsc && nyc ava",
@@ -28,11 +28,12 @@
"src/"
],
"devDependencies": {
- "rimraf": "^3.0.2",
"@rollup/plugin-commonjs": "^14.0.0",
"@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-node-resolve": "^8.4.0",
"@rollup/plugin-replace": "^2.3.3",
+ "@types/node": "^14.0.27",
+ "rimraf": "^3.0.2",
"rollup": "^2.23.0",
"rollup-plugin-sourcemaps": "^0.6.2",
"rollup-plugin-terser": "^6.1.0"
diff --git a/packages/taler-wallet-android/tsconfig.json b/packages/taler-wallet-android/tsconfig.json
index abb21b4db..37fda3c38 100644
--- a/packages/taler-wallet-android/tsconfig.json
+++ b/packages/taler-wallet-android/tsconfig.json
@@ -5,15 +5,10 @@
"declaration": true,
"declarationMap": true,
"target": "ES6",
- "jsx": "react",
- "reactNamespace": "React",
- "module": "commonjs",
+ "module": "ESNext",
"moduleResolution": "node",
"sourceMap": true,
- "lib": [
- "es6",
- "dom"
- ],
+ "lib": ["es6",],
"noImplicitReturns": true,
"noFallthroughCasesInSwitch": true,
"strict": true,
@@ -26,7 +21,8 @@
"incremental": true,
"esModuleInterop": true,
"importHelpers": true,
- "rootDir": "./src"
+ "rootDir": "./src",
+ "typeRoots": ["./node_modules/@types"]
},
"include": ["src/**/*"]
}
diff --git a/packages/taler-wallet-cli/package.json b/packages/taler-wallet-cli/package.json
index 1d4460021..aba51e414 100644
--- a/packages/taler-wallet-cli/package.json
+++ b/packages/taler-wallet-cli/package.json
@@ -33,6 +33,7 @@
"@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-node-resolve": "^8.4.0",
"@rollup/plugin-replace": "^2.3.3",
+ "@types/node": "^14.0.27",
"rimraf": "^3.0.2",
"rollup": "^2.23.0",
"rollup-plugin-sourcemaps": "^0.6.2",
diff --git a/packages/taler-wallet-cli/tsconfig.json b/packages/taler-wallet-cli/tsconfig.json
index 34767d1e0..5985a516d 100644
--- a/packages/taler-wallet-cli/tsconfig.json
+++ b/packages/taler-wallet-cli/tsconfig.json
@@ -19,7 +19,7 @@
"importHelpers": true,
"rootDir": "src",
"baseUrl": "./src",
- "types": ["node"]
+ "typeRoots": ["./node_modules/@types"]
},
"include": ["src/**/*"],
"references": [
diff --git a/packages/taler-wallet-core/tsconfig.json b/packages/taler-wallet-core/tsconfig.json
index 4e8b71d50..07e8ab0bf 100644
--- a/packages/taler-wallet-core/tsconfig.json
+++ b/packages/taler-wallet-core/tsconfig.json
@@ -20,7 +20,8 @@
"incremental": true,
"esModuleInterop": true,
"importHelpers": true,
- "rootDir": "./src"
+ "rootDir": "./src",
+ "typeRoots": ["./node_modules/@types"]
},
"references": [
{
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a3a05aae6..971d9d552 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,9 +1,6 @@
importers:
.:
- dependencies:
- prettier: 2.0.5
- specifiers:
- prettier: ^2.0.5
+ specifiers: {}
packages/idb-bridge:
dependencies:
'@types/node': 14.0.27
@@ -41,15 +38,17 @@ importers:
'@rollup/plugin-json': 4.1.0_rollup@2.23.0
'@rollup/plugin-node-resolve': 8.4.0_rollup@2.23.0
'@rollup/plugin-replace': 2.3.3_rollup@2.23.0
+ '@types/node': 14.0.27
rimraf: 3.0.2
rollup: 2.23.0
- rollup-plugin-sourcemaps: 0.6.2_rollup@2.23.0
+ rollup-plugin-sourcemaps: 0.6.2_1bb4f16ce5b550396581a296af208cfa
rollup-plugin-terser: 6.1.0_rollup@2.23.0
specifiers:
'@rollup/plugin-commonjs': ^14.0.0
'@rollup/plugin-json': ^4.1.0
'@rollup/plugin-node-resolve': ^8.4.0
'@rollup/plugin-replace': ^2.3.3
+ '@types/node': ^14.0.27
rimraf: ^3.0.2
rollup: ^2.23.0
rollup-plugin-sourcemaps: ^0.6.2
@@ -66,9 +65,10 @@ importers:
'@rollup/plugin-json': 4.1.0_rollup@2.23.0
'@rollup/plugin-node-resolve': 8.4.0_rollup@2.23.0
'@rollup/plugin-replace': 2.3.3_rollup@2.23.0
+ '@types/node': 14.0.27
rimraf: 3.0.2
rollup: 2.23.0
- rollup-plugin-sourcemaps: 0.6.2_rollup@2.23.0
+ rollup-plugin-sourcemaps: 0.6.2_1bb4f16ce5b550396581a296af208cfa
rollup-plugin-terser: 6.1.0_rollup@2.23.0
typedoc: 0.17.8_typescript@3.9.7
typescript: 3.9.7
@@ -77,6 +77,7 @@ importers:
'@rollup/plugin-json': ^4.1.0
'@rollup/plugin-node-resolve': ^8.4.0
'@rollup/plugin-replace': ^2.3.3
+ '@types/node': ^14.0.27
rimraf: ^3.0.2
rollup: ^2.23.0
rollup-plugin-sourcemaps: ^0.6.2
@@ -3658,6 +3659,7 @@ packages:
resolution:
integrity: sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
/prettier/2.0.5:
+ dev: true
engines:
node: '>=10.13.0'
hasBin: true
@@ -3990,19 +3992,6 @@ packages:
rollup: '>=0.31.2'
resolution:
integrity: sha512-9AwTKg3yRykwzemfLt71ySe0LvrAci+bpsOL1LaTYFk5BX4HF6X7DQfpHa74ANfSja3hyjiQkXCR8goSOnW//Q==
- /rollup-plugin-sourcemaps/0.6.2_rollup@2.23.0:
- dependencies:
- '@rollup/pluginutils': 3.1.0_rollup@2.23.0
- rollup: 2.23.0
- source-map-resolve: 0.6.0
- dev: true
- engines:
- node: '>=10.0.0'
- peerDependencies:
- '@types/node': '>=10.0.0'
- rollup: '>=0.31.2'
- resolution:
- integrity: sha512-9AwTKg3yRykwzemfLt71ySe0LvrAci+bpsOL1LaTYFk5BX4HF6X7DQfpHa74ANfSja3hyjiQkXCR8goSOnW//Q==
/rollup-plugin-terser/6.1.0_rollup@2.23.0:
dependencies:
'@babel/code-frame': 7.10.4