[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-wallet-core] branch master updated: fix build issues
|
From: |
gnunet |
|
Subject: |
[taler-wallet-core] branch master updated: fix build issues |
|
Date: |
Sat, 27 Mar 2021 14:36:18 +0100 |
This is an automated email from the git hooks/post-receive script.
dold pushed a commit to branch master
in repository wallet-core.
The following commit(s) were added to refs/heads/master by this push:
new d44740b7 fix build issues
d44740b7 is described below
commit d44740b787c974c5388811a2989557d93923c49a
Author: Florian Dold <florian@dold.me>
AuthorDate: Sat Mar 27 14:35:58 2021 +0100
fix build issues
---
packages/taler-util/src/index.ts | 19 ++-
packages/taler-wallet-android/package.json | 8 +-
packages/taler-wallet-android/src/index.ts | 14 +-
packages/taler-wallet-android/tsconfig.json | 2 +-
.../src/integrationtests/merchantApiTypes.ts | 5 +-
packages/taler-wallet-webextension/package.json | 1 +
.../src/browserHttpLib.ts | 2 +-
.../taler-wallet-webextension/src/pages/pay.tsx | 29 ++--
.../taler-wallet-webextension/src/pages/popup.tsx | 5 +-
.../taler-wallet-webextension/src/pages/refund.tsx | 25 ++-
.../taler-wallet-webextension/src/pages/tip.tsx | 12 +-
.../src/pages/welcome.tsx | 2 +-
.../src/pages/withdraw.tsx | 4 +-
.../taler-wallet-webextension/src/renderHtml.tsx | 167 +--------------------
packages/taler-wallet-webextension/src/wxApi.ts | 10 +-
.../taler-wallet-webextension/src/wxBackend.ts | 15 +-
packages/taler-wallet-webextension/tsconfig.json | 46 +++---
pnpm-lock.yaml | 125 +++++++++++++--
tsconfig.build.json | 11 +-
19 files changed, 243 insertions(+), 259 deletions(-)
diff --git a/packages/taler-util/src/index.ts b/packages/taler-util/src/index.ts
index 5a82ea08..255d6cbc 100644
--- a/packages/taler-util/src/index.ts
+++ b/packages/taler-util/src/index.ts
@@ -6,14 +6,13 @@ export * from "./codec.js";
export * from "./amounts.js";
export * from "./talerconfig.js";
export * from "./time.js";
-export * from "./walletTypes";
-export * from "./transactionsTypes";
-export * from "./notifications";
-export * from "./talerTypes";
-export * from "./talerconfig";
-export * from "./taleruri";
-export * from "./ReserveStatus";
-export * from "./ReserveTransaction";
-export * from "./backupTypes";
+export * from "./walletTypes.js";
+export * from "./transactionsTypes.js";
+export * from "./notifications.js";
+export * from "./talerTypes.js";
+export * from "./taleruri.js";
+export * from "./ReserveStatus.js";
+export * from "./ReserveTransaction.js";
+export * from "./backupTypes.js";
export * from "./payto.js";
-export * from "./libtool-version";
\ No newline at end of file
+export * from "./libtool-version.js";
\ No newline at end of file
diff --git a/packages/taler-wallet-android/package.json
b/packages/taler-wallet-android/package.json
index b7f0eee2..8a0c4048 100644
--- a/packages/taler-wallet-android/package.json
+++ b/packages/taler-wallet-android/package.json
@@ -34,13 +34,13 @@
"@types/node": "^14.14.22",
"prettier": "^2.2.1",
"rimraf": "^3.0.2",
- "rollup": "^2.37.1",
+ "rollup": "^2.43.0",
"rollup-plugin-sourcemaps": "^0.6.3",
"rollup-plugin-terser": "^7.0.2",
- "typescript": "^4.1.3"
+ "typescript": "^4.2.3"
},
"dependencies": {
- "@gnu-taler/taler-wallet-core": "workspace:*",
- "tslib": "^2.1.0"
+ "@gnu-taler/taler-wallet-core": "workspace:*",
+ "tslib": "^2.1.0"
}
}
diff --git a/packages/taler-wallet-android/src/index.ts
b/packages/taler-wallet-android/src/index.ts
index 6f6fa991..0be45ae7 100644
--- a/packages/taler-wallet-android/src/index.ts
+++ b/packages/taler-wallet-android/src/index.ts
@@ -22,7 +22,6 @@ import {
getDefaultNodeWallet,
DefaultNodeWalletArgs,
NodeHttpLib,
- TalerErrorCode,
makeErrorDetails,
handleWorkerError,
handleWorkerMessage,
@@ -32,17 +31,18 @@ import {
HttpRequestOptions,
openPromise,
Headers,
- CoreApiEnvelope,
- CoreApiResponse,
- CoreApiResponseSuccess,
- WalletNotification,
WALLET_EXCHANGE_PROTOCOL_VERSION,
WALLET_MERCHANT_PROTOCOL_VERSION,
- bytesToString,
- stringToBytes,
} from "@gnu-taler/taler-wallet-core";
import fs from "fs";
+import { WalletNotification } from
"../../taler-wallet-core/node_modules/@gnu-taler/taler-util/lib/notifications.js";
+import { TalerErrorCode } from
"../../taler-wallet-core/node_modules/@gnu-taler/taler-util/lib/taler-error-codes.js";
+import {
+ CoreApiEnvelope,
+ CoreApiResponse,
+ CoreApiResponseSuccess,
+} from
"../../taler-wallet-core/node_modules/@gnu-taler/taler-util/lib/walletTypes.js";
export { handleWorkerError, handleWorkerMessage };
diff --git a/packages/taler-wallet-android/tsconfig.json
b/packages/taler-wallet-android/tsconfig.json
index 37fda3c3..62be133e 100644
--- a/packages/taler-wallet-android/tsconfig.json
+++ b/packages/taler-wallet-android/tsconfig.json
@@ -8,7 +8,7 @@
"module": "ESNext",
"moduleResolution": "node",
"sourceMap": true,
- "lib": ["es6",],
+ "lib": ["es6"],
"noImplicitReturns": true,
"noFallthroughCasesInSwitch": true,
"strict": true,
diff --git a/packages/taler-wallet-cli/src/integrationtests/merchantApiTypes.ts
b/packages/taler-wallet-cli/src/integrationtests/merchantApiTypes.ts
index 2233c7ad..9d452935 100644
--- a/packages/taler-wallet-cli/src/integrationtests/merchantApiTypes.ts
+++ b/packages/taler-wallet-cli/src/integrationtests/merchantApiTypes.ts
@@ -41,8 +41,8 @@ import {
Timestamp,
CoinPublicKeyString,
EddsaPublicKeyString,
+ codecForAmountString,
} from "@gnu-taler/taler-util";
-import { codecForAmountString } from
"@gnu-taler/taler-wallet-core/lib/util/amounts";
export interface PostOrderRequest {
// The order must at least contain the minimal
@@ -296,7 +296,6 @@ export interface TipCreateRequest {
next_url: string;
}
-
export interface MerchantInstancesResponse {
// List of instances that are present in the backend (see Instance)
instances: MerchantInstanceDetail[];
@@ -316,4 +315,4 @@ export interface MerchantInstanceDetail {
// specify the desired payment target in /order requests. Note that
// front-ends do not have to support wallets selecting payment targets.
payment_targets: string[];
-}
\ No newline at end of file
+}
diff --git a/packages/taler-wallet-webextension/package.json
b/packages/taler-wallet-webextension/package.json
index b9a35eb1..69c50400 100644
--- a/packages/taler-wallet-webextension/package.json
+++ b/packages/taler-wallet-webextension/package.json
@@ -14,6 +14,7 @@
"dependencies": {
"moment": "^2.29.1",
"@gnu-taler/taler-wallet-core": "workspace:*",
+ "@gnu-taler/taler-util": "workspace:*",
"tslib": "^2.1.0"
},
"devDependencies": {
diff --git a/packages/taler-wallet-webextension/src/browserHttpLib.ts
b/packages/taler-wallet-webextension/src/browserHttpLib.ts
index c71e3417..5c27becb 100644
--- a/packages/taler-wallet-webextension/src/browserHttpLib.ts
+++ b/packages/taler-wallet-webextension/src/browserHttpLib.ts
@@ -26,7 +26,7 @@ import {
Headers,
bytesToString,
} from "@gnu-taler/taler-wallet-core";
-import { TalerErrorCode } from "@gnu-taler/taler-wallet-core";
+import { TalerErrorCode } from "@gnu-taler/taler-util";
const logger = new Logger("browserHttpLib");
diff --git a/packages/taler-wallet-webextension/src/pages/pay.tsx
b/packages/taler-wallet-webextension/src/pages/pay.tsx
index b5da04e3..9c6b1095 100644
--- a/packages/taler-wallet-webextension/src/pages/pay.tsx
+++ b/packages/taler-wallet-webextension/src/pages/pay.tsx
@@ -29,16 +29,16 @@ import * as wxApi from "../wxApi";
import React, { useState, useEffect } from "react";
+import { getJsonI18n } from "@gnu-taler/taler-wallet-core";
import {
- Amounts,
- AmountJson,
PreparePayResult,
+ ConfirmPayResult,
+ AmountJson,
PreparePayResultType,
+ Amounts,
ContractTerms,
ConfirmPayResultType,
- ConfirmPayResult,
- getJsonI18n,
-} from "@gnu-taler/taler-wallet-core";
+} from "@gnu-taler/taler-util";
function TalerPayDialog({ talerPayUri }: { talerPayUri: string }): JSX.Element
{
const [payStatus, setPayStatus] = useState<PreparePayResult | undefined>();
@@ -67,7 +67,9 @@ function TalerPayDialog({ talerPayUri }: { talerPayUri:
string }): JSX.Element {
if (payStatus.status === PreparePayResultType.PaymentPossible) {
let amountRaw = Amounts.parseOrThrow(payStatus.amountRaw);
- let amountEffective: AmountJson =
Amounts.parseOrThrow(payStatus.amountEffective);
+ let amountEffective: AmountJson = Amounts.parseOrThrow(
+ payStatus.amountEffective,
+ );
totalFees = Amounts.sub(amountEffective, amountRaw).amount;
}
@@ -141,13 +143,16 @@ function TalerPayDialog({ talerPayUri }: { talerPayUri:
string }): JSX.Element {
if (payResult.contractTerms.fulfillment_message) {
const obj = {
fulfillment_message: payResult.contractTerms.fulfillment_message,
- fulfillment_message_i18n:
payResult.contractTerms.fulfillment_message_i18n,
+ fulfillment_message_i18n:
+ payResult.contractTerms.fulfillment_message_i18n,
};
- const msg = getJsonI18n(obj, "fulfillment_message")
- return <div>
- <p>Payment succeeded.</p>
- <p>{msg}</p>
- </div>;
+ const msg = getJsonI18n(obj, "fulfillment_message");
+ return (
+ <div>
+ <p>Payment succeeded.</p>
+ <p>{msg}</p>
+ </div>
+ );
} else {
return <span>Redirecting ...</span>;
}
diff --git a/packages/taler-wallet-webextension/src/pages/popup.tsx
b/packages/taler-wallet-webextension/src/pages/popup.tsx
index 9071e46f..4d12d9a8 100644
--- a/packages/taler-wallet-webextension/src/pages/popup.tsx
+++ b/packages/taler-wallet-webextension/src/pages/popup.tsx
@@ -38,7 +38,8 @@ import {
TransactionType,
AmountString,
Timestamp,
-} from "@gnu-taler/taler-wallet-core";
+ amountFractionalBase,
+} from "@gnu-taler/taler-util";
import { abbrev, renderAmount, PageLink } from "../renderHtml";
import * as wxApi from "../wxApi";
@@ -160,7 +161,7 @@ class WalletNavBar extends React.Component<any, any> {
* Render an amount as a large number with a small currency symbol.
*/
function bigAmount(amount: AmountJson): JSX.Element {
- const v = amount.value + amount.fraction / Amounts.fractionalBase;
+ const v = amount.value + amount.fraction / amountFractionalBase;
return (
<span>
<span style={{ fontSize: "5em", display: "block" }}>{v}</span>{" "}
diff --git a/packages/taler-wallet-webextension/src/pages/refund.tsx
b/packages/taler-wallet-webextension/src/pages/refund.tsx
index 572aba8e..bfeec0aa 100644
--- a/packages/taler-wallet-webextension/src/pages/refund.tsx
+++ b/packages/taler-wallet-webextension/src/pages/refund.tsx
@@ -23,7 +23,11 @@
import React, { useEffect, useState } from "react";
import * as wxApi from "../wxApi";
import { AmountView } from "../renderHtml";
-import { PurchaseDetails, ApplyRefundResponse, Amounts } from
"@gnu-taler/taler-wallet-core";
+import {
+ PurchaseDetails,
+ ApplyRefundResponse,
+ Amounts,
+} from "@gnu-taler/taler-util";
function RefundStatusView(props: { talerRefundUri: string }): JSX.Element {
const [applyResult, setApplyResult] = useState<ApplyRefundResponse>();
@@ -57,15 +61,20 @@ function RefundStatusView(props: { talerRefundUri: string
}): JSX.Element {
<>
<h2>Refund Status</h2>
<p>
- The product <em>{applyResult.info.summary}</em> has
- received a total effective refund of{" "}
+ The product <em>{applyResult.info.summary}</em> has received a total
+ effective refund of{" "}
<AmountView amount={applyResult.amountRefundGranted} />.
</p>
- {applyResult.pendingAtExchange ? <p>Refund processing is still in
progress.</p> : null}
- {!Amounts.isZero(applyResult.amountRefundGone) ? <p>
- The refund amount of <AmountView amount={applyResult.amountRefundGone}
/>
- could not be applied.
- </p> : null}
+ {applyResult.pendingAtExchange ? (
+ <p>Refund processing is still in progress.</p>
+ ) : null}
+ {!Amounts.isZero(applyResult.amountRefundGone) ? (
+ <p>
+ The refund amount of{" "}
+ <AmountView amount={applyResult.amountRefundGone} />
+ could not be applied.
+ </p>
+ ) : null}
</>
);
}
diff --git a/packages/taler-wallet-webextension/src/pages/tip.tsx
b/packages/taler-wallet-webextension/src/pages/tip.tsx
index 29c07cfe..b1ac2722 100644
--- a/packages/taler-wallet-webextension/src/pages/tip.tsx
+++ b/packages/taler-wallet-webextension/src/pages/tip.tsx
@@ -22,7 +22,7 @@
import * as React from "react";
import { useEffect, useState } from "react";
-import { PrepareTipResult } from "@gnu-taler/taler-wallet-core";
+import { PrepareTipResult } from "@gnu-taler/taler-util";
import { AmountView } from "../renderHtml";
import * as wxApi from "../wxApi";
@@ -65,8 +65,8 @@ function TalerTipDialog({ talerTipUri }: { talerTipUri:
string }): JSX.Element {
if (prepareTipResult.accepted) {
return (
<span>
- Tip from <code>{prepareTipResult.merchantBaseUrl}</code> accepted.
- Check your transactions list for more details.
+ Tip from <code>{prepareTipResult.merchantBaseUrl}</code> accepted.
Check
+ your transactions list for more details.
</span>
);
} else {
@@ -75,8 +75,10 @@ function TalerTipDialog({ talerTipUri }: { talerTipUri:
string }): JSX.Element {
<p>
The merchant <code>{prepareTipResult.merchantBaseUrl}</code> is
offering you a tip of{" "}
- <strong><AmountView amount={prepareTipResult.tipAmountEffective}
/></strong> via the
- exchange <code>{prepareTipResult.exchangeBaseUrl}</code>
+ <strong>
+ <AmountView amount={prepareTipResult.tipAmountEffective} />
+ </strong>{" "}
+ via the exchange <code>{prepareTipResult.exchangeBaseUrl}</code>
</p>
<button onClick={doAccept}>Accept tip</button>
<button onClick={doIgnore}>Ignore</button>
diff --git a/packages/taler-wallet-webextension/src/pages/welcome.tsx
b/packages/taler-wallet-webextension/src/pages/welcome.tsx
index fb4af573..dd10ac13 100644
--- a/packages/taler-wallet-webextension/src/pages/welcome.tsx
+++ b/packages/taler-wallet-webextension/src/pages/welcome.tsx
@@ -26,7 +26,7 @@ import { PageLink } from "../renderHtml";
import * as wxApi from "../wxApi";
import { getPermissionsApi } from "../compat";
import { extendedPermissions } from "../permissions";
-import { WalletDiagnostics } from "@gnu-taler/taler-wallet-core";
+import { WalletDiagnostics } from "@gnu-taler/taler-util";
function Diagnostics(): JSX.Element | null {
const [timedOut, setTimedOut] = useState(false);
diff --git a/packages/taler-wallet-webextension/src/pages/withdraw.tsx
b/packages/taler-wallet-webextension/src/pages/withdraw.tsx
index 02758fd9..c4a02817 100644
--- a/packages/taler-wallet-webextension/src/pages/withdraw.tsx
+++ b/packages/taler-wallet-webextension/src/pages/withdraw.tsx
@@ -23,7 +23,7 @@
import * as i18n from "../i18n";
-import { WithdrawDetailView, renderAmount } from "../renderHtml";
+import { renderAmount } from "../renderHtml";
import React, { useState, useEffect } from "react";
import {
@@ -31,7 +31,7 @@ import {
onUpdateNotification,
getWithdrawalDetailsForUri,
} from "../wxApi";
-import { WithdrawUriInfoResponse } from "@gnu-taler/taler-wallet-core";
+import { WithdrawUriInfoResponse } from "@gnu-taler/taler-util";
function WithdrawalDialog(props: { talerWithdrawUri: string }): JSX.Element {
const [details, setDetails] = useState<WithdrawUriInfoResponse |
undefined>();
diff --git a/packages/taler-wallet-webextension/src/renderHtml.tsx
b/packages/taler-wallet-webextension/src/renderHtml.tsx
index c18c5c19..3e66e5c5 100644
--- a/packages/taler-wallet-webextension/src/renderHtml.tsx
+++ b/packages/taler-wallet-webextension/src/renderHtml.tsx
@@ -23,9 +23,12 @@
/**
* Imports.
*/
-import { AmountJson, Amounts, stringifyTimestamp, ExchangeWithdrawDetails }
from "@gnu-taler/taler-wallet-core";
-import * as i18n from "./i18n";
import React from "react";
+import {
+ AmountJson,
+ Amounts,
+ amountFractionalBase,
+} from "@gnu-taler/taler-util";
/**
* Render amount as HTML, which non-breaking space between
@@ -41,7 +44,7 @@ export function renderAmount(amount: AmountJson | string):
JSX.Element {
if (!a) {
return <span>(invalid amount)</span>;
}
- const x = a.value + a.fraction / Amounts.fractionalBase;
+ const x = a.value + a.fraction / amountFractionalBase;
return (
<span>
{x} {a.currency}
@@ -125,164 +128,6 @@ export class Collapsible extends React.Component<
}
}
-function WireFee(props: {
- s: string;
- rci: ExchangeWithdrawDetails;
-}): JSX.Element {
- return (
- <>
- <thead>
- <tr>
- <th colSpan={3}>Wire Method {props.s}</th>
- </tr>
- <tr>
- <th>Applies Until</th>
- <th>Wire Fee</th>
- <th>Closing Fee</th>
- </tr>
- </thead>
- <tbody>
- {props.rci.wireFees.feesForType[props.s].map((f) => (
- <tr key={f.sig}>
- <td>{stringifyTimestamp(f.endStamp)}</td>
- <td>{renderAmount(f.wireFee)}</td>
- <td>{renderAmount(f.closingFee)}</td>
- </tr>
- ))}
- </tbody>
- </>
- );
-}
-
-function AuditorDetailsView(props: {
- rci: ExchangeWithdrawDetails | null;
-}): JSX.Element {
- const rci = props.rci;
- console.log("rci", rci);
- if (!rci) {
- return (
- <p>
- Details will be displayed when a valid exchange provider URL is
entered.
- </p>
- );
- }
- if ((rci.exchangeInfo.details?.auditors ?? []).length === 0) {
- return <p>The exchange is not audited by any auditors.</p>;
- }
- return (
- <div>
- {(rci.exchangeInfo.details?.auditors ?? []).map((a) => (
- <div key={a.auditor_pub}>
- <h3>Auditor {a.auditor_url}</h3>
- <p>
- Public key: <ExpanderText text={a.auditor_pub} />
- </p>
- <p>
- Trusted:{" "}
- {rci.trustedAuditorPubs.indexOf(a.auditor_pub) >= 0 ? "yes" : "no"}
- </p>
- <p>
- Audits {a.denomination_keys.length} of {rci.numOfferedDenoms}{" "}
- denominations
- </p>
- </div>
- ))}
- </div>
- );
-}
-
-function FeeDetailsView(props: {
- rci: ExchangeWithdrawDetails | null;
-}): JSX.Element {
- const rci = props.rci;
- if (!rci) {
- return (
- <p>
- Details will be displayed when a valid exchange provider URL is
entered.
- </p>
- );
- }
-
- const denoms = rci.selectedDenoms;
- const withdrawFee = renderAmount(rci.withdrawFee);
- const overhead = renderAmount(rci.overhead);
-
- return (
- <div>
- <h3>Overview</h3>
- <p>
- Public key:{" "}
- <ExpanderText
- text={rci.exchangeInfo.details?.masterPublicKey ?? "??"}
- />
- </p>
- <p>
- {i18n.str`Withdrawal fees:`} {withdrawFee}
- </p>
- <p>
- {i18n.str`Rounding loss:`} {overhead}
- </p>
- <p>{i18n.str`Earliest expiration (for deposit): ${stringifyTimestamp(
- rci.earliestDepositExpiration,
- )}`}</p>
- <h3>Coin Fees</h3>
- <div style={{ overflow: "auto" }}>
- <table className="pure-table">
- <thead>
- <tr>
- <th>{i18n.str`# Coins`}</th>
- <th>{i18n.str`Value`}</th>
- <th>{i18n.str`Withdraw Fee`}</th>
- <th>{i18n.str`Refresh Fee`}</th>
- <th>{i18n.str`Deposit Fee`}</th>
- </tr>
- </thead>
- <tbody>
- {denoms.selectedDenoms.map((ds) => {
- return (
- <tr key={ds.denom.denomPub}>
- <td>{ds.count + "x"}</td>
- <td>{renderAmount(ds.denom.value)}</td>
- <td>{renderAmount(ds.denom.feeWithdraw)}</td>
- <td>{renderAmount(ds.denom.feeRefresh)}</td>
- <td>{renderAmount(ds.denom.feeDeposit)}</td>
- </tr>
- );
- })}
- </tbody>
- </table>
- </div>
- <h3>Wire Fees</h3>
- <div style={{ overflow: "auto" }}>
- <table className="pure-table">
- {Object.keys(rci.wireFees.feesForType).map((s) => (
- <WireFee key={s} s={s} rci={rci} />
- ))}
- </table>
- </div>
- </div>
- );
-}
-
-/**
- * Shows details about a withdraw request.
- */
-export function WithdrawDetailView(props: {
- rci: ExchangeWithdrawDetails | null;
-}): JSX.Element {
- const rci = props.rci;
- return (
- <div>
- <Collapsible initiallyCollapsed={true} title="Fee and Spending Details">
- <FeeDetailsView rci={rci} />
- </Collapsible>
- <Collapsible initiallyCollapsed={true} title="Auditor Details">
- <AuditorDetailsView rci={rci} />
- </Collapsible>
- </div>
- );
-}
-
interface ExpanderTextProps {
text: string;
}
diff --git a/packages/taler-wallet-webextension/src/wxApi.ts
b/packages/taler-wallet-webextension/src/wxApi.ts
index 3c01dfe9..c14047cf 100644
--- a/packages/taler-wallet-webextension/src/wxApi.ts
+++ b/packages/taler-wallet-webextension/src/wxApi.ts
@@ -22,21 +22,21 @@
* Imports.
*/
import {
+ CoreApiResponse,
ConfirmPayResult,
BalancesResponse,
+ TransactionsResponse,
+ ApplyRefundResponse,
PreparePayResult,
AcceptWithdrawalResponse,
WalletDiagnostics,
- CoreApiResponse,
- OperationFailedError,
GetWithdrawalDetailsForUriRequest,
WithdrawUriInfoResponse,
- TransactionsResponse,
- ApplyRefundResponse,
PrepareTipRequest,
PrepareTipResult,
AcceptTipRequest,
-} from "@gnu-taler/taler-wallet-core";
+} from "@gnu-taler/taler-util";
+import { OperationFailedError } from "@gnu-taler/taler-wallet-core";
export interface ExtendedPermissionsResponse {
newValue: boolean;
diff --git a/packages/taler-wallet-webextension/src/wxBackend.ts
b/packages/taler-wallet-webextension/src/wxBackend.ts
index 64dd25fb..62cedc9a 100644
--- a/packages/taler-wallet-webextension/src/wxBackend.ts
+++ b/packages/taler-wallet-webextension/src/wxBackend.ts
@@ -25,22 +25,23 @@
*/
import { isFirefox, getPermissionsApi } from "./compat";
import { extendedPermissions } from "./permissions";
-
import {
Wallet,
OpenedPromise,
openPromise,
openTalerDatabase,
Database,
- classifyTalerUri,
- TalerUriType,
+ Stores,
makeErrorDetails,
- TalerErrorCode,
+} from "@gnu-taler/taler-wallet-core";
+import {
+ classifyTalerUri,
CoreApiResponse,
- WalletDiagnostics,
CoreApiResponseSuccess,
- Stores,
-} from "@gnu-taler/taler-wallet-core";
+ TalerErrorCode,
+ TalerUriType,
+ WalletDiagnostics,
+} from "@gnu-taler/taler-util";
import { BrowserHttpLib } from "./browserHttpLib";
import { BrowserCryptoWorkerFactory } from "./browserCryptoWorkerFactory";
diff --git a/packages/taler-wallet-webextension/tsconfig.json
b/packages/taler-wallet-webextension/tsconfig.json
index 4b1bb19b..417a73b1 100644
--- a/packages/taler-wallet-webextension/tsconfig.json
+++ b/packages/taler-wallet-webextension/tsconfig.json
@@ -1,22 +1,30 @@
{
- "compilerOptions": {
- "composite": true,
- "lib": ["es6", "DOM"],
- "jsx": "react",
- "moduleResolution": "Node",
- "reactNamespace": "React",
- "module": "ESNext",
- "target": "ES6",
- "noImplicitAny": true,
- "outDir": "lib",
- "noEmitOnError": true,
- "strict": true,
- "incremental": true,
- "sourceMap": true,
- "esModuleInterop": true,
- "importHelpers": true,
- "rootDir": "./src",
- "typeRoots": ["./node_modules/@types"]
+ "compilerOptions": {
+ "composite": true,
+ "lib": ["es6", "DOM"],
+ "jsx": "react",
+ "moduleResolution": "Node",
+ "reactNamespace": "React",
+ "module": "ESNext",
+ "target": "ES6",
+ "noImplicitAny": true,
+ "outDir": "lib",
+ "noEmitOnError": true,
+ "strict": true,
+ "incremental": true,
+ "sourceMap": true,
+ "esModuleInterop": true,
+ "importHelpers": true,
+ "rootDir": "./src",
+ "typeRoots": ["./node_modules/@types"]
+ },
+ "references": [
+ {
+ "path": "../taler-wallet-core/"
},
- "include": ["src/**/*"]
+ {
+ "path": "../taler-util/"
+ }
+ ],
+ "include": ["src/**/*"]
}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7a8b9804..2de7cc07 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -58,17 +58,17 @@ importers:
'@gnu-taler/taler-wallet-core': link:../taler-wallet-core
tslib: 2.1.0
devDependencies:
- '@rollup/plugin-commonjs': 17.0.0_rollup@2.37.1
- '@rollup/plugin-json': 4.1.0_rollup@2.37.1
- '@rollup/plugin-node-resolve': 11.1.0_rollup@2.37.1
- '@rollup/plugin-replace': 2.3.4_rollup@2.37.1
+ '@rollup/plugin-commonjs': 17.0.0_rollup@2.43.0
+ '@rollup/plugin-json': 4.1.0_rollup@2.43.0
+ '@rollup/plugin-node-resolve': 11.1.0_rollup@2.43.0
+ '@rollup/plugin-replace': 2.3.4_rollup@2.43.0
'@types/node': 14.14.22
prettier: 2.2.1
rimraf: 3.0.2
- rollup: 2.37.1
- rollup-plugin-sourcemaps: 0.6.3_38ff52cc32daa1ae80c428f8a47a4e22
- rollup-plugin-terser: 7.0.2_rollup@2.37.1
- typescript: 4.1.3
+ rollup: 2.43.0
+ rollup-plugin-sourcemaps: 0.6.3_79665b55c550dd6b792bac22e5c7c20e
+ rollup-plugin-terser: 7.0.2_rollup@2.43.0
+ typescript: 4.2.3
specifiers:
'@gnu-taler/taler-wallet-core': workspace:*
'@rollup/plugin-commonjs': ^17.0.0
@@ -78,11 +78,11 @@ importers:
'@types/node': ^14.14.22
prettier: ^2.2.1
rimraf: ^3.0.2
- rollup: ^2.37.1
+ rollup: ^2.43.0
rollup-plugin-sourcemaps: ^0.6.3
rollup-plugin-terser: ^7.0.2
tslib: ^2.1.0
- typescript: ^4.1.3
+ typescript: ^4.2.3
packages/taler-wallet-cli:
dependencies:
'@gnu-taler/taler-util': link:../taler-util
@@ -195,6 +195,7 @@ importers:
typescript: ^4.1.3
packages/taler-wallet-webextension:
dependencies:
+ '@gnu-taler/taler-util': link:../taler-util
'@gnu-taler/taler-wallet-core': link:../taler-wallet-core
moment: 2.29.1
tslib: 2.1.0
@@ -220,6 +221,7 @@ importers:
rollup-plugin-terser: 7.0.2_rollup@2.37.1
typescript: 4.1.3
specifiers:
+ '@gnu-taler/taler-util': workspace:*
'@gnu-taler/taler-wallet-core': workspace:*
'@rollup/plugin-commonjs': ^17.0.0
'@rollup/plugin-json': ^4.1.0
@@ -558,6 +560,23 @@ packages:
rollup: ^2.30.0
resolution:
integrity:
sha512-/omBIJG1nHQc+bgkYDuLpb/V08QyutP9amOrJRUSlYJZP+b/68gM//D8sxJe3Yry2QnYIr3QjR3x4AlxJEN3GA==
+ /@rollup/plugin-commonjs/17.0.0_rollup@2.43.0:
+ dependencies:
+ '@rollup/pluginutils': 3.1.0_rollup@2.43.0
+ commondir: 1.0.1
+ estree-walker: 2.0.2
+ glob: 7.1.6
+ is-reference: 1.2.1
+ magic-string: 0.25.7
+ resolve: 1.19.0
+ rollup: 2.43.0
+ dev: true
+ engines:
+ node: '>= 8.0.0'
+ peerDependencies:
+ rollup: ^2.30.0
+ resolution:
+ integrity:
sha512-/omBIJG1nHQc+bgkYDuLpb/V08QyutP9amOrJRUSlYJZP+b/68gM//D8sxJe3Yry2QnYIr3QjR3x4AlxJEN3GA==
/@rollup/plugin-commonjs/17.1.0_rollup@2.37.1:
dependencies:
'@rollup/pluginutils': 3.1.0_rollup@2.37.1
@@ -584,6 +603,15 @@ packages:
rollup: ^1.20.0 || ^2.0.0
resolution:
integrity:
sha512-yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw==
+ /@rollup/plugin-json/4.1.0_rollup@2.43.0:
+ dependencies:
+ '@rollup/pluginutils': 3.1.0_rollup@2.43.0
+ rollup: 2.43.0
+ dev: true
+ peerDependencies:
+ rollup: ^1.20.0 || ^2.0.0
+ resolution:
+ integrity:
sha512-yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw==
/@rollup/plugin-node-resolve/11.1.0_rollup@2.37.1:
dependencies:
'@rollup/pluginutils': 3.1.0_rollup@2.37.1
@@ -600,6 +628,22 @@ packages:
rollup: ^1.20.0||^2.0.0
resolution:
integrity:
sha512-ouBBppRdWJKCllDXGzJ7ZIkYbaq+5TmyP0smt1vdJCFfoZhLi31vhpmjLhyo8lreHf4RoeSNllaWrvSqHpHRog==
+ /@rollup/plugin-node-resolve/11.1.0_rollup@2.43.0:
+ dependencies:
+ '@rollup/pluginutils': 3.1.0_rollup@2.43.0
+ '@types/resolve': 1.17.1
+ builtin-modules: 3.2.0
+ deepmerge: 4.2.2
+ is-module: 1.0.0
+ resolve: 1.19.0
+ rollup: 2.43.0
+ dev: true
+ engines:
+ node: '>= 10.0.0'
+ peerDependencies:
+ rollup: ^1.20.0||^2.0.0
+ resolution:
+ integrity:
sha512-ouBBppRdWJKCllDXGzJ7ZIkYbaq+5TmyP0smt1vdJCFfoZhLi31vhpmjLhyo8lreHf4RoeSNllaWrvSqHpHRog==
/@rollup/plugin-node-resolve/11.2.0_rollup@2.37.1:
dependencies:
'@rollup/pluginutils': 3.1.0_rollup@2.37.1
@@ -626,6 +670,16 @@ packages:
rollup: ^1.20.0 || ^2.0.0
resolution:
integrity:
sha512-waBhMzyAtjCL1GwZes2jaE9MjuQ/DQF2BatH3fRivUF3z0JBFrU0U6iBNC/4WR+2rLKhaAhPWDNPYp4mI6RqdQ==
+ /@rollup/plugin-replace/2.3.4_rollup@2.43.0:
+ dependencies:
+ '@rollup/pluginutils': 3.1.0_rollup@2.43.0
+ magic-string: 0.25.7
+ rollup: 2.43.0
+ dev: true
+ peerDependencies:
+ rollup: ^1.20.0 || ^2.0.0
+ resolution:
+ integrity:
sha512-waBhMzyAtjCL1GwZes2jaE9MjuQ/DQF2BatH3fRivUF3z0JBFrU0U6iBNC/4WR+2rLKhaAhPWDNPYp4mI6RqdQ==
/@rollup/pluginutils/3.1.0_rollup@2.37.1:
dependencies:
'@types/estree': 0.0.39
@@ -639,6 +693,19 @@ packages:
rollup: ^1.20.0||^2.0.0
resolution:
integrity:
sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==
+ /@rollup/pluginutils/3.1.0_rollup@2.43.0:
+ dependencies:
+ '@types/estree': 0.0.39
+ estree-walker: 1.0.1
+ picomatch: 2.2.2
+ rollup: 2.43.0
+ dev: true
+ engines:
+ node: '>= 8.0.0'
+ peerDependencies:
+ rollup: ^1.20.0||^2.0.0
+ resolution:
+ integrity:
sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==
/@rushstack/node-core-library/3.35.2:
dependencies:
'@types/node': 10.17.13
@@ -4392,6 +4459,23 @@ packages:
optional: true
resolution:
integrity:
sha512-paFu+nT1xvuO1tPFYXGe+XnQvg4Hjqv/eIhG8i5EspfYYPBKL57X7iVbfv55aNVASg3dzWvES9dmWsL2KhfByw==
+ /rollup-plugin-sourcemaps/0.6.3_79665b55c550dd6b792bac22e5c7c20e:
+ dependencies:
+ '@rollup/pluginutils': 3.1.0_rollup@2.43.0
+ '@types/node': 14.14.22
+ rollup: 2.43.0
+ source-map-resolve: 0.6.0
+ dev: true
+ engines:
+ node: '>=10.0.0'
+ peerDependencies:
+ '@types/node': '>=10.0.0'
+ rollup: '>=0.31.2'
+ peerDependenciesMeta:
+ '@types/node':
+ optional: true
+ resolution:
+ integrity:
sha512-paFu+nT1xvuO1tPFYXGe+XnQvg4Hjqv/eIhG8i5EspfYYPBKL57X7iVbfv55aNVASg3dzWvES9dmWsL2KhfByw==
/rollup-plugin-terser/7.0.2_rollup@2.37.1:
dependencies:
'@babel/code-frame': 7.10.4
@@ -4404,6 +4488,18 @@ packages:
rollup: ^2.0.0
resolution:
integrity:
sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==
+ /rollup-plugin-terser/7.0.2_rollup@2.43.0:
+ dependencies:
+ '@babel/code-frame': 7.10.4
+ jest-worker: 26.6.2
+ rollup: 2.43.0
+ serialize-javascript: 4.0.0
+ terser: 5.4.0
+ dev: true
+ peerDependencies:
+ rollup: ^2.0.0
+ resolution:
+ integrity:
sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==
/rollup/2.37.1:
dev: true
engines:
@@ -4413,6 +4509,15 @@ packages:
fsevents: 2.1.3
resolution:
integrity:
sha512-V3ojEeyGeSdrMSuhP3diBb06P+qV4gKQeanbDv+Qh/BZbhdZ7kHV0xAt8Yjk4GFshq/WjO7R4c7DFM20AwTFVQ==
+ /rollup/2.43.0:
+ dev: true
+ engines:
+ node: '>=10.0.0'
+ hasBin: true
+ optionalDependencies:
+ fsevents: 2.3.2
+ resolution:
+ integrity:
sha512-FRsYGqlo1iF/w3bv319iStAK0hyhhwon35Cbo7sGUoXaOpsZFy6Lel7UoGb5bNDE4OsoWjMH94WiVvpOM26l3g==
/rst-selector-parser/2.2.3:
dependencies:
lodash.flattendeep: 4.4.0
diff --git a/tsconfig.build.json b/tsconfig.build.json
index 6db804a3..936040e6 100644
--- a/tsconfig.build.json
+++ b/tsconfig.build.json
@@ -11,7 +11,16 @@
"path": "packages/taler-wallet-core/"
},
{
- "path": "packages/taler-wallet-cli"
+ "path": "packages/taler-wallet-cli/"
+ },
+ {
+ "path": "packages/taler-wallet-android/"
+ },
+ {
+ "path": "packages/taler-util/"
+ },
+ {
+ "path": "packages/taler-wallet-webextension//"
}
],
"files": []
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-wallet-core] branch master updated: fix build issues,
gnunet <=