Merge branch 'new-asset-system' into vite-integration

hydephp · Nov 14, 2024 · 3687cea · 3687cea
2 parents 91297e8 + 22c59bb
commit 3687cea
Show file tree

Hide file tree

Showing 11 changed files with 47 additions and 45 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/config/hyde.php b/config/hyde.php
@@ -439,7 +439,6 @@
             // Should the dashboard show tips?
             'tips' => true,
         ],
-
     ],
 
     /*

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
         "@tailwindcss/typography": "^0.5.15",
         "autoprefixer": "^10.4.20",
         "hydefront": "^3.3.0",
-        "postcss": "^8.4.47",
+        "postcss": "^8.4.49",
         "prettier": "3.3.3",
         "tailwindcss": "^3.4.14",
         "vite": "^5.0.0"

diff --git a/packages/framework/config/hyde.php b/packages/framework/config/hyde.php
@@ -439,7 +439,6 @@
             // Should the dashboard show tips?
             'tips' => true,
         ],
-
     ],
 
     /*

diff --git a/packages/framework/src/Console/Commands/ServeCommand.php b/packages/framework/src/Console/Commands/ServeCommand.php
@@ -126,7 +126,7 @@ protected function configureOutput(): void
     protected function printStartMessage(): void
     {
         $this->useBasicOutput()
-            ? $this->output->writeln('<info>Starting the HydeRC server...</info> Press Ctrl+C to stop')
+            ? $this->output->writeln('<info>Starting the HydeRC server...</info> 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
@@ -28,7 +28,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()}");
@@ -37,7 +37,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()}");
@@ -46,7 +46,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()}");
@@ -55,7 +55,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()}");
@@ -66,7 +66,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()}");
@@ -77,7 +77,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()}");
@@ -88,7 +88,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()}");
@@ -99,7 +99,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()}");
@@ -110,7 +110,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()}");
@@ -121,7 +121,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()}");
@@ -133,7 +133,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);
     }
 
@@ -164,7 +164,7 @@ public function testHydeServeCommandPassesThroughProcessOutput()
             ->andReturn($mockProcess);
 
         $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);
     }
@@ -220,7 +220,7 @@ public function testHydeServeCommandWithViteOption()
             ->andReturn($mockServerProcess);
 
         $this->artisan('serve --no-ansi --vite')
-            ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
+            ->expectsOutput('Starting the HydeRC server... Use Ctrl+C to stop')
             ->expectsOutput('server output')
             ->expectsOutput('vite latest output')
             ->assertExitCode(0);
@@ -261,7 +261,7 @@ public function testHydeServeCommandWithViteOptionButViteNotRunning()
             ->andReturn($mockServerProcess);
 
         $this->artisan('serve --no-ansi --vite')
-            ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
+            ->expectsOutput('Starting the HydeRC server... Use Ctrl+C to stop')
             ->assertExitCode(0);
     }
 

diff --git a/packages/hydefront/package-lock.json b/packages/hydefront/package-lock.json
diff --git 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"
 }
diff --git a/packages/realtime-compiler/src/ConsoleOutput.php b/packages/realtime-compiler/src/ConsoleOutput.php
@@ -103,7 +103,7 @@ protected function formatLineForOutput(string $line): ?string
 
     protected function formatServerStartedLine(string $line): string
     {
-        return $this->formatLine(sprintf('PHP %s Development Server started. <span class="text-yellow-500">Press Ctrl+C to stop.</span>', PHP_VERSION), $this->parseDate($line), 'green-500');
+        return $this->formatLine(sprintf('PHP %s Development Server started. <span class="text-yellow-500">Use Ctrl+C to stop.</span>', PHP_VERSION), $this->parseDate($line), 'green-500');
     }
 
     protected function formatRequestLine(string $line): string

diff --git a/vite.config.js b/vite.config.js
@@ -45,7 +45,7 @@ export default defineConfig({
     },
     build: {
         outDir: '_media',
-        emptyOutDir: true,
+        emptyOutDir: false,
         rollupOptions: {
             input: [
                 resolve(__dirname, 'resources/assets/app.js'),
@@ -58,4 +58,4 @@ export default defineConfig({
             }
         }
     }
-});
+});
-Original file line number
+Diff line change
@@ Expand Up / @@ -439,7 +439,6 @@ @@
                 // Should the dashboard show tips?
                 'tips' => true,
             ],
         ],
         /*
@@ Expand Down @@