From 24448876143e2f4b0e705ede8694a87c243b4c39 Mon Sep 17 00:00:00 2001 From: Nikita Kuznetsov Date: Fri, 12 Jan 2024 15:36:26 +0100 Subject: [PATCH 01/19] Update extension build --- apps/extension/package.json | 2 + apps/extension/task/webpack.config.js | 134 +++++++++++++------------- yarn.lock | 4 +- 3 files changed, 72 insertions(+), 68 deletions(-) diff --git a/apps/extension/package.json b/apps/extension/package.json index accf47a43..35076e2d2 100644 --- a/apps/extension/package.json +++ b/apps/extension/package.json @@ -12,6 +12,7 @@ "buffer": "^6.0.3", "copy-to-clipboard": "^3.3.3", "crypto-browserify": "^3.12.0", + "process": "^0.11.10", "react": "^18.2.0", "react-dom": "^18.2.0", "react-ga4": "^2.1.0", @@ -26,6 +27,7 @@ "@testing-library/jest-dom": "^5.16.5", "@testing-library/react": "^13.4.0", "@testing-library/user-event": "^13.5.0", + "@types/fs-extra": "^11.0.4", "@types/jest": "^27.5.2", "@types/node": "^16.18.6", "@types/react": "^18.0.26", diff --git a/apps/extension/task/webpack.config.js b/apps/extension/task/webpack.config.js index b2e5406f3..eefcf654e 100644 --- a/apps/extension/task/webpack.config.js +++ b/apps/extension/task/webpack.config.js @@ -2,76 +2,76 @@ const path = require('path'); const { ProvidePlugin } = require('webpack'); module.exports = [ - { - target: 'browserslist', - mode: 'production', - entry: './src/background.ts', - module: { - rules: [ - { - test: /\.tsx?$/, - use: 'ts-loader', - exclude: /node_modules/, + { + target: 'browserslist', + mode: 'production', + entry: './src/background.ts', + module: { + rules: [ + { + test: /\.tsx?$/, + use: 'ts-loader', + exclude: /node_modules/ + } + ] }, - ], - }, - resolve: { - extensions: ['.tsx', '.ts', '.js'], - fallback: { - buffer: require.resolve('buffer'), - }, - }, - output: { - filename: 'background.js', - path: path.resolve(__dirname, '../build'), - }, - plugins: [ - new ProvidePlugin({ - Buffer: ['buffer', 'Buffer'], - process: 'process/browser', - }), - ], - }, - { - target: 'node', - mode: 'production', - entry: './src/provider.ts', - module: { - rules: [ - { - test: /\.tsx?$/, - use: 'ts-loader', - exclude: /node_modules/, + resolve: { + extensions: ['.tsx', '.ts', '.js'], + fallback: { + buffer: require.resolve('buffer/') + } }, - ], - }, - resolve: { - extensions: ['.tsx', '.ts', '.js'], - }, - output: { - filename: 'provider.js', - path: path.resolve(__dirname, '../build'), - }, - }, - { - target: 'node', - mode: 'production', - entry: './src/content.ts', - module: { - rules: [ - { - test: /\.tsx?$/, - use: 'ts-loader', - exclude: /node_modules/, + output: { + filename: 'background.js', + path: path.resolve(__dirname, '../build') }, - ], + plugins: [ + new ProvidePlugin({ + Buffer: ['buffer', 'Buffer'], + process: 'process/browser' + }) + ] }, - resolve: { - extensions: ['.tsx', '.ts', '.js'], - }, - output: { - filename: 'content.js', - path: path.resolve(__dirname, '../build'), + { + target: 'node', + mode: 'production', + entry: './src/provider.ts', + module: { + rules: [ + { + test: /\.tsx?$/, + use: 'ts-loader', + exclude: /node_modules/ + } + ] + }, + resolve: { + extensions: ['.tsx', '.ts', '.js'] + }, + output: { + filename: 'provider.js', + path: path.resolve(__dirname, '../build') + } }, - }, + { + target: 'node', + mode: 'production', + entry: './src/content.ts', + module: { + rules: [ + { + test: /\.tsx?$/, + use: 'ts-loader', + exclude: /node_modules/ + } + ] + }, + resolve: { + extensions: ['.tsx', '.ts', '.js'] + }, + output: { + filename: 'content.js', + path: path.resolve(__dirname, '../build') + } + } ]; diff --git a/yarn.lock b/yarn.lock index 070601c35..c75995582 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5795,6 +5795,7 @@ __metadata: "@tonkeeper/core": "npm:0.1.0" "@tonkeeper/locales": "npm:0.1.0" "@tonkeeper/uikit": "npm:0.1.0" + "@types/fs-extra": "npm:^11.0.4" "@types/jest": "npm:^27.5.2" "@types/node": "npm:^16.18.6" "@types/react": "npm:^18.0.26" @@ -5806,6 +5807,7 @@ __metadata: copy-to-clipboard: "npm:^3.3.3" crypto-browserify: "npm:^3.12.0" customize-cra: "npm:^1.0.0" + process: "npm:^0.11.10" react: "npm:^18.2.0" react-app-rewired: "npm:^2.2.1" react-dom: "npm:^18.2.0" @@ -6294,7 +6296,7 @@ __metadata: languageName: node linkType: hard -"@types/fs-extra@npm:^11.0.1": +"@types/fs-extra@npm:^11.0.1, @types/fs-extra@npm:^11.0.4": version: 11.0.4 resolution: "@types/fs-extra@npm:11.0.4" dependencies: From 2cfc75b365d360606f61cc825af1aef313940953 Mon Sep 17 00:00:00 2001 From: Nikita Kuznetsov Date: Fri, 12 Jan 2024 15:40:37 +0100 Subject: [PATCH 02/19] Fix building web --- apps/web/package.json | 2 ++ package.json | 1 + yarn.lock | 3 +++ 3 files changed, 6 insertions(+) diff --git a/apps/web/package.json b/apps/web/package.json index 32cb0bcd0..f867f8716 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -9,10 +9,12 @@ "@tonkeeper/core": "0.1.0", "@tonkeeper/locales": "0.1.0", "@tonkeeper/uikit": "0.1.0", + "buffer": "^6.0.3", "copy-to-clipboard": "^3.3.3", "i18next": "^22.1.4", "i18next-browser-languagedetector": "^7.0.2", "i18next-http-backend": "^2.0.2", + "process": "^0.11.10", "react": "^18.2.0", "react-dom": "^18.2.0", "react-i18next": "^12.1.1", diff --git a/package.json b/package.json index 8af5d528e..2ce063928 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "eslint-plugin-unused-imports": "^2.0.0", "prettier": "^2.6.2", "turbo": "latest", + "typescript": "^4.9.4", "webpack": "^5.80.0", "webpack-cli": "^5.0.1", "wrangler": "^3.7.0" diff --git a/yarn.lock b/yarn.lock index c75995582..3e32dad37 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5948,10 +5948,12 @@ __metadata: "@types/react": "npm:^18.0.26" "@types/react-dom": "npm:^18.0.9" "@types/styled-components": "npm:^5.1.26" + buffer: "npm:^6.0.3" copy-to-clipboard: "npm:^3.3.3" i18next: "npm:^22.1.4" i18next-browser-languagedetector: "npm:^7.0.2" i18next-http-backend: "npm:^2.0.2" + process: "npm:^0.11.10" react: "npm:^18.2.0" react-app-rewired: "npm:^2.2.1" react-dom: "npm:^18.2.0" @@ -24431,6 +24433,7 @@ __metadata: eslint-plugin-unused-imports: "npm:^2.0.0" prettier: "npm:^2.6.2" turbo: "npm:latest" + typescript: "npm:^4.9.4" webpack: "npm:^5.80.0" webpack-cli: "npm:^5.0.1" wrangler: "npm:^3.7.0" From 53281ceab59cc89665d51fb38b3c0d320ba5e28e Mon Sep 17 00:00:00 2001 From: Nikita Kuznetsov Date: Fri, 12 Jan 2024 15:44:25 +0100 Subject: [PATCH 03/19] Update readme --- README.md | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f45349682..0ee6404d4 100644 --- a/README.md +++ b/README.md @@ -7,14 +7,21 @@ browsers. We recommend using the latest available browser version. ## Building locally -- Install `Node.js` version v20.7.0 -- Install `Yarn` version 4.0.2 +```sh +# Install `Node.js` version v20.7.0 +nvm use + +# Install `Yarn` version 4.0.2 +corepack enable +``` ### Build web script ```sh +# Install dependencies yarn +# Build web app yarn build:web ``` @@ -23,8 +30,10 @@ Compressed build could be found in `/apps/web/build` once they're built. ### Build extension script ```sh +# Install dependencies yarn +# Build extension apps yarn build:extension ``` @@ -34,8 +43,10 @@ once they're built. ### Build desktop script ```sh +# Install dependencies yarn +# Build desktop for current OS yarn build:desktop ``` From ffdcd77c9d693482c3944aca9b8869c04120ce94 Mon Sep 17 00:00:00 2001 From: Nikita Kuznetsov Date: Fri, 12 Jan 2024 15:55:55 +0100 Subject: [PATCH 04/19] Add extension workflow --- .github/workflows/cd.yaml | 40 +++++++++++++++++++++++++++++ .github/workflows/pull-request.yaml | 40 +++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index c0e614ee4..b97c06a8b 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -104,3 +104,43 @@ jobs: run: | security delete-keychain build.keychain rm ${{ github.workspace }}/AuthKey.p8 + + extension-build: + name: extension-build + runs-on: ubuntu-latest + timeout-minutes: 10 + + steps: + - name: Checkout to git repository + uses: actions/checkout@v4 + + - name: Set up Node + uses: actions/setup-node@v3 + with: + node-version: 20.7.0 + + - name: Enable Corepack + run: | + corepack enable + + - name: Run install + uses: borales/actions-yarn@v4 + with: + cmd: install + + - name: Run install + uses: borales/actions-yarn@v4 + env: + REACT_APP_AMPLITUDE: ${{ secrets.REACT_APP_AMPLITUDE_EXTENSION }} + with: + cmd: build:extension + + - name: Upload apps to artifacts + uses: actions/upload-artifact@v4 + with: + name: Tonkeeper Extensions + retention-days: 10 + compression-level: 0 + path: | + ${{ github.workspace }}/apps/extension/dist/tonkeeper_chrome_*.zip + ${{ github.workspace }}/apps/extension/dist/tonkeeper_firefix_*.zip diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml index 45558589e..3b15fb924 100644 --- a/.github/workflows/pull-request.yaml +++ b/.github/workflows/pull-request.yaml @@ -145,3 +145,43 @@ jobs: run: | security delete-keychain build.keychain rm ${{ github.workspace }}/AuthKey.p8 + + extension-build: + name: extension-build + runs-on: ubuntu-latest + timeout-minutes: 10 + + steps: + - name: Checkout to git repository + uses: actions/checkout@v4 + + - name: Set up Node + uses: actions/setup-node@v3 + with: + node-version: 20.7.0 + + - name: Enable Corepack + run: | + corepack enable + + - name: Run install + uses: borales/actions-yarn@v4 + with: + cmd: install + + - name: Run install + uses: borales/actions-yarn@v4 + env: + REACT_APP_AMPLITUDE: ${{ secrets.REACT_APP_AMPLITUDE_EXTENSION }} + with: + cmd: build:extension + + - name: Upload apps to artifacts + uses: actions/upload-artifact@v4 + with: + name: Tonkeeper Extensions + retention-days: 10 + compression-level: 0 + path: | + ${{ github.workspace }}/apps/extension/dist/tonkeeper_chrome_beta_*.zip + ${{ github.workspace }}/apps/extension/dist/tonkeeper_firefix_*.zip From c50c1d46117bd7bf836084f7695e65c6d254a5c7 Mon Sep 17 00:00:00 2001 From: Nikita Kuznetsov Date: Fri, 12 Jan 2024 16:03:36 +0100 Subject: [PATCH 05/19] Web build --- .github/workflows/pull-request.yaml | 34 ++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml index 3b15fb924..e52c199e6 100644 --- a/.github/workflows/pull-request.yaml +++ b/.github/workflows/pull-request.yaml @@ -148,7 +148,7 @@ jobs: extension-build: name: extension-build - runs-on: ubuntu-latest + runs-on: macos-13 timeout-minutes: 10 steps: @@ -185,3 +185,35 @@ jobs: path: | ${{ github.workspace }}/apps/extension/dist/tonkeeper_chrome_beta_*.zip ${{ github.workspace }}/apps/extension/dist/tonkeeper_firefix_*.zip + + web-build: + name: web-build + runs-on: macos-13 + timeout-minutes: 10 + + steps: + - name: Checkout to git repository + uses: actions/checkout@v4 + + - name: Set up Node + uses: actions/setup-node@v3 + with: + node-version: 20.7.0 + + - name: Enable Corepack + run: | + corepack enable + + - name: Run install + uses: borales/actions-yarn@v4 + with: + cmd: install + + - name: Run install + uses: borales/actions-yarn@v4 + env: + REACT_APP_AMPLITUDE: ${{ secrets.REACT_APP_AMPLITUDE_EXTENSION }} + REACT_APP_MEASUREMENT_ID: ${{ secrets.REACT_APP_MEASUREMENT_ID }} + REACT_APP_LOCALES: en,ru,it,tr-TR + with: + cmd: build:web From a70448c94f39d68e69ceb544409ccb4524130235 Mon Sep 17 00:00:00 2001 From: Nikita Kuznetsov Date: Fri, 12 Jan 2024 16:04:40 +0100 Subject: [PATCH 06/19] Update name for a tasks --- .github/workflows/pull-request.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml index e52c199e6..cf26ffa93 100644 --- a/.github/workflows/pull-request.yaml +++ b/.github/workflows/pull-request.yaml @@ -169,7 +169,7 @@ jobs: with: cmd: install - - name: Run install + - name: Run build uses: borales/actions-yarn@v4 env: REACT_APP_AMPLITUDE: ${{ secrets.REACT_APP_AMPLITUDE_EXTENSION }} @@ -209,7 +209,7 @@ jobs: with: cmd: install - - name: Run install + - name: Run build uses: borales/actions-yarn@v4 env: REACT_APP_AMPLITUDE: ${{ secrets.REACT_APP_AMPLITUDE_EXTENSION }} From 8398c8c4a095620c9a4d889ac5526812ea618798 Mon Sep 17 00:00:00 2001 From: Nikita Kuznetsov Date: Fri, 12 Jan 2024 16:23:52 +0100 Subject: [PATCH 07/19] Update extension build --- apps/extension/task/build.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/extension/task/build.ts b/apps/extension/task/build.ts index 0292efa98..23ec1ad83 100644 --- a/apps/extension/task/build.ts +++ b/apps/extension/task/build.ts @@ -6,7 +6,7 @@ import firefox from './fireFox'; common.notify('Build UI'); -common.exec('npx react-app-rewired build', { +common.exec('yarn react-app-rewired build', { stdio: 'inherit', env: { ...process.env, @@ -17,7 +17,7 @@ common.exec('npx react-app-rewired build', { common.notify(`Build Tonkeeper background.js, provider.js, content.js`); -common.exec('npx webpack -c ./task/webpack.config.js', { +common.exec('yarn webpack -c ./task/webpack.config.js', { stdio: 'inherit', env: process.env }); From e35cc5603e9cde1691506efebd420388d12eb255 Mon Sep 17 00:00:00 2001 From: Nikita Kuznetsov Date: Fri, 12 Jan 2024 16:24:02 +0100 Subject: [PATCH 08/19] Update OS --- .github/workflows/pull-request.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml index cf26ffa93..402d719b7 100644 --- a/.github/workflows/pull-request.yaml +++ b/.github/workflows/pull-request.yaml @@ -148,7 +148,7 @@ jobs: extension-build: name: extension-build - runs-on: macos-13 + runs-on: ubuntu-latest timeout-minutes: 10 steps: @@ -188,7 +188,7 @@ jobs: web-build: name: web-build - runs-on: macos-13 + runs-on: ubuntu-latest timeout-minutes: 10 steps: From 4ff7c74be710c0318324460d19ae3b6c291f9908 Mon Sep 17 00:00:00 2001 From: Nikita Kuznetsov Date: Fri, 12 Jan 2024 16:29:27 +0100 Subject: [PATCH 09/19] Deploy web workflow --- .github/workflows/cd.yaml | 41 +++++++++++++++++++++++++++++ .github/workflows/pull-request.yaml | 9 +++++++ 2 files changed, 50 insertions(+) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index b97c06a8b..f536ddc85 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -144,3 +144,44 @@ jobs: path: | ${{ github.workspace }}/apps/extension/dist/tonkeeper_chrome_*.zip ${{ github.workspace }}/apps/extension/dist/tonkeeper_firefix_*.zip + + web-build: + name: web-build + runs-on: macos-13 + timeout-minutes: 10 + + steps: + - name: Checkout to git repository + uses: actions/checkout@v4 + + - name: Set up Node + uses: actions/setup-node@v3 + with: + node-version: 20.7.0 + + - name: Enable Corepack + run: | + corepack enable + + - name: Run install + uses: borales/actions-yarn@v4 + with: + cmd: install + + - name: Run build + uses: borales/actions-yarn@v4 + env: + REACT_APP_AMPLITUDE: ${{ secrets.REACT_APP_AMPLITUDE_EXTENSION }} + REACT_APP_MEASUREMENT_ID: ${{ secrets.REACT_APP_MEASUREMENT_ID }} + REACT_APP_LOCALES: en,ru,it,tr-TR + with: + cmd: build:web + + - name: Publish to Cloudflare Pages + uses: cloudflare/pages-action@v1 + with: + apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} + accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} + projectName: tonkeeper-web + directory: 'apps/web/build' + wranglerVersion: '3' diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml index 402d719b7..d2507ef02 100644 --- a/.github/workflows/pull-request.yaml +++ b/.github/workflows/pull-request.yaml @@ -217,3 +217,12 @@ jobs: REACT_APP_LOCALES: en,ru,it,tr-TR with: cmd: build:web + + - name: Publish to Cloudflare Pages + uses: cloudflare/pages-action@v1 + with: + apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} + accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} + projectName: tonkeeper-web + directory: 'apps/web/build' + wranglerVersion: '3' From c9f2c4070dc8c58cde9608160beea3d1042780c0 Mon Sep 17 00:00:00 2001 From: Nikita Kuznetsov Date: Fri, 12 Jan 2024 16:31:30 +0100 Subject: [PATCH 10/19] Update locales --- .github/workflows/cd.yaml | 2 +- .github/workflows/pull-request.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index f536ddc85..369cf11c2 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -173,7 +173,7 @@ jobs: env: REACT_APP_AMPLITUDE: ${{ secrets.REACT_APP_AMPLITUDE_EXTENSION }} REACT_APP_MEASUREMENT_ID: ${{ secrets.REACT_APP_MEASUREMENT_ID }} - REACT_APP_LOCALES: en,ru,it,tr-TR + REACT_APP_LOCALES: en,zh_CN,ru,it,tr with: cmd: build:web diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml index d2507ef02..767ad951b 100644 --- a/.github/workflows/pull-request.yaml +++ b/.github/workflows/pull-request.yaml @@ -214,7 +214,7 @@ jobs: env: REACT_APP_AMPLITUDE: ${{ secrets.REACT_APP_AMPLITUDE_EXTENSION }} REACT_APP_MEASUREMENT_ID: ${{ secrets.REACT_APP_MEASUREMENT_ID }} - REACT_APP_LOCALES: en,ru,it,tr-TR + REACT_APP_LOCALES: en,zh_CN,ru,it,tr with: cmd: build:web From df7f00274be61eedd7ca0a1245003e2add00228b Mon Sep 17 00:00:00 2001 From: Nikita Kuznetsov Date: Fri, 12 Jan 2024 16:40:43 +0100 Subject: [PATCH 11/19] Revert "Update extension build" This reverts commit 8398c8c4a095620c9a4d889ac5526812ea618798. --- apps/extension/task/build.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/extension/task/build.ts b/apps/extension/task/build.ts index 23ec1ad83..0292efa98 100644 --- a/apps/extension/task/build.ts +++ b/apps/extension/task/build.ts @@ -6,7 +6,7 @@ import firefox from './fireFox'; common.notify('Build UI'); -common.exec('yarn react-app-rewired build', { +common.exec('npx react-app-rewired build', { stdio: 'inherit', env: { ...process.env, @@ -17,7 +17,7 @@ common.exec('yarn react-app-rewired build', { common.notify(`Build Tonkeeper background.js, provider.js, content.js`); -common.exec('yarn webpack -c ./task/webpack.config.js', { +common.exec('npx webpack -c ./task/webpack.config.js', { stdio: 'inherit', env: process.env }); From e4bc78743e7663f399ad3f30664c146f5d24b7c4 Mon Sep 17 00:00:00 2001 From: Nikita Kuznetsov Date: Fri, 12 Jan 2024 17:51:36 +0100 Subject: [PATCH 12/19] Switch web to vite build --- .github/workflows/cd.yaml | 2 +- .github/workflows/pull-request.yaml | 2 +- apps/extension/package.json | 2 +- apps/web/{public => }/index.html | 11 +- apps/web/package.json | 25 +- apps/web/src/App.tsx | 2 +- apps/web/src/index.tsx | 10 +- apps/web/src/libs/hooks.ts | 4 +- apps/web/src/react-app-env.d.ts | 1 - apps/web/src/reportWebVitals.ts | 15 - apps/web/src/vite-env.d.ts | 1 + apps/web/tsconfig.json | 46 +- apps/web/tsconfig.node.json | 10 + apps/web/vite.config.ts | 12 + packages/uikit/package.json | 2 +- .../src/components/lottie/LottieIcons.tsx | 8 +- .../src/components/lottie/TonkeeperLottie.tsx | 2 +- yarn.lock | 801 +++++++++++++++++- 18 files changed, 849 insertions(+), 107 deletions(-) rename apps/web/{public => }/index.html (80%) delete mode 100644 apps/web/src/react-app-env.d.ts delete mode 100644 apps/web/src/reportWebVitals.ts create mode 100644 apps/web/src/vite-env.d.ts create mode 100644 apps/web/tsconfig.node.json create mode 100644 apps/web/vite.config.ts diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index 369cf11c2..671834779 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -183,5 +183,5 @@ jobs: apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} projectName: tonkeeper-web - directory: 'apps/web/build' + directory: apps/web/dist wranglerVersion: '3' diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml index 767ad951b..87b988abe 100644 --- a/.github/workflows/pull-request.yaml +++ b/.github/workflows/pull-request.yaml @@ -224,5 +224,5 @@ jobs: apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} projectName: tonkeeper-web - directory: 'apps/web/build' + directory: apps/web/dist wranglerVersion: '3' diff --git a/apps/extension/package.json b/apps/extension/package.json index 35076e2d2..8720987f9 100644 --- a/apps/extension/package.json +++ b/apps/extension/package.json @@ -1,6 +1,6 @@ { "name": "@tonkeeper/extension", - "version": "3.3.13", + "version": "3.5.2", "author": "Nikita Kuznetsov ", "description": "Your extension wallet on The Open Network", "dependencies": { diff --git a/apps/web/public/index.html b/apps/web/index.html similarity index 80% rename from apps/web/public/index.html rename to apps/web/index.html index 5976a469b..f39878409 100644 --- a/apps/web/public/index.html +++ b/apps/web/index.html @@ -22,11 +22,11 @@ - - - - - + + + + +
+ diff --git a/apps/web/package.json b/apps/web/package.json index f867f8716..1135c8cd7 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -1,6 +1,6 @@ { "name": "@tonkeeper/web", - "version": "3.3.12", + "version": "3.5.2", "author": "Nikita Kuznetsov ", "description": "Your web wallet on The Open Network", "dependencies": { @@ -9,42 +9,39 @@ "@tonkeeper/core": "0.1.0", "@tonkeeper/locales": "0.1.0", "@tonkeeper/uikit": "0.1.0", - "buffer": "^6.0.3", "copy-to-clipboard": "^3.3.3", "i18next": "^22.1.4", "i18next-browser-languagedetector": "^7.0.2", "i18next-http-backend": "^2.0.2", - "process": "^0.11.10", "react": "^18.2.0", "react-dom": "^18.2.0", "react-i18next": "^12.1.1", "react-router-dom": "^6.4.5", - "styled-components": "^5.3.6", - "web-vitals": "^2.1.4" + "styled-components": "^5.3.6" }, "devDependencies": { "@testing-library/dom": "^9.3.1", "@testing-library/jest-dom": "^5.16.5", "@testing-library/react": "^13.4.0", "@testing-library/user-event": "^13.5.0", - "@types/fs-extra": "^11.0.1", + "@types/fs-extra": "^11.0.4", "@types/jest": "^27.5.2", - "@types/node": "^16.18.6", + "@types/node": "^20.11.0", "@types/react": "^18.0.26", "@types/react-dom": "^18.0.9", "@types/styled-components": "^5.1.26", - "react-app-rewired": "^2.2.1", + "@vitejs/plugin-react": "^4.2.1", + "fs-extra": "^11.2.0", "react-is": "^18.2.0", - "react-scripts": "5.0.1", "ts-node": "^10.9.1", - "typescript": "^4.9.4" + "typescript": "5.2.2", + "vite": "^5.0.11", + "vite-plugin-node-polyfills": "^0.19.0" }, "scripts": { "locales": "ts-node ./task/locales", - "start": "yarn locales && react-app-rewired start", - "build": "GENERATE_SOURCEMAP=false react-app-rewired build && yarn locales", - "test": "react-app-rewired test", - "eject": "react-app-rewired eject", + "start": "yarn locales && vite dev", + "build": "tsc && vite build && yarn locales", "build:web": "yarn build" }, "browserslist": { diff --git a/apps/web/src/App.tsx b/apps/web/src/App.tsx index d963bd7d9..f0bae78f2 100644 --- a/apps/web/src/App.tsx +++ b/apps/web/src/App.tsx @@ -86,7 +86,7 @@ export const App: FC = () => { const { t, i18n } = useTranslation(); const translation = useMemo(() => { - const languages = (process.env.REACT_APP_LOCALES ?? 'en').split(','); + const languages = (import.meta.env.VITE_APP_LOCALES ?? 'en').split(','); const client: I18nContext = { t, i18n: { diff --git a/apps/web/src/index.tsx b/apps/web/src/index.tsx index 4be163b03..41b41115a 100644 --- a/apps/web/src/index.tsx +++ b/apps/web/src/index.tsx @@ -1,15 +1,7 @@ import ReactDOM from 'react-dom/client'; import { App } from './App'; import './i18n'; -import reportWebVitals from './reportWebVitals'; -const root = ReactDOM.createRoot( - document.getElementById('root') as HTMLElement -); +const root = ReactDOM.createRoot(document.getElementById('root') as HTMLElement); root.render(); - -// If you want to start measuring performance in your app, pass a function -// to log results (for example: reportWebVitals(console.log)) -// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals -reportWebVitals(); diff --git a/apps/web/src/libs/hooks.ts b/apps/web/src/libs/hooks.ts index 08b1cad1d..c49661f91 100644 --- a/apps/web/src/libs/hooks.ts +++ b/apps/web/src/libs/hooks.ts @@ -53,8 +53,8 @@ export const useAnalytics = (account?: AccountState, wallet?: WalletState | null [QueryKey.analytics], async () => { const tracker = new AnalyticsGroup( - new Amplitude(process.env.REACT_APP_AMPLITUDE!), - new Gtag(process.env.REACT_APP_MEASUREMENT_ID!) + new Amplitude(import.meta.env.VITE_APP_AMPLITUDE!), + new Gtag(import.meta.env.VITE_APP_MEASUREMENT_ID!) ); tracker.init('Web', toWalletType(wallet), account, wallet); diff --git a/apps/web/src/react-app-env.d.ts b/apps/web/src/react-app-env.d.ts deleted file mode 100644 index 6431bc5fc..000000000 --- a/apps/web/src/react-app-env.d.ts +++ /dev/null @@ -1 +0,0 @@ -/// diff --git a/apps/web/src/reportWebVitals.ts b/apps/web/src/reportWebVitals.ts deleted file mode 100644 index 49a2a16e0..000000000 --- a/apps/web/src/reportWebVitals.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { ReportHandler } from 'web-vitals'; - -const reportWebVitals = (onPerfEntry?: ReportHandler) => { - if (onPerfEntry && onPerfEntry instanceof Function) { - import('web-vitals').then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => { - getCLS(onPerfEntry); - getFID(onPerfEntry); - getFCP(onPerfEntry); - getLCP(onPerfEntry); - getTTFB(onPerfEntry); - }); - } -}; - -export default reportWebVitals; diff --git a/apps/web/src/vite-env.d.ts b/apps/web/src/vite-env.d.ts new file mode 100644 index 000000000..11f02fe2a --- /dev/null +++ b/apps/web/src/vite-env.d.ts @@ -0,0 +1 @@ +/// diff --git a/apps/web/tsconfig.json b/apps/web/tsconfig.json index d691e3acd..2b6de22f6 100644 --- a/apps/web/tsconfig.json +++ b/apps/web/tsconfig.json @@ -1,25 +1,29 @@ { - "compilerOptions": { - "target": "es5", - "lib": ["dom", "dom.iterable", "esnext"], - "allowJs": true, - "skipLibCheck": true, - "esModuleInterop": true, - "allowSyntheticDefaultImports": true, - "strict": true, - "forceConsistentCasingInFileNames": true, - "noFallthroughCasesInSwitch": true, - "module": "esnext", - "moduleResolution": "node", - "resolveJsonModule": true, - "isolatedModules": true, - "noEmit": true, - "jsx": "react-jsx" - }, - "include": ["src"], - "ts-node": { "compilerOptions": { - "module": "CommonJS" + "target": "ES2020", + "useDefineForClassFields": true, + "lib": ["ES2020", "DOM", "DOM.Iterable"], + "module": "ESNext", + "skipLibCheck": true, + + /* Bundler mode */ + "moduleResolution": "bundler", + "resolveJsonModule": true, + "isolatedModules": true, + "noEmit": true, + "jsx": "react-jsx", + + /* Linting */ + "strict": true, + "noUnusedLocals": true, + "noUnusedParameters": true, + "noFallthroughCasesInSwitch": true + }, + "include": ["src"], + "references": [{ "path": "./tsconfig.node.json" }], + "ts-node": { + "compilerOptions": { + "module": "CommonJS" + } } - } } diff --git a/apps/web/tsconfig.node.json b/apps/web/tsconfig.node.json new file mode 100644 index 000000000..26063d857 --- /dev/null +++ b/apps/web/tsconfig.node.json @@ -0,0 +1,10 @@ +{ + "compilerOptions": { + "composite": true, + "skipLibCheck": true, + "module": "ESNext", + "moduleResolution": "bundler", + "allowSyntheticDefaultImports": true + }, + "include": ["vite.config.ts"] +} diff --git a/apps/web/vite.config.ts b/apps/web/vite.config.ts new file mode 100644 index 000000000..dd6c85dba --- /dev/null +++ b/apps/web/vite.config.ts @@ -0,0 +1,12 @@ +import react from '@vitejs/plugin-react'; +import { defineConfig } from 'vite'; +import { nodePolyfills } from 'vite-plugin-node-polyfills'; + +export default defineConfig({ + plugins: [nodePolyfills(), react()], + build: { + rollupOptions: { + external: new RegExp(`vite-plugin-node-polyfills`) + } + } +}); diff --git a/packages/uikit/package.json b/packages/uikit/package.json index 8bacc29cb..c59d2382e 100644 --- a/packages/uikit/package.json +++ b/packages/uikit/package.json @@ -25,7 +25,7 @@ "react-beautiful-dnd": "^13.1.1", "react-dom": "^18.2.0", "react-ga4": "^2.1.0", - "react-lottie": "^1.2.3", + "react-lottie": "^1.2.4", "react-qrcode-logo": "^2.9.0", "react-router-dom": "^6.4.5", "react-transition-group": "^4.4.5", diff --git a/packages/uikit/src/components/lottie/LottieIcons.tsx b/packages/uikit/src/components/lottie/LottieIcons.tsx index 3a1a70aea..4faaf3830 100644 --- a/packages/uikit/src/components/lottie/LottieIcons.tsx +++ b/packages/uikit/src/components/lottie/LottieIcons.tsx @@ -1,9 +1,9 @@ import React, { FC } from 'react'; import Lottie from 'react-lottie'; -import * as animationCheckData from './Check.json'; -import * as animationConfettiData from './Confetti.json'; -import * as animationGearData from './Gear.json'; -import * as animationWriteData from './Write.json'; +import animationCheckData from './Check.json'; +import animationConfettiData from './Confetti.json'; +import animationGearData from './Gear.json'; +import animationWriteData from './Write.json'; const defaultCheckOptions = { loop: false, diff --git a/packages/uikit/src/components/lottie/TonkeeperLottie.tsx b/packages/uikit/src/components/lottie/TonkeeperLottie.tsx index 3028d7930..8b6dd33f7 100644 --- a/packages/uikit/src/components/lottie/TonkeeperLottie.tsx +++ b/packages/uikit/src/components/lottie/TonkeeperLottie.tsx @@ -1,6 +1,6 @@ import React, { FC } from 'react'; import Lottie from 'react-lottie'; -import * as animationTonkeeperLogoData from './TonkeeperLogo.json'; +import animationTonkeeperLogoData from './TonkeeperLogo.json'; const defaultTonkeeperLogoOptions = { autoplay: true, diff --git a/yarn.lock b/yarn.lock index 3e32dad37..915234e3d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -193,6 +193,29 @@ __metadata: languageName: node linkType: hard +"@babel/core@npm:^7.23.5": + version: 7.23.7 + resolution: "@babel/core@npm:7.23.7" + dependencies: + "@ampproject/remapping": "npm:^2.2.0" + "@babel/code-frame": "npm:^7.23.5" + "@babel/generator": "npm:^7.23.6" + "@babel/helper-compilation-targets": "npm:^7.23.6" + "@babel/helper-module-transforms": "npm:^7.23.3" + "@babel/helpers": "npm:^7.23.7" + "@babel/parser": "npm:^7.23.6" + "@babel/template": "npm:^7.22.15" + "@babel/traverse": "npm:^7.23.7" + "@babel/types": "npm:^7.23.6" + convert-source-map: "npm:^2.0.0" + debug: "npm:^4.1.0" + gensync: "npm:^1.0.0-beta.2" + json5: "npm:^2.2.3" + semver: "npm:^6.3.1" + checksum: 956841695ea801c8b4196d01072e6c1062335960715a6fcfd4009831003b526b00627c78b373ed49b1658c3622c71142f7ff04235fe839cac4a1a25ed51b90aa + languageName: node + linkType: hard + "@babel/eslint-parser@npm:^7.16.3": version: 7.23.3 resolution: "@babel/eslint-parser@npm:7.23.3" @@ -493,6 +516,17 @@ __metadata: languageName: node linkType: hard +"@babel/helpers@npm:^7.23.7": + version: 7.23.8 + resolution: "@babel/helpers@npm:7.23.8" + dependencies: + "@babel/template": "npm:^7.22.15" + "@babel/traverse": "npm:^7.23.7" + "@babel/types": "npm:^7.23.6" + checksum: 4c392351910102403b6a7c922319077b179c276e422a4e45b243b45610f813a05a043b6b116cbf5eb4b437fb51b9a2dfc2b7c65f38a0de7fde1f97d08a675313 + languageName: node + linkType: hard + "@babel/highlight@npm:^7.23.4": version: 7.23.4 resolution: "@babel/highlight@npm:7.23.4" @@ -1465,6 +1499,28 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-react-jsx-self@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-transform-react-jsx-self@npm:7.23.3" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.22.5" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 882bf56bc932d015c2d83214133939ddcf342e5bcafa21f1a93b19f2e052145115e1e0351730897fd66e5f67cad7875b8a8d81ceb12b6e2a886ad0102cb4eb1f + languageName: node + linkType: hard + +"@babel/plugin-transform-react-jsx-source@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-transform-react-jsx-source@npm:7.23.3" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.22.5" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 92287fb797e522d99bdc77eaa573ce79ff0ad9f1cf4e7df374645e28e51dce0adad129f6f075430b129b5bac8dad843f65021970e12e992d6d6671f0d65bb1e0 + languageName: node + linkType: hard + "@babel/plugin-transform-react-jsx@npm:^7.12.12, @babel/plugin-transform-react-jsx@npm:^7.22.15, @babel/plugin-transform-react-jsx@npm:^7.22.5": version: 7.23.4 resolution: "@babel/plugin-transform-react-jsx@npm:7.23.4" @@ -1873,6 +1929,24 @@ __metadata: languageName: node linkType: hard +"@babel/traverse@npm:^7.23.7": + version: 7.23.7 + resolution: "@babel/traverse@npm:7.23.7" + dependencies: + "@babel/code-frame": "npm:^7.23.5" + "@babel/generator": "npm:^7.23.6" + "@babel/helper-environment-visitor": "npm:^7.22.20" + "@babel/helper-function-name": "npm:^7.23.0" + "@babel/helper-hoist-variables": "npm:^7.22.5" + "@babel/helper-split-export-declaration": "npm:^7.22.6" + "@babel/parser": "npm:^7.23.6" + "@babel/types": "npm:^7.23.6" + debug: "npm:^4.3.1" + globals: "npm:^11.1.0" + checksum: 3215e59429963c8dac85c26933372cdd322952aa9930e4bc5ef2d0e4bd7a1510d1ecf8f8fd860ace5d4d9fe496d23805a1ea019a86410aee4111de5f63ee84f9 + languageName: node + linkType: hard + "@babel/types@npm:^7.0.0, @babel/types@npm:^7.12.11, @babel/types@npm:^7.12.6, @babel/types@npm:^7.12.7, @babel/types@npm:^7.2.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.23.4, @babel/types@npm:^7.23.6, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3": version: 7.23.6 resolution: "@babel/types@npm:7.23.6" @@ -2754,6 +2828,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/aix-ppc64@npm:0.19.11": + version: 0.19.11 + resolution: "@esbuild/aix-ppc64@npm:0.19.11" + conditions: os=aix & cpu=ppc64 + languageName: node + linkType: hard + "@esbuild/android-arm64@npm:0.16.17": version: 0.16.17 resolution: "@esbuild/android-arm64@npm:0.16.17" @@ -2768,6 +2849,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/android-arm64@npm:0.19.11": + version: 0.19.11 + resolution: "@esbuild/android-arm64@npm:0.19.11" + conditions: os=android & cpu=arm64 + languageName: node + linkType: hard + "@esbuild/android-arm@npm:0.16.17": version: 0.16.17 resolution: "@esbuild/android-arm@npm:0.16.17" @@ -2782,6 +2870,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/android-arm@npm:0.19.11": + version: 0.19.11 + resolution: "@esbuild/android-arm@npm:0.19.11" + conditions: os=android & cpu=arm + languageName: node + linkType: hard + "@esbuild/android-x64@npm:0.16.17": version: 0.16.17 resolution: "@esbuild/android-x64@npm:0.16.17" @@ -2796,6 +2891,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/android-x64@npm:0.19.11": + version: 0.19.11 + resolution: "@esbuild/android-x64@npm:0.19.11" + conditions: os=android & cpu=x64 + languageName: node + linkType: hard + "@esbuild/darwin-arm64@npm:0.16.17": version: 0.16.17 resolution: "@esbuild/darwin-arm64@npm:0.16.17" @@ -2810,6 +2912,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/darwin-arm64@npm:0.19.11": + version: 0.19.11 + resolution: "@esbuild/darwin-arm64@npm:0.19.11" + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + "@esbuild/darwin-x64@npm:0.16.17": version: 0.16.17 resolution: "@esbuild/darwin-x64@npm:0.16.17" @@ -2824,6 +2933,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/darwin-x64@npm:0.19.11": + version: 0.19.11 + resolution: "@esbuild/darwin-x64@npm:0.19.11" + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + "@esbuild/freebsd-arm64@npm:0.16.17": version: 0.16.17 resolution: "@esbuild/freebsd-arm64@npm:0.16.17" @@ -2838,6 +2954,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/freebsd-arm64@npm:0.19.11": + version: 0.19.11 + resolution: "@esbuild/freebsd-arm64@npm:0.19.11" + conditions: os=freebsd & cpu=arm64 + languageName: node + linkType: hard + "@esbuild/freebsd-x64@npm:0.16.17": version: 0.16.17 resolution: "@esbuild/freebsd-x64@npm:0.16.17" @@ -2852,6 +2975,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/freebsd-x64@npm:0.19.11": + version: 0.19.11 + resolution: "@esbuild/freebsd-x64@npm:0.19.11" + conditions: os=freebsd & cpu=x64 + languageName: node + linkType: hard + "@esbuild/linux-arm64@npm:0.16.17": version: 0.16.17 resolution: "@esbuild/linux-arm64@npm:0.16.17" @@ -2866,6 +2996,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-arm64@npm:0.19.11": + version: 0.19.11 + resolution: "@esbuild/linux-arm64@npm:0.19.11" + conditions: os=linux & cpu=arm64 + languageName: node + linkType: hard + "@esbuild/linux-arm@npm:0.16.17": version: 0.16.17 resolution: "@esbuild/linux-arm@npm:0.16.17" @@ -2880,6 +3017,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-arm@npm:0.19.11": + version: 0.19.11 + resolution: "@esbuild/linux-arm@npm:0.19.11" + conditions: os=linux & cpu=arm + languageName: node + linkType: hard + "@esbuild/linux-ia32@npm:0.16.17": version: 0.16.17 resolution: "@esbuild/linux-ia32@npm:0.16.17" @@ -2894,6 +3038,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-ia32@npm:0.19.11": + version: 0.19.11 + resolution: "@esbuild/linux-ia32@npm:0.19.11" + conditions: os=linux & cpu=ia32 + languageName: node + linkType: hard + "@esbuild/linux-loong64@npm:0.16.17": version: 0.16.17 resolution: "@esbuild/linux-loong64@npm:0.16.17" @@ -2908,6 +3059,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-loong64@npm:0.19.11": + version: 0.19.11 + resolution: "@esbuild/linux-loong64@npm:0.19.11" + conditions: os=linux & cpu=loong64 + languageName: node + linkType: hard + "@esbuild/linux-mips64el@npm:0.16.17": version: 0.16.17 resolution: "@esbuild/linux-mips64el@npm:0.16.17" @@ -2922,6 +3080,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-mips64el@npm:0.19.11": + version: 0.19.11 + resolution: "@esbuild/linux-mips64el@npm:0.19.11" + conditions: os=linux & cpu=mips64el + languageName: node + linkType: hard + "@esbuild/linux-ppc64@npm:0.16.17": version: 0.16.17 resolution: "@esbuild/linux-ppc64@npm:0.16.17" @@ -2936,6 +3101,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-ppc64@npm:0.19.11": + version: 0.19.11 + resolution: "@esbuild/linux-ppc64@npm:0.19.11" + conditions: os=linux & cpu=ppc64 + languageName: node + linkType: hard + "@esbuild/linux-riscv64@npm:0.16.17": version: 0.16.17 resolution: "@esbuild/linux-riscv64@npm:0.16.17" @@ -2950,6 +3122,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-riscv64@npm:0.19.11": + version: 0.19.11 + resolution: "@esbuild/linux-riscv64@npm:0.19.11" + conditions: os=linux & cpu=riscv64 + languageName: node + linkType: hard + "@esbuild/linux-s390x@npm:0.16.17": version: 0.16.17 resolution: "@esbuild/linux-s390x@npm:0.16.17" @@ -2964,6 +3143,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-s390x@npm:0.19.11": + version: 0.19.11 + resolution: "@esbuild/linux-s390x@npm:0.19.11" + conditions: os=linux & cpu=s390x + languageName: node + linkType: hard + "@esbuild/linux-x64@npm:0.16.17": version: 0.16.17 resolution: "@esbuild/linux-x64@npm:0.16.17" @@ -2978,6 +3164,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-x64@npm:0.19.11": + version: 0.19.11 + resolution: "@esbuild/linux-x64@npm:0.19.11" + conditions: os=linux & cpu=x64 + languageName: node + linkType: hard + "@esbuild/netbsd-x64@npm:0.16.17": version: 0.16.17 resolution: "@esbuild/netbsd-x64@npm:0.16.17" @@ -2992,6 +3185,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/netbsd-x64@npm:0.19.11": + version: 0.19.11 + resolution: "@esbuild/netbsd-x64@npm:0.19.11" + conditions: os=netbsd & cpu=x64 + languageName: node + linkType: hard + "@esbuild/openbsd-x64@npm:0.16.17": version: 0.16.17 resolution: "@esbuild/openbsd-x64@npm:0.16.17" @@ -3006,6 +3206,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/openbsd-x64@npm:0.19.11": + version: 0.19.11 + resolution: "@esbuild/openbsd-x64@npm:0.19.11" + conditions: os=openbsd & cpu=x64 + languageName: node + linkType: hard + "@esbuild/sunos-x64@npm:0.16.17": version: 0.16.17 resolution: "@esbuild/sunos-x64@npm:0.16.17" @@ -3020,6 +3227,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/sunos-x64@npm:0.19.11": + version: 0.19.11 + resolution: "@esbuild/sunos-x64@npm:0.19.11" + conditions: os=sunos & cpu=x64 + languageName: node + linkType: hard + "@esbuild/win32-arm64@npm:0.16.17": version: 0.16.17 resolution: "@esbuild/win32-arm64@npm:0.16.17" @@ -3034,6 +3248,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/win32-arm64@npm:0.19.11": + version: 0.19.11 + resolution: "@esbuild/win32-arm64@npm:0.19.11" + conditions: os=win32 & cpu=arm64 + languageName: node + linkType: hard + "@esbuild/win32-ia32@npm:0.16.17": version: 0.16.17 resolution: "@esbuild/win32-ia32@npm:0.16.17" @@ -3048,6 +3269,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/win32-ia32@npm:0.19.11": + version: 0.19.11 + resolution: "@esbuild/win32-ia32@npm:0.19.11" + conditions: os=win32 & cpu=ia32 + languageName: node + linkType: hard + "@esbuild/win32-x64@npm:0.16.17": version: 0.16.17 resolution: "@esbuild/win32-x64@npm:0.16.17" @@ -3062,6 +3290,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/win32-x64@npm:0.19.11": + version: 0.19.11 + resolution: "@esbuild/win32-x64@npm:0.19.11" + conditions: os=win32 & cpu=x64 + languageName: node + linkType: hard + "@eslint-community/eslint-utils@npm:^4.2.0": version: 4.4.0 resolution: "@eslint-community/eslint-utils@npm:4.4.0" @@ -3530,7 +3765,7 @@ __metadata: languageName: node linkType: hard -"@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.14": +"@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.14, @jridgewell/sourcemap-codec@npm:^1.4.15": version: 1.4.15 resolution: "@jridgewell/sourcemap-codec@npm:1.4.15" checksum: 89960ac087781b961ad918978975bcdf2051cd1741880469783c42de64239703eab9db5230d776d8e6a09d73bb5e4cb964e07d93ee6e2e7aea5a7d726e865c09 @@ -4182,6 +4417,22 @@ __metadata: languageName: node linkType: hard +"@rollup/plugin-inject@npm:^5.0.5": + version: 5.0.5 + resolution: "@rollup/plugin-inject@npm:5.0.5" + dependencies: + "@rollup/pluginutils": "npm:^5.0.1" + estree-walker: "npm:^2.0.2" + magic-string: "npm:^0.30.3" + peerDependencies: + rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0 + peerDependenciesMeta: + rollup: + optional: true + checksum: 1d0e68dff0a8785398a1b6a7dac0dc0a7f2ded22319c0b4c411053f34cbe237ca897d1fc97e5150fddbc3486480f21cbeeb69f0ae7f44ab1ae7307c164c7e704 + languageName: node + linkType: hard + "@rollup/plugin-node-resolve@npm:^11.2.1": version: 11.2.1 resolution: "@rollup/plugin-node-resolve@npm:11.2.1" @@ -4223,6 +4474,113 @@ __metadata: languageName: node linkType: hard +"@rollup/pluginutils@npm:^5.0.1": + version: 5.1.0 + resolution: "@rollup/pluginutils@npm:5.1.0" + dependencies: + "@types/estree": "npm:^1.0.0" + estree-walker: "npm:^2.0.2" + picomatch: "npm:^2.3.1" + peerDependencies: + rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0 + peerDependenciesMeta: + rollup: + optional: true + checksum: abb15eaec5b36f159ec351b48578401bedcefdfa371d24a914cfdbb1e27d0ebfbf895299ec18ccc343d247e71f2502cba21202bc1362d7ef27d5ded699e5c2b2 + languageName: node + linkType: hard + +"@rollup/rollup-android-arm-eabi@npm:4.9.5": + version: 4.9.5 + resolution: "@rollup/rollup-android-arm-eabi@npm:4.9.5" + conditions: os=android & cpu=arm + languageName: node + linkType: hard + +"@rollup/rollup-android-arm64@npm:4.9.5": + version: 4.9.5 + resolution: "@rollup/rollup-android-arm64@npm:4.9.5" + conditions: os=android & cpu=arm64 + languageName: node + linkType: hard + +"@rollup/rollup-darwin-arm64@npm:4.9.5": + version: 4.9.5 + resolution: "@rollup/rollup-darwin-arm64@npm:4.9.5" + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + +"@rollup/rollup-darwin-x64@npm:4.9.5": + version: 4.9.5 + resolution: "@rollup/rollup-darwin-x64@npm:4.9.5" + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + +"@rollup/rollup-linux-arm-gnueabihf@npm:4.9.5": + version: 4.9.5 + resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.9.5" + conditions: os=linux & cpu=arm + languageName: node + linkType: hard + +"@rollup/rollup-linux-arm64-gnu@npm:4.9.5": + version: 4.9.5 + resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.9.5" + conditions: os=linux & cpu=arm64 & libc=glibc + languageName: node + linkType: hard + +"@rollup/rollup-linux-arm64-musl@npm:4.9.5": + version: 4.9.5 + resolution: "@rollup/rollup-linux-arm64-musl@npm:4.9.5" + conditions: os=linux & cpu=arm64 & libc=musl + languageName: node + linkType: hard + +"@rollup/rollup-linux-riscv64-gnu@npm:4.9.5": + version: 4.9.5 + resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.9.5" + conditions: os=linux & cpu=riscv64 & libc=glibc + languageName: node + linkType: hard + +"@rollup/rollup-linux-x64-gnu@npm:4.9.5": + version: 4.9.5 + resolution: "@rollup/rollup-linux-x64-gnu@npm:4.9.5" + conditions: os=linux & cpu=x64 & libc=glibc + languageName: node + linkType: hard + +"@rollup/rollup-linux-x64-musl@npm:4.9.5": + version: 4.9.5 + resolution: "@rollup/rollup-linux-x64-musl@npm:4.9.5" + conditions: os=linux & cpu=x64 & libc=musl + languageName: node + linkType: hard + +"@rollup/rollup-win32-arm64-msvc@npm:4.9.5": + version: 4.9.5 + resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.9.5" + conditions: os=win32 & cpu=arm64 + languageName: node + linkType: hard + +"@rollup/rollup-win32-ia32-msvc@npm:4.9.5": + version: 4.9.5 + resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.9.5" + conditions: os=win32 & cpu=ia32 + languageName: node + linkType: hard + +"@rollup/rollup-win32-x64-msvc@npm:4.9.5": + version: 4.9.5 + resolution: "@rollup/rollup-win32-x64-msvc@npm:4.9.5" + conditions: os=win32 & cpu=x64 + languageName: node + linkType: hard + "@rushstack/eslint-patch@npm:^1.1.0": version: 1.6.0 resolution: "@rushstack/eslint-patch@npm:1.6.0" @@ -5913,7 +6271,7 @@ __metadata: react-dom: "npm:^18.2.0" react-ga4: "npm:^2.1.0" react-is: "npm:^18.2.0" - react-lottie: "npm:^1.2.3" + react-lottie: "npm:^1.2.4" react-qrcode-logo: "npm:^2.9.0" react-router-dom: "npm:^6.4.5" react-transition-group: "npm:^4.4.5" @@ -5942,29 +6300,28 @@ __metadata: "@tonkeeper/core": "npm:0.1.0" "@tonkeeper/locales": "npm:0.1.0" "@tonkeeper/uikit": "npm:0.1.0" - "@types/fs-extra": "npm:^11.0.1" + "@types/fs-extra": "npm:^11.0.4" "@types/jest": "npm:^27.5.2" - "@types/node": "npm:^16.18.6" + "@types/node": "npm:^20.11.0" "@types/react": "npm:^18.0.26" "@types/react-dom": "npm:^18.0.9" "@types/styled-components": "npm:^5.1.26" - buffer: "npm:^6.0.3" + "@vitejs/plugin-react": "npm:^4.2.1" copy-to-clipboard: "npm:^3.3.3" + fs-extra: "npm:^11.2.0" i18next: "npm:^22.1.4" i18next-browser-languagedetector: "npm:^7.0.2" i18next-http-backend: "npm:^2.0.2" - process: "npm:^0.11.10" react: "npm:^18.2.0" - react-app-rewired: "npm:^2.2.1" react-dom: "npm:^18.2.0" react-i18next: "npm:^12.1.1" react-is: "npm:^18.2.0" react-router-dom: "npm:^6.4.5" - react-scripts: "npm:5.0.1" styled-components: "npm:^5.3.6" ts-node: "npm:^10.9.1" - typescript: "npm:^4.9.4" - web-vitals: "npm:^2.1.4" + typescript: "npm:5.2.2" + vite: "npm:^5.0.11" + vite-plugin-node-polyfills: "npm:^0.19.0" languageName: unknown linkType: soft @@ -6119,7 +6476,7 @@ __metadata: languageName: node linkType: hard -"@types/babel__core@npm:^7.0.0, @types/babel__core@npm:^7.1.14": +"@types/babel__core@npm:^7.0.0, @types/babel__core@npm:^7.1.14, @types/babel__core@npm:^7.20.5": version: 7.20.5 resolution: "@types/babel__core@npm:7.20.5" dependencies: @@ -6246,7 +6603,7 @@ __metadata: languageName: node linkType: hard -"@types/estree@npm:*, @types/estree@npm:^1.0.0": +"@types/estree@npm:*, @types/estree@npm:1.0.5, @types/estree@npm:^1.0.0": version: 1.0.5 resolution: "@types/estree@npm:1.0.5" checksum: 7de6d928dd4010b0e20c6919e1a6c27b61f8d4567befa89252055fad503d587ecb9a1e3eab1b1901f923964d7019796db810b7fd6430acb26c32866d126fd408 @@ -6574,6 +6931,15 @@ __metadata: languageName: node linkType: hard +"@types/node@npm:^20.11.0": + version: 20.11.0 + resolution: "@types/node@npm:20.11.0" + dependencies: + undici-types: "npm:~5.26.4" + checksum: 8da60a8ccb65181c3d6f7686ddc5f1b1616cafa14d9e520a866adff82c17cc99336a78dd7ce7bee8f54e2332946f678b0e3aa377fbaaf751d3c05b64600872c6 + languageName: node + linkType: hard + "@types/normalize-package-data@npm:^2.4.0": version: 2.4.4 resolution: "@types/normalize-package-data@npm:2.4.4" @@ -7109,6 +7475,21 @@ __metadata: languageName: node linkType: hard +"@vitejs/plugin-react@npm:^4.2.1": + version: 4.2.1 + resolution: "@vitejs/plugin-react@npm:4.2.1" + dependencies: + "@babel/core": "npm:^7.23.5" + "@babel/plugin-transform-react-jsx-self": "npm:^7.23.3" + "@babel/plugin-transform-react-jsx-source": "npm:^7.23.3" + "@types/babel__core": "npm:^7.20.5" + react-refresh: "npm:^0.14.0" + peerDependencies: + vite: ^4.2.0 || ^5.0.0 + checksum: d7fa6dacd3c246bcee482ff4b7037b2978b6ca002b79780ad4921e91ae4bc85ab234cfb94f8d4d825fed8488a0acdda2ff02b47c27b3055187c0727b18fc725e + languageName: node + linkType: hard + "@webassemblyjs/ast@npm:1.11.6, @webassemblyjs/ast@npm:^1.11.5": version: 1.11.6 resolution: "@webassemblyjs/ast@npm:1.11.6" @@ -8246,6 +8627,19 @@ __metadata: languageName: node linkType: hard +"assert@npm:^2.0.0": + version: 2.1.0 + resolution: "assert@npm:2.1.0" + dependencies: + call-bind: "npm:^1.0.2" + is-nan: "npm:^1.3.2" + object-is: "npm:^1.1.5" + object.assign: "npm:^4.1.4" + util: "npm:^0.12.5" + checksum: 6b9d813c8eef1c0ac13feac5553972e4bd180ae16000d4eb5c0ded2489188737c75a5aacefc97a985008b37502f62fe1bad34da1a7481a54bbfabec3964c8aa7 + languageName: node + linkType: hard + "assign-symbols@npm:^1.0.0": version: 1.0.0 resolution: "assign-symbols@npm:1.0.0" @@ -8993,6 +9387,15 @@ __metadata: languageName: node linkType: hard +"browser-resolve@npm:^2.0.0": + version: 2.0.0 + resolution: "browser-resolve@npm:2.0.0" + dependencies: + resolve: "npm:^1.17.0" + checksum: ad5314db3429a903b07d6445137588665c4677d6276298bb08f0623f05cb107762b73c78f03b4f954a712bd1ebaf98e349b9d98e423123a42804924327a5acd4 + languageName: node + linkType: hard + "browserify-aes@npm:^1.0.0, browserify-aes@npm:^1.0.4": version: 1.2.0 resolution: "browserify-aes@npm:1.2.0" @@ -9137,7 +9540,7 @@ __metadata: languageName: node linkType: hard -"buffer@npm:^5.5.0": +"buffer@npm:^5.5.0, buffer@npm:^5.7.1": version: 5.7.1 resolution: "buffer@npm:5.7.1" dependencies: @@ -10355,7 +10758,7 @@ __metadata: languageName: node linkType: hard -"create-require@npm:^1.1.0": +"create-require@npm:^1.1.0, create-require@npm:^1.1.1": version: 1.1.1 resolution: "create-require@npm:1.1.1" checksum: a9a1503d4390d8b59ad86f4607de7870b39cad43d929813599a23714831e81c520bddf61bcdd1f8e30f05fd3a2b71ae8538e946eb2786dc65c2bbc520f692eff @@ -11352,6 +11755,13 @@ __metadata: languageName: node linkType: hard +"domain-browser@npm:^4.22.0": + version: 4.23.0 + resolution: "domain-browser@npm:4.23.0" + checksum: 56d5a969ed330a16aa6f03f26e7ba3b98e07c7ce4a77d08f987e9e424f1deca009070ed9bd24011d9b863499dcba95de4d679bba77aef346ee23230e570ab9cf + languageName: node + linkType: hard + "domelementtype@npm:1": version: 1.3.1 resolution: "domelementtype@npm:1.3.1" @@ -12149,6 +12559,86 @@ __metadata: languageName: node linkType: hard +"esbuild@npm:^0.19.3": + version: 0.19.11 + resolution: "esbuild@npm:0.19.11" + dependencies: + "@esbuild/aix-ppc64": "npm:0.19.11" + "@esbuild/android-arm": "npm:0.19.11" + "@esbuild/android-arm64": "npm:0.19.11" + "@esbuild/android-x64": "npm:0.19.11" + "@esbuild/darwin-arm64": "npm:0.19.11" + "@esbuild/darwin-x64": "npm:0.19.11" + "@esbuild/freebsd-arm64": "npm:0.19.11" + "@esbuild/freebsd-x64": "npm:0.19.11" + "@esbuild/linux-arm": "npm:0.19.11" + "@esbuild/linux-arm64": "npm:0.19.11" + "@esbuild/linux-ia32": "npm:0.19.11" + "@esbuild/linux-loong64": "npm:0.19.11" + "@esbuild/linux-mips64el": "npm:0.19.11" + "@esbuild/linux-ppc64": "npm:0.19.11" + "@esbuild/linux-riscv64": "npm:0.19.11" + "@esbuild/linux-s390x": "npm:0.19.11" + "@esbuild/linux-x64": "npm:0.19.11" + "@esbuild/netbsd-x64": "npm:0.19.11" + "@esbuild/openbsd-x64": "npm:0.19.11" + "@esbuild/sunos-x64": "npm:0.19.11" + "@esbuild/win32-arm64": "npm:0.19.11" + "@esbuild/win32-ia32": "npm:0.19.11" + "@esbuild/win32-x64": "npm:0.19.11" + dependenciesMeta: + "@esbuild/aix-ppc64": + optional: true + "@esbuild/android-arm": + optional: true + "@esbuild/android-arm64": + optional: true + "@esbuild/android-x64": + optional: true + "@esbuild/darwin-arm64": + optional: true + "@esbuild/darwin-x64": + optional: true + "@esbuild/freebsd-arm64": + optional: true + "@esbuild/freebsd-x64": + optional: true + "@esbuild/linux-arm": + optional: true + "@esbuild/linux-arm64": + optional: true + "@esbuild/linux-ia32": + optional: true + "@esbuild/linux-loong64": + optional: true + "@esbuild/linux-mips64el": + optional: true + "@esbuild/linux-ppc64": + optional: true + "@esbuild/linux-riscv64": + optional: true + "@esbuild/linux-s390x": + optional: true + "@esbuild/linux-x64": + optional: true + "@esbuild/netbsd-x64": + optional: true + "@esbuild/openbsd-x64": + optional: true + "@esbuild/sunos-x64": + optional: true + "@esbuild/win32-arm64": + optional: true + "@esbuild/win32-ia32": + optional: true + "@esbuild/win32-x64": + optional: true + bin: + esbuild: bin/esbuild + checksum: a40b3858c29618c8c893389372f469245a6b2d1319782af75d33d8ba5dcadfe181fcc935f8e1a907be667946384950a4cf482ebe1e79c99c932d2b8eb35a09d0 + languageName: node + linkType: hard + "escalade@npm:^3.1.1": version: 3.1.1 resolution: "escalade@npm:3.1.1" @@ -12701,6 +13191,13 @@ __metadata: languageName: node linkType: hard +"estree-walker@npm:^2.0.2": + version: 2.0.2 + resolution: "estree-walker@npm:2.0.2" + checksum: b02109c5d46bc2ed47de4990eef770f7457b1159a229f0999a09224d2b85ffeed2d7679cffcff90aeb4448e94b0168feb5265b209cdec29aad50a3d6e93d21e2 + languageName: node + linkType: hard + "esutils@npm:^2.0.2": version: 2.0.3 resolution: "esutils@npm:2.0.3" @@ -13584,7 +14081,7 @@ __metadata: languageName: node linkType: hard -"fs-extra@npm:^11.1.0, fs-extra@npm:^11.1.1": +"fs-extra@npm:^11.1.0, fs-extra@npm:^11.1.1, fs-extra@npm:^11.2.0": version: 11.2.0 resolution: "fs-extra@npm:11.2.0" dependencies: @@ -13702,7 +14199,7 @@ __metadata: languageName: node linkType: hard -"fsevents@npm:^2.1.2, fsevents@npm:^2.3.2, fsevents@npm:~2.3.2": +"fsevents@npm:^2.1.2, fsevents@npm:^2.3.2, fsevents@npm:~2.3.2, fsevents@npm:~2.3.3": version: 2.3.3 resolution: "fsevents@npm:2.3.3" dependencies: @@ -13722,7 +14219,7 @@ __metadata: languageName: node linkType: hard -"fsevents@patch:fsevents@npm%3A^2.1.2#optional!builtin, fsevents@patch:fsevents@npm%3A^2.3.2#optional!builtin, fsevents@patch:fsevents@npm%3A~2.3.2#optional!builtin": +"fsevents@patch:fsevents@npm%3A^2.1.2#optional!builtin, fsevents@patch:fsevents@npm%3A^2.3.2#optional!builtin, fsevents@patch:fsevents@npm%3A~2.3.2#optional!builtin, fsevents@patch:fsevents@npm%3A~2.3.3#optional!builtin": version: 2.3.3 resolution: "fsevents@patch:fsevents@npm%3A2.3.3#optional!builtin::version=2.3.3&hash=df0bf1" dependencies: @@ -15206,7 +15703,7 @@ __metadata: languageName: node linkType: hard -"is-arguments@npm:^1.1.1": +"is-arguments@npm:^1.0.4, is-arguments@npm:^1.1.1": version: 1.1.1 resolution: "is-arguments@npm:1.1.1" dependencies: @@ -15445,7 +15942,7 @@ __metadata: languageName: node linkType: hard -"is-generator-function@npm:^1.0.10": +"is-generator-function@npm:^1.0.10, is-generator-function@npm:^1.0.7": version: 1.0.10 resolution: "is-generator-function@npm:1.0.10" dependencies: @@ -15527,6 +16024,16 @@ __metadata: languageName: node linkType: hard +"is-nan@npm:^1.3.2": + version: 1.3.2 + resolution: "is-nan@npm:1.3.2" + dependencies: + call-bind: "npm:^1.0.0" + define-properties: "npm:^1.1.3" + checksum: 1f784d3472c09bc2e47acba7ffd4f6c93b0394479aa613311dc1d70f1bfa72eb0846c81350967722c959ba65811bae222204d6c65856fdce68f31986140c7b0e + languageName: node + linkType: hard + "is-negative-zero@npm:^2.0.2": version: 2.0.2 resolution: "is-negative-zero@npm:2.0.2" @@ -15703,7 +16210,7 @@ __metadata: languageName: node linkType: hard -"is-typed-array@npm:^1.1.10, is-typed-array@npm:^1.1.12, is-typed-array@npm:^1.1.9": +"is-typed-array@npm:^1.1.10, is-typed-array@npm:^1.1.12, is-typed-array@npm:^1.1.3, is-typed-array@npm:^1.1.9": version: 1.1.12 resolution: "is-typed-array@npm:1.1.12" dependencies: @@ -15868,6 +16375,13 @@ __metadata: languageName: node linkType: hard +"isomorphic-timers-promises@npm:^1.0.1": + version: 1.0.1 + resolution: "isomorphic-timers-promises@npm:1.0.1" + checksum: 2dabe397039081dbf30039f295333a7f9888b072dd0afa3aa7d8ba8f812a6db5efcbda0861a4be43ecfec207d56314ecf27150187b8d0f924a93103fa93eac73 + languageName: node + linkType: hard + "isomorphic-unfetch@npm:^3.1.0": version: 3.1.0 resolution: "isomorphic-unfetch@npm:3.1.0" @@ -17474,6 +17988,15 @@ __metadata: languageName: node linkType: hard +"magic-string@npm:^0.30.3": + version: 0.30.5 + resolution: "magic-string@npm:0.30.5" + dependencies: + "@jridgewell/sourcemap-codec": "npm:^1.4.15" + checksum: c8a6b25f813215ca9db526f3a407d6dc0bf35429c2b8111d6f1c2cf6cf6afd5e2d9f9cd189416a0e3959e20ecd635f73639f9825c73de1074b29331fe36ace59 + languageName: node + linkType: hard + "make-dir@npm:^2.0.0, make-dir@npm:^2.1.0": version: 2.1.0 resolution: "make-dir@npm:2.1.0" @@ -18557,6 +19080,41 @@ __metadata: languageName: node linkType: hard +"node-stdlib-browser@npm:^1.2.0": + version: 1.2.0 + resolution: "node-stdlib-browser@npm:1.2.0" + dependencies: + assert: "npm:^2.0.0" + browser-resolve: "npm:^2.0.0" + browserify-zlib: "npm:^0.2.0" + buffer: "npm:^5.7.1" + console-browserify: "npm:^1.1.0" + constants-browserify: "npm:^1.0.0" + create-require: "npm:^1.1.1" + crypto-browserify: "npm:^3.11.0" + domain-browser: "npm:^4.22.0" + events: "npm:^3.0.0" + https-browserify: "npm:^1.0.0" + isomorphic-timers-promises: "npm:^1.0.1" + os-browserify: "npm:^0.3.0" + path-browserify: "npm:^1.0.1" + pkg-dir: "npm:^5.0.0" + process: "npm:^0.11.10" + punycode: "npm:^1.4.1" + querystring-es3: "npm:^0.2.1" + readable-stream: "npm:^3.6.0" + stream-browserify: "npm:^3.0.0" + stream-http: "npm:^3.2.0" + string_decoder: "npm:^1.0.0" + timers-browserify: "npm:^2.0.4" + tty-browserify: "npm:0.0.1" + url: "npm:^0.11.0" + util: "npm:^0.12.4" + vm-browserify: "npm:^1.0.1" + checksum: 3872da5954722fc8e8267bb58af0dbe36a85b2003e55e63e191f7cc38baf2cbff530bea42c809dfeaa0ad70c0977d0b862b4a515ad90902c1db39ff2179f9b71 + languageName: node + linkType: hard + "nopt@npm:^6.0.0": version: 6.0.0 resolution: "nopt@npm:6.0.0" @@ -19325,6 +19883,13 @@ __metadata: languageName: node linkType: hard +"path-browserify@npm:^1.0.1": + version: 1.0.1 + resolution: "path-browserify@npm:1.0.1" + checksum: 7e7368a5207e7c6b9051ef045711d0dc3c2b6203e96057e408e6e74d09f383061010d2be95cb8593fe6258a767c3e9fc6b2bfc7ce8d48ae8c3d9f6994cca9ad8 + languageName: node + linkType: hard + "path-dirname@npm:^1.0.0": version: 1.0.2 resolution: "path-dirname@npm:1.0.2" @@ -20532,6 +21097,17 @@ __metadata: languageName: node linkType: hard +"postcss@npm:^8.4.32": + version: 8.4.33 + resolution: "postcss@npm:8.4.33" + dependencies: + nanoid: "npm:^3.3.7" + picocolors: "npm:^1.0.0" + source-map-js: "npm:^1.0.2" + checksum: e22a4594c255f26117f38419fb494d7ecab0f596cd409f7aadc8a6173abf180ed7ea970cd13fd366ab12b5840be901d2a09b25197700c2ebcb5a8077326bf519 + languageName: node + linkType: hard + "prebuild-install@npm:^7.0.1": version: 7.1.1 resolution: "prebuild-install@npm:7.1.1" @@ -20925,7 +21501,7 @@ __metadata: languageName: node linkType: hard -"querystring-es3@npm:^0.2.0": +"querystring-es3@npm:^0.2.0, querystring-es3@npm:^0.2.1": version: 0.2.1 resolution: "querystring-es3@npm:0.2.1" checksum: c99fccfe1a9c4c25ea6194fa7a559fdb83d2628f118f898af6f0ac02c4ffcd7e0576997bb80e7dfa892d193988b60e23d4968122426351819f87051862af991c @@ -21287,15 +21863,15 @@ __metadata: languageName: node linkType: hard -"react-lottie@npm:^1.2.3": - version: 1.2.3 - resolution: "react-lottie@npm:1.2.3" +"react-lottie@npm:^1.2.4": + version: 1.2.4 + resolution: "react-lottie@npm:1.2.4" dependencies: babel-runtime: "npm:^6.26.0" lottie-web: "npm:^5.1.3" peerDependencies: - react: ^0.14.7 || ^15.0.0 || ^16.0.0 - checksum: 17b9a17771b3dd18f09cc0931cf049e679ee39fc99dd6c86513b301a17affe50124b1f3d434dfba86d756036f4fa97b99d2d8ded3b11a23a756097fc547cc95f + react: ">=15.0.0" + checksum: fc3d8f49ad43059820993ed01190ea924340c9a43c16b4c45ccce68ac6fdface04169e3de7c19381e51e16fa42638f8331cd2a8bc9e29c79d2c0ed9e9dd46eed languageName: node linkType: hard @@ -21361,6 +21937,13 @@ __metadata: languageName: node linkType: hard +"react-refresh@npm:^0.14.0": + version: 0.14.0 + resolution: "react-refresh@npm:0.14.0" + checksum: 75941262ce3ed4fc79b52492943fd59692f29b84f30f3822713b7e920f28e85c62a4386f85cbfbaea95ed62d3e74209f0a0bb065904b7ab2f166a74ac3812e2a + languageName: node + linkType: hard + "react-router-dom@npm:^6.20.1, react-router-dom@npm:^6.4.5": version: 6.21.0 resolution: "react-router-dom@npm:6.21.0" @@ -22040,7 +22623,7 @@ __metadata: languageName: node linkType: hard -"resolve@npm:^1.1.6, resolve@npm:^1.1.7, resolve@npm:^1.10.0, resolve@npm:^1.14.2, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.2, resolve@npm:^1.22.4, resolve@npm:^1.3.2": +"resolve@npm:^1.1.6, resolve@npm:^1.1.7, resolve@npm:^1.10.0, resolve@npm:^1.14.2, resolve@npm:^1.17.0, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.2, resolve@npm:^1.22.4, resolve@npm:^1.3.2": version: 1.22.8 resolution: "resolve@npm:1.22.8" dependencies: @@ -22066,7 +22649,7 @@ __metadata: languageName: node linkType: hard -"resolve@patch:resolve@npm%3A^1.1.6#optional!builtin, resolve@patch:resolve@npm%3A^1.1.7#optional!builtin, resolve@patch:resolve@npm%3A^1.10.0#optional!builtin, resolve@patch:resolve@npm%3A^1.14.2#optional!builtin, resolve@patch:resolve@npm%3A^1.19.0#optional!builtin, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin, resolve@patch:resolve@npm%3A^1.22.2#optional!builtin, resolve@patch:resolve@npm%3A^1.22.4#optional!builtin, resolve@patch:resolve@npm%3A^1.3.2#optional!builtin": +"resolve@patch:resolve@npm%3A^1.1.6#optional!builtin, resolve@patch:resolve@npm%3A^1.1.7#optional!builtin, resolve@patch:resolve@npm%3A^1.10.0#optional!builtin, resolve@patch:resolve@npm%3A^1.14.2#optional!builtin, resolve@patch:resolve@npm%3A^1.17.0#optional!builtin, resolve@patch:resolve@npm%3A^1.19.0#optional!builtin, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin, resolve@patch:resolve@npm%3A^1.22.2#optional!builtin, resolve@patch:resolve@npm%3A^1.22.4#optional!builtin, resolve@patch:resolve@npm%3A^1.3.2#optional!builtin": version: 1.22.8 resolution: "resolve@patch:resolve@npm%3A1.22.8#optional!builtin::version=1.22.8&hash=c3c19d" dependencies: @@ -22260,6 +22843,60 @@ __metadata: languageName: node linkType: hard +"rollup@npm:^4.2.0": + version: 4.9.5 + resolution: "rollup@npm:4.9.5" + dependencies: + "@rollup/rollup-android-arm-eabi": "npm:4.9.5" + "@rollup/rollup-android-arm64": "npm:4.9.5" + "@rollup/rollup-darwin-arm64": "npm:4.9.5" + "@rollup/rollup-darwin-x64": "npm:4.9.5" + "@rollup/rollup-linux-arm-gnueabihf": "npm:4.9.5" + "@rollup/rollup-linux-arm64-gnu": "npm:4.9.5" + "@rollup/rollup-linux-arm64-musl": "npm:4.9.5" + "@rollup/rollup-linux-riscv64-gnu": "npm:4.9.5" + "@rollup/rollup-linux-x64-gnu": "npm:4.9.5" + "@rollup/rollup-linux-x64-musl": "npm:4.9.5" + "@rollup/rollup-win32-arm64-msvc": "npm:4.9.5" + "@rollup/rollup-win32-ia32-msvc": "npm:4.9.5" + "@rollup/rollup-win32-x64-msvc": "npm:4.9.5" + "@types/estree": "npm:1.0.5" + fsevents: "npm:~2.3.2" + dependenciesMeta: + "@rollup/rollup-android-arm-eabi": + optional: true + "@rollup/rollup-android-arm64": + optional: true + "@rollup/rollup-darwin-arm64": + optional: true + "@rollup/rollup-darwin-x64": + optional: true + "@rollup/rollup-linux-arm-gnueabihf": + optional: true + "@rollup/rollup-linux-arm64-gnu": + optional: true + "@rollup/rollup-linux-arm64-musl": + optional: true + "@rollup/rollup-linux-riscv64-gnu": + optional: true + "@rollup/rollup-linux-x64-gnu": + optional: true + "@rollup/rollup-linux-x64-musl": + optional: true + "@rollup/rollup-win32-arm64-msvc": + optional: true + "@rollup/rollup-win32-ia32-msvc": + optional: true + "@rollup/rollup-win32-x64-msvc": + optional: true + fsevents: + optional: true + bin: + rollup: dist/bin/rollup + checksum: 4debf528e63edea5c3f5d38e399c6dd7287e2977d90d2d3ce38d4b3412289e2081aff8f8488a11b1699c786f2e904e9e150f30d576fe9316b5b97df0e80b1bce + languageName: node + linkType: hard + "rsvp@npm:^4.8.4": version: 4.8.5 resolution: "rsvp@npm:4.8.5" @@ -23399,6 +24036,18 @@ __metadata: languageName: node linkType: hard +"stream-http@npm:^3.2.0": + version: 3.2.0 + resolution: "stream-http@npm:3.2.0" + dependencies: + builtin-status-codes: "npm:^3.0.0" + inherits: "npm:^2.0.4" + readable-stream: "npm:^3.6.0" + xtend: "npm:^4.0.2" + checksum: 4f85738cbc6de70ecf0a04bc38b6092b4d91dd5317d3d93c88a84c48e63b82a8724ab5fd591df9f587b5139fe439d1748e4e3db3cb09c2b1e23649cb9d89859e + languageName: node + linkType: hard + "stream-shift@npm:^1.0.0": version: 1.0.1 resolution: "stream-shift@npm:1.0.1" @@ -24657,6 +25306,13 @@ __metadata: languageName: node linkType: hard +"tty-browserify@npm:0.0.1": + version: 0.0.1 + resolution: "tty-browserify@npm:0.0.1" + checksum: 93b745d43fa5a7d2b948fa23be8d313576d1d884b48acd957c07710bac1c0d8ac34c0556ad4c57c73d36e11741763ef66b3fb4fb97b06b7e4d525315a3cd45f5 + languageName: node + linkType: hard + "tunnel-agent@npm:^0.6.0": version: 0.6.0 resolution: "tunnel-agent@npm:0.6.0" @@ -24891,6 +25547,16 @@ __metadata: languageName: node linkType: hard +"typescript@npm:5.2.2": + version: 5.2.2 + resolution: "typescript@npm:5.2.2" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: d65e50eb849bd21ff8677e5b9447f9c6e74777e346afd67754934264dcbf4bd59e7d2473f6062d9a015d66bd573311166357e3eb07fea0b52859cf9bb2b58555 + languageName: node + linkType: hard + "typescript@npm:^4.9.4": version: 4.9.5 resolution: "typescript@npm:4.9.5" @@ -24901,6 +25567,16 @@ __metadata: languageName: node linkType: hard +"typescript@patch:typescript@npm%3A5.2.2#optional!builtin": + version: 5.2.2 + resolution: "typescript@patch:typescript@npm%3A5.2.2#optional!builtin::version=5.2.2&hash=f3b441" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: f79cc2ba802c94c2b78dbb00d767a10adb67368ae764709737dc277273ec148aa4558033a03ce901406b35fddf4eac46dabc94a1e1d12d2587e2b9cfe5707b4a + languageName: node + linkType: hard + "typescript@patch:typescript@npm%3A^4.9.4#optional!builtin": version: 4.9.5 resolution: "typescript@patch:typescript@npm%3A4.9.5#optional!builtin::version=4.9.5&hash=289587" @@ -25421,6 +26097,19 @@ __metadata: languageName: node linkType: hard +"util@npm:^0.12.4, util@npm:^0.12.5": + version: 0.12.5 + resolution: "util@npm:0.12.5" + dependencies: + inherits: "npm:^2.0.3" + is-arguments: "npm:^1.0.4" + is-generator-function: "npm:^1.0.7" + is-typed-array: "npm:^1.1.3" + which-typed-array: "npm:^1.1.2" + checksum: 61a10de7753353dd4d744c917f74cdd7d21b8b46379c1e48e1c4fd8e83f8190e6bd9978fc4e5102ab6a10ebda6019d1b36572fa4a325e175ec8b789a121f6147 + languageName: node + linkType: hard + "utila@npm:~0.4": version: 0.4.0 resolution: "utila@npm:0.4.0" @@ -25544,6 +26233,58 @@ __metadata: languageName: node linkType: hard +"vite-plugin-node-polyfills@npm:^0.19.0": + version: 0.19.0 + resolution: "vite-plugin-node-polyfills@npm:0.19.0" + dependencies: + "@rollup/plugin-inject": "npm:^5.0.5" + node-stdlib-browser: "npm:^1.2.0" + peerDependencies: + vite: ^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0 + checksum: 7ac092feca3faefa0983914dd081d9878ec80955ba4c7805c8a6f266a6bfae1fa7b1603c4cc985d8fb373556182f40e060b3eb61ccdfa52f4cf9fd76055bf172 + languageName: node + linkType: hard + +"vite@npm:^5.0.11": + version: 5.0.11 + resolution: "vite@npm:5.0.11" + dependencies: + esbuild: "npm:^0.19.3" + fsevents: "npm:~2.3.3" + postcss: "npm:^8.4.32" + rollup: "npm:^4.2.0" + peerDependencies: + "@types/node": ^18.0.0 || >=20.0.0 + less: "*" + lightningcss: ^1.21.0 + sass: "*" + stylus: "*" + sugarss: "*" + terser: ^5.4.0 + dependenciesMeta: + fsevents: + optional: true + peerDependenciesMeta: + "@types/node": + optional: true + less: + optional: true + lightningcss: + optional: true + sass: + optional: true + stylus: + optional: true + sugarss: + optional: true + terser: + optional: true + bin: + vite: bin/vite.js + checksum: f1a8fea35ed9f162d7a10fd13efb2c96637028b0a319d726aeec8b31e20e4d047272bda5df82167618e7774a520236c66f3093ed172802660aec5227814072f4 + languageName: node + linkType: hard + "vm-browserify@npm:^1.0.1": version: 1.1.2 resolution: "vm-browserify@npm:1.1.2" @@ -26089,7 +26830,7 @@ __metadata: languageName: node linkType: hard -"which-typed-array@npm:^1.1.11, which-typed-array@npm:^1.1.13, which-typed-array@npm:^1.1.9": +"which-typed-array@npm:^1.1.11, which-typed-array@npm:^1.1.13, which-typed-array@npm:^1.1.2, which-typed-array@npm:^1.1.9": version: 1.1.13 resolution: "which-typed-array@npm:1.1.13" dependencies: @@ -26584,7 +27325,7 @@ __metadata: languageName: node linkType: hard -"xtend@npm:^4.0.0, xtend@npm:^4.0.1, xtend@npm:~4.0.1": +"xtend@npm:^4.0.0, xtend@npm:^4.0.1, xtend@npm:^4.0.2, xtend@npm:~4.0.1": version: 4.0.2 resolution: "xtend@npm:4.0.2" checksum: ac5dfa738b21f6e7f0dd6e65e1b3155036d68104e67e5d5d1bde74892e327d7e5636a076f625599dc394330a731861e87343ff184b0047fef1360a7ec0a5a36a From 77fa1b9a1de6a5cc0d22666f7d3984f3541e8a9b Mon Sep 17 00:00:00 2001 From: Nikita Kuznetsov Date: Fri, 12 Jan 2024 18:23:23 +0100 Subject: [PATCH 13/19] Update build --- apps/web/package.json | 1 + apps/web/vite.config.ts | 9 +++++---- yarn.lock | 14 +++++++++++++- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/apps/web/package.json b/apps/web/package.json index 1135c8cd7..8bf5ebba0 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -33,6 +33,7 @@ "@vitejs/plugin-react": "^4.2.1", "fs-extra": "^11.2.0", "react-is": "^18.2.0", + "rollup-plugin-polyfill-node": "^0.13.0", "ts-node": "^10.9.1", "typescript": "5.2.2", "vite": "^5.0.11", diff --git a/apps/web/vite.config.ts b/apps/web/vite.config.ts index dd6c85dba..6740a51c5 100644 --- a/apps/web/vite.config.ts +++ b/apps/web/vite.config.ts @@ -1,12 +1,13 @@ import react from '@vitejs/plugin-react'; +import rollupNodePolyfills from 'rollup-plugin-polyfill-node'; import { defineConfig } from 'vite'; import { nodePolyfills } from 'vite-plugin-node-polyfills'; -export default defineConfig({ - plugins: [nodePolyfills(), react()], +export default defineConfig(({ mode }) => ({ + plugins: mode === 'development' ? [nodePolyfills(), react()] : [], build: { rollupOptions: { - external: new RegExp(`vite-plugin-node-polyfills`) + plugins: [rollupNodePolyfills()] } } -}); +})); diff --git a/yarn.lock b/yarn.lock index 915234e3d..cf39fb091 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4417,7 +4417,7 @@ __metadata: languageName: node linkType: hard -"@rollup/plugin-inject@npm:^5.0.5": +"@rollup/plugin-inject@npm:^5.0.4, @rollup/plugin-inject@npm:^5.0.5": version: 5.0.5 resolution: "@rollup/plugin-inject@npm:5.0.5" dependencies: @@ -6317,6 +6317,7 @@ __metadata: react-i18next: "npm:^12.1.1" react-is: "npm:^18.2.0" react-router-dom: "npm:^6.4.5" + rollup-plugin-polyfill-node: "npm:^0.13.0" styled-components: "npm:^5.3.6" ts-node: "npm:^10.9.1" typescript: "npm:5.2.2" @@ -22806,6 +22807,17 @@ __metadata: languageName: node linkType: hard +"rollup-plugin-polyfill-node@npm:^0.13.0": + version: 0.13.0 + resolution: "rollup-plugin-polyfill-node@npm:0.13.0" + dependencies: + "@rollup/plugin-inject": "npm:^5.0.4" + peerDependencies: + rollup: ^1.20.0 || ^2.0.0 || ^3.0.0 || ^4.0.0 + checksum: 915af7606b35fa5bddfa87f65e18a0329de61f08c418a3a76aa41d9a46c744809afae3e5ebbf1b9555886835405c508ee1ec52f47df5745d5f453e179e9589c4 + languageName: node + linkType: hard + "rollup-plugin-terser@npm:^7.0.0": version: 7.0.2 resolution: "rollup-plugin-terser@npm:7.0.2" From 431cd762d7ebfa8f730b2426d1bef35da1ddb0aa Mon Sep 17 00:00:00 2001 From: Nikita Kuznetsov Date: Fri, 12 Jan 2024 18:23:54 +0100 Subject: [PATCH 14/19] remove extension --- .github/workflows/cd.yaml | 40 ----------------------------- .github/workflows/pull-request.yaml | 40 ----------------------------- 2 files changed, 80 deletions(-) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index 671834779..1940cae89 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -105,46 +105,6 @@ jobs: security delete-keychain build.keychain rm ${{ github.workspace }}/AuthKey.p8 - extension-build: - name: extension-build - runs-on: ubuntu-latest - timeout-minutes: 10 - - steps: - - name: Checkout to git repository - uses: actions/checkout@v4 - - - name: Set up Node - uses: actions/setup-node@v3 - with: - node-version: 20.7.0 - - - name: Enable Corepack - run: | - corepack enable - - - name: Run install - uses: borales/actions-yarn@v4 - with: - cmd: install - - - name: Run install - uses: borales/actions-yarn@v4 - env: - REACT_APP_AMPLITUDE: ${{ secrets.REACT_APP_AMPLITUDE_EXTENSION }} - with: - cmd: build:extension - - - name: Upload apps to artifacts - uses: actions/upload-artifact@v4 - with: - name: Tonkeeper Extensions - retention-days: 10 - compression-level: 0 - path: | - ${{ github.workspace }}/apps/extension/dist/tonkeeper_chrome_*.zip - ${{ github.workspace }}/apps/extension/dist/tonkeeper_firefix_*.zip - web-build: name: web-build runs-on: macos-13 diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml index 87b988abe..bc896ef13 100644 --- a/.github/workflows/pull-request.yaml +++ b/.github/workflows/pull-request.yaml @@ -146,46 +146,6 @@ jobs: security delete-keychain build.keychain rm ${{ github.workspace }}/AuthKey.p8 - extension-build: - name: extension-build - runs-on: ubuntu-latest - timeout-minutes: 10 - - steps: - - name: Checkout to git repository - uses: actions/checkout@v4 - - - name: Set up Node - uses: actions/setup-node@v3 - with: - node-version: 20.7.0 - - - name: Enable Corepack - run: | - corepack enable - - - name: Run install - uses: borales/actions-yarn@v4 - with: - cmd: install - - - name: Run build - uses: borales/actions-yarn@v4 - env: - REACT_APP_AMPLITUDE: ${{ secrets.REACT_APP_AMPLITUDE_EXTENSION }} - with: - cmd: build:extension - - - name: Upload apps to artifacts - uses: actions/upload-artifact@v4 - with: - name: Tonkeeper Extensions - retention-days: 10 - compression-level: 0 - path: | - ${{ github.workspace }}/apps/extension/dist/tonkeeper_chrome_beta_*.zip - ${{ github.workspace }}/apps/extension/dist/tonkeeper_firefix_*.zip - web-build: name: web-build runs-on: ubuntu-latest From b080b52f34630ec9912c304cd16ab95395b18366 Mon Sep 17 00:00:00 2001 From: Nikita Kuznetsov Date: Fri, 12 Jan 2024 18:33:13 +0100 Subject: [PATCH 15/19] Downgrade vite --- apps/web/package.json | 4 +- apps/web/vite.config.ts | 12 +- yarn.lock | 380 ++++++++++++---------------------------- 3 files changed, 119 insertions(+), 277 deletions(-) diff --git a/apps/web/package.json b/apps/web/package.json index 8bf5ebba0..fcb3c747b 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -33,10 +33,10 @@ "@vitejs/plugin-react": "^4.2.1", "fs-extra": "^11.2.0", "react-is": "^18.2.0", - "rollup-plugin-polyfill-node": "^0.13.0", + "rollup-plugin-node-polyfills": "^0.2.1", "ts-node": "^10.9.1", "typescript": "5.2.2", - "vite": "^5.0.11", + "vite": "^4.5.1", "vite-plugin-node-polyfills": "^0.19.0" }, "scripts": { diff --git a/apps/web/vite.config.ts b/apps/web/vite.config.ts index 6740a51c5..1c1447772 100644 --- a/apps/web/vite.config.ts +++ b/apps/web/vite.config.ts @@ -1,13 +1,7 @@ import react from '@vitejs/plugin-react'; -import rollupNodePolyfills from 'rollup-plugin-polyfill-node'; import { defineConfig } from 'vite'; import { nodePolyfills } from 'vite-plugin-node-polyfills'; -export default defineConfig(({ mode }) => ({ - plugins: mode === 'development' ? [nodePolyfills(), react()] : [], - build: { - rollupOptions: { - plugins: [rollupNodePolyfills()] - } - } -})); +export default defineConfig({ + plugins: [nodePolyfills(), react()] +}); diff --git a/yarn.lock b/yarn.lock index cf39fb091..f0f7b29f6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2828,13 +2828,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/aix-ppc64@npm:0.19.11": - version: 0.19.11 - resolution: "@esbuild/aix-ppc64@npm:0.19.11" - conditions: os=aix & cpu=ppc64 - languageName: node - linkType: hard - "@esbuild/android-arm64@npm:0.16.17": version: 0.16.17 resolution: "@esbuild/android-arm64@npm:0.16.17" @@ -2849,9 +2842,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/android-arm64@npm:0.19.11": - version: 0.19.11 - resolution: "@esbuild/android-arm64@npm:0.19.11" +"@esbuild/android-arm64@npm:0.18.20": + version: 0.18.20 + resolution: "@esbuild/android-arm64@npm:0.18.20" conditions: os=android & cpu=arm64 languageName: node linkType: hard @@ -2870,9 +2863,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/android-arm@npm:0.19.11": - version: 0.19.11 - resolution: "@esbuild/android-arm@npm:0.19.11" +"@esbuild/android-arm@npm:0.18.20": + version: 0.18.20 + resolution: "@esbuild/android-arm@npm:0.18.20" conditions: os=android & cpu=arm languageName: node linkType: hard @@ -2891,9 +2884,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/android-x64@npm:0.19.11": - version: 0.19.11 - resolution: "@esbuild/android-x64@npm:0.19.11" +"@esbuild/android-x64@npm:0.18.20": + version: 0.18.20 + resolution: "@esbuild/android-x64@npm:0.18.20" conditions: os=android & cpu=x64 languageName: node linkType: hard @@ -2912,9 +2905,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/darwin-arm64@npm:0.19.11": - version: 0.19.11 - resolution: "@esbuild/darwin-arm64@npm:0.19.11" +"@esbuild/darwin-arm64@npm:0.18.20": + version: 0.18.20 + resolution: "@esbuild/darwin-arm64@npm:0.18.20" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard @@ -2933,9 +2926,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/darwin-x64@npm:0.19.11": - version: 0.19.11 - resolution: "@esbuild/darwin-x64@npm:0.19.11" +"@esbuild/darwin-x64@npm:0.18.20": + version: 0.18.20 + resolution: "@esbuild/darwin-x64@npm:0.18.20" conditions: os=darwin & cpu=x64 languageName: node linkType: hard @@ -2954,9 +2947,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/freebsd-arm64@npm:0.19.11": - version: 0.19.11 - resolution: "@esbuild/freebsd-arm64@npm:0.19.11" +"@esbuild/freebsd-arm64@npm:0.18.20": + version: 0.18.20 + resolution: "@esbuild/freebsd-arm64@npm:0.18.20" conditions: os=freebsd & cpu=arm64 languageName: node linkType: hard @@ -2975,9 +2968,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/freebsd-x64@npm:0.19.11": - version: 0.19.11 - resolution: "@esbuild/freebsd-x64@npm:0.19.11" +"@esbuild/freebsd-x64@npm:0.18.20": + version: 0.18.20 + resolution: "@esbuild/freebsd-x64@npm:0.18.20" conditions: os=freebsd & cpu=x64 languageName: node linkType: hard @@ -2996,9 +2989,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-arm64@npm:0.19.11": - version: 0.19.11 - resolution: "@esbuild/linux-arm64@npm:0.19.11" +"@esbuild/linux-arm64@npm:0.18.20": + version: 0.18.20 + resolution: "@esbuild/linux-arm64@npm:0.18.20" conditions: os=linux & cpu=arm64 languageName: node linkType: hard @@ -3017,9 +3010,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-arm@npm:0.19.11": - version: 0.19.11 - resolution: "@esbuild/linux-arm@npm:0.19.11" +"@esbuild/linux-arm@npm:0.18.20": + version: 0.18.20 + resolution: "@esbuild/linux-arm@npm:0.18.20" conditions: os=linux & cpu=arm languageName: node linkType: hard @@ -3038,9 +3031,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-ia32@npm:0.19.11": - version: 0.19.11 - resolution: "@esbuild/linux-ia32@npm:0.19.11" +"@esbuild/linux-ia32@npm:0.18.20": + version: 0.18.20 + resolution: "@esbuild/linux-ia32@npm:0.18.20" conditions: os=linux & cpu=ia32 languageName: node linkType: hard @@ -3059,9 +3052,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-loong64@npm:0.19.11": - version: 0.19.11 - resolution: "@esbuild/linux-loong64@npm:0.19.11" +"@esbuild/linux-loong64@npm:0.18.20": + version: 0.18.20 + resolution: "@esbuild/linux-loong64@npm:0.18.20" conditions: os=linux & cpu=loong64 languageName: node linkType: hard @@ -3080,9 +3073,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-mips64el@npm:0.19.11": - version: 0.19.11 - resolution: "@esbuild/linux-mips64el@npm:0.19.11" +"@esbuild/linux-mips64el@npm:0.18.20": + version: 0.18.20 + resolution: "@esbuild/linux-mips64el@npm:0.18.20" conditions: os=linux & cpu=mips64el languageName: node linkType: hard @@ -3101,9 +3094,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-ppc64@npm:0.19.11": - version: 0.19.11 - resolution: "@esbuild/linux-ppc64@npm:0.19.11" +"@esbuild/linux-ppc64@npm:0.18.20": + version: 0.18.20 + resolution: "@esbuild/linux-ppc64@npm:0.18.20" conditions: os=linux & cpu=ppc64 languageName: node linkType: hard @@ -3122,9 +3115,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-riscv64@npm:0.19.11": - version: 0.19.11 - resolution: "@esbuild/linux-riscv64@npm:0.19.11" +"@esbuild/linux-riscv64@npm:0.18.20": + version: 0.18.20 + resolution: "@esbuild/linux-riscv64@npm:0.18.20" conditions: os=linux & cpu=riscv64 languageName: node linkType: hard @@ -3143,9 +3136,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-s390x@npm:0.19.11": - version: 0.19.11 - resolution: "@esbuild/linux-s390x@npm:0.19.11" +"@esbuild/linux-s390x@npm:0.18.20": + version: 0.18.20 + resolution: "@esbuild/linux-s390x@npm:0.18.20" conditions: os=linux & cpu=s390x languageName: node linkType: hard @@ -3164,9 +3157,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-x64@npm:0.19.11": - version: 0.19.11 - resolution: "@esbuild/linux-x64@npm:0.19.11" +"@esbuild/linux-x64@npm:0.18.20": + version: 0.18.20 + resolution: "@esbuild/linux-x64@npm:0.18.20" conditions: os=linux & cpu=x64 languageName: node linkType: hard @@ -3185,9 +3178,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/netbsd-x64@npm:0.19.11": - version: 0.19.11 - resolution: "@esbuild/netbsd-x64@npm:0.19.11" +"@esbuild/netbsd-x64@npm:0.18.20": + version: 0.18.20 + resolution: "@esbuild/netbsd-x64@npm:0.18.20" conditions: os=netbsd & cpu=x64 languageName: node linkType: hard @@ -3206,9 +3199,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/openbsd-x64@npm:0.19.11": - version: 0.19.11 - resolution: "@esbuild/openbsd-x64@npm:0.19.11" +"@esbuild/openbsd-x64@npm:0.18.20": + version: 0.18.20 + resolution: "@esbuild/openbsd-x64@npm:0.18.20" conditions: os=openbsd & cpu=x64 languageName: node linkType: hard @@ -3227,9 +3220,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/sunos-x64@npm:0.19.11": - version: 0.19.11 - resolution: "@esbuild/sunos-x64@npm:0.19.11" +"@esbuild/sunos-x64@npm:0.18.20": + version: 0.18.20 + resolution: "@esbuild/sunos-x64@npm:0.18.20" conditions: os=sunos & cpu=x64 languageName: node linkType: hard @@ -3248,9 +3241,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/win32-arm64@npm:0.19.11": - version: 0.19.11 - resolution: "@esbuild/win32-arm64@npm:0.19.11" +"@esbuild/win32-arm64@npm:0.18.20": + version: 0.18.20 + resolution: "@esbuild/win32-arm64@npm:0.18.20" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard @@ -3269,9 +3262,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/win32-ia32@npm:0.19.11": - version: 0.19.11 - resolution: "@esbuild/win32-ia32@npm:0.19.11" +"@esbuild/win32-ia32@npm:0.18.20": + version: 0.18.20 + resolution: "@esbuild/win32-ia32@npm:0.18.20" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard @@ -3290,9 +3283,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/win32-x64@npm:0.19.11": - version: 0.19.11 - resolution: "@esbuild/win32-x64@npm:0.19.11" +"@esbuild/win32-x64@npm:0.18.20": + version: 0.18.20 + resolution: "@esbuild/win32-x64@npm:0.18.20" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -4417,7 +4410,7 @@ __metadata: languageName: node linkType: hard -"@rollup/plugin-inject@npm:^5.0.4, @rollup/plugin-inject@npm:^5.0.5": +"@rollup/plugin-inject@npm:^5.0.5": version: 5.0.5 resolution: "@rollup/plugin-inject@npm:5.0.5" dependencies: @@ -4490,97 +4483,6 @@ __metadata: languageName: node linkType: hard -"@rollup/rollup-android-arm-eabi@npm:4.9.5": - version: 4.9.5 - resolution: "@rollup/rollup-android-arm-eabi@npm:4.9.5" - conditions: os=android & cpu=arm - languageName: node - linkType: hard - -"@rollup/rollup-android-arm64@npm:4.9.5": - version: 4.9.5 - resolution: "@rollup/rollup-android-arm64@npm:4.9.5" - conditions: os=android & cpu=arm64 - languageName: node - linkType: hard - -"@rollup/rollup-darwin-arm64@npm:4.9.5": - version: 4.9.5 - resolution: "@rollup/rollup-darwin-arm64@npm:4.9.5" - conditions: os=darwin & cpu=arm64 - languageName: node - linkType: hard - -"@rollup/rollup-darwin-x64@npm:4.9.5": - version: 4.9.5 - resolution: "@rollup/rollup-darwin-x64@npm:4.9.5" - conditions: os=darwin & cpu=x64 - languageName: node - linkType: hard - -"@rollup/rollup-linux-arm-gnueabihf@npm:4.9.5": - version: 4.9.5 - resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.9.5" - conditions: os=linux & cpu=arm - languageName: node - linkType: hard - -"@rollup/rollup-linux-arm64-gnu@npm:4.9.5": - version: 4.9.5 - resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.9.5" - conditions: os=linux & cpu=arm64 & libc=glibc - languageName: node - linkType: hard - -"@rollup/rollup-linux-arm64-musl@npm:4.9.5": - version: 4.9.5 - resolution: "@rollup/rollup-linux-arm64-musl@npm:4.9.5" - conditions: os=linux & cpu=arm64 & libc=musl - languageName: node - linkType: hard - -"@rollup/rollup-linux-riscv64-gnu@npm:4.9.5": - version: 4.9.5 - resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.9.5" - conditions: os=linux & cpu=riscv64 & libc=glibc - languageName: node - linkType: hard - -"@rollup/rollup-linux-x64-gnu@npm:4.9.5": - version: 4.9.5 - resolution: "@rollup/rollup-linux-x64-gnu@npm:4.9.5" - conditions: os=linux & cpu=x64 & libc=glibc - languageName: node - linkType: hard - -"@rollup/rollup-linux-x64-musl@npm:4.9.5": - version: 4.9.5 - resolution: "@rollup/rollup-linux-x64-musl@npm:4.9.5" - conditions: os=linux & cpu=x64 & libc=musl - languageName: node - linkType: hard - -"@rollup/rollup-win32-arm64-msvc@npm:4.9.5": - version: 4.9.5 - resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.9.5" - conditions: os=win32 & cpu=arm64 - languageName: node - linkType: hard - -"@rollup/rollup-win32-ia32-msvc@npm:4.9.5": - version: 4.9.5 - resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.9.5" - conditions: os=win32 & cpu=ia32 - languageName: node - linkType: hard - -"@rollup/rollup-win32-x64-msvc@npm:4.9.5": - version: 4.9.5 - resolution: "@rollup/rollup-win32-x64-msvc@npm:4.9.5" - conditions: os=win32 & cpu=x64 - languageName: node - linkType: hard - "@rushstack/eslint-patch@npm:^1.1.0": version: 1.6.0 resolution: "@rushstack/eslint-patch@npm:1.6.0" @@ -6317,11 +6219,11 @@ __metadata: react-i18next: "npm:^12.1.1" react-is: "npm:^18.2.0" react-router-dom: "npm:^6.4.5" - rollup-plugin-polyfill-node: "npm:^0.13.0" + rollup-plugin-node-polyfills: "npm:^0.2.1" styled-components: "npm:^5.3.6" ts-node: "npm:^10.9.1" typescript: "npm:5.2.2" - vite: "npm:^5.0.11" + vite: "npm:^4.5.1" vite-plugin-node-polyfills: "npm:^0.19.0" languageName: unknown linkType: soft @@ -6604,7 +6506,7 @@ __metadata: languageName: node linkType: hard -"@types/estree@npm:*, @types/estree@npm:1.0.5, @types/estree@npm:^1.0.0": +"@types/estree@npm:*, @types/estree@npm:^1.0.0": version: 1.0.5 resolution: "@types/estree@npm:1.0.5" checksum: 7de6d928dd4010b0e20c6919e1a6c27b61f8d4567befa89252055fad503d587ecb9a1e3eab1b1901f923964d7019796db810b7fd6430acb26c32866d126fd408 @@ -12560,36 +12462,33 @@ __metadata: languageName: node linkType: hard -"esbuild@npm:^0.19.3": - version: 0.19.11 - resolution: "esbuild@npm:0.19.11" - dependencies: - "@esbuild/aix-ppc64": "npm:0.19.11" - "@esbuild/android-arm": "npm:0.19.11" - "@esbuild/android-arm64": "npm:0.19.11" - "@esbuild/android-x64": "npm:0.19.11" - "@esbuild/darwin-arm64": "npm:0.19.11" - "@esbuild/darwin-x64": "npm:0.19.11" - "@esbuild/freebsd-arm64": "npm:0.19.11" - "@esbuild/freebsd-x64": "npm:0.19.11" - "@esbuild/linux-arm": "npm:0.19.11" - "@esbuild/linux-arm64": "npm:0.19.11" - "@esbuild/linux-ia32": "npm:0.19.11" - "@esbuild/linux-loong64": "npm:0.19.11" - "@esbuild/linux-mips64el": "npm:0.19.11" - "@esbuild/linux-ppc64": "npm:0.19.11" - "@esbuild/linux-riscv64": "npm:0.19.11" - "@esbuild/linux-s390x": "npm:0.19.11" - "@esbuild/linux-x64": "npm:0.19.11" - "@esbuild/netbsd-x64": "npm:0.19.11" - "@esbuild/openbsd-x64": "npm:0.19.11" - "@esbuild/sunos-x64": "npm:0.19.11" - "@esbuild/win32-arm64": "npm:0.19.11" - "@esbuild/win32-ia32": "npm:0.19.11" - "@esbuild/win32-x64": "npm:0.19.11" +"esbuild@npm:^0.18.10": + version: 0.18.20 + resolution: "esbuild@npm:0.18.20" + dependencies: + "@esbuild/android-arm": "npm:0.18.20" + "@esbuild/android-arm64": "npm:0.18.20" + "@esbuild/android-x64": "npm:0.18.20" + "@esbuild/darwin-arm64": "npm:0.18.20" + "@esbuild/darwin-x64": "npm:0.18.20" + "@esbuild/freebsd-arm64": "npm:0.18.20" + "@esbuild/freebsd-x64": "npm:0.18.20" + "@esbuild/linux-arm": "npm:0.18.20" + "@esbuild/linux-arm64": "npm:0.18.20" + "@esbuild/linux-ia32": "npm:0.18.20" + "@esbuild/linux-loong64": "npm:0.18.20" + "@esbuild/linux-mips64el": "npm:0.18.20" + "@esbuild/linux-ppc64": "npm:0.18.20" + "@esbuild/linux-riscv64": "npm:0.18.20" + "@esbuild/linux-s390x": "npm:0.18.20" + "@esbuild/linux-x64": "npm:0.18.20" + "@esbuild/netbsd-x64": "npm:0.18.20" + "@esbuild/openbsd-x64": "npm:0.18.20" + "@esbuild/sunos-x64": "npm:0.18.20" + "@esbuild/win32-arm64": "npm:0.18.20" + "@esbuild/win32-ia32": "npm:0.18.20" + "@esbuild/win32-x64": "npm:0.18.20" dependenciesMeta: - "@esbuild/aix-ppc64": - optional: true "@esbuild/android-arm": optional: true "@esbuild/android-arm64": @@ -12636,7 +12535,7 @@ __metadata: optional: true bin: esbuild: bin/esbuild - checksum: a40b3858c29618c8c893389372f469245a6b2d1319782af75d33d8ba5dcadfe181fcc935f8e1a907be667946384950a4cf482ebe1e79c99c932d2b8eb35a09d0 + checksum: 1f723ec71c3aa196473bf3298316eedc3f62d523924652dfeb60701b609792f918fc60db84b420d1d8ba9bfa7d69de2fc1d3157ba47c028bdae5d507a26a3c64 languageName: node linkType: hard @@ -14200,7 +14099,7 @@ __metadata: languageName: node linkType: hard -"fsevents@npm:^2.1.2, fsevents@npm:^2.3.2, fsevents@npm:~2.3.2, fsevents@npm:~2.3.3": +"fsevents@npm:^2.1.2, fsevents@npm:^2.3.2, fsevents@npm:~2.3.2": version: 2.3.3 resolution: "fsevents@npm:2.3.3" dependencies: @@ -14220,7 +14119,7 @@ __metadata: languageName: node linkType: hard -"fsevents@patch:fsevents@npm%3A^2.1.2#optional!builtin, fsevents@patch:fsevents@npm%3A^2.3.2#optional!builtin, fsevents@patch:fsevents@npm%3A~2.3.2#optional!builtin, fsevents@patch:fsevents@npm%3A~2.3.3#optional!builtin": +"fsevents@patch:fsevents@npm%3A^2.1.2#optional!builtin, fsevents@patch:fsevents@npm%3A^2.3.2#optional!builtin, fsevents@patch:fsevents@npm%3A~2.3.2#optional!builtin": version: 2.3.3 resolution: "fsevents@patch:fsevents@npm%3A2.3.3#optional!builtin::version=2.3.3&hash=df0bf1" dependencies: @@ -21098,7 +20997,7 @@ __metadata: languageName: node linkType: hard -"postcss@npm:^8.4.32": +"postcss@npm:^8.4.27": version: 8.4.33 resolution: "postcss@npm:8.4.33" dependencies: @@ -22807,17 +22706,6 @@ __metadata: languageName: node linkType: hard -"rollup-plugin-polyfill-node@npm:^0.13.0": - version: 0.13.0 - resolution: "rollup-plugin-polyfill-node@npm:0.13.0" - dependencies: - "@rollup/plugin-inject": "npm:^5.0.4" - peerDependencies: - rollup: ^1.20.0 || ^2.0.0 || ^3.0.0 || ^4.0.0 - checksum: 915af7606b35fa5bddfa87f65e18a0329de61f08c418a3a76aa41d9a46c744809afae3e5ebbf1b9555886835405c508ee1ec52f47df5745d5f453e179e9589c4 - languageName: node - linkType: hard - "rollup-plugin-terser@npm:^7.0.0": version: 7.0.2 resolution: "rollup-plugin-terser@npm:7.0.2" @@ -22855,57 +22743,17 @@ __metadata: languageName: node linkType: hard -"rollup@npm:^4.2.0": - version: 4.9.5 - resolution: "rollup@npm:4.9.5" - dependencies: - "@rollup/rollup-android-arm-eabi": "npm:4.9.5" - "@rollup/rollup-android-arm64": "npm:4.9.5" - "@rollup/rollup-darwin-arm64": "npm:4.9.5" - "@rollup/rollup-darwin-x64": "npm:4.9.5" - "@rollup/rollup-linux-arm-gnueabihf": "npm:4.9.5" - "@rollup/rollup-linux-arm64-gnu": "npm:4.9.5" - "@rollup/rollup-linux-arm64-musl": "npm:4.9.5" - "@rollup/rollup-linux-riscv64-gnu": "npm:4.9.5" - "@rollup/rollup-linux-x64-gnu": "npm:4.9.5" - "@rollup/rollup-linux-x64-musl": "npm:4.9.5" - "@rollup/rollup-win32-arm64-msvc": "npm:4.9.5" - "@rollup/rollup-win32-ia32-msvc": "npm:4.9.5" - "@rollup/rollup-win32-x64-msvc": "npm:4.9.5" - "@types/estree": "npm:1.0.5" +"rollup@npm:^3.27.1": + version: 3.29.4 + resolution: "rollup@npm:3.29.4" + dependencies: fsevents: "npm:~2.3.2" dependenciesMeta: - "@rollup/rollup-android-arm-eabi": - optional: true - "@rollup/rollup-android-arm64": - optional: true - "@rollup/rollup-darwin-arm64": - optional: true - "@rollup/rollup-darwin-x64": - optional: true - "@rollup/rollup-linux-arm-gnueabihf": - optional: true - "@rollup/rollup-linux-arm64-gnu": - optional: true - "@rollup/rollup-linux-arm64-musl": - optional: true - "@rollup/rollup-linux-riscv64-gnu": - optional: true - "@rollup/rollup-linux-x64-gnu": - optional: true - "@rollup/rollup-linux-x64-musl": - optional: true - "@rollup/rollup-win32-arm64-msvc": - optional: true - "@rollup/rollup-win32-ia32-msvc": - optional: true - "@rollup/rollup-win32-x64-msvc": - optional: true fsevents: optional: true bin: rollup: dist/bin/rollup - checksum: 4debf528e63edea5c3f5d38e399c6dd7287e2977d90d2d3ce38d4b3412289e2081aff8f8488a11b1699c786f2e904e9e150f30d576fe9316b5b97df0e80b1bce + checksum: 9e39d54e23731a4c4067e9c02910cdf7479a0f9a7584796e2dc6efaa34bb1e5e015c062c87d1e64d96038baca76cefd47681ff22604fae5827147f54123dc6d0 languageName: node linkType: hard @@ -26257,16 +26105,16 @@ __metadata: languageName: node linkType: hard -"vite@npm:^5.0.11": - version: 5.0.11 - resolution: "vite@npm:5.0.11" +"vite@npm:^4.5.1": + version: 4.5.1 + resolution: "vite@npm:4.5.1" dependencies: - esbuild: "npm:^0.19.3" - fsevents: "npm:~2.3.3" - postcss: "npm:^8.4.32" - rollup: "npm:^4.2.0" + esbuild: "npm:^0.18.10" + fsevents: "npm:~2.3.2" + postcss: "npm:^8.4.27" + rollup: "npm:^3.27.1" peerDependencies: - "@types/node": ^18.0.0 || >=20.0.0 + "@types/node": ">= 14" less: "*" lightningcss: ^1.21.0 sass: "*" @@ -26293,7 +26141,7 @@ __metadata: optional: true bin: vite: bin/vite.js - checksum: f1a8fea35ed9f162d7a10fd13efb2c96637028b0a319d726aeec8b31e20e4d047272bda5df82167618e7774a520236c66f3093ed172802660aec5227814072f4 + checksum: 2ea9c030a5718ca0adaaa0ecc54402a725cff59131cf80bc84d0237f59c98168803ee59d23e697b98b1184be3af6c6edc2e81517f769c62159f11531b3341a4e languageName: node linkType: hard From 541e62a5b0456b9483b13d9bfb7f4e6741e961d4 Mon Sep 17 00:00:00 2001 From: Nikita Kuznetsov Date: Fri, 12 Jan 2024 19:06:26 +0100 Subject: [PATCH 16/19] WIP --- apps/web/index.html | 8 ++ apps/web/package.json | 7 +- apps/web/vite.config.ts | 3 +- yarn.lock | 206 +++------------------------------------- 4 files changed, 26 insertions(+), 198 deletions(-) diff --git a/apps/web/index.html b/apps/web/index.html index f39878409..2d3b13a83 100644 --- a/apps/web/index.html +++ b/apps/web/index.html @@ -33,6 +33,14 @@ href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap" rel="stylesheet" /> + + diff --git a/apps/web/package.json b/apps/web/package.json index fcb3c747b..27e9e5f7f 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -9,10 +9,12 @@ "@tonkeeper/core": "0.1.0", "@tonkeeper/locales": "0.1.0", "@tonkeeper/uikit": "0.1.0", + "buffer": "^6.0.3", "copy-to-clipboard": "^3.3.3", "i18next": "^22.1.4", "i18next-browser-languagedetector": "^7.0.2", "i18next-http-backend": "^2.0.2", + "process": "^0.11.10", "react": "^18.2.0", "react-dom": "^18.2.0", "react-i18next": "^12.1.1", @@ -33,15 +35,14 @@ "@vitejs/plugin-react": "^4.2.1", "fs-extra": "^11.2.0", "react-is": "^18.2.0", - "rollup-plugin-node-polyfills": "^0.2.1", "ts-node": "^10.9.1", "typescript": "5.2.2", - "vite": "^4.5.1", - "vite-plugin-node-polyfills": "^0.19.0" + "vite": "^4.5.1" }, "scripts": { "locales": "ts-node ./task/locales", "start": "yarn locales && vite dev", + "preview": "vite preview", "build": "tsc && vite build && yarn locales", "build:web": "yarn build" }, diff --git a/apps/web/vite.config.ts b/apps/web/vite.config.ts index 1c1447772..5e6e79b5c 100644 --- a/apps/web/vite.config.ts +++ b/apps/web/vite.config.ts @@ -1,7 +1,6 @@ import react from '@vitejs/plugin-react'; import { defineConfig } from 'vite'; -import { nodePolyfills } from 'vite-plugin-node-polyfills'; export default defineConfig({ - plugins: [nodePolyfills(), react()] + plugins: [react()] }); diff --git a/yarn.lock b/yarn.lock index f0f7b29f6..edff129fb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3758,7 +3758,7 @@ __metadata: languageName: node linkType: hard -"@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.14, @jridgewell/sourcemap-codec@npm:^1.4.15": +"@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.14": version: 1.4.15 resolution: "@jridgewell/sourcemap-codec@npm:1.4.15" checksum: 89960ac087781b961ad918978975bcdf2051cd1741880469783c42de64239703eab9db5230d776d8e6a09d73bb5e4cb964e07d93ee6e2e7aea5a7d726e865c09 @@ -4410,22 +4410,6 @@ __metadata: languageName: node linkType: hard -"@rollup/plugin-inject@npm:^5.0.5": - version: 5.0.5 - resolution: "@rollup/plugin-inject@npm:5.0.5" - dependencies: - "@rollup/pluginutils": "npm:^5.0.1" - estree-walker: "npm:^2.0.2" - magic-string: "npm:^0.30.3" - peerDependencies: - rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0 - peerDependenciesMeta: - rollup: - optional: true - checksum: 1d0e68dff0a8785398a1b6a7dac0dc0a7f2ded22319c0b4c411053f34cbe237ca897d1fc97e5150fddbc3486480f21cbeeb69f0ae7f44ab1ae7307c164c7e704 - languageName: node - linkType: hard - "@rollup/plugin-node-resolve@npm:^11.2.1": version: 11.2.1 resolution: "@rollup/plugin-node-resolve@npm:11.2.1" @@ -4467,22 +4451,6 @@ __metadata: languageName: node linkType: hard -"@rollup/pluginutils@npm:^5.0.1": - version: 5.1.0 - resolution: "@rollup/pluginutils@npm:5.1.0" - dependencies: - "@types/estree": "npm:^1.0.0" - estree-walker: "npm:^2.0.2" - picomatch: "npm:^2.3.1" - peerDependencies: - rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0 - peerDependenciesMeta: - rollup: - optional: true - checksum: abb15eaec5b36f159ec351b48578401bedcefdfa371d24a914cfdbb1e27d0ebfbf895299ec18ccc343d247e71f2502cba21202bc1362d7ef27d5ded699e5c2b2 - languageName: node - linkType: hard - "@rushstack/eslint-patch@npm:^1.1.0": version: 1.6.0 resolution: "@rushstack/eslint-patch@npm:1.6.0" @@ -6209,22 +6177,22 @@ __metadata: "@types/react-dom": "npm:^18.0.9" "@types/styled-components": "npm:^5.1.26" "@vitejs/plugin-react": "npm:^4.2.1" + buffer: "npm:^6.0.3" copy-to-clipboard: "npm:^3.3.3" fs-extra: "npm:^11.2.0" i18next: "npm:^22.1.4" i18next-browser-languagedetector: "npm:^7.0.2" i18next-http-backend: "npm:^2.0.2" + process: "npm:^0.11.10" react: "npm:^18.2.0" react-dom: "npm:^18.2.0" react-i18next: "npm:^12.1.1" react-is: "npm:^18.2.0" react-router-dom: "npm:^6.4.5" - rollup-plugin-node-polyfills: "npm:^0.2.1" styled-components: "npm:^5.3.6" ts-node: "npm:^10.9.1" typescript: "npm:5.2.2" vite: "npm:^4.5.1" - vite-plugin-node-polyfills: "npm:^0.19.0" languageName: unknown linkType: soft @@ -8530,19 +8498,6 @@ __metadata: languageName: node linkType: hard -"assert@npm:^2.0.0": - version: 2.1.0 - resolution: "assert@npm:2.1.0" - dependencies: - call-bind: "npm:^1.0.2" - is-nan: "npm:^1.3.2" - object-is: "npm:^1.1.5" - object.assign: "npm:^4.1.4" - util: "npm:^0.12.5" - checksum: 6b9d813c8eef1c0ac13feac5553972e4bd180ae16000d4eb5c0ded2489188737c75a5aacefc97a985008b37502f62fe1bad34da1a7481a54bbfabec3964c8aa7 - languageName: node - linkType: hard - "assign-symbols@npm:^1.0.0": version: 1.0.0 resolution: "assign-symbols@npm:1.0.0" @@ -9290,15 +9245,6 @@ __metadata: languageName: node linkType: hard -"browser-resolve@npm:^2.0.0": - version: 2.0.0 - resolution: "browser-resolve@npm:2.0.0" - dependencies: - resolve: "npm:^1.17.0" - checksum: ad5314db3429a903b07d6445137588665c4677d6276298bb08f0623f05cb107762b73c78f03b4f954a712bd1ebaf98e349b9d98e423123a42804924327a5acd4 - languageName: node - linkType: hard - "browserify-aes@npm:^1.0.0, browserify-aes@npm:^1.0.4": version: 1.2.0 resolution: "browserify-aes@npm:1.2.0" @@ -9443,7 +9389,7 @@ __metadata: languageName: node linkType: hard -"buffer@npm:^5.5.0, buffer@npm:^5.7.1": +"buffer@npm:^5.5.0": version: 5.7.1 resolution: "buffer@npm:5.7.1" dependencies: @@ -10661,7 +10607,7 @@ __metadata: languageName: node linkType: hard -"create-require@npm:^1.1.0, create-require@npm:^1.1.1": +"create-require@npm:^1.1.0": version: 1.1.1 resolution: "create-require@npm:1.1.1" checksum: a9a1503d4390d8b59ad86f4607de7870b39cad43d929813599a23714831e81c520bddf61bcdd1f8e30f05fd3a2b71ae8538e946eb2786dc65c2bbc520f692eff @@ -11658,13 +11604,6 @@ __metadata: languageName: node linkType: hard -"domain-browser@npm:^4.22.0": - version: 4.23.0 - resolution: "domain-browser@npm:4.23.0" - checksum: 56d5a969ed330a16aa6f03f26e7ba3b98e07c7ce4a77d08f987e9e424f1deca009070ed9bd24011d9b863499dcba95de4d679bba77aef346ee23230e570ab9cf - languageName: node - linkType: hard - "domelementtype@npm:1": version: 1.3.1 resolution: "domelementtype@npm:1.3.1" @@ -13091,13 +13030,6 @@ __metadata: languageName: node linkType: hard -"estree-walker@npm:^2.0.2": - version: 2.0.2 - resolution: "estree-walker@npm:2.0.2" - checksum: b02109c5d46bc2ed47de4990eef770f7457b1159a229f0999a09224d2b85ffeed2d7679cffcff90aeb4448e94b0168feb5265b209cdec29aad50a3d6e93d21e2 - languageName: node - linkType: hard - "esutils@npm:^2.0.2": version: 2.0.3 resolution: "esutils@npm:2.0.3" @@ -15603,7 +15535,7 @@ __metadata: languageName: node linkType: hard -"is-arguments@npm:^1.0.4, is-arguments@npm:^1.1.1": +"is-arguments@npm:^1.1.1": version: 1.1.1 resolution: "is-arguments@npm:1.1.1" dependencies: @@ -15842,7 +15774,7 @@ __metadata: languageName: node linkType: hard -"is-generator-function@npm:^1.0.10, is-generator-function@npm:^1.0.7": +"is-generator-function@npm:^1.0.10": version: 1.0.10 resolution: "is-generator-function@npm:1.0.10" dependencies: @@ -15924,16 +15856,6 @@ __metadata: languageName: node linkType: hard -"is-nan@npm:^1.3.2": - version: 1.3.2 - resolution: "is-nan@npm:1.3.2" - dependencies: - call-bind: "npm:^1.0.0" - define-properties: "npm:^1.1.3" - checksum: 1f784d3472c09bc2e47acba7ffd4f6c93b0394479aa613311dc1d70f1bfa72eb0846c81350967722c959ba65811bae222204d6c65856fdce68f31986140c7b0e - languageName: node - linkType: hard - "is-negative-zero@npm:^2.0.2": version: 2.0.2 resolution: "is-negative-zero@npm:2.0.2" @@ -16110,7 +16032,7 @@ __metadata: languageName: node linkType: hard -"is-typed-array@npm:^1.1.10, is-typed-array@npm:^1.1.12, is-typed-array@npm:^1.1.3, is-typed-array@npm:^1.1.9": +"is-typed-array@npm:^1.1.10, is-typed-array@npm:^1.1.12, is-typed-array@npm:^1.1.9": version: 1.1.12 resolution: "is-typed-array@npm:1.1.12" dependencies: @@ -16275,13 +16197,6 @@ __metadata: languageName: node linkType: hard -"isomorphic-timers-promises@npm:^1.0.1": - version: 1.0.1 - resolution: "isomorphic-timers-promises@npm:1.0.1" - checksum: 2dabe397039081dbf30039f295333a7f9888b072dd0afa3aa7d8ba8f812a6db5efcbda0861a4be43ecfec207d56314ecf27150187b8d0f924a93103fa93eac73 - languageName: node - linkType: hard - "isomorphic-unfetch@npm:^3.1.0": version: 3.1.0 resolution: "isomorphic-unfetch@npm:3.1.0" @@ -17888,15 +17803,6 @@ __metadata: languageName: node linkType: hard -"magic-string@npm:^0.30.3": - version: 0.30.5 - resolution: "magic-string@npm:0.30.5" - dependencies: - "@jridgewell/sourcemap-codec": "npm:^1.4.15" - checksum: c8a6b25f813215ca9db526f3a407d6dc0bf35429c2b8111d6f1c2cf6cf6afd5e2d9f9cd189416a0e3959e20ecd635f73639f9825c73de1074b29331fe36ace59 - languageName: node - linkType: hard - "make-dir@npm:^2.0.0, make-dir@npm:^2.1.0": version: 2.1.0 resolution: "make-dir@npm:2.1.0" @@ -18980,41 +18886,6 @@ __metadata: languageName: node linkType: hard -"node-stdlib-browser@npm:^1.2.0": - version: 1.2.0 - resolution: "node-stdlib-browser@npm:1.2.0" - dependencies: - assert: "npm:^2.0.0" - browser-resolve: "npm:^2.0.0" - browserify-zlib: "npm:^0.2.0" - buffer: "npm:^5.7.1" - console-browserify: "npm:^1.1.0" - constants-browserify: "npm:^1.0.0" - create-require: "npm:^1.1.1" - crypto-browserify: "npm:^3.11.0" - domain-browser: "npm:^4.22.0" - events: "npm:^3.0.0" - https-browserify: "npm:^1.0.0" - isomorphic-timers-promises: "npm:^1.0.1" - os-browserify: "npm:^0.3.0" - path-browserify: "npm:^1.0.1" - pkg-dir: "npm:^5.0.0" - process: "npm:^0.11.10" - punycode: "npm:^1.4.1" - querystring-es3: "npm:^0.2.1" - readable-stream: "npm:^3.6.0" - stream-browserify: "npm:^3.0.0" - stream-http: "npm:^3.2.0" - string_decoder: "npm:^1.0.0" - timers-browserify: "npm:^2.0.4" - tty-browserify: "npm:0.0.1" - url: "npm:^0.11.0" - util: "npm:^0.12.4" - vm-browserify: "npm:^1.0.1" - checksum: 3872da5954722fc8e8267bb58af0dbe36a85b2003e55e63e191f7cc38baf2cbff530bea42c809dfeaa0ad70c0977d0b862b4a515ad90902c1db39ff2179f9b71 - languageName: node - linkType: hard - "nopt@npm:^6.0.0": version: 6.0.0 resolution: "nopt@npm:6.0.0" @@ -19783,13 +19654,6 @@ __metadata: languageName: node linkType: hard -"path-browserify@npm:^1.0.1": - version: 1.0.1 - resolution: "path-browserify@npm:1.0.1" - checksum: 7e7368a5207e7c6b9051ef045711d0dc3c2b6203e96057e408e6e74d09f383061010d2be95cb8593fe6258a767c3e9fc6b2bfc7ce8d48ae8c3d9f6994cca9ad8 - languageName: node - linkType: hard - "path-dirname@npm:^1.0.0": version: 1.0.2 resolution: "path-dirname@npm:1.0.2" @@ -21401,7 +21265,7 @@ __metadata: languageName: node linkType: hard -"querystring-es3@npm:^0.2.0, querystring-es3@npm:^0.2.1": +"querystring-es3@npm:^0.2.0": version: 0.2.1 resolution: "querystring-es3@npm:0.2.1" checksum: c99fccfe1a9c4c25ea6194fa7a559fdb83d2628f118f898af6f0ac02c4ffcd7e0576997bb80e7dfa892d193988b60e23d4968122426351819f87051862af991c @@ -22523,7 +22387,7 @@ __metadata: languageName: node linkType: hard -"resolve@npm:^1.1.6, resolve@npm:^1.1.7, resolve@npm:^1.10.0, resolve@npm:^1.14.2, resolve@npm:^1.17.0, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.2, resolve@npm:^1.22.4, resolve@npm:^1.3.2": +"resolve@npm:^1.1.6, resolve@npm:^1.1.7, resolve@npm:^1.10.0, resolve@npm:^1.14.2, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.2, resolve@npm:^1.22.4, resolve@npm:^1.3.2": version: 1.22.8 resolution: "resolve@npm:1.22.8" dependencies: @@ -22549,7 +22413,7 @@ __metadata: languageName: node linkType: hard -"resolve@patch:resolve@npm%3A^1.1.6#optional!builtin, resolve@patch:resolve@npm%3A^1.1.7#optional!builtin, resolve@patch:resolve@npm%3A^1.10.0#optional!builtin, resolve@patch:resolve@npm%3A^1.14.2#optional!builtin, resolve@patch:resolve@npm%3A^1.17.0#optional!builtin, resolve@patch:resolve@npm%3A^1.19.0#optional!builtin, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin, resolve@patch:resolve@npm%3A^1.22.2#optional!builtin, resolve@patch:resolve@npm%3A^1.22.4#optional!builtin, resolve@patch:resolve@npm%3A^1.3.2#optional!builtin": +"resolve@patch:resolve@npm%3A^1.1.6#optional!builtin, resolve@patch:resolve@npm%3A^1.1.7#optional!builtin, resolve@patch:resolve@npm%3A^1.10.0#optional!builtin, resolve@patch:resolve@npm%3A^1.14.2#optional!builtin, resolve@patch:resolve@npm%3A^1.19.0#optional!builtin, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin, resolve@patch:resolve@npm%3A^1.22.2#optional!builtin, resolve@patch:resolve@npm%3A^1.22.4#optional!builtin, resolve@patch:resolve@npm%3A^1.3.2#optional!builtin": version: 1.22.8 resolution: "resolve@patch:resolve@npm%3A1.22.8#optional!builtin::version=1.22.8&hash=c3c19d" dependencies: @@ -23896,18 +23760,6 @@ __metadata: languageName: node linkType: hard -"stream-http@npm:^3.2.0": - version: 3.2.0 - resolution: "stream-http@npm:3.2.0" - dependencies: - builtin-status-codes: "npm:^3.0.0" - inherits: "npm:^2.0.4" - readable-stream: "npm:^3.6.0" - xtend: "npm:^4.0.2" - checksum: 4f85738cbc6de70ecf0a04bc38b6092b4d91dd5317d3d93c88a84c48e63b82a8724ab5fd591df9f587b5139fe439d1748e4e3db3cb09c2b1e23649cb9d89859e - languageName: node - linkType: hard - "stream-shift@npm:^1.0.0": version: 1.0.1 resolution: "stream-shift@npm:1.0.1" @@ -25166,13 +25018,6 @@ __metadata: languageName: node linkType: hard -"tty-browserify@npm:0.0.1": - version: 0.0.1 - resolution: "tty-browserify@npm:0.0.1" - checksum: 93b745d43fa5a7d2b948fa23be8d313576d1d884b48acd957c07710bac1c0d8ac34c0556ad4c57c73d36e11741763ef66b3fb4fb97b06b7e4d525315a3cd45f5 - languageName: node - linkType: hard - "tunnel-agent@npm:^0.6.0": version: 0.6.0 resolution: "tunnel-agent@npm:0.6.0" @@ -25957,19 +25802,6 @@ __metadata: languageName: node linkType: hard -"util@npm:^0.12.4, util@npm:^0.12.5": - version: 0.12.5 - resolution: "util@npm:0.12.5" - dependencies: - inherits: "npm:^2.0.3" - is-arguments: "npm:^1.0.4" - is-generator-function: "npm:^1.0.7" - is-typed-array: "npm:^1.1.3" - which-typed-array: "npm:^1.1.2" - checksum: 61a10de7753353dd4d744c917f74cdd7d21b8b46379c1e48e1c4fd8e83f8190e6bd9978fc4e5102ab6a10ebda6019d1b36572fa4a325e175ec8b789a121f6147 - languageName: node - linkType: hard - "utila@npm:~0.4": version: 0.4.0 resolution: "utila@npm:0.4.0" @@ -26093,18 +25925,6 @@ __metadata: languageName: node linkType: hard -"vite-plugin-node-polyfills@npm:^0.19.0": - version: 0.19.0 - resolution: "vite-plugin-node-polyfills@npm:0.19.0" - dependencies: - "@rollup/plugin-inject": "npm:^5.0.5" - node-stdlib-browser: "npm:^1.2.0" - peerDependencies: - vite: ^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0 - checksum: 7ac092feca3faefa0983914dd081d9878ec80955ba4c7805c8a6f266a6bfae1fa7b1603c4cc985d8fb373556182f40e060b3eb61ccdfa52f4cf9fd76055bf172 - languageName: node - linkType: hard - "vite@npm:^4.5.1": version: 4.5.1 resolution: "vite@npm:4.5.1" @@ -26690,7 +26510,7 @@ __metadata: languageName: node linkType: hard -"which-typed-array@npm:^1.1.11, which-typed-array@npm:^1.1.13, which-typed-array@npm:^1.1.2, which-typed-array@npm:^1.1.9": +"which-typed-array@npm:^1.1.11, which-typed-array@npm:^1.1.13, which-typed-array@npm:^1.1.9": version: 1.1.13 resolution: "which-typed-array@npm:1.1.13" dependencies: @@ -27185,7 +27005,7 @@ __metadata: languageName: node linkType: hard -"xtend@npm:^4.0.0, xtend@npm:^4.0.1, xtend@npm:^4.0.2, xtend@npm:~4.0.1": +"xtend@npm:^4.0.0, xtend@npm:^4.0.1, xtend@npm:~4.0.1": version: 4.0.2 resolution: "xtend@npm:4.0.2" checksum: ac5dfa738b21f6e7f0dd6e65e1b3155036d68104e67e5d5d1bde74892e327d7e5636a076f625599dc394330a731861e87343ff184b0047fef1360a7ec0a5a36a From 13ed5b47bdec931e3c854c55378dd621420e845e Mon Sep 17 00:00:00 2001 From: Nikita Kuznetsov Date: Fri, 12 Jan 2024 19:47:05 +0100 Subject: [PATCH 17/19] Update styled components and vite --- apps/extension/package.json | 2 +- apps/twa/package.json | 2 +- apps/web/package.json | 4 +- apps/web/vite.config.ts | 13 +- packages/uikit/package.json | 2 +- packages/uikit/src/components/List.tsx | 2 +- yarn.lock | 438 +++++++++++++++---------- 7 files changed, 282 insertions(+), 181 deletions(-) diff --git a/apps/extension/package.json b/apps/extension/package.json index 8720987f9..48407ee26 100644 --- a/apps/extension/package.json +++ b/apps/extension/package.json @@ -18,7 +18,7 @@ "react-ga4": "^2.1.0", "react-router-dom": "^6.4.5", "stream-browserify": "^3.0.0", - "styled-components": "^5.3.6", + "styled-components": "^6.1.1", "web-vitals": "^2.1.4", "webextension-polyfill": "^0.10.0" }, diff --git a/apps/twa/package.json b/apps/twa/package.json index 530aa5c6e..91114613c 100644 --- a/apps/twa/package.json +++ b/apps/twa/package.json @@ -18,7 +18,7 @@ "react-dom": "^18.2.0", "react-i18next": "^12.1.1", "react-router-dom": "^6.4.5", - "styled-components": "^5.3.6", + "styled-components": "^6.1.1", "web-vitals": "^2.1.4" }, "devDependencies": { diff --git a/apps/web/package.json b/apps/web/package.json index 27e9e5f7f..a2f9d8018 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -19,7 +19,7 @@ "react-dom": "^18.2.0", "react-i18next": "^12.1.1", "react-router-dom": "^6.4.5", - "styled-components": "^5.3.6" + "styled-components": "^6.1.1" }, "devDependencies": { "@testing-library/dom": "^9.3.1", @@ -37,7 +37,7 @@ "react-is": "^18.2.0", "ts-node": "^10.9.1", "typescript": "5.2.2", - "vite": "^4.5.1" + "vite": "^5.0.5" }, "scripts": { "locales": "ts-node ./task/locales", diff --git a/apps/web/vite.config.ts b/apps/web/vite.config.ts index 5e6e79b5c..2c4348fc5 100644 --- a/apps/web/vite.config.ts +++ b/apps/web/vite.config.ts @@ -1,6 +1,17 @@ import react from '@vitejs/plugin-react'; +import * as path from 'path'; import { defineConfig } from 'vite'; export default defineConfig({ - plugins: [react()] + plugins: [react()], + resolve: { + alias: { + react: path.resolve(__dirname, './node_modules/react'), + 'react-dom': path.resolve(__dirname, './node_modules/react-dom'), + 'react-router-dom': path.resolve(__dirname, './node_modules/react-router-dom'), + 'styled-components': path.resolve(__dirname, './node_modules/styled-components'), + 'react-i18next': path.resolve(__dirname, './node_modules/react-i18next'), + '@tanstack/react-query': path.resolve(__dirname, './node_modules/@tanstack/react-query') + } + } }); diff --git a/packages/uikit/package.json b/packages/uikit/package.json index c59d2382e..a97be750b 100644 --- a/packages/uikit/package.json +++ b/packages/uikit/package.json @@ -29,7 +29,7 @@ "react-qrcode-logo": "^2.9.0", "react-router-dom": "^6.4.5", "react-transition-group": "^4.4.5", - "styled-components": "^5.3.6", + "styled-components": "^6.1.1", "ton": "^13.4.1", "ton-core": "^0.49.0", "ton-crypto": "^3.2.0", diff --git a/packages/uikit/src/components/List.tsx b/packages/uikit/src/components/List.tsx index 8e290dca4..3919f7b7c 100644 --- a/packages/uikit/src/components/List.tsx +++ b/packages/uikit/src/components/List.tsx @@ -69,7 +69,7 @@ export const ListItemPayload = styled.div` export const ListItemElement = styled.div<{ hover?: boolean; dropDown?: boolean; - ios: boolean; + ios?: boolean; isHover?: boolean; }>` position: relative; diff --git a/yarn.lock b/yarn.lock index edff129fb..290669d15 100644 --- a/yarn.lock +++ b/yarn.lock @@ -373,7 +373,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-module-imports@npm:^7.0.0, @babel/helper-module-imports@npm:^7.10.4, @babel/helper-module-imports@npm:^7.12.13, @babel/helper-module-imports@npm:^7.22.15, @babel/helper-module-imports@npm:^7.22.5": +"@babel/helper-module-imports@npm:^7.10.4, @babel/helper-module-imports@npm:^7.12.13, @babel/helper-module-imports@npm:^7.22.15": version: 7.22.15 resolution: "@babel/helper-module-imports@npm:7.22.15" dependencies: @@ -877,7 +877,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-syntax-jsx@npm:^7.22.5, @babel/plugin-syntax-jsx@npm:^7.23.3": +"@babel/plugin-syntax-jsx@npm:^7.23.3": version: 7.23.3 resolution: "@babel/plugin-syntax-jsx@npm:7.23.3" dependencies: @@ -1911,7 +1911,7 @@ __metadata: languageName: node linkType: hard -"@babel/traverse@npm:^7.1.6, @babel/traverse@npm:^7.12.11, @babel/traverse@npm:^7.12.9, @babel/traverse@npm:^7.13.0, @babel/traverse@npm:^7.23.6, @babel/traverse@npm:^7.4.5, @babel/traverse@npm:^7.7.2": +"@babel/traverse@npm:^7.1.6, @babel/traverse@npm:^7.12.11, @babel/traverse@npm:^7.12.9, @babel/traverse@npm:^7.13.0, @babel/traverse@npm:^7.23.6, @babel/traverse@npm:^7.7.2": version: 7.23.6 resolution: "@babel/traverse@npm:7.23.6" dependencies: @@ -2770,7 +2770,7 @@ __metadata: languageName: node linkType: hard -"@emotion/is-prop-valid@npm:^1.1.0, @emotion/is-prop-valid@npm:^1.2.1": +"@emotion/is-prop-valid@npm:^1.2.1": version: 1.2.1 resolution: "@emotion/is-prop-valid@npm:1.2.1" dependencies: @@ -2786,20 +2786,6 @@ __metadata: languageName: node linkType: hard -"@emotion/stylis@npm:^0.8.4": - version: 0.8.5 - resolution: "@emotion/stylis@npm:0.8.5" - checksum: ceaa673457f501a393cb52873b2bc34dbe35ef0fb8faa4b943d73ecbbb42bc3cea53b87cbf482038b7b9b1f95859be3d8b58d508422b4d15aec5b62314cc3c1e - languageName: node - linkType: hard - -"@emotion/unitless@npm:^0.7.4": - version: 0.7.5 - resolution: "@emotion/unitless@npm:0.7.5" - checksum: f976e5345b53fae9414a7b2e7a949aa6b52f8bdbcc84458b1ddc0729e77ba1d1dfdff9960e0da60183877873d3a631fa24d9695dd714ed94bcd3ba5196586a6b - languageName: node - linkType: hard - "@emotion/unitless@npm:^0.8.0": version: 0.8.1 resolution: "@emotion/unitless@npm:0.8.1" @@ -2828,6 +2814,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/aix-ppc64@npm:0.19.11": + version: 0.19.11 + resolution: "@esbuild/aix-ppc64@npm:0.19.11" + conditions: os=aix & cpu=ppc64 + languageName: node + linkType: hard + "@esbuild/android-arm64@npm:0.16.17": version: 0.16.17 resolution: "@esbuild/android-arm64@npm:0.16.17" @@ -2842,9 +2835,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/android-arm64@npm:0.18.20": - version: 0.18.20 - resolution: "@esbuild/android-arm64@npm:0.18.20" +"@esbuild/android-arm64@npm:0.19.11": + version: 0.19.11 + resolution: "@esbuild/android-arm64@npm:0.19.11" conditions: os=android & cpu=arm64 languageName: node linkType: hard @@ -2863,9 +2856,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/android-arm@npm:0.18.20": - version: 0.18.20 - resolution: "@esbuild/android-arm@npm:0.18.20" +"@esbuild/android-arm@npm:0.19.11": + version: 0.19.11 + resolution: "@esbuild/android-arm@npm:0.19.11" conditions: os=android & cpu=arm languageName: node linkType: hard @@ -2884,9 +2877,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/android-x64@npm:0.18.20": - version: 0.18.20 - resolution: "@esbuild/android-x64@npm:0.18.20" +"@esbuild/android-x64@npm:0.19.11": + version: 0.19.11 + resolution: "@esbuild/android-x64@npm:0.19.11" conditions: os=android & cpu=x64 languageName: node linkType: hard @@ -2905,9 +2898,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/darwin-arm64@npm:0.18.20": - version: 0.18.20 - resolution: "@esbuild/darwin-arm64@npm:0.18.20" +"@esbuild/darwin-arm64@npm:0.19.11": + version: 0.19.11 + resolution: "@esbuild/darwin-arm64@npm:0.19.11" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard @@ -2926,9 +2919,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/darwin-x64@npm:0.18.20": - version: 0.18.20 - resolution: "@esbuild/darwin-x64@npm:0.18.20" +"@esbuild/darwin-x64@npm:0.19.11": + version: 0.19.11 + resolution: "@esbuild/darwin-x64@npm:0.19.11" conditions: os=darwin & cpu=x64 languageName: node linkType: hard @@ -2947,9 +2940,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/freebsd-arm64@npm:0.18.20": - version: 0.18.20 - resolution: "@esbuild/freebsd-arm64@npm:0.18.20" +"@esbuild/freebsd-arm64@npm:0.19.11": + version: 0.19.11 + resolution: "@esbuild/freebsd-arm64@npm:0.19.11" conditions: os=freebsd & cpu=arm64 languageName: node linkType: hard @@ -2968,9 +2961,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/freebsd-x64@npm:0.18.20": - version: 0.18.20 - resolution: "@esbuild/freebsd-x64@npm:0.18.20" +"@esbuild/freebsd-x64@npm:0.19.11": + version: 0.19.11 + resolution: "@esbuild/freebsd-x64@npm:0.19.11" conditions: os=freebsd & cpu=x64 languageName: node linkType: hard @@ -2989,9 +2982,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-arm64@npm:0.18.20": - version: 0.18.20 - resolution: "@esbuild/linux-arm64@npm:0.18.20" +"@esbuild/linux-arm64@npm:0.19.11": + version: 0.19.11 + resolution: "@esbuild/linux-arm64@npm:0.19.11" conditions: os=linux & cpu=arm64 languageName: node linkType: hard @@ -3010,9 +3003,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-arm@npm:0.18.20": - version: 0.18.20 - resolution: "@esbuild/linux-arm@npm:0.18.20" +"@esbuild/linux-arm@npm:0.19.11": + version: 0.19.11 + resolution: "@esbuild/linux-arm@npm:0.19.11" conditions: os=linux & cpu=arm languageName: node linkType: hard @@ -3031,9 +3024,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-ia32@npm:0.18.20": - version: 0.18.20 - resolution: "@esbuild/linux-ia32@npm:0.18.20" +"@esbuild/linux-ia32@npm:0.19.11": + version: 0.19.11 + resolution: "@esbuild/linux-ia32@npm:0.19.11" conditions: os=linux & cpu=ia32 languageName: node linkType: hard @@ -3052,9 +3045,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-loong64@npm:0.18.20": - version: 0.18.20 - resolution: "@esbuild/linux-loong64@npm:0.18.20" +"@esbuild/linux-loong64@npm:0.19.11": + version: 0.19.11 + resolution: "@esbuild/linux-loong64@npm:0.19.11" conditions: os=linux & cpu=loong64 languageName: node linkType: hard @@ -3073,9 +3066,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-mips64el@npm:0.18.20": - version: 0.18.20 - resolution: "@esbuild/linux-mips64el@npm:0.18.20" +"@esbuild/linux-mips64el@npm:0.19.11": + version: 0.19.11 + resolution: "@esbuild/linux-mips64el@npm:0.19.11" conditions: os=linux & cpu=mips64el languageName: node linkType: hard @@ -3094,9 +3087,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-ppc64@npm:0.18.20": - version: 0.18.20 - resolution: "@esbuild/linux-ppc64@npm:0.18.20" +"@esbuild/linux-ppc64@npm:0.19.11": + version: 0.19.11 + resolution: "@esbuild/linux-ppc64@npm:0.19.11" conditions: os=linux & cpu=ppc64 languageName: node linkType: hard @@ -3115,9 +3108,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-riscv64@npm:0.18.20": - version: 0.18.20 - resolution: "@esbuild/linux-riscv64@npm:0.18.20" +"@esbuild/linux-riscv64@npm:0.19.11": + version: 0.19.11 + resolution: "@esbuild/linux-riscv64@npm:0.19.11" conditions: os=linux & cpu=riscv64 languageName: node linkType: hard @@ -3136,9 +3129,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-s390x@npm:0.18.20": - version: 0.18.20 - resolution: "@esbuild/linux-s390x@npm:0.18.20" +"@esbuild/linux-s390x@npm:0.19.11": + version: 0.19.11 + resolution: "@esbuild/linux-s390x@npm:0.19.11" conditions: os=linux & cpu=s390x languageName: node linkType: hard @@ -3157,9 +3150,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-x64@npm:0.18.20": - version: 0.18.20 - resolution: "@esbuild/linux-x64@npm:0.18.20" +"@esbuild/linux-x64@npm:0.19.11": + version: 0.19.11 + resolution: "@esbuild/linux-x64@npm:0.19.11" conditions: os=linux & cpu=x64 languageName: node linkType: hard @@ -3178,9 +3171,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/netbsd-x64@npm:0.18.20": - version: 0.18.20 - resolution: "@esbuild/netbsd-x64@npm:0.18.20" +"@esbuild/netbsd-x64@npm:0.19.11": + version: 0.19.11 + resolution: "@esbuild/netbsd-x64@npm:0.19.11" conditions: os=netbsd & cpu=x64 languageName: node linkType: hard @@ -3199,9 +3192,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/openbsd-x64@npm:0.18.20": - version: 0.18.20 - resolution: "@esbuild/openbsd-x64@npm:0.18.20" +"@esbuild/openbsd-x64@npm:0.19.11": + version: 0.19.11 + resolution: "@esbuild/openbsd-x64@npm:0.19.11" conditions: os=openbsd & cpu=x64 languageName: node linkType: hard @@ -3220,9 +3213,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/sunos-x64@npm:0.18.20": - version: 0.18.20 - resolution: "@esbuild/sunos-x64@npm:0.18.20" +"@esbuild/sunos-x64@npm:0.19.11": + version: 0.19.11 + resolution: "@esbuild/sunos-x64@npm:0.19.11" conditions: os=sunos & cpu=x64 languageName: node linkType: hard @@ -3241,9 +3234,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/win32-arm64@npm:0.18.20": - version: 0.18.20 - resolution: "@esbuild/win32-arm64@npm:0.18.20" +"@esbuild/win32-arm64@npm:0.19.11": + version: 0.19.11 + resolution: "@esbuild/win32-arm64@npm:0.19.11" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard @@ -3262,9 +3255,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/win32-ia32@npm:0.18.20": - version: 0.18.20 - resolution: "@esbuild/win32-ia32@npm:0.18.20" +"@esbuild/win32-ia32@npm:0.19.11": + version: 0.19.11 + resolution: "@esbuild/win32-ia32@npm:0.19.11" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard @@ -3283,9 +3276,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/win32-x64@npm:0.18.20": - version: 0.18.20 - resolution: "@esbuild/win32-x64@npm:0.18.20" +"@esbuild/win32-x64@npm:0.19.11": + version: 0.19.11 + resolution: "@esbuild/win32-x64@npm:0.19.11" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -4451,6 +4444,97 @@ __metadata: languageName: node linkType: hard +"@rollup/rollup-android-arm-eabi@npm:4.9.5": + version: 4.9.5 + resolution: "@rollup/rollup-android-arm-eabi@npm:4.9.5" + conditions: os=android & cpu=arm + languageName: node + linkType: hard + +"@rollup/rollup-android-arm64@npm:4.9.5": + version: 4.9.5 + resolution: "@rollup/rollup-android-arm64@npm:4.9.5" + conditions: os=android & cpu=arm64 + languageName: node + linkType: hard + +"@rollup/rollup-darwin-arm64@npm:4.9.5": + version: 4.9.5 + resolution: "@rollup/rollup-darwin-arm64@npm:4.9.5" + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + +"@rollup/rollup-darwin-x64@npm:4.9.5": + version: 4.9.5 + resolution: "@rollup/rollup-darwin-x64@npm:4.9.5" + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + +"@rollup/rollup-linux-arm-gnueabihf@npm:4.9.5": + version: 4.9.5 + resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.9.5" + conditions: os=linux & cpu=arm + languageName: node + linkType: hard + +"@rollup/rollup-linux-arm64-gnu@npm:4.9.5": + version: 4.9.5 + resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.9.5" + conditions: os=linux & cpu=arm64 & libc=glibc + languageName: node + linkType: hard + +"@rollup/rollup-linux-arm64-musl@npm:4.9.5": + version: 4.9.5 + resolution: "@rollup/rollup-linux-arm64-musl@npm:4.9.5" + conditions: os=linux & cpu=arm64 & libc=musl + languageName: node + linkType: hard + +"@rollup/rollup-linux-riscv64-gnu@npm:4.9.5": + version: 4.9.5 + resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.9.5" + conditions: os=linux & cpu=riscv64 & libc=glibc + languageName: node + linkType: hard + +"@rollup/rollup-linux-x64-gnu@npm:4.9.5": + version: 4.9.5 + resolution: "@rollup/rollup-linux-x64-gnu@npm:4.9.5" + conditions: os=linux & cpu=x64 & libc=glibc + languageName: node + linkType: hard + +"@rollup/rollup-linux-x64-musl@npm:4.9.5": + version: 4.9.5 + resolution: "@rollup/rollup-linux-x64-musl@npm:4.9.5" + conditions: os=linux & cpu=x64 & libc=musl + languageName: node + linkType: hard + +"@rollup/rollup-win32-arm64-msvc@npm:4.9.5": + version: 4.9.5 + resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.9.5" + conditions: os=win32 & cpu=arm64 + languageName: node + linkType: hard + +"@rollup/rollup-win32-ia32-msvc@npm:4.9.5": + version: 4.9.5 + resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.9.5" + conditions: os=win32 & cpu=ia32 + languageName: node + linkType: hard + +"@rollup/rollup-win32-x64-msvc@npm:4.9.5": + version: 4.9.5 + resolution: "@rollup/rollup-win32-x64-msvc@npm:4.9.5" + conditions: os=win32 & cpu=x64 + languageName: node + linkType: hard + "@rushstack/eslint-patch@npm:^1.1.0": version: 1.6.0 resolution: "@rushstack/eslint-patch@npm:1.6.0" @@ -6044,7 +6128,7 @@ __metadata: react-router-dom: "npm:^6.4.5" react-scripts: "npm:5.0.1" stream-browserify: "npm:^3.0.0" - styled-components: "npm:^5.3.6" + styled-components: "npm:^6.1.1" ts-loader: "npm:^9.4.2" ts-node: "npm:^10.9.1" typescript: "npm:^4.9.4" @@ -6100,7 +6184,7 @@ __metadata: react-router-dom: "npm:^6.4.5" react-scripts: "npm:5.0.1" source-map-explorer: "npm:^2.5.3" - styled-components: "npm:^5.3.6" + styled-components: "npm:^6.1.1" ts-node: "npm:^10.9.1" typescript: "npm:^4.9.4" web-vitals: "npm:^2.1.4" @@ -6147,7 +6231,7 @@ __metadata: react-transition-group: "npm:^4.4.5" require-from-string: "npm:^2.0.2" storybook-addon-turbo-build: "npm:^1.1.0" - styled-components: "npm:^5.3.6" + styled-components: "npm:^6.1.1" ton: "npm:^13.4.1" ton-core: "npm:^0.49.0" ton-crypto: "npm:^3.2.0" @@ -6189,10 +6273,10 @@ __metadata: react-i18next: "npm:^12.1.1" react-is: "npm:^18.2.0" react-router-dom: "npm:^6.4.5" - styled-components: "npm:^5.3.6" + styled-components: "npm:^6.1.1" ts-node: "npm:^10.9.1" typescript: "npm:5.2.2" - vite: "npm:^4.5.1" + vite: "npm:^5.0.5" languageName: unknown linkType: soft @@ -6474,7 +6558,7 @@ __metadata: languageName: node linkType: hard -"@types/estree@npm:*, @types/estree@npm:^1.0.0": +"@types/estree@npm:*, @types/estree@npm:1.0.5, @types/estree@npm:^1.0.0": version: 1.0.5 resolution: "@types/estree@npm:1.0.5" checksum: 7de6d928dd4010b0e20c6919e1a6c27b61f8d4567befa89252055fad503d587ecb9a1e3eab1b1901f923964d7019796db810b7fd6430acb26c32866d126fd408 @@ -8827,21 +8911,6 @@ __metadata: languageName: node linkType: hard -"babel-plugin-styled-components@npm:>= 1.12.0": - version: 2.1.4 - resolution: "babel-plugin-styled-components@npm:2.1.4" - dependencies: - "@babel/helper-annotate-as-pure": "npm:^7.22.5" - "@babel/helper-module-imports": "npm:^7.22.5" - "@babel/plugin-syntax-jsx": "npm:^7.22.5" - lodash: "npm:^4.17.21" - picomatch: "npm:^2.3.1" - peerDependencies: - styled-components: ">= 2" - checksum: 34f10dd4d44cf1c8605097dd4796e2d1443266ebc686f10a9f56b5d1492b5c3de9c13d7e30b075756610adf592ed807cc8145189d00b4454f6af9879a19a5e0b - languageName: node - linkType: hard - "babel-plugin-transform-react-remove-prop-types@npm:^0.4.24": version: 0.4.24 resolution: "babel-plugin-transform-react-remove-prop-types@npm:0.4.24" @@ -10861,7 +10930,7 @@ __metadata: languageName: node linkType: hard -"css-to-react-native@npm:^3.0.0, css-to-react-native@npm:^3.2.0": +"css-to-react-native@npm:^3.2.0": version: 3.2.0 resolution: "css-to-react-native@npm:3.2.0" dependencies: @@ -12401,33 +12470,36 @@ __metadata: languageName: node linkType: hard -"esbuild@npm:^0.18.10": - version: 0.18.20 - resolution: "esbuild@npm:0.18.20" - dependencies: - "@esbuild/android-arm": "npm:0.18.20" - "@esbuild/android-arm64": "npm:0.18.20" - "@esbuild/android-x64": "npm:0.18.20" - "@esbuild/darwin-arm64": "npm:0.18.20" - "@esbuild/darwin-x64": "npm:0.18.20" - "@esbuild/freebsd-arm64": "npm:0.18.20" - "@esbuild/freebsd-x64": "npm:0.18.20" - "@esbuild/linux-arm": "npm:0.18.20" - "@esbuild/linux-arm64": "npm:0.18.20" - "@esbuild/linux-ia32": "npm:0.18.20" - "@esbuild/linux-loong64": "npm:0.18.20" - "@esbuild/linux-mips64el": "npm:0.18.20" - "@esbuild/linux-ppc64": "npm:0.18.20" - "@esbuild/linux-riscv64": "npm:0.18.20" - "@esbuild/linux-s390x": "npm:0.18.20" - "@esbuild/linux-x64": "npm:0.18.20" - "@esbuild/netbsd-x64": "npm:0.18.20" - "@esbuild/openbsd-x64": "npm:0.18.20" - "@esbuild/sunos-x64": "npm:0.18.20" - "@esbuild/win32-arm64": "npm:0.18.20" - "@esbuild/win32-ia32": "npm:0.18.20" - "@esbuild/win32-x64": "npm:0.18.20" +"esbuild@npm:^0.19.3": + version: 0.19.11 + resolution: "esbuild@npm:0.19.11" + dependencies: + "@esbuild/aix-ppc64": "npm:0.19.11" + "@esbuild/android-arm": "npm:0.19.11" + "@esbuild/android-arm64": "npm:0.19.11" + "@esbuild/android-x64": "npm:0.19.11" + "@esbuild/darwin-arm64": "npm:0.19.11" + "@esbuild/darwin-x64": "npm:0.19.11" + "@esbuild/freebsd-arm64": "npm:0.19.11" + "@esbuild/freebsd-x64": "npm:0.19.11" + "@esbuild/linux-arm": "npm:0.19.11" + "@esbuild/linux-arm64": "npm:0.19.11" + "@esbuild/linux-ia32": "npm:0.19.11" + "@esbuild/linux-loong64": "npm:0.19.11" + "@esbuild/linux-mips64el": "npm:0.19.11" + "@esbuild/linux-ppc64": "npm:0.19.11" + "@esbuild/linux-riscv64": "npm:0.19.11" + "@esbuild/linux-s390x": "npm:0.19.11" + "@esbuild/linux-x64": "npm:0.19.11" + "@esbuild/netbsd-x64": "npm:0.19.11" + "@esbuild/openbsd-x64": "npm:0.19.11" + "@esbuild/sunos-x64": "npm:0.19.11" + "@esbuild/win32-arm64": "npm:0.19.11" + "@esbuild/win32-ia32": "npm:0.19.11" + "@esbuild/win32-x64": "npm:0.19.11" dependenciesMeta: + "@esbuild/aix-ppc64": + optional: true "@esbuild/android-arm": optional: true "@esbuild/android-arm64": @@ -12474,7 +12546,7 @@ __metadata: optional: true bin: esbuild: bin/esbuild - checksum: 1f723ec71c3aa196473bf3298316eedc3f62d523924652dfeb60701b609792f918fc60db84b420d1d8ba9bfa7d69de2fc1d3157ba47c028bdae5d507a26a3c64 + checksum: a40b3858c29618c8c893389372f469245a6b2d1319782af75d33d8ba5dcadfe181fcc935f8e1a907be667946384950a4cf482ebe1e79c99c932d2b8eb35a09d0 languageName: node linkType: hard @@ -14031,7 +14103,7 @@ __metadata: languageName: node linkType: hard -"fsevents@npm:^2.1.2, fsevents@npm:^2.3.2, fsevents@npm:~2.3.2": +"fsevents@npm:^2.1.2, fsevents@npm:^2.3.2, fsevents@npm:~2.3.2, fsevents@npm:~2.3.3": version: 2.3.3 resolution: "fsevents@npm:2.3.3" dependencies: @@ -14051,7 +14123,7 @@ __metadata: languageName: node linkType: hard -"fsevents@patch:fsevents@npm%3A^2.1.2#optional!builtin, fsevents@patch:fsevents@npm%3A^2.3.2#optional!builtin, fsevents@patch:fsevents@npm%3A~2.3.2#optional!builtin": +"fsevents@patch:fsevents@npm%3A^2.1.2#optional!builtin, fsevents@patch:fsevents@npm%3A^2.3.2#optional!builtin, fsevents@patch:fsevents@npm%3A~2.3.2#optional!builtin, fsevents@patch:fsevents@npm%3A~2.3.3#optional!builtin": version: 2.3.3 resolution: "fsevents@patch:fsevents@npm%3A2.3.3#optional!builtin::version=2.3.3&hash=df0bf1" dependencies: @@ -14884,7 +14956,7 @@ __metadata: languageName: node linkType: hard -"hoist-non-react-statics@npm:^3.0.0, hoist-non-react-statics@npm:^3.3.0, hoist-non-react-statics@npm:^3.3.2": +"hoist-non-react-statics@npm:^3.3.0, hoist-non-react-statics@npm:^3.3.2": version: 3.3.2 resolution: "hoist-non-react-statics@npm:3.3.2" dependencies: @@ -20861,7 +20933,7 @@ __metadata: languageName: node linkType: hard -"postcss@npm:^8.4.27": +"postcss@npm:^8.4.32": version: 8.4.33 resolution: "postcss@npm:8.4.33" dependencies: @@ -22607,17 +22679,57 @@ __metadata: languageName: node linkType: hard -"rollup@npm:^3.27.1": - version: 3.29.4 - resolution: "rollup@npm:3.29.4" - dependencies: +"rollup@npm:^4.2.0": + version: 4.9.5 + resolution: "rollup@npm:4.9.5" + dependencies: + "@rollup/rollup-android-arm-eabi": "npm:4.9.5" + "@rollup/rollup-android-arm64": "npm:4.9.5" + "@rollup/rollup-darwin-arm64": "npm:4.9.5" + "@rollup/rollup-darwin-x64": "npm:4.9.5" + "@rollup/rollup-linux-arm-gnueabihf": "npm:4.9.5" + "@rollup/rollup-linux-arm64-gnu": "npm:4.9.5" + "@rollup/rollup-linux-arm64-musl": "npm:4.9.5" + "@rollup/rollup-linux-riscv64-gnu": "npm:4.9.5" + "@rollup/rollup-linux-x64-gnu": "npm:4.9.5" + "@rollup/rollup-linux-x64-musl": "npm:4.9.5" + "@rollup/rollup-win32-arm64-msvc": "npm:4.9.5" + "@rollup/rollup-win32-ia32-msvc": "npm:4.9.5" + "@rollup/rollup-win32-x64-msvc": "npm:4.9.5" + "@types/estree": "npm:1.0.5" fsevents: "npm:~2.3.2" dependenciesMeta: + "@rollup/rollup-android-arm-eabi": + optional: true + "@rollup/rollup-android-arm64": + optional: true + "@rollup/rollup-darwin-arm64": + optional: true + "@rollup/rollup-darwin-x64": + optional: true + "@rollup/rollup-linux-arm-gnueabihf": + optional: true + "@rollup/rollup-linux-arm64-gnu": + optional: true + "@rollup/rollup-linux-arm64-musl": + optional: true + "@rollup/rollup-linux-riscv64-gnu": + optional: true + "@rollup/rollup-linux-x64-gnu": + optional: true + "@rollup/rollup-linux-x64-musl": + optional: true + "@rollup/rollup-win32-arm64-msvc": + optional: true + "@rollup/rollup-win32-ia32-msvc": + optional: true + "@rollup/rollup-win32-x64-msvc": + optional: true fsevents: optional: true bin: rollup: dist/bin/rollup - checksum: 9e39d54e23731a4c4067e9c02910cdf7479a0f9a7584796e2dc6efaa34bb1e5e015c062c87d1e64d96038baca76cefd47681ff22604fae5827147f54123dc6d0 + checksum: 4debf528e63edea5c3f5d38e399c6dd7287e2977d90d2d3ce38d4b3412289e2081aff8f8488a11b1699c786f2e904e9e150f30d576fe9316b5b97df0e80b1bce languageName: node linkType: hard @@ -24061,28 +24173,6 @@ __metadata: languageName: node linkType: hard -"styled-components@npm:^5.3.6": - version: 5.3.11 - resolution: "styled-components@npm:5.3.11" - dependencies: - "@babel/helper-module-imports": "npm:^7.0.0" - "@babel/traverse": "npm:^7.4.5" - "@emotion/is-prop-valid": "npm:^1.1.0" - "@emotion/stylis": "npm:^0.8.4" - "@emotion/unitless": "npm:^0.7.4" - babel-plugin-styled-components: "npm:>= 1.12.0" - css-to-react-native: "npm:^3.0.0" - hoist-non-react-statics: "npm:^3.0.0" - shallowequal: "npm:^1.1.0" - supports-color: "npm:^5.5.0" - peerDependencies: - react: ">= 16.8.0" - react-dom: ">= 16.8.0" - react-is: ">= 16.8.0" - checksum: 7e1baee0f7b4479fe1a4064e4ae87e40f1ba583030d04827cef73fa7b36d3a91ed552dc76164d319216039f906af42a5229648c023482280fa4b5f71f00eef2d - languageName: node - linkType: hard - "styled-components@npm:^6.1.1": version: 6.1.1 resolution: "styled-components@npm:6.1.1" @@ -24163,7 +24253,7 @@ __metadata: languageName: node linkType: hard -"supports-color@npm:^5.3.0, supports-color@npm:^5.5.0": +"supports-color@npm:^5.3.0": version: 5.5.0 resolution: "supports-color@npm:5.5.0" dependencies: @@ -25925,16 +26015,16 @@ __metadata: languageName: node linkType: hard -"vite@npm:^4.5.1": - version: 4.5.1 - resolution: "vite@npm:4.5.1" +"vite@npm:^5.0.5": + version: 5.0.11 + resolution: "vite@npm:5.0.11" dependencies: - esbuild: "npm:^0.18.10" - fsevents: "npm:~2.3.2" - postcss: "npm:^8.4.27" - rollup: "npm:^3.27.1" + esbuild: "npm:^0.19.3" + fsevents: "npm:~2.3.3" + postcss: "npm:^8.4.32" + rollup: "npm:^4.2.0" peerDependencies: - "@types/node": ">= 14" + "@types/node": ^18.0.0 || >=20.0.0 less: "*" lightningcss: ^1.21.0 sass: "*" @@ -25961,7 +26051,7 @@ __metadata: optional: true bin: vite: bin/vite.js - checksum: 2ea9c030a5718ca0adaaa0ecc54402a725cff59131cf80bc84d0237f59c98168803ee59d23e697b98b1184be3af6c6edc2e81517f769c62159f11531b3341a4e + checksum: f1a8fea35ed9f162d7a10fd13efb2c96637028b0a319d726aeec8b31e20e4d047272bda5df82167618e7774a520236c66f3093ed172802660aec5227814072f4 languageName: node linkType: hard From 209df9a03c4c779b221089db98d64327021f22e0 Mon Sep 17 00:00:00 2001 From: Nikita Kuznetsov Date: Fri, 12 Jan 2024 19:48:59 +0100 Subject: [PATCH 18/19] Latest vite --- apps/web/package.json | 2 +- yarn.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/web/package.json b/apps/web/package.json index a2f9d8018..8a3be4a87 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -37,7 +37,7 @@ "react-is": "^18.2.0", "ts-node": "^10.9.1", "typescript": "5.2.2", - "vite": "^5.0.5" + "vite": "^5.0.11" }, "scripts": { "locales": "ts-node ./task/locales", diff --git a/yarn.lock b/yarn.lock index 290669d15..69ee60997 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6276,7 +6276,7 @@ __metadata: styled-components: "npm:^6.1.1" ts-node: "npm:^10.9.1" typescript: "npm:5.2.2" - vite: "npm:^5.0.5" + vite: "npm:^5.0.11" languageName: unknown linkType: soft @@ -26015,7 +26015,7 @@ __metadata: languageName: node linkType: hard -"vite@npm:^5.0.5": +"vite@npm:^5.0.11": version: 5.0.11 resolution: "vite@npm:5.0.11" dependencies: From 593af3692e0988a15e5c33cfed774ac439311a60 Mon Sep 17 00:00:00 2001 From: Nikita Kuznetsov Date: Fri, 12 Jan 2024 19:52:34 +0100 Subject: [PATCH 19/19] test main branch --- .github/workflows/cd.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index 1940cae89..7ec1d278e 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -144,4 +144,5 @@ jobs: accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} projectName: tonkeeper-web directory: apps/web/dist + branch: main wranglerVersion: '3'