Skip to content

Commit b032afa

Browse files
committed
Merge branch 'master' of github.com:caffeinated/themes
2 parents 45d20b6 + 6539459 commit b032afa

2 files changed

Lines changed: 50 additions & 31 deletions

File tree

resources/stubs/theme/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
},
1212
"devDependencies": {
1313
"axios": "^0.18",
14-
"bootstrap": "^4.0.0",
14+
"bootstrap": "^4.3.1",
1515
"cross-env": "^5.1",
16-
"jquery": "^3.2",
16+
"jquery": "^3.4",
1717
"laravel-mix": "^2.0",
18-
"lodash": "^4.17.5",
18+
"lodash": "^4.17.13",
1919
"popper.js": "^1.12",
2020
"vue": "^2.5.17"
2121
}

resources/stubs/theme/yarn.lock

Lines changed: 47 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -267,11 +267,11 @@ aws4@^1.8.0:
267267
resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
268268

269269
axios@^0.18:
270-
version "0.18.0"
271-
resolved "https://registry.npmjs.org/axios/-/axios-0.18.0.tgz#32d53e4851efdc0a11993b6cd000789d70c05102"
270+
version "0.18.1"
271+
resolved "https://registry.yarnpkg.com/axios/-/axios-0.18.1.tgz#ff3f0de2e7b5d180e757ad98000f1081b87bcea3"
272272
dependencies:
273-
follow-redirects "^1.3.0"
274-
is-buffer "^1.1.5"
273+
follow-redirects "1.5.10"
274+
is-buffer "^2.0.2"
275275

276276
babel-code-frame@^6.26.0:
277277
version "6.26.0"
@@ -838,9 +838,9 @@ bonjour@^3.5.0:
838838
multicast-dns "^6.0.1"
839839
multicast-dns-service-types "^1.1.0"
840840

841-
bootstrap@^4.0.0:
842-
version "4.1.3"
843-
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.1.3.tgz#0eb371af2c8448e8c210411d0cb824a6409a12be"
841+
bootstrap@^4.3.1:
842+
version "4.3.1"
843+
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.3.1.tgz#280ca8f610504d99d7b6b4bfc4b68cec601704ac"
844844

845845
brace-expansion@^1.1.7:
846846
version "1.1.11"
@@ -2189,7 +2189,7 @@ flush-write-stream@^1.0.0:
21892189
inherits "^2.0.1"
21902190
readable-stream "^2.0.4"
21912191

2192-
follow-redirects@^1.0.0, follow-redirects@^1.3.0:
2192+
follow-redirects@1.5.10, follow-redirects@^1.0.0:
21932193
version "1.5.10"
21942194
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a"
21952195
dependencies:
@@ -2291,8 +2291,8 @@ fsevents@^1.2.2:
22912291
node-pre-gyp "^0.10.0"
22922292

22932293
fstream@^1.0.0, fstream@^1.0.2:
2294-
version "1.0.11"
2295-
resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
2294+
version "1.0.12"
2295+
resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045"
22962296
dependencies:
22972297
graceful-fs "^4.1.2"
22982298
inherits "~2.0.0"
@@ -2364,7 +2364,7 @@ glob-parent@^3.1.0:
23642364
is-glob "^3.1.0"
23652365
path-dirname "^1.0.0"
23662366

2367-
glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1:
2367+
glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1:
23682368
version "7.1.3"
23692369
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
23702370
dependencies:
@@ -2375,6 +2375,17 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1:
23752375
once "^1.3.0"
23762376
path-is-absolute "^1.0.0"
23772377

2378+
glob@^7.1.3:
2379+
version "7.1.5"
2380+
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.5.tgz#6714c69bee20f3c3e64c4dd905553e532b40cdc0"
2381+
dependencies:
2382+
fs.realpath "^1.0.0"
2383+
inflight "^1.0.4"
2384+
inherits "2"
2385+
minimatch "^3.0.4"
2386+
once "^1.3.0"
2387+
path-is-absolute "^1.0.0"
2388+
23782389
globals@^9.18.0:
23792390
version "9.18.0"
23802391
resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
@@ -2404,8 +2415,8 @@ globule@^1.0.0:
24042415
minimatch "~3.0.2"
24052416

24062417
graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
2407-
version "4.1.15"
2408-
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
2418+
version "4.2.3"
2419+
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
24092420

24102421
growly@^1.3.0:
24112422
version "1.3.0"
@@ -2701,14 +2712,18 @@ inflight@^1.0.4:
27012712
once "^1.3.0"
27022713
wrappy "1"
27032714

2704-
inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
2705-
version "2.0.3"
2706-
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
2715+
inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
2716+
version "2.0.4"
2717+
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
27072718

27082719
inherits@2.0.1:
27092720
version "2.0.1"
27102721
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
27112722

2723+
inherits@2.0.3:
2724+
version "2.0.3"
2725+
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
2726+
27122727
ini@~1.3.0:
27132728
version "1.3.5"
27142729
resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
@@ -2771,6 +2786,10 @@ is-buffer@^1.1.5, is-buffer@~1.1.1:
27712786
version "1.1.6"
27722787
resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
27732788

2789+
is-buffer@^2.0.2:
2790+
version "2.0.4"
2791+
resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.4.tgz#3e572f23c8411a5cfd9557c849e3665e0b290623"
2792+
27742793
is-builtin-module@^1.0.0:
27752794
version "1.0.0"
27762795
resolved "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
@@ -2989,9 +3008,9 @@ isstream@~0.1.2:
29893008
version "0.1.2"
29903009
resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
29913010

2992-
jquery@^3.2:
2993-
version "3.3.1"
2994-
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"
3011+
jquery@^3.4:
3012+
version "3.4.0"
3013+
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.0.tgz#8de513fa0fa4b2c7d2e48a530e26f0596936efdf"
29953014

29963015
js-base64@^2.1.8, js-base64@^2.1.9:
29973016
version "2.4.9"
@@ -3278,8 +3297,8 @@ lodash.memoize@^4.1.2:
32783297
resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
32793298

32803299
lodash.mergewith@^4.6.0:
3281-
version "4.6.1"
3282-
resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
3300+
version "4.6.2"
3301+
resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz#617121f89ac55f59047c7aec1ccd6654c6590f55"
32833302

32843303
lodash.restparam@^3.0.0:
32853304
version "3.6.1"
@@ -3293,9 +3312,9 @@ lodash.uniq@^4.5.0:
32933312
version "4.5.0"
32943313
resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
32953314

3296-
lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.10:
3297-
version "4.17.11"
3298-
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
3315+
lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.13, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.10:
3316+
version "4.17.13"
3317+
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.13.tgz#0bdc3a6adc873d2f4e0c4bac285df91b64fc7b93"
32993318

33003319
loglevel@^1.4.1:
33013320
version "1.6.1"
@@ -3494,7 +3513,7 @@ minimatch@^3.0.4, minimatch@~3.0.2:
34943513

34953514
minimist@0.0.8:
34963515
version "0.0.8"
3497-
resolved "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
3516+
resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
34983517

34993518
minimist@^1.1.3, minimist@^1.2.0:
35003519
version "1.2.0"
@@ -4797,10 +4816,10 @@ right-align@^0.1.1:
47974816
align-text "^0.1.1"
47984817

47994818
rimraf@2, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
4800-
version "2.6.2"
4801-
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
4819+
version "2.7.1"
4820+
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
48024821
dependencies:
4803-
glob "^7.0.5"
4822+
glob "^7.1.3"
48044823

48054824
ripemd160@^2.0.0, ripemd160@^2.0.1:
48064825
version "2.0.2"

0 commit comments

Comments
 (0)