Skip to content

Commit

Permalink
Merge branch 'main' into feat/safari-support
Browse files Browse the repository at this point in the history
  • Loading branch information
kvhnuke committed Oct 7, 2024
2 parents 01a0317 + 8d6c8e0 commit f4e2df4
Show file tree
Hide file tree
Showing 188 changed files with 17,133 additions and 3,098 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
node-version: "16"
node-version: "20"
cache: "yarn"
- run: yarn install
- run: yarn build:all
Expand Down
13 changes: 7 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,18 @@
"prepare": "husky"
},
"devDependencies": {
"@commitlint/cli": "^19.3.0",
"@commitlint/config-conventional": "^19.2.2",
"@swc/core": "^1.7.6",
"@commitlint/cli": "^19.4.1",
"@commitlint/config-conventional": "^19.4.1",
"@swc/core": "^1.7.28",
"concurrently": "^8.2.2",
"husky": "^9.1.4",
"husky": "^9.1.6",
"node-notifier": "^10.0.1",
"nodemon": "^3.1.4",
"nodemon": "^3.1.7",
"ultra-runner": "^3.10.5"
},
"resolutions": {
"@ledgerhq/compressjs": "https://registry.yarnpkg.com/@favware/skip-dependency/-/skip-dependency-1.2.1.tgz",
"@noble/hashes": "^1.4.0"
"@noble/hashes": "^1.4.0",
"fork-ts-checker-webpack-plugin": "^6.5.3"
}
}
16 changes: 8 additions & 8 deletions packages/extension-bridge/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,24 +39,24 @@
"webextension-polyfill": "^0.12.0"
},
"devDependencies": {
"@types/chai": "^4.3.17",
"@types/mocha": "^10.0.7",
"@types/node": "^20.14.14",
"@types/webextension-polyfill": "^0.10.7",
"@types/chai": "^4.3.20",
"@types/mocha": "^10.0.8",
"@types/node": "^20.16.10",
"@types/webextension-polyfill": "^0.12.1",
"@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/parser": "^5.62.0",
"bumpp": "^9.4.2",
"bumpp": "^9.6.1",
"eslint": "^8.57.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-config-prettier": "^8.10.0",
"eslint-import-resolver-alias": "^1.1.2",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-import": "^2.30.0",
"eslint-plugin-module-resolver": "^1.5.0",
"prettier": "^2.8.8",
"ts-node": "^10.9.2",
"tsconfig-paths": "^4.2.0",
"tsup": "^8.2.4",
"type-fest": "^4.23.0",
"tsup": "^8.3.0",
"type-fest": "^4.26.1",
"typescript": "^4.9.5",
"typescript-eslint": "0.0.1-alpha.0"
}
Expand Down
4 changes: 4 additions & 0 deletions packages/extension/configs/base-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ const setConfig = (config) => {
net: false,
tls: false,
});
config.set("externals", {
"node:path": "commonjs2 node:path",
"node:fs/promises": {},
});
config
.plugin("buffer") // <-arbitrary name to give this plugin entry I guess?
.use(require.resolve("webpack/lib/ProvidePlugin"), [
Expand Down
6 changes: 5 additions & 1 deletion packages/extension/configs/rollup.config.base.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import nodeResolve from "@rollup/plugin-node-resolve";
import { uglify } from "rollup-plugin-uglify";
import inject from "@rollup/plugin-inject";
import replace from "@rollup/plugin-replace";
import json from "@rollup/plugin-json";
import packageJson from "../package.json" assert { type: "json" };

/** @typedef {import('rollup').InputOptions} InputOptions */
Expand All @@ -27,8 +28,11 @@ const base = {
__VERSION__: JSON.stringify(packageJson.version),
__IS_OPERA__: process.env.BROWSER === "opera-edge",
}),
typescript(),
typescript({
exclude: [/node_modules/],
}),
commonjs(),
json(),
inject({
Buffer: ["buffer", "Buffer"],
}),
Expand Down
81 changes: 46 additions & 35 deletions packages/extension/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@enkryptcom/extension",
"version": "1.43.0",
"version": "1.44.0",
"private": true,
"scripts": {
"zip": "cd dist; zip -r release.zip *;",
Expand All @@ -22,8 +22,8 @@
"watch-vue-firefox": "cross-env BROWSER='firefox' vue-cli-service build --watch --no-clean"
},
"dependencies": {
"@amplitude/analytics-browser": "^2.10.0",
"@babel/runtime": "^7.25.0",
"@amplitude/analytics-browser": "^2.11.7",
"@babel/runtime": "^7.25.6",
"@enkryptcom/extension-bridge": "workspace:^",
"@enkryptcom/hw-wallets": "workspace:^",
"@enkryptcom/keyring": "workspace:^",
Expand All @@ -32,26 +32,35 @@
"@enkryptcom/swap": "workspace:^",
"@enkryptcom/types": "workspace:^",
"@enkryptcom/utils": "workspace:^",
"@ethereumjs/common": "^4.3.0",
"@ethereumjs/tx": "^5.3.0",
"@ethereumjs/util": "^9.0.3",
"@kadena/client": "^1.13.0",
"@ledgerhq/hw-transport-webusb": "^6.29.2",
"@ethereumjs/common": "^4.4.0",
"@ethereumjs/tx": "^5.4.0",
"@ethereumjs/util": "^9.1.0",
"@kadena/client": "^1.14.0",
"@ledgerhq/hw-transport-webusb": "^6.29.4",
"@metamask/eth-sig-util": "^7.0.3",
"@metaplex-foundation/mpl-bubblegum": "^4.2.1",
"@metaplex-foundation/umi": "^0.9.2",
"@metaplex-foundation/umi-bundle-defaults": "^0.9.2",
"@rollup/plugin-replace": "^5.0.7",
"@types/chrome": "^0.0.269",
"@solana-developers/helpers": "^2.5.6",
"@solana/spl-token": "^0.4.8",
"@solana/wallet-standard-features": "^1.2.0",
"@solana/web3.js": "^1.95.3",
"@types/chrome": "^0.0.273",
"@types/events": "^3.0.3",
"@types/less": "^3.0.6",
"@types/lodash": "^4.17.7",
"@types/lodash": "^4.17.9",
"@types/utf-8-validate": "^5.0.2",
"@vueuse/core": "^10.11.0",
"@vueuse/core": "^10.11.1",
"@wallet-standard/base": "^0.0.0-20240703212708",
"add": "^2.0.6",
"bignumber.js": "^9.1.2",
"bip39": "^3.1.0",
"bitcoinjs-lib": "^6.1.6",
"bs58": "^6.0.0",
"chai": "^4.5.0",
"concurrently": "^8.2.2",
"core-js": "^3.38.0",
"core-js": "^3.38.1",
"echarts": "^5.5.1",
"ethereum-cryptography": "^2.2.1",
"ethereumjs-abi": "^0.6.8",
Expand All @@ -62,15 +71,15 @@
"moment": "^2.30.1",
"nanoevents": "^9.0.0",
"pact-lang-api": "^4.3.6",
"pinia": "^2.2.0",
"qrcode.vue": "^3.4.1",
"pinia": "^2.2.4",
"qrcode.vue": "^3.5.0",
"switch-ts": "^1.1.1",
"url-parse": "^1.5.10",
"uuid": "^10.0.0",
"vue": "^3.4.35",
"vue-echarts": "7.0.1",
"vue-router": "4.4.2",
"vue3-lottie": "^3.3.0",
"vue": "^3.5.10",
"vue-echarts": "7.0.3",
"vue-router": "4.4.5",
"vue3-lottie": "^3.3.1",
"vuedraggable": "^4.1.0",
"web3-eth": "^1.10.4",
"web3-utils": "^1.10.4",
Expand All @@ -79,26 +88,28 @@
},
"devDependencies": {
"@babel/plugin-transform-class-static-block": "^7.24.7",
"@kadena/pactjs-cli": "^1.13.0",
"@polkadot/api": "^12.2.3",
"@polkadot/extension-inject": "^0.50.1",
"@polkadot/keyring": "^13.0.2",
"@polkadot/rpc-provider": "^12.2.3",
"@polkadot/types": "^12.2.3",
"@polkadot/types-known": "^12.2.3",
"@polkadot/ui-shared": "^3.8.3",
"@polkadot/util": "^13.0.2",
"@kadena/pactjs-cli": "^1.14.0",
"@polkadot/api": "^13.2.1",
"@polkadot/extension-inject": "^0.53.1",
"@polkadot/keyring": "^13.1.1",
"@polkadot/rpc-provider": "^13.2.1",
"@polkadot/types": "^13.2.1",
"@polkadot/types-known": "^13.2.1",
"@polkadot/ui-shared": "^3.10.1",
"@polkadot/util": "^13.1.1",
"@polkadot/wasm-crypto": "^7.3.2",
"@rollup/plugin-commonjs": "^26.0.1",
"@rollup/plugin-commonjs": "^26.0.3",
"@rollup/plugin-inject": "^5.0.5",
"@rollup/plugin-node-resolve": "^15.2.3",
"@rollup/plugin-json": "^6.1.0",
"@rollup/plugin-node-resolve": "^15.3.0",
"@rollup/plugin-typescript": "^11.1.6",
"@types/bs58": "^4.0.4",
"@types/ethereumjs-abi": "^0.6.5",
"@types/mocha": "^10.0.7",
"@types/mocha": "^10.0.8",
"@types/url-parse": "^1.4.11",
"@types/uuid": "^10.0.0",
"@types/wif": "^2.0.5",
"@types/zxcvbn": "^4.4.4",
"@types/zxcvbn": "^4.4.5",
"@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/parser": "^5.62.0",
"@vue/cli-plugin-babel": "~5.0.8",
Expand All @@ -116,19 +127,19 @@
"https-browserify": "^1.0.0",
"less": "^4.2.0",
"less-loader": "^12.2.0",
"mocha": "^10.7.0",
"mocha": "^10.7.3",
"path-browserify": "^1.0.1",
"prettier": "^2.8.8",
"rimraf": "^6.0.1",
"rollup": "^4.20.0",
"rollup": "^4.23.0",
"rollup-plugin-uglify": "^6.0.4",
"semver": "^7.6.3",
"stream-browserify": "^3.0.0",
"stream-http": "^3.2.0",
"systeminformation": "^5.23.3",
"systeminformation": "^5.23.5",
"ts-mocha": "^10.0.0",
"tsconfig-paths": "^4.2.0",
"typescript": "^4.9.5",
"typescript": "^5.6.2",
"url": "^0.11.4",
"webextension-polyfill": "^0.12.0"
},
Expand Down
Loading

1 comment on commit f4e2df4

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.