commit ff09c98f3b0515dd92dc5f9bab887336b080b4f5
parent 678a90934c7b819b1d5c864f7429242d7d74a1e6
Author: Jonathan Buchanan <jonathan.russ.buchanan@gmail.com>
Date: Wed, 7 Jul 2021 02:42:55 -0400
change taler-wallet-android to taler-wallet-embedded
Diffstat:
7 files changed, 393 insertions(+), 394 deletions(-)
diff --git a/packages/taler-wallet-android/package.json b/packages/taler-wallet-android/package.json
@@ -1,46 +0,0 @@
-{
- "name": "@gnu-taler/taler-wallet-android",
- "version": "0.8.0",
- "description": "",
- "engines": {
- "node": ">=0.12.0"
- },
- "repository": {
- "type": "git",
- "url": "git://git.taler.net/wallet-core.git"
- },
- "main": "dist/taler-wallet-android.js",
- "author": "Florian Dold",
- "license": "GPL-3.0",
- "scripts": {
- "compile": "tsc && rollup -c",
- "pretty": "prettier --write src",
- "coverage": "tsc && nyc ava",
- "clean": "rimraf lib dist tsconfig.tsbuildinfo"
- },
- "files": [
- "AUTHORS",
- "README",
- "COPYING",
- "bin/",
- "dist/node",
- "src/"
- ],
- "devDependencies": {
- "@rollup/plugin-commonjs": "^17.0.0",
- "@rollup/plugin-json": "^4.1.0",
- "@rollup/plugin-node-resolve": "^11.1.0",
- "@rollup/plugin-replace": "^2.3.4",
- "@types/node": "^14.14.22",
- "prettier": "^2.2.1",
- "rimraf": "^3.0.2",
- "rollup": "^2.43.0",
- "rollup-plugin-sourcemaps": "^0.6.3",
- "rollup-plugin-terser": "^7.0.2",
- "typescript": "^4.2.3"
- },
- "dependencies": {
- "@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
@@ -1,288 +0,0 @@
-/*
- This file is part of GNU Taler
- (C) 2019 GNUnet e.V.
-
- GNU Taler is free software; you can redistribute it and/or modify it under the
- terms of the GNU General Public License as published by the Free Software
- Foundation; either version 3, or (at your option) any later version.
-
- GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY
- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along with
- GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
- */
-
-/**
- * Imports.
- */
-import {
- getDefaultNodeWallet,
- DefaultNodeWalletArgs,
- NodeHttpLib,
- makeErrorDetails,
- handleWorkerError,
- handleWorkerMessage,
- HttpRequestLibrary,
- OpenedPromise,
- HttpResponse,
- HttpRequestOptions,
- openPromise,
- Headers,
- WALLET_EXCHANGE_PROTOCOL_VERSION,
- WALLET_MERCHANT_PROTOCOL_VERSION,
- Wallet,
-} 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 };
-
-export class AndroidHttpLib implements HttpRequestLibrary {
- useNfcTunnel = false;
-
- private nodeHttpLib: HttpRequestLibrary = new NodeHttpLib();
-
- private requestId = 1;
-
- private requestMap: {
- [id: number]: OpenedPromise<HttpResponse>;
- } = {};
-
- constructor(private sendMessage: (m: string) => void) {}
-
- fetch(url: string, opt?: HttpRequestOptions): Promise<HttpResponse> {
- return this.nodeHttpLib.fetch(url, opt);
- }
-
- get(url: string, opt?: HttpRequestOptions): Promise<HttpResponse> {
- if (this.useNfcTunnel) {
- const myId = this.requestId++;
- const p = openPromise<HttpResponse>();
- this.requestMap[myId] = p;
- const request = {
- method: "get",
- url,
- };
- this.sendMessage(
- JSON.stringify({
- type: "tunnelHttp",
- request,
- id: myId,
- }),
- );
- return p.promise;
- } else {
- return this.nodeHttpLib.get(url, opt);
- }
- }
-
- postJson(
- url: string,
- body: any,
- opt?: HttpRequestOptions,
- ): Promise<HttpResponse> {
- if (this.useNfcTunnel) {
- const myId = this.requestId++;
- const p = openPromise<HttpResponse>();
- this.requestMap[myId] = p;
- const request = {
- method: "postJson",
- url,
- body,
- };
- this.sendMessage(
- JSON.stringify({ type: "tunnelHttp", request, id: myId }),
- );
- return p.promise;
- } else {
- return this.nodeHttpLib.postJson(url, body, opt);
- }
- }
-
- handleTunnelResponse(msg: any): void {
- const myId = msg.id;
- const p = this.requestMap[myId];
- if (!p) {
- console.error(
- `no matching request for tunneled HTTP response, id=${myId}`,
- );
- }
- const headers = new Headers();
- if (msg.status != 0) {
- const resp: HttpResponse = {
- // FIXME: pass through this URL
- requestUrl: "",
- headers,
- status: msg.status,
- requestMethod: "FIXME",
- json: async () => JSON.parse(msg.responseText),
- text: async () => msg.responseText,
- bytes: async () => {
- throw Error("bytes() not supported for tunnel response");
- },
- };
- p.resolve(resp);
- } else {
- p.reject(new Error(`unexpected HTTP status code ${msg.status}`));
- }
- delete this.requestMap[myId];
- }
-}
-
-function sendAkonoMessage(ev: CoreApiEnvelope): void {
- // @ts-ignore
- const sendMessage = globalThis.__akono_sendMessage;
- if (typeof sendMessage !== "function") {
- const errMsg =
- "FATAL: cannot install android wallet listener: akono functions missing";
- console.error(errMsg);
- throw new Error(errMsg);
- }
- const m = JSON.stringify(ev);
- // @ts-ignore
- sendMessage(m);
-}
-
-class AndroidWalletMessageHandler {
- walletArgs: DefaultNodeWalletArgs | undefined;
- maybeWallet: Wallet | undefined;
- wp = openPromise<Wallet>();
- httpLib = new NodeHttpLib();
-
- /**
- * Handle a request from the Android wallet.
- */
- async handleMessage(
- operation: string,
- id: string,
- args: any,
- ): Promise<CoreApiResponse> {
- const wrapResponse = (result: unknown): CoreApiResponseSuccess => {
- return {
- type: "response",
- id,
- operation,
- result,
- };
- };
-
- const reinit = async () => {
- const w = await getDefaultNodeWallet(this.walletArgs);
- this.maybeWallet = w;
- await w.handleCoreApiRequest("initWallet", "akono-init", {});
- w.runRetryLoop().catch((e) => {
- console.error("Error during wallet retry loop", e);
- });
- this.wp.resolve(w);
- };
-
- switch (operation) {
- case "init": {
- this.walletArgs = {
- notifyHandler: async (notification: WalletNotification) => {
- sendAkonoMessage({ type: "notification", payload: notification });
- },
- persistentStoragePath: args.persistentStoragePath,
- httpLib: this.httpLib,
- };
- await reinit();
- return wrapResponse({
- supported_protocol_versions: {
- exchange: WALLET_EXCHANGE_PROTOCOL_VERSION,
- merchant: WALLET_MERCHANT_PROTOCOL_VERSION,
- },
- });
- }
- case "startTunnel": {
- // this.httpLib.useNfcTunnel = true;
- throw Error("not implemented");
- }
- case "stopTunnel": {
- // this.httpLib.useNfcTunnel = false;
- throw Error("not implemented");
- }
- case "tunnelResponse": {
- // httpLib.handleTunnelResponse(msg.args);
- throw Error("not implemented");
- }
- case "reset": {
- const oldArgs = this.walletArgs;
- this.walletArgs = { ...oldArgs };
- if (oldArgs && oldArgs.persistentStoragePath) {
- try {
- fs.unlinkSync(oldArgs.persistentStoragePath);
- } catch (e) {
- console.error("Error while deleting the wallet db:", e);
- }
- // Prevent further storage!
- this.walletArgs.persistentStoragePath = undefined;
- }
- const wallet = await this.wp.promise;
- wallet.stop();
- this.wp = openPromise<Wallet>();
- this.maybeWallet = undefined;
- await reinit();
- return wrapResponse({});
- }
- default: {
- const wallet = await this.wp.promise;
- return await wallet.handleCoreApiRequest(operation, id, args);
- }
- }
- }
-}
-
-export function installAndroidWalletListener(): void {
- const handler = new AndroidWalletMessageHandler();
- const onMessage = async (msgStr: any): Promise<void> => {
- if (typeof msgStr !== "string") {
- console.error("expected string as message");
- return;
- }
- const msg = JSON.parse(msgStr);
- const operation = msg.operation;
- if (typeof operation !== "string") {
- console.error(
- "message to android wallet helper must contain operation of type string",
- );
- return;
- }
- const id = msg.id;
- console.log(`android listener: got request for ${operation} (${id})`);
-
- try {
- const respMsg = await handler.handleMessage(operation, id, msg.args);
- console.log(
- `android listener: sending success response for ${operation} (${id})`,
- );
- sendAkonoMessage(respMsg);
- } catch (e) {
- const respMsg: CoreApiResponse = {
- type: "error",
- id,
- operation,
- error: makeErrorDetails(
- TalerErrorCode.WALLET_UNEXPECTED_EXCEPTION,
- "unexpected exception",
- {},
- ),
- };
- sendAkonoMessage(respMsg);
- return;
- }
- };
-
- // @ts-ignore
- globalThis.__akono_onMessage = onMessage;
-
- console.log("android wallet listener installed");
-}
diff --git a/packages/taler-wallet-embedded/package.json b/packages/taler-wallet-embedded/package.json
@@ -0,0 +1,46 @@
+{
+ "name": "@gnu-taler/taler-wallet-embedded",
+ "version": "0.8.0",
+ "description": "",
+ "engines": {
+ "node": ">=0.12.0"
+ },
+ "repository": {
+ "type": "git",
+ "url": "git://git.taler.net/wallet-core.git"
+ },
+ "main": "dist/taler-wallet-embedded.js",
+ "author": "Florian Dold",
+ "license": "GPL-3.0",
+ "scripts": {
+ "compile": "tsc && rollup -c",
+ "pretty": "prettier --write src",
+ "coverage": "tsc && nyc ava",
+ "clean": "rimraf lib dist tsconfig.tsbuildinfo"
+ },
+ "files": [
+ "AUTHORS",
+ "README",
+ "COPYING",
+ "bin/",
+ "dist/node",
+ "src/"
+ ],
+ "devDependencies": {
+ "@rollup/plugin-commonjs": "^17.0.0",
+ "@rollup/plugin-json": "^4.1.0",
+ "@rollup/plugin-node-resolve": "^11.1.0",
+ "@rollup/plugin-replace": "^2.3.4",
+ "@types/node": "^14.14.22",
+ "prettier": "^2.2.1",
+ "rimraf": "^3.0.2",
+ "rollup": "^2.43.0",
+ "rollup-plugin-sourcemaps": "^0.6.3",
+ "rollup-plugin-terser": "^7.0.2",
+ "typescript": "^4.2.3"
+ },
+ "dependencies": {
+ "@gnu-taler/taler-wallet-core": "workspace:*",
+ "tslib": "^2.1.0"
+ }
+}
diff --git a/packages/taler-wallet-android/rollup.config.js b/packages/taler-wallet-embedded/rollup.config.js
diff --git a/packages/taler-wallet-embedded/src/index.ts b/packages/taler-wallet-embedded/src/index.ts
@@ -0,0 +1,288 @@
+/*
+ This file is part of GNU Taler
+ (C) 2019 GNUnet e.V.
+
+ GNU Taler is free software; you can redistribute it and/or modify it under the
+ terms of the GNU General Public License as published by the Free Software
+ Foundation; either version 3, or (at your option) any later version.
+
+ GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along with
+ GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
+ */
+
+/**
+ * Imports.
+ */
+import {
+ getDefaultNodeWallet,
+ DefaultNodeWalletArgs,
+ NodeHttpLib,
+ makeErrorDetails,
+ handleWorkerError,
+ handleWorkerMessage,
+ HttpRequestLibrary,
+ OpenedPromise,
+ HttpResponse,
+ HttpRequestOptions,
+ openPromise,
+ Headers,
+ WALLET_EXCHANGE_PROTOCOL_VERSION,
+ WALLET_MERCHANT_PROTOCOL_VERSION,
+ Wallet,
+} 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 };
+
+export class NativeHttpLib implements HttpRequestLibrary {
+ useNfcTunnel = false;
+
+ private nodeHttpLib: HttpRequestLibrary = new NodeHttpLib();
+
+ private requestId = 1;
+
+ private requestMap: {
+ [id: number]: OpenedPromise<HttpResponse>;
+ } = {};
+
+ constructor(private sendMessage: (m: string) => void) {}
+
+ fetch(url: string, opt?: HttpRequestOptions): Promise<HttpResponse> {
+ return this.nodeHttpLib.fetch(url, opt);
+ }
+
+ get(url: string, opt?: HttpRequestOptions): Promise<HttpResponse> {
+ if (this.useNfcTunnel) {
+ const myId = this.requestId++;
+ const p = openPromise<HttpResponse>();
+ this.requestMap[myId] = p;
+ const request = {
+ method: "get",
+ url,
+ };
+ this.sendMessage(
+ JSON.stringify({
+ type: "tunnelHttp",
+ request,
+ id: myId,
+ }),
+ );
+ return p.promise;
+ } else {
+ return this.nodeHttpLib.get(url, opt);
+ }
+ }
+
+ postJson(
+ url: string,
+ body: any,
+ opt?: HttpRequestOptions,
+ ): Promise<HttpResponse> {
+ if (this.useNfcTunnel) {
+ const myId = this.requestId++;
+ const p = openPromise<HttpResponse>();
+ this.requestMap[myId] = p;
+ const request = {
+ method: "postJson",
+ url,
+ body,
+ };
+ this.sendMessage(
+ JSON.stringify({ type: "tunnelHttp", request, id: myId }),
+ );
+ return p.promise;
+ } else {
+ return this.nodeHttpLib.postJson(url, body, opt);
+ }
+ }
+
+ handleTunnelResponse(msg: any): void {
+ const myId = msg.id;
+ const p = this.requestMap[myId];
+ if (!p) {
+ console.error(
+ `no matching request for tunneled HTTP response, id=${myId}`,
+ );
+ }
+ const headers = new Headers();
+ if (msg.status != 0) {
+ const resp: HttpResponse = {
+ // FIXME: pass through this URL
+ requestUrl: "",
+ headers,
+ status: msg.status,
+ requestMethod: "FIXME",
+ json: async () => JSON.parse(msg.responseText),
+ text: async () => msg.responseText,
+ bytes: async () => {
+ throw Error("bytes() not supported for tunnel response");
+ },
+ };
+ p.resolve(resp);
+ } else {
+ p.reject(new Error(`unexpected HTTP status code ${msg.status}`));
+ }
+ delete this.requestMap[myId];
+ }
+}
+
+function sendNativeMessage(ev: CoreApiEnvelope): void {
+ // @ts-ignore
+ const sendMessage = globalThis.__native_sendMessage;
+ if (typeof sendMessage !== "function") {
+ const errMsg =
+ "FATAL: cannot install native wallet listener: native functions missing";
+ console.error(errMsg);
+ throw new Error(errMsg);
+ }
+ const m = JSON.stringify(ev);
+ // @ts-ignore
+ sendMessage(m);
+}
+
+class NativeWalletMessageHandler {
+ walletArgs: DefaultNodeWalletArgs | undefined;
+ maybeWallet: Wallet | undefined;
+ wp = openPromise<Wallet>();
+ httpLib = new NodeHttpLib();
+
+ /**
+ * Handle a request from the native wallet.
+ */
+ async handleMessage(
+ operation: string,
+ id: string,
+ args: any,
+ ): Promise<CoreApiResponse> {
+ const wrapResponse = (result: unknown): CoreApiResponseSuccess => {
+ return {
+ type: "response",
+ id,
+ operation,
+ result,
+ };
+ };
+
+ const reinit = async () => {
+ const w = await getDefaultNodeWallet(this.walletArgs);
+ this.maybeWallet = w;
+ await w.handleCoreApiRequest("initWallet", "native-init", {});
+ w.runRetryLoop().catch((e) => {
+ console.error("Error during wallet retry loop", e);
+ });
+ this.wp.resolve(w);
+ };
+
+ switch (operation) {
+ case "init": {
+ this.walletArgs = {
+ notifyHandler: async (notification: WalletNotification) => {
+ sendNativeMessage({ type: "notification", payload: notification });
+ },
+ persistentStoragePath: args.persistentStoragePath,
+ httpLib: this.httpLib,
+ };
+ await reinit();
+ return wrapResponse({
+ supported_protocol_versions: {
+ exchange: WALLET_EXCHANGE_PROTOCOL_VERSION,
+ merchant: WALLET_MERCHANT_PROTOCOL_VERSION,
+ },
+ });
+ }
+ case "startTunnel": {
+ // this.httpLib.useNfcTunnel = true;
+ throw Error("not implemented");
+ }
+ case "stopTunnel": {
+ // this.httpLib.useNfcTunnel = false;
+ throw Error("not implemented");
+ }
+ case "tunnelResponse": {
+ // httpLib.handleTunnelResponse(msg.args);
+ throw Error("not implemented");
+ }
+ case "reset": {
+ const oldArgs = this.walletArgs;
+ this.walletArgs = { ...oldArgs };
+ if (oldArgs && oldArgs.persistentStoragePath) {
+ try {
+ fs.unlinkSync(oldArgs.persistentStoragePath);
+ } catch (e) {
+ console.error("Error while deleting the wallet db:", e);
+ }
+ // Prevent further storage!
+ this.walletArgs.persistentStoragePath = undefined;
+ }
+ const wallet = await this.wp.promise;
+ wallet.stop();
+ this.wp = openPromise<Wallet>();
+ this.maybeWallet = undefined;
+ await reinit();
+ return wrapResponse({});
+ }
+ default: {
+ const wallet = await this.wp.promise;
+ return await wallet.handleCoreApiRequest(operation, id, args);
+ }
+ }
+ }
+}
+
+export function installNativeWalletListener(): void {
+ const handler = new NativeWalletMessageHandler();
+ const onMessage = async (msgStr: any): Promise<void> => {
+ if (typeof msgStr !== "string") {
+ console.error("expected string as message");
+ return;
+ }
+ const msg = JSON.parse(msgStr);
+ const operation = msg.operation;
+ if (typeof operation !== "string") {
+ console.error(
+ "message to native wallet helper must contain operation of type string",
+ );
+ return;
+ }
+ const id = msg.id;
+ console.log(`native listener: got request for ${operation} (${id})`);
+
+ try {
+ const respMsg = await handler.handleMessage(operation, id, msg.args);
+ console.log(
+ `native listener: sending success response for ${operation} (${id})`,
+ );
+ sendNativeMessage(respMsg);
+ } catch (e) {
+ const respMsg: CoreApiResponse = {
+ type: "error",
+ id,
+ operation,
+ error: makeErrorDetails(
+ TalerErrorCode.WALLET_UNEXPECTED_EXCEPTION,
+ "unexpected exception",
+ {},
+ ),
+ };
+ sendNativeMessage(respMsg);
+ return;
+ }
+ };
+
+ // @ts-ignore
+ globalThis.__native_onMessage = onMessage;
+
+ console.log("native wallet listener installed");
+}
diff --git a/packages/taler-wallet-android/tsconfig.json b/packages/taler-wallet-embedded/tsconfig.json
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
@@ -62,37 +62,6 @@ importers:
rimraf: 3.0.2
typescript: 4.2.3
- packages/taler-wallet-android:
- specifiers:
- '@gnu-taler/taler-wallet-core': workspace:*
- '@rollup/plugin-commonjs': ^17.0.0
- '@rollup/plugin-json': ^4.1.0
- '@rollup/plugin-node-resolve': ^11.1.0
- '@rollup/plugin-replace': ^2.3.4
- '@types/node': ^14.14.22
- prettier: ^2.2.1
- rimraf: ^3.0.2
- rollup: ^2.43.0
- rollup-plugin-sourcemaps: ^0.6.3
- rollup-plugin-terser: ^7.0.2
- tslib: ^2.1.0
- typescript: ^4.2.3
- dependencies:
- '@gnu-taler/taler-wallet-core': link:../taler-wallet-core
- tslib: 2.1.0
- devDependencies:
- '@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.43.0
- rollup-plugin-sourcemaps: 0.6.3_79665b55c550dd6b792bac22e5c7c20e
- rollup-plugin-terser: 7.0.2_rollup@2.43.0
- typescript: 4.2.3
-
packages/taler-wallet-cli:
specifiers:
'@gnu-taler/taler-util': workspace:*
@@ -203,6 +172,37 @@ importers:
typedoc: 0.20.16_typescript@4.1.3
typescript: 4.1.3
+ packages/taler-wallet-embedded:
+ specifiers:
+ '@gnu-taler/taler-wallet-core': workspace:*
+ '@rollup/plugin-commonjs': ^17.0.0
+ '@rollup/plugin-json': ^4.1.0
+ '@rollup/plugin-node-resolve': ^11.1.0
+ '@rollup/plugin-replace': ^2.3.4
+ '@types/node': ^14.14.22
+ prettier: ^2.2.1
+ rimraf: ^3.0.2
+ rollup: ^2.43.0
+ rollup-plugin-sourcemaps: ^0.6.3
+ rollup-plugin-terser: ^7.0.2
+ tslib: ^2.1.0
+ typescript: ^4.2.3
+ dependencies:
+ '@gnu-taler/taler-wallet-core': link:../taler-wallet-core
+ tslib: 2.2.0
+ devDependencies:
+ '@rollup/plugin-commonjs': 17.1.0_rollup@2.43.0
+ '@rollup/plugin-json': 4.1.0_rollup@2.43.0
+ '@rollup/plugin-node-resolve': 11.2.0_rollup@2.43.0
+ '@rollup/plugin-replace': 2.4.2_rollup@2.43.0
+ '@types/node': 14.17.1
+ prettier: 2.2.1
+ rimraf: 3.0.2
+ rollup: 2.43.0
+ rollup-plugin-sourcemaps: 0.6.3_6efbbae6640434994627e0ab519821c6
+ rollup-plugin-terser: 7.0.2_rollup@2.43.0
+ typescript: 4.2.3
+
packages/taler-wallet-webextension:
specifiers:
'@babel/core': ^7.14.0
@@ -3252,36 +3252,36 @@ packages:
rollup: 2.37.1
dev: true
- /@rollup/plugin-commonjs/17.0.0_rollup@2.43.0:
- resolution: {integrity: sha512-/omBIJG1nHQc+bgkYDuLpb/V08QyutP9amOrJRUSlYJZP+b/68gM//D8sxJe3Yry2QnYIr3QjR3x4AlxJEN3GA==}
+ /@rollup/plugin-commonjs/17.1.0_rollup@2.37.1:
+ resolution: {integrity: sha512-PoMdXCw0ZyvjpCMT5aV4nkL0QywxP29sODQsSGeDpr/oI49Qq9tRtAsb/LbYbDzFlOydVEqHmmZWFtXJEAX9ew==}
engines: {node: '>= 8.0.0'}
peerDependencies:
rollup: ^2.30.0
dependencies:
- '@rollup/pluginutils': 3.1.0_rollup@2.43.0
+ '@rollup/pluginutils': 3.1.0_rollup@2.37.1
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
+ resolve: 1.20.0
+ rollup: 2.37.1
dev: true
- /@rollup/plugin-commonjs/17.1.0_rollup@2.37.1:
+ /@rollup/plugin-commonjs/17.1.0_rollup@2.43.0:
resolution: {integrity: sha512-PoMdXCw0ZyvjpCMT5aV4nkL0QywxP29sODQsSGeDpr/oI49Qq9tRtAsb/LbYbDzFlOydVEqHmmZWFtXJEAX9ew==}
engines: {node: '>= 8.0.0'}
peerDependencies:
rollup: ^2.30.0
dependencies:
- '@rollup/pluginutils': 3.1.0_rollup@2.37.1
+ '@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.20.0
- rollup: 2.37.1
+ rollup: 2.43.0
dev: true
/@rollup/plugin-image/2.0.6_rollup@2.37.1:
@@ -3328,34 +3328,34 @@ packages:
rollup: 2.37.1
dev: true
- /@rollup/plugin-node-resolve/11.1.0_rollup@2.43.0:
- resolution: {integrity: sha512-ouBBppRdWJKCllDXGzJ7ZIkYbaq+5TmyP0smt1vdJCFfoZhLi31vhpmjLhyo8lreHf4RoeSNllaWrvSqHpHRog==}
+ /@rollup/plugin-node-resolve/11.2.0_rollup@2.37.1:
+ resolution: {integrity: sha512-qHjNIKYt5pCcn+5RUBQxK8krhRvf1HnyVgUCcFFcweDS7fhkOLZeYh0mhHK6Ery8/bb9tvN/ubPzmfF0qjDCTA==}
engines: {node: '>= 10.0.0'}
peerDependencies:
rollup: ^1.20.0||^2.0.0
dependencies:
- '@rollup/pluginutils': 3.1.0_rollup@2.43.0
+ '@rollup/pluginutils': 3.1.0_rollup@2.37.1
'@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
+ resolve: 1.20.0
+ rollup: 2.37.1
dev: true
- /@rollup/plugin-node-resolve/11.2.0_rollup@2.37.1:
+ /@rollup/plugin-node-resolve/11.2.0_rollup@2.43.0:
resolution: {integrity: sha512-qHjNIKYt5pCcn+5RUBQxK8krhRvf1HnyVgUCcFFcweDS7fhkOLZeYh0mhHK6Ery8/bb9tvN/ubPzmfF0qjDCTA==}
engines: {node: '>= 10.0.0'}
peerDependencies:
rollup: ^1.20.0||^2.0.0
dependencies:
- '@rollup/pluginutils': 3.1.0_rollup@2.37.1
+ '@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.20.0
- rollup: 2.37.1
+ rollup: 2.43.0
dev: true
/@rollup/plugin-node-resolve/7.1.3_rollup@1.32.1:
@@ -3382,24 +3382,24 @@ packages:
rollup: 2.37.1
dev: true
- /@rollup/plugin-replace/2.3.4_rollup@2.43.0:
- resolution: {integrity: sha512-waBhMzyAtjCL1GwZes2jaE9MjuQ/DQF2BatH3fRivUF3z0JBFrU0U6iBNC/4WR+2rLKhaAhPWDNPYp4mI6RqdQ==}
+ /@rollup/plugin-replace/2.4.2_rollup@1.32.1:
+ resolution: {integrity: sha512-IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg==}
peerDependencies:
rollup: ^1.20.0 || ^2.0.0
dependencies:
- '@rollup/pluginutils': 3.1.0_rollup@2.43.0
+ '@rollup/pluginutils': 3.1.0_rollup@1.32.1
magic-string: 0.25.7
- rollup: 2.43.0
+ rollup: 1.32.1
dev: true
- /@rollup/plugin-replace/2.4.2_rollup@1.32.1:
+ /@rollup/plugin-replace/2.4.2_rollup@2.43.0:
resolution: {integrity: sha512-IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg==}
peerDependencies:
rollup: ^1.20.0 || ^2.0.0
dependencies:
- '@rollup/pluginutils': 3.1.0_rollup@1.32.1
+ '@rollup/pluginutils': 3.1.0_rollup@2.43.0
magic-string: 0.25.7
- rollup: 1.32.1
+ rollup: 2.43.0
dev: true
/@rollup/pluginutils/3.1.0_rollup@1.32.1:
@@ -12052,7 +12052,7 @@ packages:
resolution: {integrity: sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==}
engines: {node: '>= 10.13.0'}
dependencies:
- '@types/node': 14.14.22
+ '@types/node': 14.17.1
merge-stream: 2.0.0
supports-color: 7.2.0
dev: true
@@ -15767,7 +15767,7 @@ packages:
source-map-resolve: 0.6.0
dev: true
- /rollup-plugin-sourcemaps/0.6.3_79665b55c550dd6b792bac22e5c7c20e:
+ /rollup-plugin-sourcemaps/0.6.3_6efbbae6640434994627e0ab519821c6:
resolution: {integrity: sha512-paFu+nT1xvuO1tPFYXGe+XnQvg4Hjqv/eIhG8i5EspfYYPBKL57X7iVbfv55aNVASg3dzWvES9dmWsL2KhfByw==}
engines: {node: '>=10.0.0'}
peerDependencies:
@@ -15778,7 +15778,7 @@ packages:
optional: true
dependencies:
'@rollup/pluginutils': 3.1.0_rollup@2.43.0
- '@types/node': 14.14.22
+ '@types/node': 14.17.1
rollup: 2.43.0
source-map-resolve: 0.6.0
dev: true
@@ -15801,7 +15801,7 @@ packages:
peerDependencies:
rollup: ^2.0.0
dependencies:
- '@babel/code-frame': 7.10.4
+ '@babel/code-frame': 7.12.13
jest-worker: 26.6.2
rollup: 2.37.1
serialize-javascript: 4.0.0
@@ -15813,7 +15813,7 @@ packages:
peerDependencies:
rollup: ^2.0.0
dependencies:
- '@babel/code-frame': 7.10.4
+ '@babel/code-frame': 7.12.13
jest-worker: 26.6.2
rollup: 2.43.0
serialize-javascript: 4.0.0
@@ -17257,7 +17257,6 @@ packages:
/tslib/2.2.0:
resolution: {integrity: sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==}
- dev: true
/tsutils/3.19.1_typescript@4.1.3:
resolution: {integrity: sha512-GEdoBf5XI324lu7ycad7s6laADfnAqCw6wLGI+knxvw9vsIYBaJfYdmeCEG3FMMUiSm3OGgNb+m6utsWf5h9Vw==}
