Skip to content

Commit 0d82009

Browse files
authored
Merge branch 'next_release' into 20210202_specific_ruby_gem_dependencies
2 parents b6af388 + a901b22 commit 0d82009

File tree

5 files changed

+29
-44
lines changed

5 files changed

+29
-44
lines changed

Gemfile.lock

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,12 @@ GEM
122122
method_source (0.9.2)
123123
mimemagic (0.3.5)
124124
mini_mime (1.0.2)
125-
mini_portile2 (2.4.0)
126-
minitest (5.14.1)
127-
nio4r (2.5.2)
128-
nokogiri (1.10.10)
129-
mini_portile2 (~> 2.4.0)
125+
mini_portile2 (2.5.0)
126+
minitest (5.14.2)
127+
nio4r (2.5.3)
128+
nokogiri (1.11.1)
129+
mini_portile2 (~> 2.5.0)
130+
racc (~> 1.4)
130131
pg (1.2.3)
131132
pry (0.12.2)
132133
coderay (~> 1.1.0)
@@ -139,6 +140,7 @@ GEM
139140
public_suffix (4.0.3)
140141
puma (4.3.5)
141142
nio4r (~> 2.0)
143+
racc (1.5.2)
142144
rack (2.2.3)
143145
rack-proxy (0.6.5)
144146
rack

builder/Gemfile.lock

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,15 @@ GEM
8080
method_source (0.9.2)
8181
mimemagic (0.3.4)
8282
mini_mime (1.0.2)
83-
mini_portile2 (2.4.0)
83+
mini_portile2 (2.5.0)
8484
minitest (5.14.0)
8585
msgpack (1.3.1)
8686
nio4r (2.5.2)
87-
nokogiri (1.10.8)
88-
mini_portile2 (~> 2.4.0)
87+
nokogiri (1.11.1)
88+
mini_portile2 (~> 2.5.0)
89+
racc (~> 1.4)
8990
puma (3.12.6)
91+
racc (1.5.2)
9092
rack (2.2.3)
9193
rack-proxy (0.6.5)
9294
rack

builder/yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2430,9 +2430,9 @@ domutils@^1.7.0:
24302430
domelementtype "1"
24312431

24322432
dot-prop@^4.1.1:
2433-
version "4.2.0"
2434-
resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57"
2435-
integrity sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==
2433+
version "4.2.1"
2434+
resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.1.tgz#45884194a71fc2cda71cbb4bceb3a4dd2f433ba4"
2435+
integrity sha512-l0p4+mIuJIua0mhxGoh4a+iNL9bmeK5DvnSVQa6T0OhrVmaEa1XScX5Etc673FePCJOArq/4Pa2cLGODUWTPOQ==
24362436
dependencies:
24372437
is-obj "^1.0.0"
24382438

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"yarn": "^1.22.0"
1414
},
1515
"exports": {
16+
".": "./app/javascript/matestack-ui-core",
1617
"./concepts/": "./app/concepts/matestack/ui/core/"
1718
},
1819
"scripts": {

spec/dummy/yarn.lock

Lines changed: 13 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1278,13 +1278,12 @@ aws4@^1.8.0:
12781278
resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
12791279
integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
12801280

1281-
axios@^0.18.1:
1282-
version "0.18.1"
1283-
resolved "https://registry.yarnpkg.com/axios/-/axios-0.18.1.tgz#ff3f0de2e7b5d180e757ad98000f1081b87bcea3"
1284-
integrity sha512-0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g==
1281+
axios@^0.21.1:
1282+
version "0.21.1"
1283+
resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8"
1284+
integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==
12851285
dependencies:
1286-
follow-redirects "1.5.10"
1287-
is-buffer "^2.0.2"
1286+
follow-redirects "^1.10.0"
12881287

12891288
babel-loader@^8.0.6:
12901289
version "8.0.6"
@@ -2352,13 +2351,6 @@ [email protected], debug@^2.1.2, debug@^2.2.0, debug@^2.3.3:
23522351
dependencies:
23532352
ms "2.0.0"
23542353

2355-
debug@=3.1.0:
2356-
version "3.1.0"
2357-
resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
2358-
integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
2359-
dependencies:
2360-
ms "2.0.0"
2361-
23622354
debug@^3.1.1, debug@^3.2.5:
23632355
version "3.2.6"
23642356
resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
@@ -3006,17 +2998,10 @@ flush-write-stream@^1.0.0:
30062998
inherits "^2.0.1"
30072999
readable-stream "^2.0.4"
30083000

3009-
3010-
version "1.5.10"
3011-
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a"
3012-
integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==
3013-
dependencies:
3014-
debug "=3.1.0"
3015-
3016-
follow-redirects@^1.0.0:
3017-
version "1.13.0"
3018-
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz#b42e8d93a2a7eea5ed88633676d6597bc8e384db"
3019-
integrity sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==
3001+
follow-redirects@^1.0.0, follow-redirects@^1.10.0:
3002+
version "1.13.1"
3003+
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.1.tgz#5f69b813376cee4fd0474a3aba835df04ab763b7"
3004+
integrity sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg==
30203005

30213006
for-in@^1.0.2:
30223007
version "1.0.2"
@@ -3752,11 +3737,6 @@ is-buffer@^1.1.5:
37523737
resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
37533738
integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
37543739

3755-
is-buffer@^2.0.2:
3756-
version "2.0.4"
3757-
resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.4.tgz#3e572f23c8411a5cfd9557c849e3665e0b290623"
3758-
integrity sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==
3759-
37603740
is-builtin-module@^1.0.0:
37613741
version "1.0.0"
37623742
resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
@@ -4348,13 +4328,13 @@ map-visit@^1.0.0:
43484328
object-visit "^1.0.0"
43494329

43504330
matestack-ui-core@../../:
4351-
version "1.2.0"
4331+
version "1.3.2"
43524332
dependencies:
4353-
axios "^0.18.1"
4333+
axios "^0.21.1"
43544334
link-module-alias "^1.2.0"
43554335
v-runtime-template "^1.5.2"
43564336
vue "^2.5.17"
4357-
vue-turbolinks "^2.1.0"
4337+
vue-turbolinks "~2.1.0"
43584338
vuex "^3.0.1"
43594339
yarn "^1.22.0"
43604340

@@ -7509,7 +7489,7 @@ vm-browserify@^1.0.1:
75097489
resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
75107490
integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
75117491

7512-
vue-turbolinks@^2.1.0:
7492+
vue-turbolinks@~2.1.0:
75137493
version "2.1.0"
75147494
resolved "https://registry.yarnpkg.com/vue-turbolinks/-/vue-turbolinks-2.1.0.tgz#fc7372d06d624aa3fb68231dc0b509719edc778f"
75157495
integrity sha512-Rgq9eUS2LgHVoSR58S0utW7g/aqLlVZ6uM7S1e02+xEUGKW1fqhUHQXea3p+cE59ldf+f3nz3Cc3HVO4MlrTFA==

0 commit comments

Comments
 (0)