From 947df2ac7457e9cf3551a369bb0e539d635ebb6e Mon Sep 17 00:00:00 2001 From: Ustych Maksym Date: Fri, 1 Jan 2021 20:35:59 +0200 Subject: [PATCH 1/4] Update sail package in the composer.json (#5507) --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 2bc6bbe7..3795a6db 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "require-dev": { "facade/ignition": "^2.5", "fakerphp/faker": "^1.9.1", - "laravel/sail": "^0.0.5", + "laravel/sail": "^1.0.1", "mockery/mockery": "^1.4.2", "nunomaduro/collision": "^5.0", "phpunit/phpunit": "^9.3.3" From eeb91d4546ef7f86bcbfdb9b0772ee02c4df8630 Mon Sep 17 00:00:00 2001 From: Jeffrey Way Date: Mon, 4 Jan 2021 09:44:16 -0500 Subject: [PATCH 2/4] Upgrade to Mix v6 (#5505) * Upgrade to Mix v6 * Remove cross-env --- package.json | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 2aefa8f8..cc15b616 100644 --- a/package.json +++ b/package.json @@ -2,18 +2,17 @@ "private": true, "scripts": { "dev": "npm run development", - "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --config=node_modules/laravel-mix/setup/webpack.config.js", - "watch": "npm run development -- --watch", - "watch-poll": "npm run watch -- --watch-poll", - "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --disable-host-check --config=node_modules/laravel-mix/setup/webpack.config.js", + "development": "mix", + "watch": "mix watch", + "watch-poll": "mix watch -- --watch-options-poll=1000", + "hot": "mix watch --hot", "prod": "npm run production", - "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --config=node_modules/laravel-mix/setup/webpack.config.js" + "production": "mix --production" }, "devDependencies": { "axios": "^0.19", - "cross-env": "^7.0", - "laravel-mix": "^5.0.1", + "laravel-mix": "^6.0.6", "lodash": "^4.17.19", - "resolve-url-loader": "^3.1.0" + "postcss": "^8.1.14" } } From 4de728e78c91b496ce5de09983a56e229aa0ade1 Mon Sep 17 00:00:00 2001 From: RobTables <52382103+RobTables@users.noreply.github.com> Date: Tue, 5 Jan 2021 01:02:11 -0700 Subject: [PATCH 3/4] Update to package.json - Axios Version Security Vulnerability: https://www.npmjs.com/advisories/1594 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cc15b616..00c65067 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "production": "mix --production" }, "devDependencies": { - "axios": "^0.19", + "axios": "^0.21", "laravel-mix": "^6.0.6", "lodash": "^4.17.19", "postcss": "^8.1.14" From f9f39ee7ac5d6abfe7c717fd331055daa24255f2 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Tue, 5 Jan 2021 16:48:16 +0100 Subject: [PATCH 4/4] Update CHANGELOG.md --- CHANGELOG.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5859655e..6a55a929 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,20 @@ # Release Notes -## [Unreleased](https://github.com/laravel/laravel/compare/v8.5.6...8.x) +## [Unreleased](https://github.com/laravel/laravel/compare/v8.5.7...8.x) + + +## [v8.5.7 (2021-01-05)](https://github.com/laravel/laravel/compare/v8.5.6...v8.5.7) + +### Changed +- Update sail to the v1.0.1 ([#5507](https://github.com/laravel/laravel/pull/5507)) +- Upgrade to Mix v6 ([#5505](https://github.com/laravel/laravel/pull/5505)) +- Updated Axios ([4de728e](https://github.com/laravel/laravel/commit/4de728e78c91b496ce5de09983a56e229aa0ade1)) ## [v8.5.6 (2020-12-22)](https://github.com/laravel/laravel/compare/v8.5.5...v8.5.6) ### Added -- Add `lock_connection` ([](https://github.com/laravel/laravel/commit/bc339f712389cf536ad7e340453f35d1dd865777), [e8788a7](https://github.com/laravel/laravel/commit/e8788a768899ff2a2ef1fe78e24b46e6e10175dc)) +- Add `lock_connection` ([bc339f7](https://github.com/laravel/laravel/commit/bc339f712389cf536ad7e340453f35d1dd865777), [e8788a7](https://github.com/laravel/laravel/commit/e8788a768899ff2a2ef1fe78e24b46e6e10175dc)) ## [v8.5.5 (2020-12-12)](https://github.com/laravel/laravel/compare/v8.5.4...v8.5.5)