Skip to content

Commit

Permalink
Merge branch 'dev' into feat/nfts
Browse files Browse the repository at this point in the history
  • Loading branch information
0xKheops committed Jul 22, 2024
2 parents 3bc6aa2 + b464c53 commit b256817
Show file tree
Hide file tree
Showing 74 changed files with 19,624 additions and 11,494 deletions.
5 changes: 0 additions & 5 deletions .changeset/chilled-readers-itch.md

This file was deleted.

9 changes: 8 additions & 1 deletion .changeset/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,12 @@
"access": "restricted",
"baseBranch": "origin/dev",
"updateInternalDependencies": "patch",
"ignore": ["balances-demo", "extension", "playground", "extension-core", "extension-shared"]
"ignore": [
"balances-demo",
"extension",
"playground",
"extension-core",
"extension-shared",
"talisman-ui"
]
}
5 changes: 0 additions & 5 deletions .changeset/dull-dogs-punch.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/eleven-apricots-protect.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/fifty-trainers-cover.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/forty-taxis-lick.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/grumpy-seals-enjoy.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/hungry-glasses-invite.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/little-geese-return.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/long-dingos-mate.md

This file was deleted.

1 change: 0 additions & 1 deletion .changeset/neat-kiwis-look.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"@talismn/connection-meta": patch
"@talismn/eslint-config": patch
"@talismn/on-chain-id": patch
"talisman-ui": patch
"@talismn/token-rates": patch
"@talismn/balances": patch
"@talismn/icons": patch
Expand Down
5 changes: 0 additions & 5 deletions .changeset/nervous-years-retire.md

This file was deleted.

1 change: 0 additions & 1 deletion .changeset/nine-pumpkins-jam.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---
"talisman-ui": patch
"@talismn/icons": patch
---

Expand Down
5 changes: 0 additions & 5 deletions .changeset/quiet-ears-remain.md

This file was deleted.

1 change: 0 additions & 1 deletion .changeset/red-keys-smell.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"@talismn/connection-meta": patch
"@talismn/balances-react": patch
"@talismn/on-chain-id": patch
"talisman-ui": patch
"@talismn/token-rates": patch
"@talismn/babel-preset": patch
"@talismn/balances": patch
Expand Down
5 changes: 0 additions & 5 deletions .changeset/rotten-suits-try.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/rude-birds-admire.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/soft-frogs-grow.md

This file was deleted.

1 change: 0 additions & 1 deletion .changeset/thirty-kids-wash.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"@talismn/connection-meta": patch
"@talismn/balances-react": patch
"@talismn/on-chain-id": patch
"talisman-ui": patch
"@talismn/token-rates": patch
"@talismn/balances": patch
"@talismn/icons": patch
Expand Down
5 changes: 0 additions & 5 deletions .changeset/three-points-flow.md

This file was deleted.

1 change: 0 additions & 1 deletion .changeset/tricky-ducks-fix.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---
"talisman-ui": patch
"@talismn/icons": patch
---

Expand Down
5 changes: 0 additions & 5 deletions .changeset/two-kids-repeat.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/young-frogs-explode.md

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ jobs:
# this will turn the list of files changed by this PR into a list of packages changed by this PR
run: |
EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
FILES_IN_PACKAGES="$(echo '${{ steps.changed-files.outputs.CHANGED_FILES }}' | { grep ^packages || true; })"
FILES_IN_PACKAGES="$(echo '${{ steps.changed-files.outputs.CHANGED_FILES }}' | { grep ^packages || true; } | { grep -v -e '^packages/extension-core' -e '^packages/extension-shared' -e '^packages/talisman-ui' || true; })"
if [[ $FILES_IN_PACKAGES != '' ]]; then
UNIQ_PACKAGE_DIRS="$(echo $FILES_IN_PACKAGES | cut -d/ -f1-2 | sort | uniq)"
UNIQ_PACKAGE_JSONS="$(find $UNIQ_PACKAGE_DIRS -name node_modules -prune -o -name package.json -print || true)"
Expand Down
13 changes: 9 additions & 4 deletions apps/balances-demo/postcss.config.cjs
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
/* eslint-env es2021 */
const tailwindcss = require("tailwindcss")
const autoprefixer = require("autoprefixer")

module.exports = {
plugins: [tailwindcss("./tailwind.config.cjs"), autoprefixer],
/** @type {import('postcss-load-config').Config} */
const config = {
plugins: [
require("tailwindcss/nesting"),
require("tailwindcss")("./tailwind.config.cjs"),
require("autoprefixer"),
],
}

module.exports = config
12 changes: 6 additions & 6 deletions apps/balances-demo/public/fonts/fonts.css
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
@font-face {
font-family: "Surt";
font-weight: normal;
src: url("./fonts/Surt-Regular.woff") format("woff");
src: url("/fonts/Surt-Regular.woff") format("woff");
}

@font-face {
font-family: "Surt";
font-weight: bold;
src: url("./fonts/Surt-SemiBold.woff2") format("woff2");
src: url("/fonts/Surt-SemiBold.woff2") format("woff2");
}

@font-face {
font-family: "SurtExpanded";
font-weight: normal;
src: url("./fonts/Surt-SemiBoldExp.woff2") format("woff2");
src: url("/fonts/Surt-SemiBoldExp.woff2") format("woff2");
}

@font-face {
font-family: "WhyteInktrapMedium";
font-weight: normal;
src: url("./fonts/Whyte-Inktrap-Medium.woff2") format("woff2");
src: url("/fonts/Whyte-Inktrap-Medium.woff2") format("woff2");
}

@font-face {
font-family: "Inter";
font-optical-sizing: auto;
font-variation-settings: "slnt" 0;
src: url("./fonts/Inter.ttf") format("truetype");
src: url("/fonts/Inter.ttf") format("truetype");
}

@font-face {
font-family: "Unbounded";
font-optical-sizing: auto;
src: url("./fonts/Unbounded.ttf") format("truetype");
src: url("/fonts/Unbounded.ttf") format("truetype");
}
67 changes: 35 additions & 32 deletions apps/extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
"private": true,
"license": "GPL-3.0-or-later",
"dependencies": {
"@alectalisman/webpack-ext-reloader": "^1.1.9-a",
"@babel/core": "^7.23.7",
"@babel/eslint-parser": "^7.23.3",
"@blowfishxyz/api-client": "0.1.13",
"@dnd-kit/core": "6.1.0",
"@dnd-kit/sortable": "7.0.2",
Expand All @@ -32,12 +29,11 @@
"@scure/bip39": "^1.2.2",
"@sentry/browser": "8.8.0",
"@sentry/react": "8.8.0",
"@sentry/webpack-plugin": "2.10.2",
"@solana/qr-code-styling": "1.6.0",
"@spruceid/siwe-parser": "^2.0.2",
"@substrate/txwrapper-core": "*",
"@svgr/webpack": "^6.5.1",
"@tailwindcss/container-queries": "^0.1.1",
"@tailwindcss/forms": "^0.5.3",
"@talismn/balances": "workspace:*",
"@talismn/chaindata-provider": "workspace:*",
"@talismn/icons": "workspace:*",
Expand All @@ -49,10 +45,6 @@
"@talismn/token-rates": "workspace:*",
"@talismn/util": "workspace:*",
"@tanstack/react-query": "4.29.19",
"@testing-library/dom": "^8.14.0",
"@testing-library/jest-dom": "^5.11.4",
"@testing-library/react": "^13.3.0",
"@testing-library/user-event": "^13.5.0",
"@types/blueimp-md5": "2.18.0",
"@types/chrome": "0.0.268",
"@types/color": "3.0.3",
Expand All @@ -72,28 +64,19 @@
"anylogger": "^1.0.11",
"anylogger-loglevel": "^1.0.0",
"assert": "^2.0.0",
"babel-eslint": "^10.1.0",
"bcryptjs": "^2.4.3",
"bignumber.js": "^9.1.2",
"blueimp-md5": "2.19.0",
"buffer": "^6.0.3",
"case-sensitive-paths-webpack-plugin": "^2.4.0",
"check-password-strength": "^2.0.7",
"circular-dependency-plugin": "^5.2.2",
"copy-webpack-plugin": "^10.2.4",
"css-loader": "^6.7.3",
"date-fns": "^2.30.0",
"dcent-web-connector": "^0.16.0",
"decimal.js": "10.4.3",
"dexie": "^3.2.4",
"dexie-react-hooks": "^1.1.7",
"dompurify": "^3.0.6",
"dotenv": "^16.3.1",
"dotenv-webpack": "^7.1.1",
"extension-core": "workspace:*",
"extension-shared": "workspace:*",
"fork-ts-checker-notifier-webpack-plugin": "^6.0.0",
"fork-ts-checker-webpack-plugin": "^7.3.0",
"framer-motion": "10.12.18",
"fuse.js": "^6.6.2",
"highlight.js": "11.8.0",
Expand All @@ -110,7 +93,6 @@
"marked": "^11.1.0",
"posthog-js": "^1.139.0",
"raptorq": "1.7.24",
"raw-loader": "^4.0.2",
"react": "18.2.0",
"react-app-polyfill": "3.0.0",
"react-countup": "^6.5.0",
Expand All @@ -122,36 +104,35 @@
"react-router-dom": "6.14.1",
"react-toastify": "^9.1.1",
"react-use": "17.4.0",
"remove-files-webpack-plugin": "^1.5.0",
"rxjs": "^7.8.1",
"semver": "^7.5.4",
"style-loader": "3.3.3",
"talisman-ui": "workspace:*",
"terser-webpack-plugin": "5.3.9",
"ts-loader": "9.4.4",
"ts-results": "3.3.0",
"typescript": "^5.2.2",
"url-join": "^5.0.0",
"viem": "^2.8.18",
"webpack": "^5.89.0",
"webpack-cli": "^4.10.0",
"webpack-manifest-plugin": "5.0.0",
"webpack-merge": "^5.10.0",
"webpack-sources": "^3.2.3",
"yup": "0.32.11"
},
"devDependencies": {
"@alectalisman/webpack-ext-reloader": "^1.1.9-a",
"@babel/core": "^7.23.7",
"@babel/eslint-parser": "^7.23.3",
"@babel/plugin-syntax-flow": "^7.23.3",
"@babel/plugin-transform-react-jsx": "^7.23.4",
"@babel/preset-env": "^7.23.7",
"@babel/preset-typescript": "^7.23.3",
"@peculiar/webcrypto": "^1.4.3",
"@sentry/webpack-plugin": "2.10.2",
"@svgr/webpack": "^6.5.1",
"@swc/core": "^1.3.14",
"@swc/helpers": "^0.4.12",
"@swc/jest": "^0.2.23",
"@tailwindcss/forms": "^0.5.3",
"@talismn/eslint-config": "workspace:*",
"@talismn/tsconfig": "workspace:*",
"@testing-library/dom": "^8.14.0",
"@testing-library/jest-dom": "^5.11.4",
"@testing-library/react": "^13.3.0",
"@testing-library/user-event": "^13.5.0",
"@types/bcryptjs": "^2.4.2",
"@types/lz-string": "^1.3.34",
"@types/pako": "^2.0.3",
Expand All @@ -160,13 +141,23 @@
"@typescript-eslint/parser": "^6.9.0",
"archiver": "5.3.1",
"autoprefixer": "^10.4.12",
"babel-eslint": "^10.1.0",
"babel-jest": "27.5.1",
"babel-plugin-module-extension-resolver": "^1.0.0",
"browserify-zlib": "^0.2.0",
"case-sensitive-paths-webpack-plugin": "^2.4.0",
"circular-dependency-plugin": "^5.2.2",
"copy-webpack-plugin": "^10.2.4",
"crypto-browserify": "3.12.0",
"css-loader": "^6.7.3",
"dotenv": "^16.3.1",
"dotenv-webpack": "^7.1.1",
"esbuild-loader": "^4.2.2",
"eslint": "^8.52.0",
"eslint-webpack-plugin": "^4.0.1",
"fake-indexeddb": "4.0.2",
"fork-ts-checker-notifier-webpack-plugin": "^6.0.0",
"fork-ts-checker-webpack-plugin": "^7.3.0",
"html-webpack-plugin": "^5.5.3",
"https-browserify": "^1.0.0",
"i18next-parser": "^8.2.0",
Expand All @@ -177,18 +168,30 @@
"postcss": "^8.4.33",
"postcss-import": "^15.1.0",
"postcss-loader": "^7.0.2",
"raw-loader": "^4.0.2",
"remove-files-webpack-plugin": "^1.5.0",
"sinon-chrome": "^3.0.1",
"speed-measure-webpack-plugin": "^1.5.0",
"stream-http": "^3.2.0",
"style-loader": "3.3.3",
"tailwindcss": "^3.4.1",
"terser-webpack-plugin": "5.3.9",
"ts-jest": "29.1.1",
"ts-loader": "9.4.4",
"tsconfig-paths-webpack-plugin": "^4.1.0",
"url": "^0.11.3",
"webpack-bundle-analyzer": "^4.10.1"
"webpack": "^5.89.0",
"webpack-bundle-analyzer": "^4.10.1",
"webpack-cli": "^4.10.0",
"webpack-manifest-plugin": "5.0.0",
"webpack-merge": "^5.10.0",
"webpack-sources": "^3.2.3"
},
"scripts": {
"start": "rm -rf dist && webpack --config webpack/webpack.dev.js --watch",
"chore:update-translations": "pnpm exec i18next --silent --config i18next-parser.config.cjs",
"dev": "rm -rf dist && webpack --config webpack/webpack.dev.js --watch",
"dev:firefox": "rm -rf dist && BROWSER=firefox webpack --config webpack/webpack.dev.js --watch",
"dev": "rm -rf dist && webpack --config webpack/webpack.dev.js --watch --env build=dev",
"dev:firefox": "rm -rf dist && BROWSER=firefox webpack --config webpack/webpack.dev.js --watch --env build=dev",
"build:extension": "rm -rf dist && webpack --config webpack/webpack.prod.js --env build=qa",
"build:extension:firefox": "rm -rf dist && BROWSER=firefox webpack --config webpack/webpack.prod.js --env build=qa",
"build:extension:ci": "rm -rf dist && webpack --config webpack/webpack.prod.js --env build=ci",
Expand Down
Loading

0 comments on commit b256817

Please sign in to comment.