From 8b9566e540b8a01ed59a06373ff96166785b4ae6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Feb 2024 09:54:49 +0000 Subject: [PATCH 1/9] build(deps-dev): Bump laravel/dusk from 7.12.1 to 7.12.3 Bumps [laravel/dusk](https://github.com/laravel/dusk) from 7.12.1 to 7.12.3. - [Release notes](https://github.com/laravel/dusk/releases) - [Changelog](https://github.com/laravel/dusk/blob/7.x/CHANGELOG.md) - [Commits](https://github.com/laravel/dusk/compare/v7.12.1...v7.12.3) --- updated-dependencies: - dependency-name: laravel/dusk dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- composer.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/composer.lock b/composer.lock index 8667ae8e..9e3182fd 100644 --- a/composer.lock +++ b/composer.lock @@ -653,16 +653,16 @@ }, { "name": "doctrine/inflector", - "version": "2.0.9", + "version": "2.0.10", "source": { "type": "git", "url": "https://github.com/doctrine/inflector.git", - "reference": "2930cd5ef353871c821d5c43ed030d39ac8cfe65" + "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/2930cd5ef353871c821d5c43ed030d39ac8cfe65", - "reference": "2930cd5ef353871c821d5c43ed030d39ac8cfe65", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/5817d0659c5b50c9b950feb9af7b9668e2c436bc", + "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc", "shasum": "" }, "require": { @@ -724,7 +724,7 @@ ], "support": { "issues": "https://github.com/doctrine/inflector/issues", - "source": "https://github.com/doctrine/inflector/tree/2.0.9" + "source": "https://github.com/doctrine/inflector/tree/2.0.10" }, "funding": [ { @@ -740,7 +740,7 @@ "type": "tidelift" } ], - "time": "2024-01-15T18:05:13+00:00" + "time": "2024-02-18T20:23:39+00:00" }, { "name": "doctrine/lexer", @@ -9848,16 +9848,16 @@ }, { "name": "laravel/dusk", - "version": "v7.12.1", + "version": "v7.12.3", "source": { "type": "git", "url": "https://github.com/laravel/dusk.git", - "reference": "e7c2509034753dd4b2339b082884eef357673bf7" + "reference": "676df11326c29d11ee566cd046f8e49e0ce6eb0a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/dusk/zipball/e7c2509034753dd4b2339b082884eef357673bf7", - "reference": "e7c2509034753dd4b2339b082884eef357673bf7", + "url": "https://api.github.com/repos/laravel/dusk/zipball/676df11326c29d11ee566cd046f8e49e0ce6eb0a", + "reference": "676df11326c29d11ee566cd046f8e49e0ce6eb0a", "shasum": "" }, "require": { @@ -9918,9 +9918,9 @@ ], "support": { "issues": "https://github.com/laravel/dusk/issues", - "source": "https://github.com/laravel/dusk/tree/v7.12.1" + "source": "https://github.com/laravel/dusk/tree/v7.12.3" }, - "time": "2024-01-03T22:54:48+00:00" + "time": "2024-02-15T13:38:58+00:00" }, { "name": "laravel/pint", From 816e9a984b5941fc3f542951f68dab934785924e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Feb 2024 09:04:55 +0000 Subject: [PATCH 2/9] build(deps-dev): Bump laravel/sail from 1.27.4 to 1.28.0 Bumps [laravel/sail](https://github.com/laravel/sail) from 1.27.4 to 1.28.0. - [Release notes](https://github.com/laravel/sail/releases) - [Changelog](https://github.com/laravel/sail/blob/1.x/CHANGELOG.md) - [Commits](https://github.com/laravel/sail/compare/v1.27.4...v1.28.0) --- updated-dependencies: - dependency-name: laravel/sail dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- composer.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/composer.lock b/composer.lock index 9e3182fd..179e6138 100644 --- a/composer.lock +++ b/composer.lock @@ -1944,16 +1944,16 @@ }, { "name": "laravel/framework", - "version": "v10.44.0", + "version": "v10.45.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "1199dbe361787bbe9648131a79f53921b4148cf6" + "reference": "8b08d8cd79f8093eb51a8c59e21647bedfbf05f2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/1199dbe361787bbe9648131a79f53921b4148cf6", - "reference": "1199dbe361787bbe9648131a79f53921b4148cf6", + "url": "https://api.github.com/repos/laravel/framework/zipball/8b08d8cd79f8093eb51a8c59e21647bedfbf05f2", + "reference": "8b08d8cd79f8093eb51a8c59e21647bedfbf05f2", "shasum": "" }, "require": { @@ -2146,7 +2146,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-02-13T16:01:16+00:00" + "time": "2024-02-20T15:32:48+00:00" }, { "name": "laravel/horizon", @@ -9990,16 +9990,16 @@ }, { "name": "laravel/sail", - "version": "v1.27.4", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/laravel/sail.git", - "reference": "3047e1a157fad968cc5f6e620d5cbe5c0867fffd" + "reference": "a05861ca9b04558b1ec1f36cff521a271a259b6c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/sail/zipball/3047e1a157fad968cc5f6e620d5cbe5c0867fffd", - "reference": "3047e1a157fad968cc5f6e620d5cbe5c0867fffd", + "url": "https://api.github.com/repos/laravel/sail/zipball/a05861ca9b04558b1ec1f36cff521a271a259b6c", + "reference": "a05861ca9b04558b1ec1f36cff521a271a259b6c", "shasum": "" }, "require": { @@ -10048,7 +10048,7 @@ "issues": "https://github.com/laravel/sail/issues", "source": "https://github.com/laravel/sail" }, - "time": "2024-02-08T15:24:21+00:00" + "time": "2024-02-20T15:11:00+00:00" }, { "name": "maximebf/debugbar", From 253561701da925edc5199e5a4e96e6d24ae29e73 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Feb 2024 10:26:55 +0000 Subject: [PATCH 3/9] build(deps): Bump laravel/horizon from 5.23.0 to 5.23.1 Bumps [laravel/horizon](https://github.com/laravel/horizon) from 5.23.0 to 5.23.1. - [Release notes](https://github.com/laravel/horizon/releases) - [Changelog](https://github.com/laravel/horizon/blob/5.x/CHANGELOG.md) - [Commits](https://github.com/laravel/horizon/compare/v5.23.0...v5.23.1) --- updated-dependencies: - dependency-name: laravel/horizon dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 179e6138..061ebd0c 100644 --- a/composer.lock +++ b/composer.lock @@ -2150,16 +2150,16 @@ }, { "name": "laravel/horizon", - "version": "v5.23.0", + "version": "v5.23.1", "source": { "type": "git", "url": "https://github.com/laravel/horizon.git", - "reference": "0b1bf46b21c397fdbe80b1ab54451fd227934508" + "reference": "7475de7eb5b465c2da84218002fe1a62b8175da0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/horizon/zipball/0b1bf46b21c397fdbe80b1ab54451fd227934508", - "reference": "0b1bf46b21c397fdbe80b1ab54451fd227934508", + "url": "https://api.github.com/repos/laravel/horizon/zipball/7475de7eb5b465c2da84218002fe1a62b8175da0", + "reference": "7475de7eb5b465c2da84218002fe1a62b8175da0", "shasum": "" }, "require": { @@ -2222,9 +2222,9 @@ ], "support": { "issues": "https://github.com/laravel/horizon/issues", - "source": "https://github.com/laravel/horizon/tree/v5.23.0" + "source": "https://github.com/laravel/horizon/tree/v5.23.1" }, - "time": "2024-02-12T18:36:34+00:00" + "time": "2024-02-20T15:14:10+00:00" }, { "name": "laravel/prompts", From 4ef0a4f6f1b15df1b67cc6a58fa9a270d65b979a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Feb 2024 10:30:19 +0000 Subject: [PATCH 4/9] build(deps-dev): Bump laravel/pint from 1.13.11 to 1.14.0 Bumps [laravel/pint](https://github.com/laravel/pint) from 1.13.11 to 1.14.0. - [Release notes](https://github.com/laravel/pint/releases) - [Changelog](https://github.com/laravel/pint/blob/main/CHANGELOG.md) - [Commits](https://github.com/laravel/pint/compare/v1.13.11...v1.14.0) --- updated-dependencies: - dependency-name: laravel/pint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index 061ebd0c..1741ac81 100644 --- a/composer.lock +++ b/composer.lock @@ -9924,16 +9924,16 @@ }, { "name": "laravel/pint", - "version": "v1.13.11", + "version": "v1.14.0", "source": { "type": "git", "url": "https://github.com/laravel/pint.git", - "reference": "60a163c3e7e3346a1dec96d3e6f02e6465452552" + "reference": "6b127276e3f263f7bb17d5077e9e0269e61b2a0e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/pint/zipball/60a163c3e7e3346a1dec96d3e6f02e6465452552", - "reference": "60a163c3e7e3346a1dec96d3e6f02e6465452552", + "url": "https://api.github.com/repos/laravel/pint/zipball/6b127276e3f263f7bb17d5077e9e0269e61b2a0e", + "reference": "6b127276e3f263f7bb17d5077e9e0269e61b2a0e", "shasum": "" }, "require": { @@ -9986,7 +9986,7 @@ "issues": "https://github.com/laravel/pint/issues", "source": "https://github.com/laravel/pint" }, - "time": "2024-02-13T17:20:13+00:00" + "time": "2024-02-20T17:38:05+00:00" }, { "name": "laravel/sail", From 78db64f1dc0f4d29daa4918cf2ff2fd56155edd5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 Feb 2024 09:40:10 +0000 Subject: [PATCH 5/9] build(deps): Bump laravel/framework from 10.45.0 to 10.45.1 Bumps [laravel/framework](https://github.com/laravel/framework) from 10.45.0 to 10.45.1. - [Release notes](https://github.com/laravel/framework/releases) - [Changelog](https://github.com/laravel/framework/blob/10.x/CHANGELOG.md) - [Commits](https://github.com/laravel/framework/compare/v10.45.0...v10.45.1) --- updated-dependencies: - dependency-name: laravel/framework dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index 1741ac81..b7f37f9c 100644 --- a/composer.lock +++ b/composer.lock @@ -1944,16 +1944,16 @@ }, { "name": "laravel/framework", - "version": "v10.45.0", + "version": "v10.45.1", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "8b08d8cd79f8093eb51a8c59e21647bedfbf05f2" + "reference": "dcf5d1d722b84ad38a5e053289130b6962f830bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/8b08d8cd79f8093eb51a8c59e21647bedfbf05f2", - "reference": "8b08d8cd79f8093eb51a8c59e21647bedfbf05f2", + "url": "https://api.github.com/repos/laravel/framework/zipball/dcf5d1d722b84ad38a5e053289130b6962f830bd", + "reference": "dcf5d1d722b84ad38a5e053289130b6962f830bd", "shasum": "" }, "require": { @@ -2146,7 +2146,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-02-20T15:32:48+00:00" + "time": "2024-02-21T14:07:36+00:00" }, { "name": "laravel/horizon", From 19172a8ab316cfcef5302360d1eee800c1b346bd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 23 Feb 2024 16:01:31 +0000 Subject: [PATCH 6/9] build(deps-dev): Bump vimeo/psalm from 5.22.1 to 5.22.2 Bumps [vimeo/psalm](https://github.com/vimeo/psalm) from 5.22.1 to 5.22.2. - [Release notes](https://github.com/vimeo/psalm/releases) - [Commits](https://github.com/vimeo/psalm/compare/5.22.1...5.22.2) --- updated-dependencies: - dependency-name: vimeo/psalm dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- composer.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/composer.lock b/composer.lock index b7f37f9c..182f46df 100644 --- a/composer.lock +++ b/composer.lock @@ -11277,21 +11277,21 @@ }, { "name": "phpdocumentor/type-resolver", - "version": "1.8.0", + "version": "1.8.2", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "fad452781b3d774e3337b0c0b245dd8e5a4455fc" + "reference": "153ae662783729388a584b4361f2545e4d841e3c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/fad452781b3d774e3337b0c0b245dd8e5a4455fc", - "reference": "fad452781b3d774e3337b0c0b245dd8e5a4455fc", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/153ae662783729388a584b4361f2545e4d841e3c", + "reference": "153ae662783729388a584b4361f2545e4d841e3c", "shasum": "" }, "require": { "doctrine/deprecations": "^1.0", - "php": "^7.4 || ^8.0", + "php": "^7.3 || ^8.0", "phpdocumentor/reflection-common": "^2.0", "phpstan/phpdoc-parser": "^1.13" }, @@ -11329,9 +11329,9 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.0" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.2" }, - "time": "2024-01-11T11:49:22+00:00" + "time": "2024-02-23T11:10:43+00:00" }, { "name": "phpstan/phpdoc-parser", @@ -13619,16 +13619,16 @@ }, { "name": "vimeo/psalm", - "version": "5.22.1", + "version": "5.22.2", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "e9dad66e11274315dac27e08349c628c7d6a1a43" + "reference": "d768d914152dbbf3486c36398802f74e80cfde48" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/e9dad66e11274315dac27e08349c628c7d6a1a43", - "reference": "e9dad66e11274315dac27e08349c628c7d6a1a43", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/d768d914152dbbf3486c36398802f74e80cfde48", + "reference": "d768d914152dbbf3486c36398802f74e80cfde48", "shasum": "" }, "require": { @@ -13725,7 +13725,7 @@ "issues": "https://github.com/vimeo/psalm/issues", "source": "https://github.com/vimeo/psalm" }, - "time": "2024-02-15T22:52:31+00:00" + "time": "2024-02-22T23:39:07+00:00" }, { "name": "zbateson/mail-mime-parser", From 7e6a047bc8ba4239b3c27c0b85cfb77e272ab323 Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Fri, 23 Feb 2024 16:10:04 +0000 Subject: [PATCH 7/9] Remove PHP 8.2 Added 8.4 as well for testing purposes --- .github/workflows/phpunit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 433e1a15..e0b510e1 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: operating-system: ['ubuntu-latest'] - php-versions: ['8.2', '8.3'] + php-versions: ['8.3', '8.4'] phpunit-versions: ['latest'] services: From 811f968fb9d535a007fe34f98bd23f5480036652 Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Fri, 23 Feb 2024 16:14:47 +0000 Subject: [PATCH 8/9] Run just 8.3 tests --- .github/workflows/phpunit.yml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index e0b510e1..e1765ef3 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -9,12 +9,6 @@ jobs: name: PHPUnit test suite - strategy: - matrix: - operating-system: ['ubuntu-latest'] - php-versions: ['8.3', '8.4'] - phpunit-versions: ['latest'] - services: postgres: image: postgres:latest @@ -32,10 +26,10 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: ${{ matrix.php-versions }} + php-version: '8.3' extensions: mbstring, intl, phpredis, imagick coverage: xdebug - tools: phpunit:${{ matrix.phpunit-versions }} + tools: phpunit env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -51,9 +45,9 @@ jobs: uses: actions/cache@v3 with: path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-php-${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.lock') }} + key: ${{ runner.os }}-php-8.3-composer-${{ hashFiles('**/composer.lock') }} restore-keys: | - ${{ runner.os }}-php-${{ matrix.php-version }}-composer- + ${{ runner.os }}-php-8.3-composer- - name: Install Composer Dependencies run: composer install --quiet --no-ansi --no-interaction --no-progress From f770235e86d01109f41eb5fa648ebe7477bb9889 Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Fri, 23 Feb 2024 16:35:48 +0000 Subject: [PATCH 9/9] Use system fonts for better webperf --- .env.example | 2 -- config/app.php | 11 ----------- public/assets/css/variables.css | 6 +++--- resources/views/master.blade.php | 3 --- 4 files changed, 3 insertions(+), 19 deletions(-) diff --git a/.env.example b/.env.example index 5b52d82b..0b76aa53 100644 --- a/.env.example +++ b/.env.example @@ -86,6 +86,4 @@ LOG_SLACK_WEBHOOK_URL= FLARE_KEY= IGNITION_OPEN_AI_KEY= -FONT_LINK= - BRIDGY_MASTODON_TOKEN= diff --git a/config/app.php b/config/app.php index 2c80a4e3..3a419461 100644 --- a/config/app.php +++ b/config/app.php @@ -144,17 +144,6 @@ return [ // 'store' => 'redis', ], - /* - |-------------------------------------------------------------------------- - | Font Link - |-------------------------------------------------------------------------- - | - | Which URL should the app load custom fonts from - | - */ - - 'font_link' => env('FONT_LINK'), - /* |-------------------------------------------------------------------------- | Autoloaded Service Providers diff --git a/public/assets/css/variables.css b/public/assets/css/variables.css index b571ff20..cd0b7448 100644 --- a/public/assets/css/variables.css +++ b/public/assets/css/variables.css @@ -1,8 +1,8 @@ :root { /* Font Family */ - --font-family-headings: "Archer SSm A", "Archer SSm B", serif; - --font-family-body: "Verlag A", "Verlag B", sans-serif; - --font-family-monospace: "Operator Mono SSm A", "Operator Mono SSm B", monospace; + --font-family-headings: Rockwell, 'Rockwell Nova', 'Roboto Slab', 'DejaVu Serif', 'Sitka Small', serif; + --font-family-body: Charter, 'Bitstream Charter', 'Sitka Text', Cambria, serif; + --font-family-monospace: ui-monospace, 'Cascadia Code', 'Source Code Pro', Menlo, Consolas, 'DejaVu Sans Mono', monospace;; /* Font Size */ --font-size-sm: 0.75rem; /* 12px */ diff --git a/resources/views/master.blade.php b/resources/views/master.blade.php index 88b5e7f1..5c4f09d9 100644 --- a/resources/views/master.blade.php +++ b/resources/views/master.blade.php @@ -4,9 +4,6 @@ @yield('title'){{ config('app.name') }} - @if (!empty(config('app.font_link'))) - - @endif