diff --git a/CHANGELOG.md b/CHANGELOG.md
index c0dce429..202f4415 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
# Release Notes
-## [Unreleased](https://github.com/laravel/laravel/compare/v9.3.12...master)
+## [Unreleased](https://github.com/laravel/laravel/compare/v9.5.0...master)
-## [v10.0.0 (2022-02-07)](https://github.com/laravel/laravel/compare/v9.3.12...master)
+## [v10.0.0 (2022-02-07)](https://github.com/laravel/laravel/compare/v9.5.0...master)
Laravel 10 includes a variety of changes to the application skeleton. Please consult the diff to see what's new.
diff --git a/README.md b/README.md
index bf0ddd92..3ed385a7 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
-
+
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 4f42fe69..e207aaa2 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
@@ -12,7 +12,7 @@ return new class extends Migration
public function up(): void
{
Schema::create('password_resets', function (Blueprint $table) {
- $table->string('email')->index();
+ $table->string('email')->primary();
$table->string('token');
$table->timestamp('created_at')->nullable();
});
diff --git a/lang/en/validation.php b/lang/en/validation.php
index f3d8cc5f..af94bd42 100644
--- a/lang/en/validation.php
+++ b/lang/en/validation.php
@@ -22,6 +22,7 @@ return [
'alpha_dash' => 'The :attribute must only contain letters, numbers, dashes and underscores.',
'alpha_num' => 'The :attribute must only contain letters and numbers.',
'array' => 'The :attribute must be an array.',
+ 'ascii' => 'The :attribute must only contain single-byte alphanumeric characters and symbols.',
'before' => 'The :attribute must be a date before :date.',
'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
'between' => [
@@ -36,6 +37,7 @@ return [
'date' => 'The :attribute is not a valid date.',
'date_equals' => 'The :attribute must be a date equal to :date.',
'date_format' => 'The :attribute does not match the format :format.',
+ 'decimal' => 'The :attribute must have :decimal decimal places.',
'declined' => 'The :attribute must be declined.',
'declined_if' => 'The :attribute must be declined when :other is :value.',
'different' => 'The :attribute and :other must be different.',
@@ -141,6 +143,7 @@ return [
'uploaded' => 'The :attribute failed to upload.',
'uppercase' => 'The :attribute must be uppercase.',
'url' => 'The :attribute must be a valid URL.',
+ 'ulid' => 'The :attribute must be a valid ULID.',
'uuid' => 'The :attribute must be a valid UUID.',
/*
diff --git a/package.json b/package.json
index a11c53af..0b32ba69 100644
--- a/package.json
+++ b/package.json
@@ -6,9 +6,9 @@
},
"devDependencies": {
"axios": "^1.1.2",
- "laravel-vite-plugin": "^0.7.0",
+ "laravel-vite-plugin": "^0.7.2",
"lodash": "^4.17.19",
"postcss": "^8.1.14",
- "vite": "^3.0.0"
+ "vite": "^4.0.0"
}
}
diff --git a/resources/js/bootstrap.js b/resources/js/bootstrap.js
index 366c49d0..a5b3eddc 100644
--- a/resources/js/bootstrap.js
+++ b/resources/js/bootstrap.js
@@ -26,6 +26,7 @@ window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
// window.Echo = new Echo({
// broadcaster: 'pusher',
// key: import.meta.env.VITE_PUSHER_APP_KEY,
+// cluster: import.meta.env.VITE_PUSHER_APP_CLUSTER ?? 'mt1',
// wsHost: import.meta.env.VITE_PUSHER_HOST ? import.meta.env.VITE_PUSHER_HOST : `ws-${import.meta.env.VITE_PUSHER_APP_CLUSTER}.pusher.com`,
// wsPort: import.meta.env.VITE_PUSHER_PORT ?? 80,
// wssPort: import.meta.env.VITE_PUSHER_PORT ?? 443,
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
index 0ad6097c..9faad4e8 100644
--- a/resources/views/welcome.blade.php
+++ b/resources/views/welcome.blade.php
@@ -49,7 +49,7 @@