From 5e126d90c9bc3ec2198123b81802a6d726507326 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2024 21:50:37 +0000 Subject: [PATCH 1/7] Bump postcss from 8.4.48 to 8.4.49 Bumps [postcss](https://github.com/postcss/postcss) from 8.4.48 to 8.4.49. - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss/compare/8.4.48...8.4.49) --- updated-dependencies: - dependency-name: postcss dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index f52bf634020..303b51ab3b7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "autoprefixer": "^10.4.20", "hydefront": "^3.4.0", "laravel-mix": "^6.0.49", - "postcss": "^8.4.47", + "postcss": "^8.4.49", "prettier": "3.3.3", "tailwindcss": "^3.4.14" } @@ -6649,9 +6649,9 @@ } }, "node_modules/postcss": { - "version": "8.4.48", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.48.tgz", - "integrity": "sha512-GCRK8F6+Dl7xYniR5a4FYbpBzU8XnZVeowqsQFYdcXuSbChgiks7qybSkbvnaeqv0G0B+dd9/jJgH8kkLDQeEA==", + "version": "8.4.49", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz", + "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==", "dev": true, "funding": [ { @@ -14583,9 +14583,9 @@ } }, "postcss": { - "version": "8.4.48", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.48.tgz", - "integrity": "sha512-GCRK8F6+Dl7xYniR5a4FYbpBzU8XnZVeowqsQFYdcXuSbChgiks7qybSkbvnaeqv0G0B+dd9/jJgH8kkLDQeEA==", + "version": "8.4.49", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz", + "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==", "dev": true, "requires": { "nanoid": "^3.3.7", diff --git a/package.json b/package.json index 58420d69e15..d8da0ed1bc6 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "autoprefixer": "^10.4.20", "hydefront": "^3.4.0", "laravel-mix": "^6.0.49", - "postcss": "^8.4.47", + "postcss": "^8.4.49", "prettier": "3.3.3", "tailwindcss": "^3.4.14" } From 896bd53057c3d56a91d5e251f46f1eb5464bc465 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2024 09:50:24 +0000 Subject: [PATCH 2/7] Bump jetbrains/phpstorm-attributes from 1.1 to 1.2 Bumps [jetbrains/phpstorm-attributes](https://github.com/JetBrains/phpstorm-attributes) from 1.1 to 1.2. - [Release notes](https://github.com/JetBrains/phpstorm-attributes/releases) - [Commits](https://github.com/JetBrains/phpstorm-attributes/compare/1.1...1.2) --- updated-dependencies: - dependency-name: jetbrains/phpstorm-attributes dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- composer.lock | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/composer.lock b/composer.lock index a8e3e56cfbe..a841a15d206 100644 --- a/composer.lock +++ b/composer.lock @@ -1127,11 +1127,11 @@ }, { "name": "hyde/framework", - "version": "dev-master", + "version": "dev-main", "dist": { "type": "path", "url": "./packages/framework", - "reference": "4512c1ec8a45b9ab81ab3f97efb1c1184e91ced6" + "reference": "784479be93b9882e4416fcec249de2e839f72df4" }, "require": { "illuminate/support": "^10.0", @@ -1177,7 +1177,7 @@ }, { "name": "hyde/publications", - "version": "dev-bump-composer-dependencies", + "version": "dev-main", "dist": { "type": "path", "url": "./packages/publications", @@ -1224,7 +1224,7 @@ }, { "name": "hyde/ui-kit", - "version": "dev-bump-composer-dependencies", + "version": "dev-main", "dist": { "type": "path", "url": "./packages/ui-kit", @@ -7859,7 +7859,7 @@ }, { "name": "hyde/monorepo-dev-tools", - "version": "dev-bump-composer-dependencies", + "version": "dev-main", "dist": { "type": "path", "url": "./monorepo/DevTools", @@ -7885,11 +7885,11 @@ }, { "name": "hyde/realtime-compiler", - "version": "dev-master", + "version": "dev-main", "dist": { "type": "path", "url": "./packages/realtime-compiler", - "reference": "8dede06db83f19a82dd542ca52504a8f2327acfa" + "reference": "6a68a736b9cb318aaaa6ee9c82ea508b0d45a985" }, "require": { "desilva/microserve": "^2.0", @@ -7941,7 +7941,7 @@ }, { "name": "hyde/testing", - "version": "dev-bump-composer-dependencies", + "version": "dev-main", "dist": { "type": "path", "url": "./packages/testing", @@ -8188,16 +8188,16 @@ }, { "name": "jetbrains/phpstorm-attributes", - "version": "1.1", + "version": "1.2", "source": { "type": "git", "url": "https://github.com/JetBrains/phpstorm-attributes.git", - "reference": "22fb28d679deceedba8366dbae65cc8ebfc17e26" + "reference": "64de815a4509c29e00d5e3474087fd24c171afc2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/JetBrains/phpstorm-attributes/zipball/22fb28d679deceedba8366dbae65cc8ebfc17e26", - "reference": "22fb28d679deceedba8366dbae65cc8ebfc17e26", + "url": "https://api.github.com/repos/JetBrains/phpstorm-attributes/zipball/64de815a4509c29e00d5e3474087fd24c171afc2", + "reference": "64de815a4509c29e00d5e3474087fd24c171afc2", "shasum": "" }, "type": "library", @@ -8224,9 +8224,9 @@ ], "support": { "issues": "https://youtrack.jetbrains.com/newIssue?project=WI", - "source": "https://github.com/JetBrains/phpstorm-attributes/tree/1.1" + "source": "https://github.com/JetBrains/phpstorm-attributes/tree/1.2" }, - "time": "2023-09-01T08:50:25+00:00" + "time": "2024-10-11T10:46:19+00:00" }, { "name": "laravel/dusk", From a0bf7ad2f470b1b2b577be8d53bda1572abe1d28 Mon Sep 17 00:00:00 2001 From: Caen De Silva Date: Tue, 12 Nov 2024 11:30:43 +0100 Subject: [PATCH 3/7] Shorten the realtime compiler server start message --- RELEASE_NOTES.md | 1 + .../src/Console/Commands/ServeCommand.php | 2 +- .../Feature/Commands/ServeCommandTest.php | 24 +++++++++---------- .../realtime-compiler/src/ConsoleOutput.php | 2 +- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 0d9efd91c09..5ff93709b79 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -27,6 +27,7 @@ This serves two purposes: - Updated to HydeFront v3.4 in https://github.com/hydephp/develop/pull/1803 - Realtime Compiler: Virtual routes are now managed through the service container in https://github.com/hydephp/develop/pull/1858 - Realtime Compiler: Improved the dashboard layout in https://github.com/hydephp/develop/pull/1866 +- Realtime Compiler: Shorten the realtime compiler server start message from "Press Ctrl+C to stop" to "Use Ctrl+C to stop" to better fit 80 column terminals in https://github.com/hydephp/develop/pull/2017 ### Deprecated - The `PostAuthor::getName()` method is now deprecated and will be removed in v2. (use `$author->name` instead) in https://github.com/hydephp/develop/pull/1794 diff --git a/packages/framework/src/Console/Commands/ServeCommand.php b/packages/framework/src/Console/Commands/ServeCommand.php index 86008ee805e..bcb8e11a192 100644 --- a/packages/framework/src/Console/Commands/ServeCommand.php +++ b/packages/framework/src/Console/Commands/ServeCommand.php @@ -101,7 +101,7 @@ protected function configureOutput(): void protected function printStartMessage(): void { $this->useBasicOutput() - ? $this->output->writeln('Starting the HydeRC server... Press Ctrl+C to stop') + ? $this->output->writeln('Starting the HydeRC server... Use Ctrl+C to stop') : $this->console->printStartMessage($this->getHostSelection(), $this->getPortSelection(), $this->getEnvironmentVariables()); } diff --git a/packages/framework/tests/Feature/Commands/ServeCommandTest.php b/packages/framework/tests/Feature/Commands/ServeCommandTest.php index c8569cc38ae..2744c673fb0 100644 --- a/packages/framework/tests/Feature/Commands/ServeCommandTest.php +++ b/packages/framework/tests/Feature/Commands/ServeCommandTest.php @@ -27,7 +27,7 @@ protected function setUp(): void public function testHydeServeCommand() { $this->artisan('serve --no-ansi') - ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop') + ->expectsOutput('Starting the HydeRC server... Use Ctrl+C to stop') ->assertExitCode(0); Process::assertRan("php -S localhost:8080 {$this->binaryPath()}"); @@ -36,7 +36,7 @@ public function testHydeServeCommand() public function testHydeServeCommandWithPortOption() { $this->artisan('serve --no-ansi --port=8081') - ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop') + ->expectsOutput('Starting the HydeRC server... Use Ctrl+C to stop') ->assertExitCode(0); Process::assertRan("php -S localhost:8081 {$this->binaryPath()}"); @@ -45,7 +45,7 @@ public function testHydeServeCommandWithPortOption() public function testHydeServeCommandWithHostOption() { $this->artisan('serve --no-ansi --host=foo') - ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop') + ->expectsOutput('Starting the HydeRC server... Use Ctrl+C to stop') ->assertExitCode(0); Process::assertRan("php -S foo:8080 {$this->binaryPath()}"); @@ -54,7 +54,7 @@ public function testHydeServeCommandWithHostOption() public function testHydeServeCommandWithPortAndHostOption() { $this->artisan('serve --no-ansi --port=8081 --host=foo') - ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop') + ->expectsOutput('Starting the HydeRC server... Use Ctrl+C to stop') ->assertExitCode(0); Process::assertRan("php -S foo:8081 {$this->binaryPath()}"); @@ -65,7 +65,7 @@ public function testHydeServeCommandWithPortDefinedInConfig() config(['hyde.server.port' => 8081]); $this->artisan('serve --no-ansi') - ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop') + ->expectsOutput('Starting the HydeRC server... Use Ctrl+C to stop') ->assertExitCode(0); Process::assertRan("php -S localhost:8081 {$this->binaryPath()}"); @@ -76,7 +76,7 @@ public function testHydeServeCommandWithPortDefinedInConfigAndPortOption() config(['hyde.server.port' => 8081]); $this->artisan('serve --no-ansi --port=8082') - ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop') + ->expectsOutput('Starting the HydeRC server... Use Ctrl+C to stop') ->assertExitCode(0); Process::assertRan("php -S localhost:8082 {$this->binaryPath()}"); @@ -87,7 +87,7 @@ public function testHydeServeCommandWithPortMissingInConfigAndPortOption() config(['hyde.server.port' => null]); $this->artisan('serve --no-ansi --port=8081') - ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop') + ->expectsOutput('Starting the HydeRC server... Use Ctrl+C to stop') ->assertExitCode(0); Process::assertRan("php -S localhost:8081 {$this->binaryPath()}"); @@ -98,7 +98,7 @@ public function testHydeServeCommandWithHostDefinedInConfig() config(['hyde.server.host' => 'foo']); $this->artisan('serve --no-ansi') - ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop') + ->expectsOutput('Starting the HydeRC server... Use Ctrl+C to stop') ->assertExitCode(0); Process::assertRan("php -S foo:8080 {$this->binaryPath()}"); @@ -109,7 +109,7 @@ public function testHydeServeCommandWithHostDefinedInConfigAndHostOption() config(['hyde.server.host' => 'foo']); $this->artisan('serve --no-ansi --host=bar') - ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop') + ->expectsOutput('Starting the HydeRC server... Use Ctrl+C to stop') ->assertExitCode(0); Process::assertRan("php -S bar:8080 {$this->binaryPath()}"); @@ -120,7 +120,7 @@ public function testHydeServeCommandWithHostMissingInConfigAndHostOption() config(['hyde.server.host' => null]); $this->artisan('serve --no-ansi --host=foo') - ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop') + ->expectsOutput('Starting the HydeRC server... Use Ctrl+C to stop') ->assertExitCode(0); Process::assertRan("php -S foo:8080 {$this->binaryPath()}"); @@ -132,7 +132,7 @@ public function testHydeServeCommandWithInvalidConfigValue() config(['hyde.server.port' => 'foo']); $this->artisan('serve --no-ansi') - ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop') + ->expectsOutput('Starting the HydeRC server... Use Ctrl+C to stop') ->assertExitCode(0); } @@ -158,7 +158,7 @@ public function testHydeServeCommandPassesThroughProcessOutput() ->andReturnSelf(); $this->artisan('serve --no-ansi') - ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop') + ->expectsOutput('Starting the HydeRC server... Use Ctrl+C to stop') ->expectsOutput('foo') ->assertExitCode(0); } diff --git a/packages/realtime-compiler/src/ConsoleOutput.php b/packages/realtime-compiler/src/ConsoleOutput.php index a96cd0329be..99868f6254c 100644 --- a/packages/realtime-compiler/src/ConsoleOutput.php +++ b/packages/realtime-compiler/src/ConsoleOutput.php @@ -101,7 +101,7 @@ protected function formatLineForOutput(string $line): ?string protected function formatServerStartedLine(string $line): string { - return $this->formatLine(sprintf('PHP %s Development Server started. Press Ctrl+C to stop.', PHP_VERSION), $this->parseDate($line), 'green-500'); + return $this->formatLine(sprintf('PHP %s Development Server started. Use Ctrl+C to stop.', PHP_VERSION), $this->parseDate($line), 'green-500'); } protected function formatRequestLine(string $line): string From dc487081b5fcc801a59284652da4f61831971b4d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Nov 2024 22:07:11 +0000 Subject: [PATCH 4/7] Bump sass from 1.80.6 to 1.80.7 in /packages/hydefront Bumps [sass](https://github.com/sass/dart-sass) from 1.80.6 to 1.80.7. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md) - [Commits](https://github.com/sass/dart-sass/compare/1.80.6...1.80.7) --- updated-dependencies: - dependency-name: sass dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- packages/hydefront/package-lock.json | 16 ++++++++-------- packages/hydefront/package.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/hydefront/package-lock.json b/packages/hydefront/package-lock.json index 4691bcf7d20..7a33288c0e0 100644 --- a/packages/hydefront/package-lock.json +++ b/packages/hydefront/package-lock.json @@ -9,7 +9,7 @@ "version": "3.4.0", "license": "MIT", "devDependencies": { - "sass": "1.80.6" + "sass": "1.80.7" } }, "node_modules/@parcel/watcher": { @@ -341,9 +341,9 @@ } }, "node_modules/immutable": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.6.tgz", - "integrity": "sha512-Ju0+lEMyzMVZarkTn/gqRpdqd5dOPaz1mCZ0SH3JV6iFw81PldE/PEB1hWVEA288HPt4WXW8O7AWxB10M+03QQ==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.0.2.tgz", + "integrity": "sha512-1NU7hWZDkV7hJ4PJ9dur9gTNQ4ePNPN4k9/0YhwjzykTi/+3Q5pF93YU5QoVj8BuOnhLgaY8gs0U2pj4kSYVcw==", "dev": true }, "node_modules/is-extglob": { @@ -427,13 +427,13 @@ } }, "node_modules/sass": { - "version": "1.80.6", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.80.6.tgz", - "integrity": "sha512-ccZgdHNiBF1NHBsWvacvT5rju3y1d/Eu+8Ex6c21nHp2lZGLBEtuwc415QfiI1PJa1TpCo3iXwwSRjRpn2Ckjg==", + "version": "1.80.7", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.80.7.tgz", + "integrity": "sha512-MVWvN0u5meytrSjsU7AWsbhoXi1sc58zADXFllfZzbsBT1GHjjar6JwBINYPRrkx/zqnQ6uqbQuHgE95O+C+eQ==", "dev": true, "dependencies": { "chokidar": "^4.0.0", - "immutable": "^4.0.0", + "immutable": "^5.0.2", "source-map-js": ">=0.6.2 <2.0.0" }, "bin": { diff --git a/packages/hydefront/package.json b/packages/hydefront/package.json index 83ef4743354..c2f3db810dc 100644 --- a/packages/hydefront/package.json +++ b/packages/hydefront/package.json @@ -23,7 +23,7 @@ }, "homepage": "https://github.com/hydephp/hydefront#readme", "devDependencies": { - "sass": "1.80.6" + "sass": "1.80.7" }, "main": "dist/hyde.css" } From a66da8e1450ac2ddb36676d3d22db028338a03ac Mon Sep 17 00:00:00 2001 From: Caen De Silva Date: Thu, 14 Nov 2024 15:27:15 +0100 Subject: [PATCH 5/7] Document realtime compiler options --- docs/extensions/realtime-compiler.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/extensions/realtime-compiler.md b/docs/extensions/realtime-compiler.md index b20f2fb3928..706b5a5dff3 100644 --- a/docs/extensions/realtime-compiler.md +++ b/docs/extensions/realtime-compiler.md @@ -21,6 +21,16 @@ This will start a local development server at `http://localhost:8080` >warning Please note that the server is designed for local development, and should not be used on a public network. +### Options + +- `--host=`: [default: "localhost"] +- `--port=`: [default: 8080] +- `--save-preview=`: Should the served page be saved to disk? (Overrides config setting) +- `--dashboard=`: Enable the realtime compiler dashboard. (Overrides config setting) +- `--pretty-urls=`: Enable pretty URLs. (Overrides config setting) +- `--play-cdn=`: Enable the Tailwind Play CDN. (Overrides config setting) +- `--open=false`: Open the site preview in the browser. + ### Configuration The server can be configured in the `config/hyde.php` file to change the port, host, and to customize its features. From 67280c373f10f82386f74dbd74d2348d05a8af54 Mon Sep 17 00:00:00 2001 From: Caen De Silva Date: Thu, 14 Nov 2024 15:28:19 +0100 Subject: [PATCH 6/7] Match configuration example to actual configuration --- docs/extensions/realtime-compiler.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/docs/extensions/realtime-compiler.md b/docs/extensions/realtime-compiler.md index 706b5a5dff3..05b126d00dd 100644 --- a/docs/extensions/realtime-compiler.md +++ b/docs/extensions/realtime-compiler.md @@ -39,9 +39,29 @@ The server can be configured in the `config/hyde.php` file to change the port, h // filepath config/hyde.php 'server' => [ + // The default port the preview is served on 'port' => env('SERVER_PORT', 8080), + + // The default host the preview is served on 'host' => env('SERVER_HOST', 'localhost'), + + // Should preview pages be saved to the output directory? 'save_preview' => true, + + // Should the live edit feature be enabled? + 'live_edit' => env('SERVER_LIVE_EDIT', true), + + // Configure the realtime compiler dashboard + 'dashboard' => [ + // Should the realtime compiler dashboard be enabled? + 'enabled' => env('SERVER_DASHBOARD', true), + + // Can the dashboard make edits to the project file system? + 'interactive' => true, + + // Should the dashboard show tips? + 'tips' => true, + ], ], ``` From a97c30951e7b44daa363441a65becfa747f08527 Mon Sep 17 00:00:00 2001 From: Caen De Silva Date: Thu, 14 Nov 2024 15:28:52 +0100 Subject: [PATCH 7/7] Format config documentation --- config/hyde.php | 1 - packages/framework/config/hyde.php | 1 - 2 files changed, 2 deletions(-) diff --git a/config/hyde.php b/config/hyde.php index 33d0ccc6140..3d41f7da554 100644 --- a/config/hyde.php +++ b/config/hyde.php @@ -449,7 +449,6 @@ // Should the dashboard show tips? 'tips' => true, ], - ], /* diff --git a/packages/framework/config/hyde.php b/packages/framework/config/hyde.php index 33d0ccc6140..3d41f7da554 100644 --- a/packages/framework/config/hyde.php +++ b/packages/framework/config/hyde.php @@ -449,7 +449,6 @@ // Should the dashboard show tips? 'tips' => true, ], - ], /*