Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop branch into master branch #63

Draft
wants to merge 21 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
2518672
Bump terser from 5.14.1 to 5.16.9
dependabot[bot] Apr 16, 2023
f51bfd9
Merge pull request #62 from bitshares/dependabot/npm_and_yarn/develop…
abitmore Apr 16, 2023
5c84187
Bump socket.io-parser from 4.2.0 to 4.2.2
dependabot[bot] Apr 16, 2023
af10d1b
Bump webpack from 5.73.0 to 5.76.0
dependabot[bot] Apr 16, 2023
691a7dd
Merge pull request #64 from bitshares/dependabot/npm_and_yarn/socket.…
abitmore May 7, 2023
610914f
Merge pull request #65 from bitshares/dependabot/npm_and_yarn/webpack…
abitmore May 7, 2023
24cef35
Bump socket.io-parser from 4.2.0 to 4.2.3
dependabot[bot] May 23, 2023
ac16d5f
Merge branch 'develop' into dependabot/npm_and_yarn/socket.io-parser-…
abitmore May 26, 2023
24d86a8
Merge pull request #66 from bitshares/dependabot/npm_and_yarn/socket.…
abitmore May 26, 2023
d4e0c22
Bump crypto-js from 4.1.1 to 4.2.0 in /examples
dependabot[bot] Oct 25, 2023
aadef7c
Bump crypto-js from 4.1.1 to 4.2.0
dependabot[bot] Oct 25, 2023
0942d95
Merge pull request #68 from bitshares/dependabot/npm_and_yarn/crypto-…
abitmore Oct 26, 2023
5a3d44f
Merge pull request #67 from bitshares/dependabot/npm_and_yarn/example…
abitmore Oct 26, 2023
44ffcdd
Bump es5-ext from 0.10.62 to 0.10.64 in /examples
dependabot[bot] Feb 27, 2024
943f9c8
Merge pull request #69 from bitshares/dependabot/npm_and_yarn/example…
abitmore Feb 27, 2024
12182b6
Bump ws from 8.8.1 to 8.17.1 in /examples
dependabot[bot] Jun 19, 2024
0612724
Merge pull request #70 from bitshares/dependabot/npm_and_yarn/example…
abitmore Jun 19, 2024
df02fd3
Bump webpack from 5.76.0 to 5.94.0
dependabot[bot] Aug 30, 2024
d0b05eb
Merge pull request #71 from bitshares/dependabot/npm_and_yarn/webpack…
abitmore Aug 31, 2024
4877eac
Bump cross-spawn from 7.0.3 to 7.0.6
dependabot[bot] Nov 24, 2024
74a8e32
Merge pull request #72 from bitshares/dependabot/npm_and_yarn/cross-s…
abitmore Nov 24, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 22 additions & 11 deletions examples/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@ create-hmac@^1.1.7:
sha.js "^2.4.8"

crypto-js@^4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.1.1.tgz#9e485bcf03521041bd85844786b83fb7619736cf"
integrity sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==
version "4.2.0"
resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.2.0.tgz#4d931639ecdfd12ff80e8186dba6af2c2e856631"
integrity sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==

d@1, d@^1.0.1:
version "1.0.1"
Expand Down Expand Up @@ -201,13 +201,14 @@ es-to-primitive@^1.2.1:
is-date-object "^1.0.1"
is-symbol "^1.0.2"

es5-ext@^0.10.35, es5-ext@^0.10.50, es5-ext@~0.10.14:
version "0.10.62"
resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.62.tgz#5e6adc19a6da524bf3d1e02bbc8960e5eb49a9a5"
integrity sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==
es5-ext@^0.10.35, es5-ext@^0.10.50, es5-ext@^0.10.62, es5-ext@~0.10.14:
version "0.10.64"
resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.64.tgz#12e4ffb48f1ba2ea777f1fcdd1918ef73ea21714"
integrity sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==
dependencies:
es6-iterator "^2.0.3"
es6-symbol "^3.1.3"
esniff "^2.0.1"
next-tick "^1.1.0"

es6-iterator@^2.0.3:
Expand All @@ -227,6 +228,16 @@ es6-symbol@^3.1.1, es6-symbol@^3.1.3:
d "^1.0.1"
ext "^1.1.2"

esniff@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/esniff/-/esniff-2.0.1.tgz#a4d4b43a5c71c7ec51c51098c1d8a29081f9b308"
integrity sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==
dependencies:
d "^1.0.1"
es5-ext "^0.10.62"
event-emitter "^0.3.5"
type "^2.7.2"

event-emitter@^0.3.5:
version "0.3.5"
resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
Expand Down Expand Up @@ -632,7 +643,7 @@ type@^1.0.1:
resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0"
integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==

type@^2.5.0:
type@^2.5.0, type@^2.7.2:
version "2.7.2"
resolved "https://registry.yarnpkg.com/type/-/type-2.7.2.tgz#2376a15a3a28b1efa0f5350dcf72d24df6ef98d0"
integrity sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==
Expand Down Expand Up @@ -686,6 +697,6 @@ which-typed-array@^1.1.2:
is-typed-array "^1.1.9"

ws@^8.4.0:
version "8.8.1"
resolved "https://registry.yarnpkg.com/ws/-/ws-8.8.1.tgz#5dbad0feb7ade8ecc99b830c1d77c913d4955ff0"
integrity sha512-bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA==
version "8.17.1"
resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.1.tgz#9293da530bb548febc95371d90f9c878727d919b"
integrity sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
"author": "Bitshares community",
"license": "MIT",
"devDependencies": {
"webpack": "^5.73.0",
"webpack": "^5.94.0",
"webpack-cli": "^4.10.0"
},
"dependencies": {
"@noble/ed25519": "^1.6.1",
"crypto-js": "^4.1.1",
"crypto-js": "^4.2.0",
"otpauth": "^8.0.1",
"socket.io-client": "^4.5.1",
"uuid": "^8.3.2"
Expand Down
Loading