From 3fa134d1f1c02d588e91cefb7d780028f8e67e3f Mon Sep 17 00:00:00 2001 From: Jeffrey Way Date: Tue, 24 Jan 2017 11:16:56 -0500 Subject: [PATCH 01/54] Make scripts work with Yarn --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 194b47c8..5d8582c3 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,10 @@ { "private": true, "scripts": { - "dev": "cross-env NODE_ENV=development webpack --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", - "watch": "cross-env NODE_ENV=development webpack --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", - "hot": "cross-env NODE_ENV=development webpack-dev-server --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", - "production": "cross-env NODE_ENV=production webpack --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" + "dev": "node_modules/cross-env/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", + "watch": "node_modules/cross-env/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", + "hot": "node_modules/cross-env/bin/cross-env.js NODE_ENV=development webpack-dev-server --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", + "production": "node_modules/cross-env/bin/cross-env.js NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" }, "devDependencies": { "axios": "^0.15.2", From e0a3b2651795b3bc068e8426dfc85e50108eae04 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 24 Jan 2017 10:18:57 -0600 Subject: [PATCH 02/54] update composer fil --- composer.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 5bb4dc0c..60f1d038 100644 --- a/composer.json +++ b/composer.json @@ -42,7 +42,5 @@ "config": { "preferred-install": "dist", "sort-packages": true - }, - "minimum-stability": "dev", - "prefer-stable": true + } } From 489f2f311ea9297943c60799b71e810795c888ee Mon Sep 17 00:00:00 2001 From: Martin Bastien Date: Tue, 24 Jan 2017 14:47:43 -0500 Subject: [PATCH 03/54] Add missing path for Yarn Fix --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5d8582c3..f3b26870 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "scripts": { "dev": "node_modules/cross-env/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", "watch": "node_modules/cross-env/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", - "hot": "node_modules/cross-env/bin/cross-env.js NODE_ENV=development webpack-dev-server --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", + "hot": "node_modules/cross-env/bin/cross-env.js NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", "production": "node_modules/cross-env/bin/cross-env.js NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" }, "devDependencies": { From bf33e1702217bc5ea71387dafe6623b922f68b74 Mon Sep 17 00:00:00 2001 From: Eric Dowell Date: Tue, 24 Jan 2017 15:44:09 -0600 Subject: [PATCH 04/54] Update composer.json Only autoload the tests namespace in dev. --- composer.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 60f1d038..e5f21170 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,11 @@ "database" ], "psr-4": { - "App\\": "app/", + "App\\": "app/" + } + }, + "autoload-dev": { + "psr-4": { "Tests\\": "tests/" } }, From c55b8efe729867defea392907a059a9017317d08 Mon Sep 17 00:00:00 2001 From: fzoske Date: Wed, 25 Jan 2017 11:05:42 +0100 Subject: [PATCH 05/54] Ensure cross-env gets executed by node --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index f3b26870..220aff58 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,10 @@ { "private": true, "scripts": { - "dev": "node_modules/cross-env/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", - "watch": "node_modules/cross-env/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", - "hot": "node_modules/cross-env/bin/cross-env.js NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", - "production": "node_modules/cross-env/bin/cross-env.js NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" + "dev": "node node_modules/cross-env/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", + "watch": "node node_modules/cross-env/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", + "hot": "node node_modules/cross-env/bin/cross-env.js NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", + "production": "node node_modules/cross-env/bin/cross-env.js NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" }, "devDependencies": { "axios": "^0.15.2", From d4d5330bbbe597a6067d6972bc2dfb9834f4f55d Mon Sep 17 00:00:00 2001 From: Jean-Philippe Murray Date: Thu, 26 Jan 2017 21:22:52 -0500 Subject: [PATCH 06/54] Remove the hot file from versionning Following https://github.com/laravel/framework/pull/17571, I was correctly pointed that the small proposition should be made over here. Here's a copy / past of my message, for clarity's sake. --- When you run `npm run hmr`, a `hot` file is created to the public folder for the `mix()` helper to know if it has to server from the webpack server or not. This file does not go away until we run `npm run dev` (or `watch`). True, if we use `npm run production` in our production server it goes away too, but in case we don't make it go away in development, I don't think it's necessary to version it. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index b278165a..c561e9bd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ /node_modules /public/storage +/public/hot /storage/*.key /vendor /.idea From 1078776e953d35bd67af0971fe78efa037d8fb83 Mon Sep 17 00:00:00 2001 From: Ivan Nikitin Date: Sat, 28 Jan 2017 14:18:03 +0300 Subject: [PATCH 07/54] Remove redundant check from bootstrap/autoload.php Redundant check removed since compiled class file generation was removed https://github.com/laravel/framework/commit/09964cc8c04674ec710af02794f774308a5c92ca#diff-7b18a52eceff5eb716c1de268e98d55dL870 --- bootstrap/autoload.php | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/bootstrap/autoload.php b/bootstrap/autoload.php index 38301379..94adc997 100644 --- a/bootstrap/autoload.php +++ b/bootstrap/autoload.php @@ -15,20 +15,3 @@ define('LARAVEL_START', microtime(true)); */ require __DIR__.'/../vendor/autoload.php'; - -/* -|-------------------------------------------------------------------------- -| Include The Compiled Class File -|-------------------------------------------------------------------------- -| -| To dramatically increase your application's performance, you may use a -| compiled class file which contains all of the classes commonly used -| by a request. The Artisan "optimize" is used to create this file. -| -*/ - -$compiledPath = __DIR__.'/cache/compiled.php'; - -if (file_exists($compiledPath)) { - require $compiledPath; -} From cc42c3fe0a8097a31b37268e8c45488e4b719c1a Mon Sep 17 00:00:00 2001 From: Tim Groeneveld Date: Mon, 30 Jan 2017 17:26:30 +1000 Subject: [PATCH 08/54] Append '@' to let composer resolve PHP executable To execute PHP scripts, you can use `@php` which will automatically resolve to whatever php process is currently being used. See https://getcomposer.org/doc/articles/scripts.md#executing-php-scripts for more information. --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index e5f21170..f8cd47cb 100644 --- a/composer.json +++ b/composer.json @@ -29,18 +29,18 @@ }, "scripts": { "post-root-package-install": [ - "php -r \"file_exists('.env') || copy('.env.example', '.env');\"" + "@php -r \"file_exists('.env') || copy('.env.example', '.env');\"" ], "post-create-project-cmd": [ - "php artisan key:generate" + "@php artisan key:generate" ], "post-install-cmd": [ "Illuminate\\Foundation\\ComposerScripts::postInstall", - "php artisan optimize" + "@php artisan optimize" ], "post-update-cmd": [ "Illuminate\\Foundation\\ComposerScripts::postUpdate", - "php artisan optimize" + "@php artisan optimize" ] }, "config": { From 0cdcc779bfe4d2aedf15de26b14e1ff940202334 Mon Sep 17 00:00:00 2001 From: Michael Zhang Date: Mon, 30 Jan 2017 12:07:53 -0500 Subject: [PATCH 09/54] Make axios automatically send the `X-CSRF-TOKEN` --- resources/assets/js/bootstrap.js | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/assets/js/bootstrap.js b/resources/assets/js/bootstrap.js index 4e8b9586..e89ea5a6 100644 --- a/resources/assets/js/bootstrap.js +++ b/resources/assets/js/bootstrap.js @@ -28,6 +28,7 @@ window.Vue = require('vue'); window.axios = require('axios'); window.axios.defaults.headers.common = { + 'X-CSRF-TOKEN': window.Laravel.csrfToken, 'X-Requested-With': 'XMLHttpRequest' }; From 095fa50f7bd54cd256a2aa58618d683ff5b377a1 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Mon, 30 Jan 2017 16:29:40 -0600 Subject: [PATCH 10/54] Revert "Append '@' to let composer resolve PHP executable" --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index f8cd47cb..e5f21170 100644 --- a/composer.json +++ b/composer.json @@ -29,18 +29,18 @@ }, "scripts": { "post-root-package-install": [ - "@php -r \"file_exists('.env') || copy('.env.example', '.env');\"" + "php -r \"file_exists('.env') || copy('.env.example', '.env');\"" ], "post-create-project-cmd": [ - "@php artisan key:generate" + "php artisan key:generate" ], "post-install-cmd": [ "Illuminate\\Foundation\\ComposerScripts::postInstall", - "@php artisan optimize" + "php artisan optimize" ], "post-update-cmd": [ "Illuminate\\Foundation\\ComposerScripts::postUpdate", - "@php artisan optimize" + "php artisan optimize" ] }, "config": { From 72a76c021e0e707cba66f172786b66473d2e5c03 Mon Sep 17 00:00:00 2001 From: Atef Ben Ali Date: Tue, 31 Jan 2017 14:10:21 +0100 Subject: [PATCH 11/54] Add App locate as default value of 'lang' attribute Add App locate as default lang in the app.php config file instead of 'en' of 'lang' attribute in the main view. --- resources/views/welcome.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php index d6760370..44b7e721 100644 --- a/resources/views/welcome.blade.php +++ b/resources/views/welcome.blade.php @@ -1,5 +1,5 @@ - + From 926f53bcc0c879b8580e55239453902a78914afa Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Wed, 1 Feb 2017 09:04:07 +0800 Subject: [PATCH 12/54] Laravel 5.4 explicitly require phpunit 5.7.0+ As demonstrated in laravel/framework#17699 it is possible to have phpunit being installed with a lower than `5.7.0`, which doesn't work at all on 5.4 due to the changes with PHPUnit namespaced class. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index e5f21170..2b1259d7 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ "require-dev": { "fzaninotto/faker": "~1.4", "mockery/mockery": "0.9.*", - "phpunit/phpunit": "~5.0" + "phpunit/phpunit": "~5.7" }, "autoload": { "classmap": [ From ae03042300a06adf86e69417a7a12603fa25a3c8 Mon Sep 17 00:00:00 2001 From: Luis Dalmolin Date: Thu, 2 Feb 2017 10:01:16 -0200 Subject: [PATCH 13/54] Updated laravel-mix version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 220aff58..f823aa4e 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "axios": "^0.15.2", "bootstrap-sass": "^3.3.7", "jquery": "^3.1.0", - "laravel-mix": "^0.5.0", + "laravel-mix": "^0.6.0", "lodash": "^4.16.2", "vue": "^2.0.1" } From a6fdc9472f2619cdc7b41b089157fb74e462e9d7 Mon Sep 17 00:00:00 2001 From: Mohamed Said Date: Fri, 3 Feb 2017 18:06:39 +0200 Subject: [PATCH 14/54] Put back configuration for sendmail --- config/mail.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/config/mail.php b/config/mail.php index 68ed285d..e74deeac 100644 --- a/config/mail.php +++ b/config/mail.php @@ -87,6 +87,19 @@ return [ 'username' => env('MAIL_USERNAME'), 'password' => env('MAIL_PASSWORD'), + + /* + |-------------------------------------------------------------------------- + | Sendmail System Path + |-------------------------------------------------------------------------- + | + | When using the "sendmail" driver to send e-mails, we will need to know + | the path to where Sendmail lives on this server. A default path has + | been provided here, which will work well on most of your systems. + | + */ + + 'sendmail' => '/usr/sbin/sendmail -bs', /* |-------------------------------------------------------------------------- From be631a66933c99f599ca2bd88c61b21ff0a059b3 Mon Sep 17 00:00:00 2001 From: Mohamed Said Date: Fri, 3 Feb 2017 16:06:59 +0000 Subject: [PATCH 15/54] Apply fixes from StyleCI --- config/mail.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/mail.php b/config/mail.php index e74deeac..bb92224c 100644 --- a/config/mail.php +++ b/config/mail.php @@ -87,7 +87,7 @@ return [ 'username' => env('MAIL_USERNAME'), 'password' => env('MAIL_PASSWORD'), - + /* |-------------------------------------------------------------------------- | Sendmail System Path @@ -98,7 +98,7 @@ return [ | been provided here, which will work well on most of your systems. | */ - + 'sendmail' => '/usr/sbin/sendmail -bs', /* From 2cc5f349d495991447beb08cf04f5f607e95fbb6 Mon Sep 17 00:00:00 2001 From: "Ahmed M. Ammar" Date: Fri, 3 Feb 2017 18:21:04 +0200 Subject: [PATCH 16/54] Add font path variable --- resources/assets/sass/_variables.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/assets/sass/_variables.scss b/resources/assets/sass/_variables.scss index 0a2bc731..4cc95e3d 100644 --- a/resources/assets/sass/_variables.scss +++ b/resources/assets/sass/_variables.scss @@ -35,3 +35,6 @@ $input-color-placeholder: lighten($text-color, 30%); // Panels $panel-default-heading-bg: #fff; + +// Fonts +$icon-font-path: "~bootstrap-sass/assets/fonts/bootstrap/"; From 0cb107c84c13d216b9460c5e61d3089b0f1e54e2 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Fri, 3 Feb 2017 15:49:27 -0600 Subject: [PATCH 17/54] move fontsls --- resources/assets/sass/_variables.scss | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/resources/assets/sass/_variables.scss b/resources/assets/sass/_variables.scss index 4cc95e3d..53202ac1 100644 --- a/resources/assets/sass/_variables.scss +++ b/resources/assets/sass/_variables.scss @@ -17,6 +17,7 @@ $brand-warning: #cbb956; $brand-danger: #bf5329; // Typography +$icon-font-path: "~bootstrap-sass/assets/fonts/bootstrap/"; $font-family-sans-serif: "Raleway", sans-serif; $font-size-base: 14px; $line-height-base: 1.6; @@ -35,6 +36,3 @@ $input-color-placeholder: lighten($text-color, 30%); // Panels $panel-default-heading-bg: #fff; - -// Fonts -$icon-font-path: "~bootstrap-sass/assets/fonts/bootstrap/"; From 0257612e8ac09b22f51a8df15d8edc531165057a Mon Sep 17 00:00:00 2001 From: Rick Bolton Date: Wed, 8 Feb 2017 09:30:06 +0000 Subject: [PATCH 18/54] Updated axios, jQuery, Laravel Mix, Lodash and Vue.js versions --- package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index f823aa4e..a8d816cc 100644 --- a/package.json +++ b/package.json @@ -7,11 +7,11 @@ "production": "node node_modules/cross-env/bin/cross-env.js NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" }, "devDependencies": { - "axios": "^0.15.2", + "axios": "^0.15.3", "bootstrap-sass": "^3.3.7", - "jquery": "^3.1.0", - "laravel-mix": "^0.6.0", - "lodash": "^4.16.2", - "vue": "^2.0.1" + "jquery": "^3.1.1", + "laravel-mix": "^0.7.2", + "lodash": "^4.17.4", + "vue": "^2.1.10" } } From e8b4f0e6ce5299972b656a562742c928b72f4d9d Mon Sep 17 00:00:00 2001 From: Prabhat Shahi Date: Thu, 16 Feb 2017 11:51:31 +0545 Subject: [PATCH 19/54] Update package.json update laravel mix to new version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a8d816cc..60181c95 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "axios": "^0.15.3", "bootstrap-sass": "^3.3.7", "jquery": "^3.1.1", - "laravel-mix": "^0.7.2", + "laravel-mix": "^0.8.1", "lodash": "^4.17.4", "vue": "^2.1.10" } From 39338373b91b68d35efa1b6ebf0730979ca689fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabr=C3=ADcio=20Kneipp?= Date: Fri, 17 Feb 2017 15:36:28 -0200 Subject: [PATCH 20/54] Change hard-coded '/login' string to named route --- app/Exceptions/Handler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 21c9784c..a747e31b 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -60,6 +60,6 @@ class Handler extends ExceptionHandler return response()->json(['error' => 'Unauthenticated.'], 401); } - return redirect()->guest('login'); + return redirect()->guest(route('login')); } } From 96f662a625a642b43509b2ca2ca061ceb77cfe7d Mon Sep 17 00:00:00 2001 From: Jeffrey Way Date: Tue, 21 Feb 2017 13:57:31 -0500 Subject: [PATCH 21/54] Refactor npm scripts Per #4147, this adds a new `npm run watch-poll` command, and dries up some of those long repetitive commands. --- package.json | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 60181c95..b452f737 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,14 @@ { "private": true, "scripts": { - "dev": "node node_modules/cross-env/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", - "watch": "node node_modules/cross-env/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", - "hot": "node node_modules/cross-env/bin/cross-env.js NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", - "production": "node node_modules/cross-env/bin/cross-env.js NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" + "dev": "node node_modules/webpack/bin/webpack.js --progress --hide-modules --config=$npm_package_config_webpack", + "watch": "npm run dev -- -w", + "watch-poll": "npm run dev -- -w --watch-poll", + "hot": "node node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=$npm_package_config_webpack", + "production": "npm run dev -- -p" + }, + "config": { + "webpack": "node_modules/laravel-mix/setup/webpack.config.js" }, "devDependencies": { "axios": "^0.15.3", From c76716f228d809d24d1886c3e279d08fb8377ebc Mon Sep 17 00:00:00 2001 From: Jeffrey Way Date: Thu, 23 Feb 2017 09:50:35 -0500 Subject: [PATCH 22/54] Revert npm script refactor --- package.json | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index b452f737..5870fb76 100644 --- a/package.json +++ b/package.json @@ -1,14 +1,11 @@ { "private": true, "scripts": { - "dev": "node node_modules/webpack/bin/webpack.js --progress --hide-modules --config=$npm_package_config_webpack", - "watch": "npm run dev -- -w", - "watch-poll": "npm run dev -- -w --watch-poll", - "hot": "node node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=$npm_package_config_webpack", - "production": "npm run dev -- -p" - }, - "config": { - "webpack": "node_modules/laravel-mix/setup/webpack.config.js" + "dev": "node node_modules/cross-env/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", + "watch": "node node_modules/cross-env/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", + "watch-poll": "node node_modules/cross-env/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --watch-poll --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", + "hot": "node node_modules/cross-env/bin/cross-env.js NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", + "production": "node node_modules/cross-env/bin/cross-env.js NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" }, "devDependencies": { "axios": "^0.15.3", From 90886732cf6df6d8694287c3f9d92496a4f1c61b Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Wed, 1 Mar 2017 16:52:59 +0100 Subject: [PATCH 23/54] Update description of filled rule `filled` isn't really required. It just implies that it needs a value. --- resources/lang/en/validation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index 9608bc25..2a5c7434 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -41,7 +41,7 @@ return [ 'email' => 'The :attribute must be a valid email address.', 'exists' => 'The selected :attribute is invalid.', 'file' => 'The :attribute must be a file.', - 'filled' => 'The :attribute field is required.', + 'filled' => 'The :attribute field must have a value.', 'image' => 'The :attribute must be an image.', 'in' => 'The selected :attribute is invalid.', 'in_array' => 'The :attribute field does not exist in :other.', From 48f44440f7713d3267af2969ed84297455f3787e Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Fri, 3 Mar 2017 08:39:45 -0600 Subject: [PATCH 24/54] ignore testing dir --- storage/framework/testing/.gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 storage/framework/testing/.gitignore diff --git a/storage/framework/testing/.gitignore b/storage/framework/testing/.gitignore new file mode 100644 index 00000000..d6b7ef32 --- /dev/null +++ b/storage/framework/testing/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore From eab39557ac77442f1b8797725c53ee99bf8fe050 Mon Sep 17 00:00:00 2001 From: Kristoffer Eklund Date: Sat, 4 Mar 2017 17:57:34 +0100 Subject: [PATCH 25/54] Fix cross-env bin path --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 5870fb76..8cc73d4d 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,11 @@ { "private": true, "scripts": { - "dev": "node node_modules/cross-env/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", - "watch": "node node_modules/cross-env/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", + "dev": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", + "watch": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", "watch-poll": "node node_modules/cross-env/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --watch-poll --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", - "hot": "node node_modules/cross-env/bin/cross-env.js NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", - "production": "node node_modules/cross-env/bin/cross-env.js NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" + "hot": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", + "production": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" }, "devDependencies": { "axios": "^0.15.3", From df1f0f912af703aa03a6c9e0a3e3e67f25927e57 Mon Sep 17 00:00:00 2001 From: Kristoffer Eklund Date: Sat, 4 Mar 2017 18:54:33 +0100 Subject: [PATCH 26/54] Fix cross-env bin path --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8cc73d4d..4deb43f6 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "scripts": { "dev": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", "watch": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", - "watch-poll": "node node_modules/cross-env/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --watch-poll --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", + "watch-poll": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --watch-poll --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", "hot": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", "production": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" }, From 63dc985f2f02705598e4e8a76946904e4b174ecd Mon Sep 17 00:00:00 2001 From: Dimitar Zlatev Date: Sun, 5 Mar 2017 13:30:16 +0200 Subject: [PATCH 27/54] Use consistent config paths --- config/view.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/view.php b/config/view.php index e193ab61..2acfd9cc 100644 --- a/config/view.php +++ b/config/view.php @@ -14,7 +14,7 @@ return [ */ 'paths' => [ - realpath(base_path('resources/views')), + resource_path('views'), ], /* From f0374e4fe6f0ddb935dc34bae2808620ab30448f Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Mon, 6 Mar 2017 12:36:45 +0100 Subject: [PATCH 28/54] Add cross-env as a dependency and update paths --- package.json | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 4deb43f6..f24a123c 100644 --- a/package.json +++ b/package.json @@ -1,15 +1,16 @@ { "private": true, "scripts": { - "dev": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", - "watch": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", - "watch-poll": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --watch-poll --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", - "hot": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", - "production": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" + "dev": "node node_modules/.bin/cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", + "watch": "node node_modules/.bin/cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", + "watch-poll": "node node_modules/.bin/cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --watch-poll --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", + "hot": "node node_modules/.bin/cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", + "production": "node node_modules/.bin/cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" }, "devDependencies": { "axios": "^0.15.3", "bootstrap-sass": "^3.3.7", + "cross-env": "^3.2.3", "jquery": "^3.1.1", "laravel-mix": "^0.8.1", "lodash": "^4.17.4", From 65c4d16d04f030633b0b4a09c2c98f716e5c1873 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Mon, 6 Mar 2017 12:39:46 +0100 Subject: [PATCH 29/54] Do not use full paths --- package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index f24a123c..a9637ed9 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,11 @@ { "private": true, "scripts": { - "dev": "node node_modules/.bin/cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", - "watch": "node node_modules/.bin/cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", - "watch-poll": "node node_modules/.bin/cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --watch-poll --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", - "hot": "node node_modules/.bin/cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", - "production": "node node_modules/.bin/cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" + "dev": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", + "watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", + "watch-poll": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --watch-poll --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", + "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", + "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" }, "devDependencies": { "axios": "^0.15.3", From b0846539b1867e76af5c62369e5d6887fd139da0 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Wed, 8 Mar 2017 11:20:18 -0600 Subject: [PATCH 30/54] fix cascade --- public/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/index.php b/public/index.php index 716731f8..1e1d775f 100644 --- a/public/index.php +++ b/public/index.php @@ -15,7 +15,7 @@ | Composer provides a convenient, automatically generated class loader for | our application. We just need to utilize it! We'll simply require it | into the script here so that we don't have to worry about manual -| loading any of our classes later on. It feels nice to relax. +| loading any of our classes later on. It feels great to relax. | */ From 29db165c6aa2cb398ace8a64d96e1baabedfab4f Mon Sep 17 00:00:00 2001 From: Kouceyla Date: Thu, 9 Mar 2017 17:58:00 +0100 Subject: [PATCH 31/54] Upgrade laravel-mix to 0.8.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a9637ed9..c896e51b 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "bootstrap-sass": "^3.3.7", "cross-env": "^3.2.3", "jquery": "^3.1.1", - "laravel-mix": "^0.8.1", + "laravel-mix": "^0.8.3", "lodash": "^4.17.4", "vue": "^2.1.10" } From 31c262301899b6cd1a4ce2631ad0e313b444b131 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 14 Mar 2017 08:31:41 -0500 Subject: [PATCH 32/54] update example --- resources/assets/js/bootstrap.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/assets/js/bootstrap.js b/resources/assets/js/bootstrap.js index e89ea5a6..5031fba6 100644 --- a/resources/assets/js/bootstrap.js +++ b/resources/assets/js/bootstrap.js @@ -40,6 +40,8 @@ window.axios.defaults.headers.common = { // import Echo from "laravel-echo" +// window.Pusher = require('pusher-js'); + // window.Echo = new Echo({ // broadcaster: 'pusher', // key: 'your-pusher-key' From 7262b443737de0737cf664b497ef15017f4ed841 Mon Sep 17 00:00:00 2001 From: Alex Mokrenko Date: Tue, 14 Mar 2017 16:59:18 +0300 Subject: [PATCH 33/54] common js style --- resources/assets/js/bootstrap.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/js/bootstrap.js b/resources/assets/js/bootstrap.js index 5031fba6..36ec688c 100644 --- a/resources/assets/js/bootstrap.js +++ b/resources/assets/js/bootstrap.js @@ -38,7 +38,7 @@ window.axios.defaults.headers.common = { * allows your team to easily build robust real-time web applications. */ -// import Echo from "laravel-echo" +// import Echo from 'laravel-echo' // window.Pusher = require('pusher-js'); From a812983d0b2be5d06e7cb534135e922a478fe5e0 Mon Sep 17 00:00:00 2001 From: Brent Shaffer Date: Wed, 9 Nov 2016 16:03:37 -0800 Subject: [PATCH 34/54] Adds socket to config/database.php for consistency For the mysql driver only (as this only applies to mysql) add the "socket" configuration parameter and corresponding environment variable. --- config/database.php | 1 + 1 file changed, 1 insertion(+) diff --git a/config/database.php b/config/database.php index df36b2dd..a196943f 100644 --- a/config/database.php +++ b/config/database.php @@ -46,6 +46,7 @@ return [ 'database' => env('DB_DATABASE', 'forge'), 'username' => env('DB_USERNAME', 'forge'), 'password' => env('DB_PASSWORD', ''), + 'unix_socket' => env('DB_SOCKET', ''), 'charset' => 'utf8mb4', 'collation' => 'utf8mb4_unicode_ci', 'prefix' => '', From d6d98f970500db7d30799991a587773a7103c510 Mon Sep 17 00:00:00 2001 From: halaei Date: Fri, 17 Mar 2017 11:47:10 +0330 Subject: [PATCH 35/54] unindex token --- .../2014_10_12_100000_create_password_resets_table.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/migrations/2014_10_12_100000_create_password_resets_table.php b/database/migrations/2014_10_12_100000_create_password_resets_table.php index 294c3ea4..2afa8972 100644 --- a/database/migrations/2014_10_12_100000_create_password_resets_table.php +++ b/database/migrations/2014_10_12_100000_create_password_resets_table.php @@ -14,7 +14,7 @@ class CreatePasswordResetsTable extends Migration { Schema::create('password_resets', function (Blueprint $table) { $table->string('email')->index(); - $table->string('token')->index(); + $table->string('token'); $table->timestamp('created_at')->nullable(); }); } From 01fa7e37db205a15b3b907b36e8a71f9cdd8d323 Mon Sep 17 00:00:00 2001 From: Ben Sampson Date: Fri, 17 Mar 2017 16:18:18 +0000 Subject: [PATCH 36/54] Mailtrap now reference smtp. for their host value. --- .env.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.example b/.env.example index 251aeb94..55b5223b 100644 --- a/.env.example +++ b/.env.example @@ -21,7 +21,7 @@ REDIS_PASSWORD=null REDIS_PORT=6379 MAIL_DRIVER=smtp -MAIL_HOST=mailtrap.io +MAIL_HOST=smtp.mailtrap.io MAIL_PORT=2525 MAIL_USERNAME=null MAIL_PASSWORD=null From 93876d6276f38b2f10a6bbb1bcf9db0771142e72 Mon Sep 17 00:00:00 2001 From: JuanDMeGon Date: Wed, 22 Mar 2017 01:26:12 -0500 Subject: [PATCH 37/54] The .js files should be vendored too Some projects can present JS as the primary language, even clearly being a Laravel/PHP project. With this, that problem can be avoided. --- .gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitattributes b/.gitattributes index a8763f8e..2195b20d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,4 @@ * text=auto *.css linguist-vendored *.scss linguist-vendored +*.js linguist-vendored From d3760f7fbf414a21d0010368c8dad5f9299df204 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Fri, 24 Mar 2017 14:22:01 -0500 Subject: [PATCH 38/54] Add sponsors to readme. --- readme.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/readme.md b/readme.md index 70f23e0b..2995cd69 100644 --- a/readme.md +++ b/readme.md @@ -27,6 +27,17 @@ Laravel has the most extensive and thorough documentation and video tutorial lib If you're not in the mood to read, [Laracasts](https://laracasts.com) contains over 900 video tutorials on a range of topics including Laravel, modern PHP, unit testing, JavaScript, and more. Boost the skill level of yourself and your entire team by digging into our comprehensive video library. +## Laravel Sponsors + +We would like to extend our thanks to the following sponsors for helping fund on-going Laravel development. If you are interested in becoming a sponsor, please visit the Laravel [Patreon page](http://patreon.com/taylorotwell): + +- **[Vehikl](https://vehikl.com)** +- **[Tighten Co.](https://tighten.co)** +- **[British Software Development](https://www.britishsoftware.com)** +- **[Styde](https://styde.net)** +- **[Codecourse](https://www.codecourse.com)** +- [Fragrantica](https://www.fragrantica.com) + ## Contributing Thank you for considering contributing to the Laravel framework! The contribution guide can be found in the [Laravel documentation](http://laravel.com/docs/contributions). From dd8fd3905597c69aa1c66a56eacbd9b4ad646346 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Fri, 24 Mar 2017 14:22:49 -0500 Subject: [PATCH 39/54] correct link --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 2995cd69..2c54d224 100644 --- a/readme.md +++ b/readme.md @@ -31,7 +31,7 @@ If you're not in the mood to read, [Laracasts](https://laracasts.com) contains o We would like to extend our thanks to the following sponsors for helping fund on-going Laravel development. If you are interested in becoming a sponsor, please visit the Laravel [Patreon page](http://patreon.com/taylorotwell): -- **[Vehikl](https://vehikl.com)** +- **[Vehikl](http://vehikl.com)** - **[Tighten Co.](https://tighten.co)** - **[British Software Development](https://www.britishsoftware.com)** - **[Styde](https://styde.net)** From a2151d6682f92c8515fa898975a1c806961b9068 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Till=20Kr=C3=BCss?= Date: Sat, 25 Mar 2017 09:33:49 -0700 Subject: [PATCH 40/54] Added changelog --- CHANGELOG.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 00000000..ea2ed376 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,16 @@ +# Release Notes + +## v5.4.16 (2017-03-17) + +### Added +- Added `unix_socket` to `mysql` in `config/database.php` ()[#4179](https://github.com/laravel/laravel/pull/4179)) +- Added Pusher example code to `bootstrap.js` ([31c2623](https://github.com/laravel/laravel/commit/31c262301899b6cd1a4ce2631ad0e313b444b131)) + +### Changed +- Use `smtp.mailtrap.io` as default `MAIL_HOST` ([#4182](https://github.com/laravel/laravel/pull/4182)) +- Upgrade Laravel Mix to `0.8.3` ([#4174](https://github.com/laravel/laravel/pull/4174)) +- Use `resource_path()` in `config/view.php` ([#4165](https://github.com/laravel/laravel/pull/4165)) +- Use `cross-env` binary ([#4167](https://github.com/laravel/laravel/pull/4167)) + +### Removed +- Remove index from password reset `token` column ([#4180](https://github.com/laravel/laravel/pull/4180)) From 78117c0285e8447d38926f39dd2c4176621d43af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Till=20Kr=C3=BCss?= Date: Sat, 25 Mar 2017 10:52:13 -0700 Subject: [PATCH 41/54] Removed line --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea2ed376..86c095e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,6 @@ ### Changed - Use `smtp.mailtrap.io` as default `MAIL_HOST` ([#4182](https://github.com/laravel/laravel/pull/4182)) -- Upgrade Laravel Mix to `0.8.3` ([#4174](https://github.com/laravel/laravel/pull/4174)) - Use `resource_path()` in `config/view.php` ([#4165](https://github.com/laravel/laravel/pull/4165)) - Use `cross-env` binary ([#4167](https://github.com/laravel/laravel/pull/4167)) From 667836b1596a961092aea1d8da7bb478086b54a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Till=20Kr=C3=BCss?= Date: Sat, 25 Mar 2017 12:02:22 -0700 Subject: [PATCH 42/54] Ignore changelog in export --- .gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitattributes b/.gitattributes index 2195b20d..967315dd 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,3 +2,4 @@ *.css linguist-vendored *.scss linguist-vendored *.js linguist-vendored +CHANGELOG.md export-ignore From 4d7676fdb76f62423afe93e296c4eefdc5c91121 Mon Sep 17 00:00:00 2001 From: Laurence Ioannou Date: Sun, 26 Mar 2017 00:12:38 +0000 Subject: [PATCH 43/54] Possible URL fix? --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 2c54d224..336ce592 100644 --- a/readme.md +++ b/readme.md @@ -33,7 +33,7 @@ We would like to extend our thanks to the following sponsors for helping fund on - **[Vehikl](http://vehikl.com)** - **[Tighten Co.](https://tighten.co)** -- **[British Software Development](https://www.britishsoftware.com)** +- **[British Software Development](https://www.britishsoftware.co)** - **[Styde](https://styde.net)** - **[Codecourse](https://www.codecourse.com)** - [Fragrantica](https://www.fragrantica.com) From 605ffb9ba97b2ba877a65b9cbb7182ca40b78087 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Sat, 25 Mar 2017 21:17:09 -0500 Subject: [PATCH 44/54] rename example event --- app/Providers/EventServiceProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index a182657e..fca6152c 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -13,7 +13,7 @@ class EventServiceProvider extends ServiceProvider * @var array */ protected $listen = [ - 'App\Events\SomeEvent' => [ + 'App\Events\Event' => [ 'App\Listeners\EventListener', ], ]; From b19f4e8308354f287917ab46f595a09de38ad6af Mon Sep 17 00:00:00 2001 From: Mohamed Said Date: Sun, 26 Mar 2017 14:34:05 +0200 Subject: [PATCH 45/54] require laravel-mix v0.* --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c896e51b..4eebe405 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "bootstrap-sass": "^3.3.7", "cross-env": "^3.2.3", "jquery": "^3.1.1", - "laravel-mix": "^0.8.3", + "laravel-mix": "0.*", "lodash": "^4.17.4", "vue": "^2.1.10" } From 2b5925bc62523658e455ea2372809511de68395a Mon Sep 17 00:00:00 2001 From: Alexandr Date: Mon, 27 Mar 2017 14:31:34 +0300 Subject: [PATCH 46/54] Composer -o Composer allows us to optimize the autoloader using the --optimize flag or shortly -o. --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 2b1259d7..eb080e96 100644 --- a/composer.json +++ b/composer.json @@ -45,6 +45,7 @@ }, "config": { "preferred-install": "dist", - "sort-packages": true + "sort-packages": true, + "optimize-autoloader": true } } From f19a2f206a055ca9495a085e9dfc191179b301ca Mon Sep 17 00:00:00 2001 From: Michael Dyrynda Date: Tue, 28 Mar 2017 11:23:08 +1030 Subject: [PATCH 47/54] Provide consistency with NPM scripts It trips me up each time that `npm run dev` exists but `npm run prod` does not. This serves to fix that case, as well as providing consistency in both directions `dev`/`development` and `prod`/`production`. [Source](https://twitter.com/michaeldyrynda/status/846507021251690497) --- package.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 4eebe405..6732bded 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,9 @@ "watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", "watch-poll": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --watch-poll --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", - "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" + "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", + "development": "$npm_package_scripts_dev", + "prod": "$npm_package_scripts_production" }, "devDependencies": { "axios": "^0.15.3", From a4d18804507ead8bf1a3ff26f2c98a1ec7ff5c16 Mon Sep 17 00:00:00 2001 From: Dayle Rees Date: Tue, 28 Mar 2017 09:36:45 +0100 Subject: [PATCH 48/54] Add vagrant virtual machine directory to git ignore list. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index c561e9bd..a6b4afc4 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ /storage/*.key /vendor /.idea +/.vagrant Homestead.json Homestead.yaml .env From f5b68b1fc5decfb9b0d7105ece73123b3601f254 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 28 Mar 2017 07:49:22 -0500 Subject: [PATCH 49/54] Update package.json --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 6732bded..f0f177cc 100644 --- a/package.json +++ b/package.json @@ -1,13 +1,13 @@ { "private": true, "scripts": { - "dev": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", + "dev": "$npm_package_scripts_development", + "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", "watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", "watch-poll": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --watch-poll --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", - "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", - "development": "$npm_package_scripts_dev", - "prod": "$npm_package_scripts_production" + "prod": "$npm_package_scripts_production", + "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" }, "devDependencies": { "axios": "^0.15.3", From 3335525431827ee4ab29fa9c0d120ea1b77e8cec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morva=20Krist=C3=B3f?= Date: Wed, 29 Mar 2017 11:45:09 +0200 Subject: [PATCH 50/54] NPM scripts should support Windows --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index f0f177cc..b7b17982 100644 --- a/package.json +++ b/package.json @@ -1,12 +1,12 @@ { "private": true, "scripts": { - "dev": "$npm_package_scripts_development", + "dev": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", "watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", "watch-poll": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --watch-poll --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", - "prod": "$npm_package_scripts_production", + "prod": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" }, "devDependencies": { From e42ce3eae950677e9da0b974f424b6f43433e1aa Mon Sep 17 00:00:00 2001 From: Roberto Aguilar Date: Fri, 31 Mar 2017 00:21:17 -0600 Subject: [PATCH 51/54] DRY some npm scripts `dev` and `prod` are just aliases, so this allows to just defer them to their counterparts. `watch-poll` just adds one extra argument so the special option `--` allows to pass it to the `watch` script. --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index b7b17982..83294b63 100644 --- a/package.json +++ b/package.json @@ -1,12 +1,12 @@ { "private": true, "scripts": { - "dev": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", + "dev": "npm run development", "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", "watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", - "watch-poll": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --watch-poll --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", + "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 --config=node_modules/laravel-mix/setup/webpack.config.js", - "prod": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", + "prod": "npm run production", "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" }, "devDependencies": { From 99d4e59d25ef6e7cb247bb7e3caed423466b1924 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morva=20Krist=C3=B3f?= Date: Mon, 3 Apr 2017 21:06:10 +0200 Subject: [PATCH 52/54] Sorting gitignore file --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a6b4afc4..7deb0000 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ /node_modules -/public/storage /public/hot +/public/storage /storage/*.key /vendor /.idea From 323e553f336b7e7b189a27fba4102a3c3851ee1b Mon Sep 17 00:00:00 2001 From: Matthew Davis Date: Mon, 3 Apr 2017 20:07:41 +0100 Subject: [PATCH 53/54] Make app name configurable in environment file --- .env.example | 1 + config/app.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.env.example b/.env.example index 55b5223b..668c06f0 100644 --- a/.env.example +++ b/.env.example @@ -1,3 +1,4 @@ +APP_NAME=Laravel APP_ENV=local APP_KEY= APP_DEBUG=true diff --git a/config/app.php b/config/app.php index 3036ac7c..135e9778 100644 --- a/config/app.php +++ b/config/app.php @@ -12,7 +12,7 @@ return [ | any other location as required by the application or its packages. */ - 'name' => 'Laravel', + 'name' => env('APP_NAME', 'Laravel'), /* |-------------------------------------------------------------------------- From 0d31e2993b3ee681f4aeef486619c90a26f9086e Mon Sep 17 00:00:00 2001 From: Matt Isenhower Date: Thu, 6 Apr 2017 15:58:57 -0700 Subject: [PATCH 54/54] Add to axios defaults instead of overwriting them This change ensures the default "Accept" header specified by axios is retained. --- resources/assets/js/bootstrap.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/resources/assets/js/bootstrap.js b/resources/assets/js/bootstrap.js index 36ec688c..86574839 100644 --- a/resources/assets/js/bootstrap.js +++ b/resources/assets/js/bootstrap.js @@ -27,10 +27,8 @@ window.Vue = require('vue'); window.axios = require('axios'); -window.axios.defaults.headers.common = { - 'X-CSRF-TOKEN': window.Laravel.csrfToken, - 'X-Requested-With': 'XMLHttpRequest' -}; +window.axios.defaults.headers.common['X-CSRF-TOKEN'] = window.Laravel.csrfToken; +window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest'; /** * Echo exposes an expressive API for subscribing to channels and listening