taler/wallet-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

0006728: set up wallet CI pipeline for WebExtension build

Browse Source 
This commit split in three main things:
 * added deploy-webext to upload the extension zipfile
 * put scope into the npm packages to be able to deploy them
 * added deploy-npm to deploy related npm packages

Also, fixing bug on `make clean`. Some packages where not
being deleting tsconfig.tsbuildinfo and making subsequent
`make` fail
This commit is contained in:
Sebastian 2021-01-30 12:35:55 -03:00
parent 69aaaefce3
commit 4845ebddf6
No known key found for this signature in database
GPG Key ID: BE4FF68352439FC1
57 changed files with 117 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
.gitlab-ci.yml
View File

@ -1,13 +1,37 @@
image: "registry.gitlab.com/gnu-taler/docker-taler-ci:latest" image: "registry.gitlab.com/sebasjm/docker-taler-ci:latest"
before_script: # before_script:
- pg_ctlcluster 12 main start # - pg_ctlcluster 12 main start
test: stages:
- test
- deploy
# test:
# stage: test
# script:
# - ./bootstrap
# - ./configure
# - make install
deploy-webext:
stage: deploy
script: script:
- ./bootstrap - ./bootstrap
- ./configure - ./configure
- make install integrationtests - make webextension
- 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN"
--upload-file packages/taler-wallet-webextension/extension/taler-wallet-$(jq -r .version packages/taler-wallet-webextension/manifest.json).zip
"${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/taler-wallet/$(jq -r .version packages/taler-wallet-webextension/manifest.json | cut -d . -f 1,2,3)/taler-wallet-$(jq -r .version packages/taler-wallet-webextension/manifest.json).zip"'
after_script: deploy-npm:
- pg_ctlcluster 12 main stop stage: deploy
script:
- npm config set @gnu-taler:registry https://gitlab.com/api/v4/projects/${CI_PROJECT_ID}/packages/npm/
- npm config set '//gitlab.com/api/v4/projects/${CI_PROJECT_ID}/packages/npm/:_authToken' ${CI_JOB_TOKEN}
- ./bootstrap
- ./configure
- make publish
# after_script:
# - pg_ctlcluster 12 main stop

6
build-system/Makefile
View File

@ -4,7 +4,7 @@ src = src
poname = taler-wallet-webex poname = taler-wallet-webex
tsc = node_modules/typescript/bin/tsc tsc = node_modules/typescript/bin/tsc
pogen = node_modules/pogen/bin/pogen.js pogen = node_modules/@gnu-taler/pogen/bin/pogen.js
typedoc = node_modules/typedoc/bin/typedoc typedoc = node_modules/typedoc/bin/typedoc
ava = node_modules/.bin/ava ava = node_modules/.bin/ava
nyc = node_modules/nyc/bin/nyc.js nyc = node_modules/nyc/bin/nyc.js
@ -21,6 +21,10 @@ compile:
dist: dist:
$(git-archive-all) --include ./configure taler-wallet-$(shell git describe --tags).tar.gz $(git-archive-all) --include ./configure taler-wallet-$(shell git describe --tags).tar.gz
.PHONY: publish
publish: compile
pnpm publish -r --no-git-checks
# make documentation from docstrings # make documentation from docstrings
.PHONY: typedoc .PHONY: typedoc
typedoc: typedoc:

2
build-system/taler-build-scripts

@ -1 +1 @@
Subproject commit 47f14fcf1d03d9dad1bae59987488ea05ecd307b Subproject commit c76fb9b3af6ec43f2d2a83e6b4f523dcc5ac6a54

4
packages/idb-bridge/package.json
View File

@ -1,5 +1,5 @@
{ {
"name": "idb-bridge", "name": "@gnu-taler/idb-bridge",
"version": "0.0.16", "version": "0.0.16",
"description": "IndexedDB implementation that uses SQLite3 as storage", "description": "IndexedDB implementation that uses SQLite3 as storage",
"main": "./dist/idb-bridge.js", "main": "./dist/idb-bridge.js",
@ -33,4 +33,4 @@
"esm" "esm"
] ]
} }
} }

2
packages/pogen/package.json
View File

@ -1,5 +1,5 @@
{ {
"name": "pogen", "name": "@gnu-taler/pogen",
"version": "0.0.5", "version": "0.0.5",
"main": "bin/pogen.js", "main": "bin/pogen.js",
"author": "Florian Dold", "author": "Florian Dold",

8
packages/taler-wallet-android/package.json
View File

@ -1,5 +1,5 @@
{ {
"name": "taler-wallet-android", "name": "@gnu-taler/taler-wallet-android",
"version": "0.8.0", "version": "0.8.0",
"description": "", "description": "",
"engines": { "engines": {
@ -16,7 +16,7 @@
"compile": "tsc && rollup -c", "compile": "tsc && rollup -c",
"pretty": "prettier --write src", "pretty": "prettier --write src",
"coverage": "tsc && nyc ava", "coverage": "tsc && nyc ava",
"clean": "rimraf lib dist" "clean": "rimraf lib dist tsconfig.tsbuildinfo"
}, },
"files": [ "files": [
"AUTHORS", "AUTHORS",
@ -40,7 +40,7 @@
"typescript": "^4.1.3" "typescript": "^4.1.3"
}, },
"dependencies": { "dependencies": {
"taler-wallet-core": "workspace:*", "@gnu-taler/taler-wallet-core": "workspace:*",
"tslib": "^2.1.0" "tslib": "^2.1.0"
} }
} }

2
packages/taler-wallet-android/src/index.ts
View File

@ -40,7 +40,7 @@ import {
WALLET_MERCHANT_PROTOCOL_VERSION, WALLET_MERCHANT_PROTOCOL_VERSION,
bytesToString, bytesToString,
stringToBytes, stringToBytes,
} from "taler-wallet-core"; } from "@gnu-taler/taler-wallet-core";
import fs from "fs"; import fs from "fs";

6
packages/taler-wallet-cli/package.json
View File

@ -1,5 +1,5 @@
{ {
"name": "taler-wallet-cli", "name": "@gnu-taler/taler-wallet-cli",
"version": "0.8.1", "version": "0.8.1",
"description": "", "description": "",
"engines": { "engines": {
@ -18,7 +18,7 @@
"scripts": { "scripts": {
"prepare": "tsc && rollup -c", "prepare": "tsc && rollup -c",
"compile": "tsc && rollup -c", "compile": "tsc && rollup -c",
"clean": "rimraf lib dist", "clean": "rimraf lib dist tsconfig.tsbuildinfo",
"pretty": "prettier --write src" "pretty": "prettier --write src"
}, },
"files": [ "files": [
@ -48,7 +48,7 @@
"axios": "^0.21.1", "axios": "^0.21.1",
"minimatch": "^3.0.4", "minimatch": "^3.0.4",
"source-map-support": "^0.5.19", "source-map-support": "^0.5.19",
"taler-wallet-core": "workspace:*", "@gnu-taler/taler-wallet-core": "workspace:*",
"tslib": "^2.1.0" "tslib": "^2.1.0"
} }
} }

4
packages/taler-wallet-cli/src/index.ts
View File

@ -38,14 +38,14 @@ import {
rsaBlind, rsaBlind,
RecoveryMergeStrategy, RecoveryMergeStrategy,
stringToBytes, stringToBytes,
} from "taler-wallet-core"; } from "@gnu-taler/taler-wallet-core";
import * as clk from "./clk"; import * as clk from "./clk";
import { deepStrictEqual } from "assert"; import { deepStrictEqual } from "assert";
import { getTestInfo, runTests } from "./integrationtests/testrunner"; import { getTestInfo, runTests } from "./integrationtests/testrunner";
// This module also serves as the entry point for the crypto // This module also serves as the entry point for the crypto
// thread worker, and thus must expose these two handlers. // thread worker, and thus must expose these two handlers.
export { handleWorkerError, handleWorkerMessage } from "taler-wallet-core"; export { handleWorkerError, handleWorkerMessage } from "@gnu-taler/taler-wallet-core";
const logger = new Logger("taler-wallet-cli.ts"); const logger = new Logger("taler-wallet-cli.ts");

6
packages/taler-wallet-cli/src/integrationtests/harness.ts
View File

@ -82,7 +82,7 @@ import {
CreateDepositGroupResponse, CreateDepositGroupResponse,
TrackDepositGroupRequest, TrackDepositGroupRequest,
TrackDepositGroupResponse, TrackDepositGroupResponse,
} from "taler-wallet-core"; } from "@gnu-taler/taler-wallet-core";
import { URL } from "url"; import { URL } from "url";
import axios, { AxiosError } from "axios"; import axios, { AxiosError } from "axios";
import { import {
@ -95,8 +95,8 @@ import {
TipCreateConfirmation, TipCreateConfirmation,
TipCreateRequest, TipCreateRequest,
} from "./merchantApiTypes"; } from "./merchantApiTypes";
import { ApplyRefundResponse } from "taler-wallet-core"; import { ApplyRefundResponse } from "@gnu-taler/taler-wallet-core";
import { PendingOperationsResponse } from "taler-wallet-core"; import { PendingOperationsResponse } from "@gnu-taler/taler-wallet-core";
import { CoinConfig } from "./denomStructures"; import { CoinConfig } from "./denomStructures";
const exec = util.promisify(require("child_process").exec); const exec = util.promisify(require("child_process").exec);

2
packages/taler-wallet-cli/src/integrationtests/helpers.ts
View File

@ -44,7 +44,7 @@ import {
PreparePayResultType, PreparePayResultType,
ConfirmPayResultType, ConfirmPayResultType,
ContractTerms, ContractTerms,
} from "taler-wallet-core"; } from "@gnu-taler/taler-wallet-core";
import { import {
FaultInjectedExchangeService, FaultInjectedExchangeService,
FaultInjectedMerchantService, FaultInjectedMerchantService,

2
packages/taler-wallet-cli/src/integrationtests/libeufin.ts
View File

@ -18,7 +18,7 @@
* Imports. * Imports.
*/ */
import axios from "axios"; import axios from "axios";
import { URL } from "taler-wallet-core"; import { URL } from "@gnu-taler/taler-wallet-core";
import { import {
GlobalTestState, GlobalTestState,
pingProc, pingProc,

4
packages/taler-wallet-cli/src/integrationtests/merchantApiTypes.ts
View File

@ -40,8 +40,8 @@ import {
AmountString, AmountString,
Timestamp, Timestamp,
CoinPublicKeyString, CoinPublicKeyString,
} from "taler-wallet-core"; } from "@gnu-taler/taler-wallet-core";
import { codecForAmountString } from "taler-wallet-core/lib/util/amounts"; import { codecForAmountString } from "@gnu-taler/taler-wallet-core/lib/util/amounts";
export interface PostOrderRequest { export interface PostOrderRequest {
// The order must at least contain the minimal // The order must at least contain the minimal

2
packages/taler-wallet-cli/src/integrationtests/test-bank-api.ts
View File

@ -28,7 +28,7 @@ import {
BankAccessApi, BankAccessApi,
CreditDebitIndicator, CreditDebitIndicator,
} from "./harness"; } from "./harness";
import { createEddsaKeyPair, encodeCrock } from "taler-wallet-core"; import { createEddsaKeyPair, encodeCrock } from "@gnu-taler/taler-wallet-core";
import { defaultCoinConfig } from "./denomStructures"; import { defaultCoinConfig } from "./denomStructures";
/** /**

2
packages/taler-wallet-cli/src/integrationtests/test-exchange-management.ts
View File

@ -32,7 +32,7 @@ import {
ExchangesListRespose, ExchangesListRespose,
URL, URL,
TalerErrorCode, TalerErrorCode,
} from "taler-wallet-core"; } from "@gnu-taler/taler-wallet-core";
import { import {
FaultInjectedExchangeService, FaultInjectedExchangeService,
FaultInjectionResponseContext, FaultInjectionResponseContext,

2
packages/taler-wallet-cli/src/integrationtests/test-libeufin-basic.ts
View File

@ -17,7 +17,7 @@
/** /**
* Imports. * Imports.
*/ */
import { CoreApiResponse } from "taler-wallet-core"; import { CoreApiResponse } from "@gnu-taler/taler-wallet-core";
import { CoinConfig, defaultCoinConfig } from "./denomStructures"; import { CoinConfig, defaultCoinConfig } from "./denomStructures";
import { import {
DbInfo, DbInfo,

2
packages/taler-wallet-cli/src/integrationtests/test-merchant-exchange-confusion.ts
View File

@ -36,7 +36,7 @@ import {
codecForMerchantOrderStatusUnpaid, codecForMerchantOrderStatusUnpaid,
ConfirmPayResultType, ConfirmPayResultType,
URL, URL,
} from "taler-wallet-core"; } from "@gnu-taler/taler-wallet-core";
import axios from "axios"; import axios from "axios";
import { import {
FaultInjectedExchangeService, FaultInjectedExchangeService,

2
packages/taler-wallet-cli/src/integrationtests/test-merchant-longpolling.ts
View File

@ -24,7 +24,7 @@ import {
codecForMerchantOrderStatusUnpaid, codecForMerchantOrderStatusUnpaid,
ConfirmPayResultType, ConfirmPayResultType,
URL, URL,
} from "taler-wallet-core"; } from "@gnu-taler/taler-wallet-core";
import axios from "axios"; import axios from "axios";
/** /**

2
packages/taler-wallet-cli/src/integrationtests/test-merchant-refund-api.ts
View File

@ -30,7 +30,7 @@ import {
withdrawViaBank, withdrawViaBank,
SimpleTestEnvironment, SimpleTestEnvironment,
} from "./helpers"; } from "./helpers";
import { durationFromSpec, PreparePayResultType, URL } from "taler-wallet-core"; import { durationFromSpec, PreparePayResultType, URL } from "@gnu-taler/taler-wallet-core";
import axios from "axios"; import axios from "axios";
async function testRefundApiWithFulfillmentUrl( async function testRefundApiWithFulfillmentUrl(

2
packages/taler-wallet-cli/src/integrationtests/test-pay-abort.ts
View File

@ -22,7 +22,7 @@
/** /**
* Imports. * Imports.
*/ */
import { PreparePayResultType, TalerErrorCode, URL } from "taler-wallet-core"; import { PreparePayResultType, TalerErrorCode, URL } from "@gnu-taler/taler-wallet-core";
import { FaultInjectionRequestContext, FaultInjectionResponseContext } from "./faultInjection"; import { FaultInjectionRequestContext, FaultInjectionResponseContext } from "./faultInjection";
import { GlobalTestState, MerchantPrivateApi, setupDb } from "./harness"; import { GlobalTestState, MerchantPrivateApi, setupDb } from "./harness";
import { import {

2
packages/taler-wallet-cli/src/integrationtests/test-pay-paid.ts
View File

@ -27,7 +27,7 @@ import {
codecForMerchantOrderStatusUnpaid, codecForMerchantOrderStatusUnpaid,
ConfirmPayResultType, ConfirmPayResultType,
URL, URL,
} from "taler-wallet-core"; } from "@gnu-taler/taler-wallet-core";
import axios from "axios"; import axios from "axios";
import { FaultInjectionRequestContext } from "./faultInjection"; import { FaultInjectionRequestContext } from "./faultInjection";

2
packages/taler-wallet-cli/src/integrationtests/test-payment-claim.ts
View File

@ -19,7 +19,7 @@
*/ */
import { GlobalTestState, MerchantPrivateApi, WalletCli } from "./harness"; import { GlobalTestState, MerchantPrivateApi, WalletCli } from "./harness";
import { createSimpleTestkudosEnvironment, withdrawViaBank } from "./helpers"; import { createSimpleTestkudosEnvironment, withdrawViaBank } from "./helpers";
import { PreparePayResultType, TalerErrorCode } from "taler-wallet-core"; import { PreparePayResultType, TalerErrorCode } from "@gnu-taler/taler-wallet-core";
/** /**
* Run test for basic, bank-integrated withdrawal. * Run test for basic, bank-integrated withdrawal.

2
packages/taler-wallet-cli/src/integrationtests/test-payment-fault.ts
View File

@ -37,7 +37,7 @@ import {
FaultInjectionRequestContext, FaultInjectionRequestContext,
FaultInjectionResponseContext, FaultInjectionResponseContext,
} from "./faultInjection"; } from "./faultInjection";
import { CoreApiResponse } from "taler-wallet-core"; import { CoreApiResponse } from "@gnu-taler/taler-wallet-core";
import { defaultCoinConfig } from "./denomStructures"; import { defaultCoinConfig } from "./denomStructures";
/** /**

2
packages/taler-wallet-cli/src/integrationtests/test-payment-idempotency.ts
View File

@ -19,7 +19,7 @@
*/ */
import { GlobalTestState, MerchantPrivateApi } from "./harness"; import { GlobalTestState, MerchantPrivateApi } from "./harness";
import { createSimpleTestkudosEnvironment, withdrawViaBank } from "./helpers"; import { createSimpleTestkudosEnvironment, withdrawViaBank } from "./helpers";
import { PreparePayResultType } from "taler-wallet-core"; import { PreparePayResultType } from "@gnu-taler/taler-wallet-core";
/** /**
* Test the wallet-core payment API, especially that repeated operations * Test the wallet-core payment API, especially that repeated operations

2
packages/taler-wallet-cli/src/integrationtests/test-payment-transient.ts
View File

@ -30,7 +30,7 @@ import {
codecForExchangeKeysJson, codecForExchangeKeysJson,
TalerErrorDetails, TalerErrorDetails,
TalerErrorCode, TalerErrorCode,
} from "taler-wallet-core"; } from "@gnu-taler/taler-wallet-core";
import axios from "axios"; import axios from "axios";
import { import {
FaultInjectionRequestContext, FaultInjectionRequestContext,

2
packages/taler-wallet-cli/src/integrationtests/test-paywall-flow.ts
View File

@ -23,7 +23,7 @@ import {
PreparePayResultType, PreparePayResultType,
codecForMerchantOrderStatusUnpaid, codecForMerchantOrderStatusUnpaid,
ConfirmPayResultType, ConfirmPayResultType,
} from "taler-wallet-core"; } from "@gnu-taler/taler-wallet-core";
import axios from "axios"; import axios from "axios";
/** /**

2
packages/taler-wallet-cli/src/integrationtests/test-refund-auto.ts
View File

@ -19,7 +19,7 @@
*/ */
import { GlobalTestState, MerchantPrivateApi } from "./harness"; import { GlobalTestState, MerchantPrivateApi } from "./harness";
import { createSimpleTestkudosEnvironment, withdrawViaBank } from "./helpers"; import { createSimpleTestkudosEnvironment, withdrawViaBank } from "./helpers";
import { durationFromSpec } from "taler-wallet-core"; import { durationFromSpec } from "@gnu-taler/taler-wallet-core";
/** /**
* Run test for basic, bank-integrated withdrawal. * Run test for basic, bank-integrated withdrawal.

2
packages/taler-wallet-cli/src/integrationtests/test-refund-gone.ts
View File

@ -28,7 +28,7 @@ import {
timestampAddDuration, timestampAddDuration,
getTimestampNow, getTimestampNow,
timestampTruncateToSecond, timestampTruncateToSecond,
} from "taler-wallet-core"; } from "@gnu-taler/taler-wallet-core";
/** /**
* Run test for basic, bank-integrated withdrawal. * Run test for basic, bank-integrated withdrawal.

2
packages/taler-wallet-cli/src/integrationtests/test-refund-incremental.ts
View File

@ -19,7 +19,7 @@
*/ */
import { GlobalTestState, delayMs, MerchantPrivateApi } from "./harness"; import { GlobalTestState, delayMs, MerchantPrivateApi } from "./harness";
import { createSimpleTestkudosEnvironment, withdrawViaBank } from "./helpers"; import { createSimpleTestkudosEnvironment, withdrawViaBank } from "./helpers";
import { TransactionType, Amounts, durationFromSpec } from "taler-wallet-core"; import { TransactionType, Amounts, durationFromSpec } from "@gnu-taler/taler-wallet-core";
/** /**
* Run test for basic, bank-integrated withdrawal. * Run test for basic, bank-integrated withdrawal.

2
packages/taler-wallet-cli/src/integrationtests/test-refund.ts
View File

@ -17,7 +17,7 @@
/** /**
* Imports. * Imports.
*/ */
import { durationFromSpec } from "taler-wallet-core"; import { durationFromSpec } from "@gnu-taler/taler-wallet-core";
import { GlobalTestState, MerchantPrivateApi } from "./harness"; import { GlobalTestState, MerchantPrivateApi } from "./harness";
import { createSimpleTestkudosEnvironment, withdrawViaBank } from "./helpers"; import { createSimpleTestkudosEnvironment, withdrawViaBank } from "./helpers";

2
packages/taler-wallet-cli/src/integrationtests/test-timetravel-autorefresh.ts
View File

@ -23,7 +23,7 @@ import {
durationFromSpec, durationFromSpec,
PendingOperationsResponse, PendingOperationsResponse,
PreparePayResultType, PreparePayResultType,
} from "taler-wallet-core"; } from "@gnu-taler/taler-wallet-core";
import { makeNoFeeCoinConfig } from "./denomStructures"; import { makeNoFeeCoinConfig } from "./denomStructures";
import { import {
BankService, BankService,

2
packages/taler-wallet-cli/src/integrationtests/test-timetravel-withdraw.ts
View File

@ -23,7 +23,7 @@ import {
withdrawViaBank, withdrawViaBank,
startWithdrawViaBank, startWithdrawViaBank,
} from "./helpers"; } from "./helpers";
import { Duration, TransactionType } from "taler-wallet-core"; import { Duration, TransactionType } from "@gnu-taler/taler-wallet-core";
/** /**
* Basic time travel test. * Basic time travel test.

2
packages/taler-wallet-cli/src/integrationtests/test-withdrawal-abort-bank.ts
View File

@ -19,7 +19,7 @@
*/ */
import { GlobalTestState, BankApi, BankAccessApi } from "./harness"; import { GlobalTestState, BankApi, BankAccessApi } from "./harness";
import { createSimpleTestkudosEnvironment } from "./helpers"; import { createSimpleTestkudosEnvironment } from "./helpers";
import { codecForBalancesResponse, TalerErrorCode } from "taler-wallet-core"; import { codecForBalancesResponse, TalerErrorCode } from "@gnu-taler/taler-wallet-core";
/** /**
* Run test for basic, bank-integrated withdrawal. * Run test for basic, bank-integrated withdrawal.

2
packages/taler-wallet-cli/src/integrationtests/test-withdrawal-bank-integrated.ts
View File

@ -19,7 +19,7 @@
*/ */
import { GlobalTestState, BankApi, BankAccessApi } from "./harness"; import { GlobalTestState, BankApi, BankAccessApi } from "./harness";
import { createSimpleTestkudosEnvironment } from "./helpers"; import { createSimpleTestkudosEnvironment } from "./helpers";
import { codecForBalancesResponse } from "taler-wallet-core"; import { codecForBalancesResponse } from "@gnu-taler/taler-wallet-core";
/** /**
* Run test for basic, bank-integrated withdrawal. * Run test for basic, bank-integrated withdrawal.

4
packages/taler-wallet-cli/src/integrationtests/test-withdrawal-manual.ts
View File

@ -19,8 +19,8 @@
*/ */
import { GlobalTestState, BankApi } from "./harness"; import { GlobalTestState, BankApi } from "./harness";
import { createSimpleTestkudosEnvironment } from "./helpers"; import { createSimpleTestkudosEnvironment } from "./helpers";
import { CoreApiResponse } from "taler-wallet-core"; import { CoreApiResponse } from "@gnu-taler/taler-wallet-core";
import { codecForBalancesResponse } from "taler-wallet-core"; import { codecForBalancesResponse } from "@gnu-taler/taler-wallet-core";
/** /**
* Run test for basic, bank-integrated withdrawal. * Run test for basic, bank-integrated withdrawal.

8
packages/taler-wallet-core/package.json
View File

@ -1,5 +1,5 @@
{ {
"name": "taler-wallet-core", "name": "@gnu-taler/taler-wallet-core",
"version": "0.8.1", "version": "0.8.1",
"description": "", "description": "",
"engines": { "engines": {
@ -17,7 +17,7 @@
"pretty": "prettier --write src", "pretty": "prettier --write src",
"test": "tsc && ava", "test": "tsc && ava",
"coverage": "tsc && nyc ava", "coverage": "tsc && nyc ava",
"clean": "rimraf dist lib" "clean": "rimraf dist lib tsconfig.tsbuildinfo"
}, },
"files": [ "files": [
"AUTHORS", "AUTHORS",
@ -47,7 +47,7 @@
"jed": "^1.1.1", "jed": "^1.1.1",
"nyc": "^15.1.0", "nyc": "^15.1.0",
"po2json": "^0.4.5", "po2json": "^0.4.5",
"pogen": "workspace:*", "@gnu-taler/pogen": "workspace:*",
"prettier": "^2.2.1", "prettier": "^2.2.1",
"rimraf": "^3.0.2", "rimraf": "^3.0.2",
"rollup": "^2.37.1", "rollup": "^2.37.1",
@ -61,7 +61,7 @@
"axios": "^0.21.1", "axios": "^0.21.1",
"big-integer": "^1.6.48", "big-integer": "^1.6.48",
"fflate": "^0.6.0", "fflate": "^0.6.0",
"idb-bridge": "workspace:*", "@gnu-taler/idb-bridge": "workspace:*",
"source-map-support": "^0.5.19", "source-map-support": "^0.5.19",
"tslib": "^2.1.0" "tslib": "^2.1.0"
}, },

2
packages/taler-wallet-core/src/crypto/workers/nodeThreadWorker.ts
View File

@ -44,7 +44,7 @@ const workerCode = `
} }
if (!tw) { if (!tw) {
try { try {
tw = require("taler-wallet-android"); tw = require("@gnu-taler/taler-wallet-android");
} catch (e) { } catch (e) {
console.warn("could not load taler-wallet-android either"); console.warn("could not load taler-wallet-android either");
throw e; throw e;

2
packages/taler-wallet-core/src/db.ts
View File

@ -11,7 +11,7 @@ import {
IDBDatabase, IDBDatabase,
IDBObjectStore, IDBObjectStore,
IDBTransaction, IDBTransaction,
} from "idb-bridge"; } from "@gnu-taler/idb-bridge";
import { Logger } from "./util/logging"; import { Logger } from "./util/logging";
/** /**

4
packages/taler-wallet-core/src/headless/helpers.ts
View File

@ -23,7 +23,7 @@
* Imports. * Imports.
*/ */
import { Wallet } from "../wallet"; import { Wallet } from "../wallet";
import { MemoryBackend, BridgeIDBFactory, shimIndexedDB } from "idb-bridge"; import { MemoryBackend, BridgeIDBFactory, shimIndexedDB } from "@gnu-taler/idb-bridge";
import { openTalerDatabase } from "../db"; import { openTalerDatabase } from "../db";
import { HttpRequestLibrary } from "../util/http"; import { HttpRequestLibrary } from "../util/http";
import fs from "fs"; import fs from "fs";
@ -33,7 +33,7 @@ import { Database } from "../util/query";
import { NodeHttpLib } from "./NodeHttpLib"; import { NodeHttpLib } from "./NodeHttpLib";
import { Logger } from "../util/logging"; import { Logger } from "../util/logging";
import { SynchronousCryptoWorkerFactory } from "../crypto/workers/synchronousWorker"; import { SynchronousCryptoWorkerFactory } from "../crypto/workers/synchronousWorker";
import type { IDBFactory } from "idb-bridge/lib/idbtypes"; import type { IDBFactory } from "@gnu-taler/idb-bridge/lib/idbtypes";
import { Stores } from "../types/dbTypes"; import { Stores } from "../types/dbTypes";
const logger = new Logger("headless/helpers.ts"); const logger = new Logger("headless/helpers.ts");

2
packages/taler-wallet-core/src/types/dbTypes.ts
View File

@ -39,7 +39,7 @@ import { Index, Store } from "../util/query";
import { TalerErrorDetails, RefreshReason } from "./walletTypes"; import { TalerErrorDetails, RefreshReason } from "./walletTypes";
import { ReserveTransaction } from "./ReserveTransaction"; import { ReserveTransaction } from "./ReserveTransaction";
import { Timestamp, Duration } from "../util/time"; import { Timestamp, Duration } from "../util/time";
import { IDBKeyPath } from "idb-bridge"; import { IDBKeyPath } from "@gnu-taler/idb-bridge";
import { RetryInfo } from "../util/retries"; import { RetryInfo } from "../util/retries";
export enum ReserveRecordStatus { export enum ReserveRecordStatus {

2
packages/taler-wallet-core/src/util/query.ts
View File

@ -33,7 +33,7 @@ import {
IDBVersionChangeEvent, IDBVersionChangeEvent,
Event, Event,
IDBCursor, IDBCursor,
} from "idb-bridge"; } from "@gnu-taler/idb-bridge";
import { Logger } from "./logging"; import { Logger } from "./logging";
const logger = new Logger("query.ts"); const logger = new Logger("query.ts");

4
packages/taler-wallet-webextension/package.json
View File

@ -1,5 +1,5 @@
{ {
"name": "taler-wallet-webextension", "name": "@gnu-taler/taler-wallet-webextension",
"version": "0.8.1-dev.2", "version": "0.8.1-dev.2",
"description": "GNU Taler Wallet browser extension", "description": "GNU Taler Wallet browser extension",
"main": "./build/index.js", "main": "./build/index.js",
@ -13,7 +13,7 @@
}, },
"dependencies": { "dependencies": {
"moment": "^2.29.1", "moment": "^2.29.1",
"taler-wallet-core": "workspace:*", "@gnu-taler/taler-wallet-core": "workspace:*",
"tslib": "^2.1.0" "tslib": "^2.1.0"
}, },
"devDependencies": { "devDependencies": {

2
packages/taler-wallet-webextension/src/browserCryptoWorkerFactory.ts
View File

@ -19,7 +19,7 @@
* @author Florian Dold * @author Florian Dold
*/ */
import type { CryptoWorker, CryptoWorkerFactory } from "taler-wallet-core"; import type { CryptoWorker, CryptoWorkerFactory } from "@gnu-taler/taler-wallet-core";
export class BrowserCryptoWorkerFactory implements CryptoWorkerFactory { export class BrowserCryptoWorkerFactory implements CryptoWorkerFactory {
startWorker(): CryptoWorker { startWorker(): CryptoWorker {

4
packages/taler-wallet-webextension/src/browserHttpLib.ts
View File

@ -25,8 +25,8 @@ import {
HttpResponse, HttpResponse,
Headers, Headers,
bytesToString, bytesToString,
} from "taler-wallet-core"; } from "@gnu-taler/taler-wallet-core";
import { TalerErrorCode } from "taler-wallet-core"; import { TalerErrorCode } from "@gnu-taler/taler-wallet-core";
const logger = new Logger("browserHttpLib"); const logger = new Logger("browserHttpLib");

2
packages/taler-wallet-webextension/src/browserWorkerEntry.ts
View File

@ -22,7 +22,7 @@
* Imports. * Imports.
*/ */
import { CryptoImplementation, Logger } from "taler-wallet-core"; import { CryptoImplementation, Logger } from "@gnu-taler/taler-wallet-core";
const logger = new Logger("browserWorkerEntry.ts"); const logger = new Logger("browserWorkerEntry.ts");

2
packages/taler-wallet-webextension/src/i18n.tsx
View File

@ -23,7 +23,7 @@
*/ */
import React from "react"; import React from "react";
import * as i18nCore from "taler-wallet-core"; import * as i18nCore from "@gnu-taler/taler-wallet-core";
/** /**
* Convert template strings to a msgid * Convert template strings to a msgid
*/ */

2
packages/taler-wallet-webextension/src/pageEntryPoint.ts
View File

@ -26,7 +26,7 @@ import { createWithdrawPage } from "./pages/withdraw";
import { createWelcomePage } from "./pages/welcome"; import { createWelcomePage } from "./pages/welcome";
import { createPayPage } from "./pages/pay"; import { createPayPage } from "./pages/pay";
import { createRefundPage } from "./pages/refund"; import { createRefundPage } from "./pages/refund";
import { setupI18n } from "taler-wallet-core"; import { setupI18n } from "@gnu-taler/taler-wallet-core";
import { createTipPage } from './pages/tip'; import { createTipPage } from './pages/tip';
function main(): void { function main(): void {

2
packages/taler-wallet-webextension/src/pages/pay.tsx
View File

@ -38,7 +38,7 @@ import {
ConfirmPayResultType, ConfirmPayResultType,
ConfirmPayResult, ConfirmPayResult,
getJsonI18n, getJsonI18n,
} from "taler-wallet-core"; } from "@gnu-taler/taler-wallet-core";
function TalerPayDialog({ talerPayUri }: { talerPayUri: string }): JSX.Element { function TalerPayDialog({ talerPayUri }: { talerPayUri: string }): JSX.Element {
const [payStatus, setPayStatus] = useState<PreparePayResult | undefined>(); const [payStatus, setPayStatus] = useState<PreparePayResult | undefined>();

2
packages/taler-wallet-webextension/src/pages/popup.tsx
View File

@ -38,7 +38,7 @@ import {
TransactionType, TransactionType,
AmountString, AmountString,
Timestamp, Timestamp,
} from "taler-wallet-core"; } from "@gnu-taler/taler-wallet-core";
import { abbrev, renderAmount, PageLink } from "../renderHtml"; import { abbrev, renderAmount, PageLink } from "../renderHtml";
import * as wxApi from "../wxApi"; import * as wxApi from "../wxApi";

2
packages/taler-wallet-webextension/src/pages/refund.tsx
View File

@ -23,7 +23,7 @@
import React, { useEffect, useState } from "react"; import React, { useEffect, useState } from "react";
import * as wxApi from "../wxApi"; import * as wxApi from "../wxApi";
import { AmountView } from "../renderHtml"; import { AmountView } from "../renderHtml";
import { PurchaseDetails, ApplyRefundResponse, Amounts } from "taler-wallet-core"; import { PurchaseDetails, ApplyRefundResponse, Amounts } from "@gnu-taler/taler-wallet-core";
function RefundStatusView(props: { talerRefundUri: string }): JSX.Element { function RefundStatusView(props: { talerRefundUri: string }): JSX.Element {
const [applyResult, setApplyResult] = useState<ApplyRefundResponse>(); const [applyResult, setApplyResult] = useState<ApplyRefundResponse>();

2
packages/taler-wallet-webextension/src/pages/tip.tsx
View File

@ -22,7 +22,7 @@
import * as React from "react"; import * as React from "react";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { PrepareTipResult } from "taler-wallet-core"; import { PrepareTipResult } from "@gnu-taler/taler-wallet-core";
import { AmountView } from "../renderHtml"; import { AmountView } from "../renderHtml";
import * as wxApi from "../wxApi"; import * as wxApi from "../wxApi";

2
packages/taler-wallet-webextension/src/pages/welcome.tsx
View File

@ -26,7 +26,7 @@ import { PageLink } from "../renderHtml";
import * as wxApi from "../wxApi"; import * as wxApi from "../wxApi";
import { getPermissionsApi } from "../compat"; import { getPermissionsApi } from "../compat";
import { extendedPermissions } from "../permissions"; import { extendedPermissions } from "../permissions";
import { WalletDiagnostics } from "taler-wallet-core"; import { WalletDiagnostics } from "@gnu-taler/taler-wallet-core";
function Diagnostics(): JSX.Element | null { function Diagnostics(): JSX.Element | null {
const [timedOut, setTimedOut] = useState(false); const [timedOut, setTimedOut] = useState(false);

2
packages/taler-wallet-webextension/src/pages/withdraw.tsx
View File

@ -31,7 +31,7 @@ import {
onUpdateNotification, onUpdateNotification,
getWithdrawalDetailsForUri, getWithdrawalDetailsForUri,
} from "../wxApi"; } from "../wxApi";
import { WithdrawUriInfoResponse } from "taler-wallet-core"; import { WithdrawUriInfoResponse } from "@gnu-taler/taler-wallet-core";
function WithdrawalDialog(props: { talerWithdrawUri: string }): JSX.Element { function WithdrawalDialog(props: { talerWithdrawUri: string }): JSX.Element {
const [details, setDetails] = useState<WithdrawUriInfoResponse | undefined>(); const [details, setDetails] = useState<WithdrawUriInfoResponse | undefined>();

2
packages/taler-wallet-webextension/src/renderHtml.tsx
View File

@ -23,7 +23,7 @@
/** /**
* Imports. * Imports.
*/ */
import { AmountJson, Amounts, stringifyTimestamp, ExchangeWithdrawDetails } from "taler-wallet-core"; import { AmountJson, Amounts, stringifyTimestamp, ExchangeWithdrawDetails } from "@gnu-taler/taler-wallet-core";
import * as i18n from "./i18n"; import * as i18n from "./i18n";
import React from "react"; import React from "react";

2
packages/taler-wallet-webextension/src/wxApi.ts
View File

@ -36,7 +36,7 @@ import {
PrepareTipRequest, PrepareTipRequest,
PrepareTipResult, PrepareTipResult,
AcceptTipRequest, AcceptTipRequest,
} from "taler-wallet-core"; } from "@gnu-taler/taler-wallet-core";
export interface ExtendedPermissionsResponse { export interface ExtendedPermissionsResponse {
newValue: boolean; newValue: boolean;

2
packages/taler-wallet-webextension/src/wxBackend.ts
View File

@ -40,7 +40,7 @@ import {
WalletDiagnostics, WalletDiagnostics,
CoreApiResponseSuccess, CoreApiResponseSuccess,
Stores, Stores,
} from "taler-wallet-core"; } from "@gnu-taler/taler-wallet-core";
import { BrowserHttpLib } from "./browserHttpLib"; import { BrowserHttpLib } from "./browserHttpLib";
import { BrowserCryptoWorkerFactory } from "./browserCryptoWorkerFactory"; import { BrowserCryptoWorkerFactory } from "./browserCryptoWorkerFactory";

20
pnpm-lock.yaml
View File

@ -33,7 +33,7 @@ importers:
typescript: ^4.1.3 typescript: ^4.1.3
packages/taler-wallet-android: packages/taler-wallet-android:
dependencies: dependencies:
taler-wallet-core: link:../taler-wallet-core '@gnu-taler/taler-wallet-core': link:../taler-wallet-core
tslib: 2.1.0 tslib: 2.1.0
devDependencies: devDependencies:
'@rollup/plugin-commonjs': 17.0.0_rollup@2.37.1 '@rollup/plugin-commonjs': 17.0.0_rollup@2.37.1
@ -58,7 +58,7 @@ importers:
rollup: ^2.37.1 rollup: ^2.37.1
rollup-plugin-sourcemaps: ^0.6.3 rollup-plugin-sourcemaps: ^0.6.3
rollup-plugin-terser: ^7.0.2 rollup-plugin-terser: ^7.0.2
taler-wallet-core: workspace:* '@gnu-taler/taler-wallet-core': workspace:*
tslib: ^2.1.0 tslib: ^2.1.0
typescript: ^4.1.3 typescript: ^4.1.3
packages/taler-wallet-cli: packages/taler-wallet-cli:
@ -67,7 +67,7 @@ importers:
axios: 0.21.1 axios: 0.21.1
minimatch: 3.0.4 minimatch: 3.0.4
source-map-support: 0.5.19 source-map-support: 0.5.19
taler-wallet-core: link:../taler-wallet-core '@gnu-taler/taler-wallet-core': link:../taler-wallet-core
tslib: 2.1.0 tslib: 2.1.0
devDependencies: devDependencies:
'@rollup/plugin-commonjs': 17.0.0_rollup@2.37.1 '@rollup/plugin-commonjs': 17.0.0_rollup@2.37.1
@ -97,7 +97,7 @@ importers:
rollup-plugin-sourcemaps: ^0.6.3 rollup-plugin-sourcemaps: ^0.6.3
rollup-plugin-terser: ^7.0.2 rollup-plugin-terser: ^7.0.2
source-map-support: ^0.5.19 source-map-support: ^0.5.19
taler-wallet-core: workspace:* '@gnu-taler/taler-wallet-core': workspace:*
tslib: ^2.1.0 tslib: ^2.1.0
typedoc: ^0.20.16 typedoc: ^0.20.16
typescript: ^4.1.3 typescript: ^4.1.3
@ -107,7 +107,7 @@ importers:
axios: 0.21.1 axios: 0.21.1
big-integer: 1.6.48 big-integer: 1.6.48
fflate: 0.6.0 fflate: 0.6.0
idb-bridge: link:../idb-bridge '@gnu-taler/idb-bridge': link:../idb-bridge
source-map-support: 0.5.19 source-map-support: 0.5.19
tslib: 2.1.0 tslib: 2.1.0
devDependencies: devDependencies:
@ -126,7 +126,7 @@ importers:
jed: 1.1.1 jed: 1.1.1
nyc: 15.1.0 nyc: 15.1.0
po2json: 0.4.5 po2json: 0.4.5
pogen: link:../pogen '@gnu-taler/pogen': link:../pogen
prettier: 2.2.1 prettier: 2.2.1
rimraf: 3.0.2 rimraf: 3.0.2
rollup: 2.37.1 rollup: 2.37.1
@ -151,11 +151,11 @@ importers:
eslint-plugin-react-hooks: ^4.2.0 eslint-plugin-react-hooks: ^4.2.0
esm: ^3.2.25 esm: ^3.2.25
fflate: ^0.6.0 fflate: ^0.6.0
idb-bridge: workspace:* '@gnu-taler/idb-bridge': workspace:*
jed: ^1.1.1 jed: ^1.1.1
nyc: ^15.1.0 nyc: ^15.1.0
po2json: ^0.4.5 po2json: ^0.4.5
pogen: workspace:* '@gnu-taler/pogen': workspace:*
prettier: ^2.2.1 prettier: ^2.2.1
rimraf: ^3.0.2 rimraf: ^3.0.2
rollup: ^2.37.1 rollup: ^2.37.1
@ -168,7 +168,7 @@ importers:
packages/taler-wallet-webextension: packages/taler-wallet-webextension:
dependencies: dependencies:
moment: 2.29.1 moment: 2.29.1
taler-wallet-core: link:../taler-wallet-core '@gnu-taler/taler-wallet-core': link:../taler-wallet-core
tslib: 2.1.0 tslib: 2.1.0
devDependencies: devDependencies:
'@rollup/plugin-commonjs': 17.0.0_rollup@2.37.1 '@rollup/plugin-commonjs': 17.0.0_rollup@2.37.1
@ -212,7 +212,7 @@ importers:
rollup-plugin-ignore: ^1.0.9 rollup-plugin-ignore: ^1.0.9
rollup-plugin-sourcemaps: ^0.6.3 rollup-plugin-sourcemaps: ^0.6.3
rollup-plugin-terser: ^7.0.2 rollup-plugin-terser: ^7.0.2
taler-wallet-core: workspace:* '@gnu-taler/taler-wallet-core': workspace:*
tslib: ^2.1.0 tslib: ^2.1.0
typescript: ^4.1.3 typescript: ^4.1.3
lockfileVersion: 5.2 lockfileVersion: 5.2