[taler-wallet-core] branch master updated (b56fedc0 -> a8f03d3d)

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a change to branch master
in repository wallet-core.

    from b56fedc0 cleanup
     new 2fddbddd configure check
     new ef2af70a makefile
     new a8f03d3d dependencies / build tasks

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 build-system/Makefile                       |  2 +-
 build-system/configure.py                   |  3 ++-
 build-system/taler-build-scripts            |  2 +-
 packages/taler-wallet-android/package.json  |  5 +++--
 packages/taler-wallet-android/tsconfig.json | 12 ++++--------
 packages/taler-wallet-cli/package.json      |  1 +
 packages/taler-wallet-cli/tsconfig.json     |  2 +-
 packages/taler-wallet-core/tsconfig.json    |  3 ++-
 pnpm-lock.yaml                              | 27 ++++++++-------------------
 9 files changed, 23 insertions(+), 34 deletions(-)

diff --git a/build-system/Makefile b/build-system/Makefile
index 342f7c14..1ece8afd 100644
--- a/build-system/Makefile
+++ b/build-system/Makefile
@@ -70,7 +70,7 @@ install: warn-noprefix
 else
 install_target = $(prefix)/lib/taler-wallet-cli
 .PHONY: install
-install: # compile
+install: compile
        install -d $(install_target)/node_modules/taler-wallet-cli
        install -d $(install_target)/node_modules/taler-wallet-cli/bin
        install -d $(install_target)/node_modules/taler-wallet-cli/dist
diff --git a/build-system/configure.py b/build-system/configure.py
index 32b32602..3dcfbfe3 100644
--- a/build-system/configure.py
+++ b/build-system/configure.py
@@ -17,7 +17,8 @@ b.enable_prefix()
 b.enable_configmk()
 b.add_tool(tbc.PosixTool("find"))
 b.add_tool(tbc.NodeJsTool(version_spec=">=12"))
-b.add_tool(tbc.YarnTool())
+b.add_tool(tbc.GenericTool("npm"))
+b.add_tool(tbc.GenericTool("pnpm", hint="Use 'sudo npm -g pnpm' to install."))
 b.run()
 
 print("copying Makefile")
diff --git a/build-system/taler-build-scripts b/build-system/taler-build-scripts
index f65d9338..c76fb9b3 160000
--- a/build-system/taler-build-scripts
+++ b/build-system/taler-build-scripts
@@ -1 +1 @@
-Subproject commit f65d933845faa73a864cce17a8ccd575d8da9f10
+Subproject commit c76fb9b3af6ec43f2d2a83e6b4f523dcc5ac6a54
diff --git a/packages/taler-wallet-android/package.json 
b/packages/taler-wallet-android/package.json
index a24dbdbe..61889cfc 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 abb21b4d..37fda3c3 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 1d446002..aba51e41 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 34767d1e..5985a516 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 4e8b71d5..07e8ab0b 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 a3a05aae..971d9d55 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

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.