Skip to content

Commit 0813e56

Browse files
committed
Merge branch 'master' into develop
2 parents 98e5d9f + 9d743b6 commit 0813e56

File tree

3 files changed

+47
-45
lines changed

3 files changed

+47
-45
lines changed

example/yarn.lock

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2768,10 +2768,10 @@ bluebird@^3.3.5, bluebird@^3.5.5:
27682768
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
27692769
integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
27702770

2771-
bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.4.0:
2772-
version "4.11.9"
2773-
resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828"
2774-
integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==
2771+
bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9:
2772+
version "4.12.0"
2773+
resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88"
2774+
integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==
27752775

27762776
bn.js@^5.1.1:
27772777
version "5.1.3"
@@ -2844,7 +2844,7 @@ braces@^3.0.1, braces@~3.0.2:
28442844
dependencies:
28452845
fill-range "^7.0.1"
28462846

2847-
brorand@^1.0.1:
2847+
brorand@^1.0.1, brorand@^1.1.0:
28482848
version "1.1.0"
28492849
resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
28502850
integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
@@ -3973,17 +3973,17 @@ element-resize-detector@^1.2.1:
39733973
batch-processor "1.0.0"
39743974

39753975
elliptic@^6.5.3:
3976-
version "6.5.3"
3977-
resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6"
3978-
integrity sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==
3976+
version "6.5.4"
3977+
resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"
3978+
integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==
39793979
dependencies:
3980-
bn.js "^4.4.0"
3981-
brorand "^1.0.1"
3980+
bn.js "^4.11.9"
3981+
brorand "^1.1.0"
39823982
hash.js "^1.0.0"
3983-
hmac-drbg "^1.0.0"
3984-
inherits "^2.0.1"
3985-
minimalistic-assert "^1.0.0"
3986-
minimalistic-crypto-utils "^1.0.0"
3983+
hmac-drbg "^1.0.1"
3984+
inherits "^2.0.4"
3985+
minimalistic-assert "^1.0.1"
3986+
minimalistic-crypto-utils "^1.0.1"
39873987

39883988
emoji-regex@^7.0.1:
39893989
version "7.0.3"
@@ -4952,7 +4952,7 @@ highlight.js@^10.1.1, highlight.js@~10.4.0:
49524952
resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.4.1.tgz#d48fbcf4a9971c4361b3f95f302747afe19dbad0"
49534953
integrity sha512-yR5lWvNz7c85OhVAEAeFhVCc/GV4C30Fjzc/rCP0aCWzc1UUOPUk55dK/qdwTZHBvMZo+eZ2jpk62ndX/xMFlg==
49544954

4955-
hmac-drbg@^1.0.0:
4955+
hmac-drbg@^1.0.1:
49564956
version "1.0.1"
49574957
resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
49584958
integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
@@ -5979,7 +5979,7 @@ minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
59795979
resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
59805980
integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
59815981

5982-
minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
5982+
minimalistic-crypto-utils@^1.0.1:
59835983
version "1.0.1"
59845984
resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
59855985
integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
@@ -8603,9 +8603,9 @@ xtend@^4.0.0, xtend@~4.0.1:
86038603
integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
86048604

86058605
y18n@^4.0.0:
8606-
version "4.0.0"
8607-
resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
8608-
integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
8606+
version "4.0.1"
8607+
resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4"
8608+
integrity sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==
86098609

86108610
yallist@^3.0.2:
86118611
version "3.1.1"

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
"theme",
99
"playground",
1010
"react",
11-
"typescript"
11+
"typescript",
12+
"storybook-addon",
13+
"style"
1214
],
1315
"bugs": "https://github.com/jeslage/storybook-addon-theme-playground/issues",
1416
"repository": "jeslage/storybook-addon-theme-playground",

yarn.lock

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3012,10 +3012,10 @@ bluebird@^3.3.5, bluebird@^3.5.5:
30123012
resolved "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz"
30133013
integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
30143014

3015-
bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
3016-
version "4.11.9"
3017-
resolved "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz"
3018-
integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==
3015+
bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.11.9:
3016+
version "4.12.0"
3017+
resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88"
3018+
integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==
30193019

30203020
body-parser@1.19.0:
30213021
version "1.19.0"
@@ -3083,9 +3083,9 @@ braces@^3.0.1, braces@~3.0.2:
30833083
dependencies:
30843084
fill-range "^7.0.1"
30853085

3086-
brorand@^1.0.1:
3086+
brorand@^1.0.1, brorand@^1.1.0:
30873087
version "1.1.0"
3088-
resolved "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz"
3088+
resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
30893089
integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
30903090

30913091
browserify-aes@^1.0.0, browserify-aes@^1.0.4:
@@ -4258,17 +4258,17 @@ element-resize-detector@^1.2.1:
42584258
batch-processor "1.0.0"
42594259

42604260
elliptic@^6.0.0:
4261-
version "6.5.3"
4262-
resolved "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz"
4263-
integrity sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==
4261+
version "6.5.4"
4262+
resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"
4263+
integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==
42644264
dependencies:
4265-
bn.js "^4.4.0"
4266-
brorand "^1.0.1"
4265+
bn.js "^4.11.9"
4266+
brorand "^1.1.0"
42674267
hash.js "^1.0.0"
4268-
hmac-drbg "^1.0.0"
4269-
inherits "^2.0.1"
4270-
minimalistic-assert "^1.0.0"
4271-
minimalistic-crypto-utils "^1.0.0"
4268+
hmac-drbg "^1.0.1"
4269+
inherits "^2.0.4"
4270+
minimalistic-assert "^1.0.1"
4271+
minimalistic-crypto-utils "^1.0.1"
42724272

42734273
emoji-regex@^7.0.1:
42744274
version "7.0.3"
@@ -5463,7 +5463,7 @@ hash-base@^3.0.0:
54635463

54645464
hash.js@^1.0.0, hash.js@^1.0.3:
54655465
version "1.1.7"
5466-
resolved "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz"
5466+
resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
54675467
integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==
54685468
dependencies:
54695469
inherits "^2.0.3"
@@ -5510,9 +5510,9 @@ highlight.js@~9.15.0, highlight.js@~9.15.1:
55105510
resolved "https://registry.npmjs.org/highlight.js/-/highlight.js-9.15.10.tgz"
55115511
integrity sha512-RoV7OkQm0T3os3Dd2VHLNMoaoDVx77Wygln3n9l5YV172XonWG6rgQD3XnF/BuFFZw9A0TJgmMSO8FEWQgvcXw==
55125512

5513-
hmac-drbg@^1.0.0:
5513+
hmac-drbg@^1.0.1:
55145514
version "1.0.1"
5515-
resolved "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz"
5515+
resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
55165516
integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
55175517
dependencies:
55185518
hash.js "^1.0.3"
@@ -5715,7 +5715,7 @@ inflight@^1.0.4:
57155715
once "^1.3.0"
57165716
wrappy "1"
57175717

5718-
inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
5718+
inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3:
57195719
version "2.0.4"
57205720
resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"
57215721
integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -6701,12 +6701,12 @@ min-indent@^1.0.0:
67016701

67026702
minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
67036703
version "1.0.1"
6704-
resolved "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz"
6704+
resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
67056705
integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
67066706

6707-
minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
6707+
minimalistic-crypto-utils@^1.0.1:
67086708
version "1.0.1"
6709-
resolved "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz"
6709+
resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
67106710
integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
67116711

67126712
minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.4:
@@ -9695,9 +9695,9 @@ xtend@^4.0.0, xtend@~4.0.1:
96959695
integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
96969696

96979697
y18n@^4.0.0:
9698-
version "4.0.0"
9699-
resolved "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz"
9700-
integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
9698+
version "4.0.1"
9699+
resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4"
9700+
integrity sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==
97019701

97029702
yallist@^3.0.2:
97039703
version "3.1.1"

0 commit comments

Comments
 (0)