From 7e7edaffb2784fc13c5e071eba2b70fb35b3c898 Mon Sep 17 00:00:00 2001 From: Will Browning Date: Wed, 28 Feb 2024 09:32:02 +0000 Subject: [PATCH] Fixed #604 --- composer.json | 2 +- composer.lock | 71 ++++++++++++------------ package-lock.json | 30 +++++----- postfix/composer.lock | 38 ++++++------- resources/js/Pages/Settings/Security.vue | 2 +- resources/js/app.js | 2 +- resources/views/layouts/app.blade.php | 2 +- vite.config.mjs | 6 ++ 8 files changed, 80 insertions(+), 73 deletions(-) diff --git a/composer.json b/composer.json index 01ba5ca..1e34d36 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "php-mime-mail-parser/php-mime-mail-parser": "^8.0", "pragmarx/google2fa-laravel": "^2.0.0", "ramsey/uuid": "^4.0", - "tightenco/ziggy": "^1.6" + "tightenco/ziggy": "^2.0.0" }, "require-dev": { "fakerphp/faker": "^1.9.1", diff --git a/composer.lock b/composer.lock index 6ea9a0d..a8ff4ee 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "4f1f354547ae4442221199e2ee8f720c", + "content-hash": "7ae67087b11d887317770af9a29212ef", "packages": [ { "name": "asbiin/laravel-webauthn", @@ -288,16 +288,16 @@ }, { "name": "chillerlan/php-qrcode", - "version": "5.0.1", + "version": "5.0.2", "source": { "type": "git", "url": "https://github.com/chillerlan/php-qrcode.git", - "reference": "e81ed39ca3c94357aa021c7525fa9ffb451018d1" + "reference": "da5bdb82c8755f54de112b271b402aaa8df53269" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/chillerlan/php-qrcode/zipball/e81ed39ca3c94357aa021c7525fa9ffb451018d1", - "reference": "e81ed39ca3c94357aa021c7525fa9ffb451018d1", + "url": "https://api.github.com/repos/chillerlan/php-qrcode/zipball/da5bdb82c8755f54de112b271b402aaa8df53269", + "reference": "da5bdb82c8755f54de112b271b402aaa8df53269", "shasum": "" }, "require": { @@ -378,7 +378,7 @@ "type": "ko_fi" } ], - "time": "2024-01-07T19:37:03+00:00" + "time": "2024-02-27T14:37:26+00:00" }, { "name": "chillerlan/php-settings-container", @@ -2054,16 +2054,16 @@ }, { "name": "laravel/framework", - "version": "v10.45.1", + "version": "v10.46.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "dcf5d1d722b84ad38a5e053289130b6962f830bd" + "reference": "5e95946a8283a8d5c015035793f9c61c297e937f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/dcf5d1d722b84ad38a5e053289130b6962f830bd", - "reference": "dcf5d1d722b84ad38a5e053289130b6962f830bd", + "url": "https://api.github.com/repos/laravel/framework/zipball/5e95946a8283a8d5c015035793f9c61c297e937f", + "reference": "5e95946a8283a8d5c015035793f9c61c297e937f", "shasum": "" }, "require": { @@ -2256,20 +2256,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-02-21T14:07:36+00:00" + "time": "2024-02-27T16:46:54+00:00" }, { "name": "laravel/prompts", - "version": "v0.1.15", + "version": "v0.1.16", "source": { "type": "git", "url": "https://github.com/laravel/prompts.git", - "reference": "d814a27514d99b03c85aa42b22cfd946568636c1" + "reference": "ca6872ab6aec3ab61db3a61f83a6caf764ec7781" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/prompts/zipball/d814a27514d99b03c85aa42b22cfd946568636c1", - "reference": "d814a27514d99b03c85aa42b22cfd946568636c1", + "url": "https://api.github.com/repos/laravel/prompts/zipball/ca6872ab6aec3ab61db3a61f83a6caf764ec7781", + "reference": "ca6872ab6aec3ab61db3a61f83a6caf764ec7781", "shasum": "" }, "require": { @@ -2311,9 +2311,9 @@ ], "support": { "issues": "https://github.com/laravel/prompts/issues", - "source": "https://github.com/laravel/prompts/tree/v0.1.15" + "source": "https://github.com/laravel/prompts/tree/v0.1.16" }, - "time": "2023-12-29T22:37:42+00:00" + "time": "2024-02-21T19:25:27+00:00" }, { "name": "laravel/sanctum", @@ -8362,37 +8362,38 @@ }, { "name": "tightenco/ziggy", - "version": "v1.8.2", + "version": "v2.0.3", "source": { "type": "git", "url": "https://github.com/tighten/ziggy.git", - "reference": "939576ad0f3d3e633a9401c8c377bc7bc873ff35" + "reference": "3600edd4c5f788efcfbbfef726809ea929bb7a44" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tighten/ziggy/zipball/939576ad0f3d3e633a9401c8c377bc7bc873ff35", - "reference": "939576ad0f3d3e633a9401c8c377bc7bc873ff35", + "url": "https://api.github.com/repos/tighten/ziggy/zipball/3600edd4c5f788efcfbbfef726809ea929bb7a44", + "reference": "3600edd4c5f788efcfbbfef726809ea929bb7a44", "shasum": "" }, "require": { "ext-json": "*", - "laravel/framework": ">=5.4@dev" + "laravel/framework": ">=9.0", + "php": ">=8.1" }, "require-dev": { - "orchestra/testbench": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0", - "phpunit/phpunit": "^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0" + "orchestra/testbench": "^7.0 || ^8.0 || ^9.0", + "phpunit/phpunit": "^9.5 || ^10.3" }, "type": "library", "extra": { "laravel": { "providers": [ - "Tightenco\\Ziggy\\ZiggyServiceProvider" + "Tighten\\Ziggy\\ZiggyServiceProvider" ] } }, "autoload": { "psr-4": { - "Tightenco\\Ziggy\\": "src/" + "Tighten\\Ziggy\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -8413,7 +8414,7 @@ "email": "jacob@tighten.co" } ], - "description": "Generates a Blade directive exporting all of your named Laravel routes. Also provides a nice route() helper function in JavaScript.", + "description": "Use your Laravel named routes in JavaScript.", "homepage": "https://github.com/tighten/ziggy", "keywords": [ "Ziggy", @@ -8423,9 +8424,9 @@ ], "support": { "issues": "https://github.com/tighten/ziggy/issues", - "source": "https://github.com/tighten/ziggy/tree/v1.8.2" + "source": "https://github.com/tighten/ziggy/tree/v2.0.3" }, - "time": "2024-02-20T19:56:04+00:00" + "time": "2024-02-21T00:07:20+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -8893,16 +8894,16 @@ }, { "name": "web-token/jwt-library", - "version": "3.3.0", + "version": "3.3.1", "source": { "type": "git", "url": "https://github.com/web-token/jwt-library.git", - "reference": "5edf0f193425bb9c695a433180ddf9d263f55063" + "reference": "37a0665d89865d09579e484e5d7d70950d079198" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/web-token/jwt-library/zipball/5edf0f193425bb9c695a433180ddf9d263f55063", - "reference": "5edf0f193425bb9c695a433180ddf9d263f55063", + "url": "https://api.github.com/repos/web-token/jwt-library/zipball/37a0665d89865d09579e484e5d7d70950d079198", + "reference": "37a0665d89865d09579e484e5d7d70950d079198", "shasum": "" }, "require": { @@ -8974,7 +8975,7 @@ ], "support": { "issues": "https://github.com/web-token/jwt-library/issues", - "source": "https://github.com/web-token/jwt-library/tree/3.3.0" + "source": "https://github.com/web-token/jwt-library/tree/3.3.1" }, "funding": [ { @@ -8986,7 +8987,7 @@ "type": "patreon" } ], - "time": "2024-02-22T08:15:45+00:00" + "time": "2024-02-28T09:04:35+00:00" }, { "name": "webmozart/assert", diff --git a/package-lock.json b/package-lock.json index 02bdad9..3c1e4d0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -692,9 +692,9 @@ } }, "node_modules/@types/eslint": { - "version": "8.56.3", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.3.tgz", - "integrity": "sha512-PvSf1wfv2wJpVIFUMSb+i4PvqNYkB9Rkp9ZDO3oaWzq4SKhsQk4mrMBr3ZH06I0hKrVGLBacmgl8JM4WVjb9dg==", + "version": "8.56.4", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.4.tgz", + "integrity": "sha512-lG1GLUnL5vuRBGb3MgWUWLdGMH2Hps+pERuyQXCfWozuGKdnhf9Pbg4pkcrVUHjKrU7Rl+GCZ/299ObBXZFAxg==", "peer": true, "dependencies": { "@types/estree": "*", @@ -723,9 +723,9 @@ "peer": true }, "node_modules/@types/node": { - "version": "20.11.20", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.20.tgz", - "integrity": "sha512-7/rR21OS+fq8IyHTgtLkDK949uzsa6n8BkziAKtPVpugIkO6D+/ooXMvzXxDnZrmtXVfjb1bKQafYpb8s89LOg==", + "version": "20.11.21", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.21.tgz", + "integrity": "sha512-/ySDLGscFPNasfqStUuWWPfL78jompfIoVzLJPVVAHBh6rpG68+pI2Gk+fNLeI8/f1yPYL4s46EleVIc20F1Ow==", "peer": true, "dependencies": { "undici-types": "~5.26.4" @@ -1602,9 +1602,9 @@ "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==" }, "node_modules/electron-to-chromium": { - "version": "1.4.682", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.682.tgz", - "integrity": "sha512-oCglfs8yYKs9RQjJFOHonSnhikPK3y+0SvSYc/YpYJV//6rqc0/hbwd0c7vgK4vrl6y2gJAwjkhkSGWK+z4KRA==" + "version": "1.4.685", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.685.tgz", + "integrity": "sha512-yDYeobbTEe4TNooEzOQO6xFqg9XnAkVy2Lod1C1B2it8u47JNLYvl9nLDWBamqUakWB8Jc1hhS1uHUNYTNQdfw==" }, "node_modules/emoji-regex": { "version": "10.3.0", @@ -1621,9 +1621,9 @@ } }, "node_modules/enhanced-resolve": { - "version": "5.15.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz", - "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==", + "version": "5.15.1", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.1.tgz", + "integrity": "sha512-3d3JRbwsCLJsYgvb6NuWEG44jjPSOMuS73L/6+7BZuoKm3W+qXnSoIYVHi8dG7Qcg4inAY4jbzkZ7MnskePeDg==", "peer": true, "dependencies": { "graceful-fs": "^4.2.4", @@ -2275,9 +2275,9 @@ } }, "node_modules/laravel-vite-plugin": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/laravel-vite-plugin/-/laravel-vite-plugin-1.0.1.tgz", - "integrity": "sha512-laLEZUnSskIDZtLb2FNRdcjsRUhh1VOVvapbVGVTeaBPJTCF/b6gbPiX2dZdcH1RKoOE0an7L+2gnInk6K33Zw==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/laravel-vite-plugin/-/laravel-vite-plugin-1.0.2.tgz", + "integrity": "sha512-Mcclml10khYzBVxDwJro8wnVDwD4i7XOSEMACQNnarvTnHjrjXLLL+B/Snif2wYAyElsOqagJZ7VAinb/2vF5g==", "dev": true, "dependencies": { "picocolors": "^1.0.0", diff --git a/postfix/composer.lock b/postfix/composer.lock index 4f2f5bb..53713b7 100644 --- a/postfix/composer.lock +++ b/postfix/composer.lock @@ -290,16 +290,16 @@ }, { "name": "illuminate/collections", - "version": "v10.45.1", + "version": "v10.46.0", "source": { "type": "git", "url": "https://github.com/illuminate/collections.git", - "reference": "04c24117515ab9b701e4b28506d3f3c15d14bd5f" + "reference": "dd0c652dfac0901c17bcfac94fe792e615b56e12" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/collections/zipball/04c24117515ab9b701e4b28506d3f3c15d14bd5f", - "reference": "04c24117515ab9b701e4b28506d3f3c15d14bd5f", + "url": "https://api.github.com/repos/illuminate/collections/zipball/dd0c652dfac0901c17bcfac94fe792e615b56e12", + "reference": "dd0c652dfac0901c17bcfac94fe792e615b56e12", "shasum": "" }, "require": { @@ -341,11 +341,11 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-02-13T21:55:58+00:00" + "time": "2024-02-21T14:18:14+00:00" }, { "name": "illuminate/conditionable", - "version": "v10.45.1", + "version": "v10.46.0", "source": { "type": "git", "url": "https://github.com/illuminate/conditionable.git", @@ -391,7 +391,7 @@ }, { "name": "illuminate/container", - "version": "v10.45.1", + "version": "v10.46.0", "source": { "type": "git", "url": "https://github.com/illuminate/container.git", @@ -442,7 +442,7 @@ }, { "name": "illuminate/contracts", - "version": "v10.45.1", + "version": "v10.46.0", "source": { "type": "git", "url": "https://github.com/illuminate/contracts.git", @@ -490,16 +490,16 @@ }, { "name": "illuminate/database", - "version": "v10.45.1", + "version": "v10.46.0", "source": { "type": "git", "url": "https://github.com/illuminate/database.git", - "reference": "64394348243be403ac9edf21c400077304e005b2" + "reference": "d756278a38541ec2f25c75e2553398b37a6d4e42" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/database/zipball/64394348243be403ac9edf21c400077304e005b2", - "reference": "64394348243be403ac9edf21c400077304e005b2", + "url": "https://api.github.com/repos/illuminate/database/zipball/d756278a38541ec2f25c75e2553398b37a6d4e42", + "reference": "d756278a38541ec2f25c75e2553398b37a6d4e42", "shasum": "" }, "require": { @@ -559,11 +559,11 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-02-20T15:20:15+00:00" + "time": "2024-02-26T16:14:36+00:00" }, { "name": "illuminate/macroable", - "version": "v10.45.1", + "version": "v10.46.0", "source": { "type": "git", "url": "https://github.com/illuminate/macroable.git", @@ -609,16 +609,16 @@ }, { "name": "illuminate/support", - "version": "v10.45.1", + "version": "v10.46.0", "source": { "type": "git", "url": "https://github.com/illuminate/support.git", - "reference": "ef80b6c0d0faec648d0625f1bd2b604b61cba5e5" + "reference": "96d4512df39bee8cb60d50783f944a48242ea862" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/support/zipball/ef80b6c0d0faec648d0625f1bd2b604b61cba5e5", - "reference": "ef80b6c0d0faec648d0625f1bd2b604b61cba5e5", + "url": "https://api.github.com/repos/illuminate/support/zipball/96d4512df39bee8cb60d50783f944a48242ea862", + "reference": "96d4512df39bee8cb60d50783f944a48242ea862", "shasum": "" }, "require": { @@ -676,7 +676,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-02-16T10:04:27+00:00" + "time": "2024-02-26T22:20:06+00:00" }, { "name": "nesbot/carbon", diff --git a/resources/js/Pages/Settings/Security.vue b/resources/js/Pages/Settings/Security.vue index 2c1c12b..9cdbbf7 100644 --- a/resources/js/Pages/Settings/Security.vue +++ b/resources/js/Pages/Settings/Security.vue @@ -135,7 +135,7 @@ name="password_confirmation" id="password-confirm" v-model="updatePasswordForm.password_confirmation" - class="block w-full rounded-md border-0 py-1.5 text-grey-900 shadow-sm ring-1 ring-grey-300 placeholder:text-grey-400 focus:ring-2 focus:ring-inset focus:ring-indigo-600 sm:text-sm sm:leading-6" + class="block w-full rounded-md border-0 py-1.5 text-grey-900 shadow-sm ring-1 ring-grey-300 placeholder:text-grey-400 focus:ring-2 focus:ring-inset focus:ring-indigo-600 sm:text-base sm:leading-6" placeholder="********" required /> diff --git a/resources/js/app.js b/resources/js/app.js index 3fbf2ab..b1ccc4a 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -14,7 +14,7 @@ window.dayjs = dayjs import { createApp, h } from 'vue' import { createInertiaApp } from '@inertiajs/vue3' -import { ZiggyVue } from '../../vendor/tightenco/ziggy/dist/vue.m' +import { ZiggyVue } from 'ziggy-js' import Notifications from '@kyvg/vue3-notification' // Styles diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 3f6e113..397d2b2 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -15,8 +15,8 @@ - @routes @vite('resources/js/app.js') + @routes @inertiaHead diff --git a/vite.config.mjs b/vite.config.mjs index 4c91e55..62578e4 100644 --- a/vite.config.mjs +++ b/vite.config.mjs @@ -2,6 +2,7 @@ import { defineConfig, loadEnv } from 'vite' import laravel from 'laravel-vite-plugin' import vue from '@vitejs/plugin-vue' import fs from 'fs' +import { resolve } from 'path' export default defineConfig(({ command, mode }) => { const env = loadEnv(mode, process.cwd(), 'APP_URL') @@ -46,6 +47,11 @@ export default defineConfig(({ command, mode }) => { }), ], base: '', + resolve: { + alias: { + 'ziggy-js': resolve('vendor/tightenco/ziggy'), + }, + }, } })