Skip to content

Commit 54f53cb

Browse files
Merge branch '1.x' into dependabot/npm_and_yarn/resolve-url-loader-4.0.0
2 parents ae3948a + f8cfaec commit 54f53cb

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"cross-env": "^7.0",
1515
"laravel-mix": "^5.0.9",
1616
"resolve-url-loader": "^4.0.0",
17-
"sass": "^1.32.8",
17+
"sass": "^1.32.12",
1818
"sass-loader": "^11.0.1",
1919
"tailwindcss": "^1.9.4",
2020
"vue": "^2.6.12",

yarn.lock

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1748,10 +1748,10 @@ charenc@0.0.2:
17481748
resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
17491749
integrity sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=
17501750

1751-
"chokidar@>=2.0.0 <4.0.0", chokidar@^3.4.1:
1752-
version "3.4.3"
1753-
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.3.tgz#c1df38231448e45ca4ac588e6c79573ba6a57d5b"
1754-
integrity sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==
1751+
"chokidar@>=3.0.0 <4.0.0", chokidar@^3.4.1:
1752+
version "3.5.1"
1753+
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a"
1754+
integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==
17551755
dependencies:
17561756
anymatch "~3.1.1"
17571757
braces "~3.0.2"
@@ -1761,7 +1761,7 @@ charenc@0.0.2:
17611761
normalize-path "~3.0.0"
17621762
readdirp "~3.5.0"
17631763
optionalDependencies:
1764-
fsevents "~2.1.2"
1764+
fsevents "~2.3.1"
17651765

17661766
chokidar@^2.0.3, chokidar@^2.1.8:
17671767
version "2.1.8"
@@ -3134,10 +3134,10 @@ fsevents@^1.2.7:
31343134
bindings "^1.5.0"
31353135
nan "^2.12.1"
31363136

3137-
fsevents@~2.1.2:
3138-
version "2.1.3"
3139-
resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e"
3140-
integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==
3137+
fsevents@~2.3.1:
3138+
version "2.3.2"
3139+
resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
3140+
integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
31413141

31423142
function-bind@^1.1.1:
31433143
version "1.1.1"
@@ -5855,12 +5855,12 @@ sass-loader@^11.0.1:
58555855
klona "^2.0.4"
58565856
neo-async "^2.6.2"
58575857

5858-
sass@^1.32.8:
5859-
version "1.32.8"
5860-
resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.8.tgz#f16a9abd8dc530add8834e506878a2808c037bdc"
5861-
integrity sha512-Sl6mIeGpzjIUZqvKnKETfMf0iDAswD9TNlv13A7aAF3XZlRPMq4VvJWBC2N2DXbp94MQVdNSFG6LfF/iOXrPHQ==
5858+
sass@^1.32.12:
5859+
version "1.32.12"
5860+
resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.12.tgz#a2a47ad0f1c168222db5206444a30c12457abb9f"
5861+
integrity sha512-zmXn03k3hN0KaiVTjohgkg98C3UowhL1/VSGdj4/VAAiMKGQOE80PFPxFP2Kyq0OUskPKcY5lImkhBKEHlypJA==
58625862
dependencies:
5863-
chokidar ">=2.0.0 <4.0.0"
5863+
chokidar ">=3.0.0 <4.0.0"
58645864

58655865
sax@~1.2.4:
58665866
version "1.2.4"
@@ -6186,9 +6186,9 @@ sprintf-js@~1.0.2:
61866186
integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
61876187

61886188
ssri@^6.0.1:
6189-
version "6.0.1"
6190-
resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
6191-
integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==
6189+
version "6.0.2"
6190+
resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5"
6191+
integrity sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==
61926192
dependencies:
61936193
figgy-pudding "^3.5.1"
61946194

@@ -6698,9 +6698,9 @@ urix@^0.1.0:
66986698
integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
66996699

67006700
url-parse@^1.4.3:
6701-
version "1.4.7"
6702-
resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278"
6703-
integrity sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==
6701+
version "1.5.1"
6702+
resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.1.tgz#d5fa9890af8a5e1f274a2c98376510f6425f6e3b"
6703+
integrity sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q==
67046704
dependencies:
67056705
querystringify "^2.1.1"
67066706
requires-port "^1.0.0"

0 commit comments

Comments
 (0)