Skip to content

Commit b331e10

Browse files
driesvintsdriesvints
committed
Merge branch '9.x'
# Conflicts: # composer.json
2 parents ea6e409 + bb73205 commit b331e10

14 files changed

+75
-45
lines changed

‎.env.example

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,13 @@ AWS_USE_PATH_STYLE_ENDPOINT=false
4646
PUSHER_APP_ID=
4747
PUSHER_APP_KEY=
4848
PUSHER_APP_SECRET=
49+
PUSHER_HOST=
50+
PUSHER_PORT=443
51+
PUSHER_SCHEME=https
4952
PUSHER_APP_CLUSTER=mt1
5053

51-
MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
52-
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
54+
VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
55+
VITE_PUSHER_HOST="${PUSHER_HOST}"
56+
VITE_PUSHER_PORT="${PUSHER_PORT}"
57+
VITE_PUSHER_SCHEME="${PUSHER_SCHEME}"
58+
VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

‎.github/workflows/pull-requests.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
name: Pull Requests
1+
name: pull requests
22

33
on:
44
pull_request_target:
5-
types:
6-
- opened
5+
types: [opened]
76

87
permissions:
98
pull-requests: write

‎.github/workflows/update-changelog.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "Update Changelog"
1+
name: update changelog
22

33
on:
44
release:

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/node_modules
2+
/public/build
23
/public/hot
34
/public/storage
45
/storage/*.key

‎.styleci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ php:
88
js:
99
finder:
1010
not-name:
11-
- webpack.mix.js
11+
- vite.config.js
1212
css: true

‎CHANGELOG.md

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,30 @@
11
# Release Notes
22

3-
## [Unreleased](https://github.com/laravel/laravel/compare/v9.1.8...9.x)
3+
## [Unreleased](https://github.com/laravel/laravel/compare/v9.2.0...9.x)
4+
5+
## [v9.2.0](https://github.com/laravel/laravel/compare/v9.1.10...v9.2.0) - 2022-06-28
6+
7+
### Added
8+
9+
- Vite by @jessarcher in https://github.com/laravel/laravel/pull/5904
10+
- Added support for easy development configuration in bootstrap.js by @rennokki in https://github.com/laravel/laravel/pull/5900
11+
12+
### Changed
13+
14+
- Sorted entries in the `en` validation translations file by @FaridAghili in https://github.com/laravel/laravel/pull/5899
15+
16+
## [v9.1.10](https://github.com/laravel/laravel/compare/v9.1.9...v9.1.10) - 2022-06-07
17+
18+
### Changed
19+
20+
- Add language line by @taylorotwell in https://github.com/laravel/laravel/commit/b084aacc5ad105e39c2b058e9523e73655be8d1f
21+
- Improve Pusher configuration for easy development by @oanhnn in https://github.com/laravel/laravel/pull/5897
22+
23+
## [v9.1.9](https://github.com/laravel/laravel/compare/v9.1.8...v9.1.9) - 2022-05-28
24+
25+
### Changed
26+
27+
- Switch to ESM imports by @jessarcher in https://github.com/laravel/laravel/pull/5895
428

529
## [v9.1.8](https://github.com/laravel/laravel/compare/v9.1.7...v9.1.8) - 2022-05-05
630

‎config/broadcasting.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,11 @@
3636
'secret' => env('PUSHER_APP_SECRET'),
3737
'app_id' => env('PUSHER_APP_ID'),
3838
'options' => [
39-
'cluster' => env('PUSHER_APP_CLUSTER'),
40-
'useTLS' => true,
39+
'host' => env('PUSHER_HOST', 'api-'.env('PUSHER_APP_CLUSTER', 'mt1').'.pusher.com') ?: 'api-'.env('PUSHER_APP_CLUSTER', 'mt1').'.pusher.com',
40+
'port' => env('PUSHER_PORT', 443),
41+
'scheme' => env('PUSHER_SCHEME', 'https'),
42+
'encrypted' => true,
43+
'useTLS' => env('PUSHER_SCHEME', 'https') === 'https',
4144
],
4245
'client_options' => [
4346
// Guzzle client options: https://docs.guzzlephp.org/en/stable/request-options.html

‎database/factories/UserFactory.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ class UserFactory extends Factory
1818
public function definition()
1919
{
2020
return [
21-
'name' => $this->faker->name(),
22-
'email' => $this->faker->unique()->safeEmail(),
21+
'name' => fake()->name(),
22+
'email' => fake()->safeEmail(),
2323
'email_verified_at' => now(),
2424
'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password
2525
'remember_token' => Str::random(10),

‎lang/en/validation.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
'digits_between' => 'The :attribute must be between :min and :max digits.',
4444
'dimensions' => 'The :attribute has invalid image dimensions.',
4545
'distinct' => 'The :attribute field has a duplicate value.',
46+
'doesnt_start_with' => 'The :attribute may not start with one of the following: :values.',
4647
'email' => 'The :attribute must be a valid email address.',
4748
'ends_with' => 'The :attribute must end with one of the following: :values.',
4849
'enum' => 'The selected :attribute is invalid.',

‎package.json

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
11
{
22
"private": true,
33
"scripts": {
4-
"dev": "npm run development",
5-
"development": "mix",
6-
"watch": "mix watch",
7-
"watch-poll": "mix watch -- --watch-options-poll=1000",
8-
"hot": "mix watch --hot",
9-
"prod": "npm run production",
10-
"production": "mix --production"
4+
"dev": "vite",
5+
"build": "vite build"
116
},
127
"devDependencies": {
138
"axios": "^0.25",
14-
"laravel-mix": "^6.0.6",
9+
"laravel-vite-plugin": "^0.2.1",
1510
"lodash": "^4.17.19",
16-
"postcss": "^8.1.14"
11+
"postcss": "^8.1.14",
12+
"vite": "^2.9.11"
1713
}
1814
}

‎resources/js/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
require('./bootstrap');
1+
import './bootstrap';

‎resources/js/bootstrap.js

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
window._ = require('lodash');
1+
import _ from 'lodash';
2+
window._ = _;
23

34
/**
45
* We'll load the axios HTTP library which allows us to easily issue requests
56
* to our Laravel back-end. This library automatically handles sending the
67
* CSRF token as a header based on the value of the "XSRF" token cookie.
78
*/
89

9-
window.axios = require('axios');
10+
import axios from 'axios';
11+
window.axios = axios;
1012

1113
window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
1214

@@ -18,11 +20,15 @@ window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
1820

1921
// import Echo from 'laravel-echo';
2022

21-
// window.Pusher = require('pusher-js');
23+
// import Pusher from 'pusher-js';
24+
// window.Pusher = Pusher;
2225

2326
// window.Echo = new Echo({
2427
// broadcaster: 'pusher',
25-
// key: process.env.MIX_PUSHER_APP_KEY,
26-
// cluster: process.env.MIX_PUSHER_APP_CLUSTER,
27-
// forceTLS: true
28+
// key: import.meta.env.VITE_PUSHER_APP_KEY,
29+
// wsHost: import.meta.env.VITE_PUSHER_HOST ?? `ws-${import.meta.env.VITE_PUSHER_CLUSTER}.pusher.com`,
30+
// wsPort: import.meta.env.VITE_PUSHER_PORT ?? 80,
31+
// wssPort: import.meta.env.VITE_PUSHER_PORT ?? 443,
32+
// forceTLS: (import.meta.env.VITE_PUSHER_SCHEME ?? 'https') === 'https',
33+
// enabledTransports: ['ws', 'wss'],
2834
// });

‎vite.config.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import { defineConfig } from 'vite';
2+
import laravel from 'laravel-vite-plugin';
3+
4+
export default defineConfig({
5+
plugins: [
6+
laravel([
7+
'resources/css/app.css',
8+
'resources/js/app.js',
9+
]),
10+
],
11+
});

‎webpack.mix.js

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)