Merge branch 'alpha' into dependabot/npm_and_yarn/dev/sass-loader-10.0.5

This commit is contained in:
Henry Whitaker
2020-11-07 14:52:15 +00:00
committed by GitHub
3 changed files with 725 additions and 812 deletions

23
composer.lock generated
View File

@@ -1440,27 +1440,23 @@
},
{
"name": "laravel/ui",
"version": "v2.3.0",
"version": "v2.5.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/ui.git",
"reference": "2ccaa3b821ea8ac7e05393b946d0578bdb46099b"
"reference": "d01a705763c243b07be795e9d1bb47f89260f73d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/ui/zipball/2ccaa3b821ea8ac7e05393b946d0578bdb46099b",
"reference": "2ccaa3b821ea8ac7e05393b946d0578bdb46099b",
"url": "https://api.github.com/repos/laravel/ui/zipball/d01a705763c243b07be795e9d1bb47f89260f73d",
"reference": "d01a705763c243b07be795e9d1bb47f89260f73d",
"shasum": ""
},
"require": {
"illuminate/console": "^7.0|^8.0",
"illuminate/filesystem": "^7.0|^8.0",
"illuminate/support": "^7.0|^8.0",
"php": "^7.2.5"
},
"require-dev": {
"mockery/mockery": "^1.0",
"phpunit/phpunit": "^8.0|^9.0"
"illuminate/console": "^7.0",
"illuminate/filesystem": "^7.0",
"illuminate/support": "^7.0",
"php": "^7.2.5|^8.0"
},
"type": "library",
"extra": {
@@ -1491,7 +1487,7 @@
"laravel",
"ui"
],
"time": "2020-09-09T12:07:59+00:00"
"time": "2020-11-03T19:45:19+00:00"
},
{
"name": "lcobucci/jwt",
@@ -6329,6 +6325,7 @@
"faker",
"fixtures"
],
"abandoned": true,
"time": "2019-12-12T13:22:17+00:00"
},
{

1508
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -10,19 +10,19 @@
"production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
},
"devDependencies": {
"@babel/preset-react": "^7.10.4",
"@babel/preset-react": "^7.12.5",
"axios": "^0.20",
"bootstrap": "^4.5.2",
"cross-env": "^7.0",
"jquery": "^3.5",
"laravel-mix": "^5.0.5",
"laravel-mix": "^5.0.9",
"lodash": "^4.17.20",
"popper.js": "^1.12",
"react": "^16.2.0",
"react-dom": "^16.2.0",
"resolve-url-loader": "^3.1.0",
"sass": "^1.26.10",
"sass-loader": "^10.0.5"
"sass": "^1.29.0",
},
"dependencies": {
"@babel/plugin-proposal-class-properties": "^7.10.4",