Skip to content

Commit 3687cea

Browse files
emmadesilvaemmadesilva
committed
Merge branch 'new-asset-system' into vite-integration
2 parents 91297e8 + 22c59bb commit 3687cea

File tree

11 files changed

+47
-45
lines changed

11 files changed

+47
-45
lines changed

‎composer.lock‎

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/hyde.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,6 @@
439439
// Should the dashboard show tips?
440440
'tips' => true,
441441
],
442-
443442
],
444443

445444
/*

‎package-lock.json‎

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"@tailwindcss/typography": "^0.5.15",
99
"autoprefixer": "^10.4.20",
1010
"hydefront": "^3.3.0",
11-
"postcss": "^8.4.47",
11+
"postcss": "^8.4.49",
1212
"prettier": "3.3.3",
1313
"tailwindcss": "^3.4.14",
1414
"vite": "^5.0.0"

‎packages/framework/config/hyde.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,6 @@
439439
// Should the dashboard show tips?
440440
'tips' => true,
441441
],
442-
443442
],
444443

445444
/*

‎packages/framework/src/Console/Commands/ServeCommand.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ protected function configureOutput(): void
126126
protected function printStartMessage(): void
127127
{
128128
$this->useBasicOutput()
129-
? $this->output->writeln('<info>Starting the HydeRC server...</info> Press Ctrl+C to stop')
129+
? $this->output->writeln('<info>Starting the HydeRC server...</info> Use Ctrl+C to stop')
130130
: $this->console->printStartMessage($this->getHostSelection(), $this->getPortSelection(), $this->getEnvironmentVariables());
131131
}
132132

‎packages/framework/tests/Feature/Commands/ServeCommandTest.php‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ protected function setUp(): void
2828
public function testHydeServeCommand()
2929
{
3030
$this->artisan('serve --no-ansi')
31-
->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
31+
->expectsOutput('Starting the HydeRC server... Use Ctrl+C to stop')
3232
->assertExitCode(0);
3333

3434
Process::assertRan("php -S localhost:8080 {$this->binaryPath()}");
@@ -37,7 +37,7 @@ public function testHydeServeCommand()
3737
public function testHydeServeCommandWithPortOption()
3838
{
3939
$this->artisan('serve --no-ansi --port=8081')
40-
->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
40+
->expectsOutput('Starting the HydeRC server... Use Ctrl+C to stop')
4141
->assertExitCode(0);
4242

4343
Process::assertRan("php -S localhost:8081 {$this->binaryPath()}");
@@ -46,7 +46,7 @@ public function testHydeServeCommandWithPortOption()
4646
public function testHydeServeCommandWithHostOption()
4747
{
4848
$this->artisan('serve --no-ansi --host=foo')
49-
->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
49+
->expectsOutput('Starting the HydeRC server... Use Ctrl+C to stop')
5050
->assertExitCode(0);
5151

5252
Process::assertRan("php -S foo:8080 {$this->binaryPath()}");
@@ -55,7 +55,7 @@ public function testHydeServeCommandWithHostOption()
5555
public function testHydeServeCommandWithPortAndHostOption()
5656
{
5757
$this->artisan('serve --no-ansi --port=8081 --host=foo')
58-
->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
58+
->expectsOutput('Starting the HydeRC server... Use Ctrl+C to stop')
5959
->assertExitCode(0);
6060

6161
Process::assertRan("php -S foo:8081 {$this->binaryPath()}");
@@ -66,7 +66,7 @@ public function testHydeServeCommandWithPortDefinedInConfig()
6666
config(['hyde.server.port' => 8081]);
6767

6868
$this->artisan('serve --no-ansi')
69-
->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
69+
->expectsOutput('Starting the HydeRC server... Use Ctrl+C to stop')
7070
->assertExitCode(0);
7171

7272
Process::assertRan("php -S localhost:8081 {$this->binaryPath()}");
@@ -77,7 +77,7 @@ public function testHydeServeCommandWithPortDefinedInConfigAndPortOption()
7777
config(['hyde.server.port' => 8081]);
7878

7979
$this->artisan('serve --no-ansi --port=8082')
80-
->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
80+
->expectsOutput('Starting the HydeRC server... Use Ctrl+C to stop')
8181
->assertExitCode(0);
8282

8383
Process::assertRan("php -S localhost:8082 {$this->binaryPath()}");
@@ -88,7 +88,7 @@ public function testHydeServeCommandWithPortMissingInConfigAndPortOption()
8888
config(['hyde.server.port' => null]);
8989

9090
$this->artisan('serve --no-ansi --port=8081')
91-
->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
91+
->expectsOutput('Starting the HydeRC server... Use Ctrl+C to stop')
9292
->assertExitCode(0);
9393

9494
Process::assertRan("php -S localhost:8081 {$this->binaryPath()}");
@@ -99,7 +99,7 @@ public function testHydeServeCommandWithHostDefinedInConfig()
9999
config(['hyde.server.host' => 'foo']);
100100

101101
$this->artisan('serve --no-ansi')
102-
->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
102+
->expectsOutput('Starting the HydeRC server... Use Ctrl+C to stop')
103103
->assertExitCode(0);
104104

105105
Process::assertRan("php -S foo:8080 {$this->binaryPath()}");
@@ -110,7 +110,7 @@ public function testHydeServeCommandWithHostDefinedInConfigAndHostOption()
110110
config(['hyde.server.host' => 'foo']);
111111

112112
$this->artisan('serve --no-ansi --host=bar')
113-
->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
113+
->expectsOutput('Starting the HydeRC server... Use Ctrl+C to stop')
114114
->assertExitCode(0);
115115

116116
Process::assertRan("php -S bar:8080 {$this->binaryPath()}");
@@ -121,7 +121,7 @@ public function testHydeServeCommandWithHostMissingInConfigAndHostOption()
121121
config(['hyde.server.host' => null]);
122122

123123
$this->artisan('serve --no-ansi --host=foo')
124-
->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
124+
->expectsOutput('Starting the HydeRC server... Use Ctrl+C to stop')
125125
->assertExitCode(0);
126126

127127
Process::assertRan("php -S foo:8080 {$this->binaryPath()}");
@@ -133,7 +133,7 @@ public function testHydeServeCommandWithInvalidConfigValue()
133133
config(['hyde.server.port' => 'foo']);
134134

135135
$this->artisan('serve --no-ansi')
136-
->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
136+
->expectsOutput('Starting the HydeRC server... Use Ctrl+C to stop')
137137
->assertExitCode(0);
138138
}
139139

@@ -164,7 +164,7 @@ public function testHydeServeCommandPassesThroughProcessOutput()
164164
->andReturn($mockProcess);
165165

166166
$this->artisan('serve --no-ansi')
167-
->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
167+
->expectsOutput('Starting the HydeRC server... Use Ctrl+C to stop')
168168
->expectsOutput('foo')
169169
->assertExitCode(0);
170170
}
@@ -220,7 +220,7 @@ public function testHydeServeCommandWithViteOption()
220220
->andReturn($mockServerProcess);
221221

222222
$this->artisan('serve --no-ansi --vite')
223-
->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
223+
->expectsOutput('Starting the HydeRC server... Use Ctrl+C to stop')
224224
->expectsOutput('server output')
225225
->expectsOutput('vite latest output')
226226
->assertExitCode(0);
@@ -261,7 +261,7 @@ public function testHydeServeCommandWithViteOptionButViteNotRunning()
261261
->andReturn($mockServerProcess);
262262

263263
$this->artisan('serve --no-ansi --vite')
264-
->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
264+
->expectsOutput('Starting the HydeRC server... Use Ctrl+C to stop')
265265
->assertExitCode(0);
266266
}
267267

‎packages/hydefront/package-lock.json‎

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/hydefront/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
},
2424
"homepage": "https://github.com/hydephp/hydefront#readme",
2525
"devDependencies": {
26-
"sass": "1.80.6"
26+
"sass": "1.80.7"
2727
},
2828
"main": "dist/hyde.css"
2929
}

‎packages/realtime-compiler/src/ConsoleOutput.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ protected function formatLineForOutput(string $line): ?string
103103

104104
protected function formatServerStartedLine(string $line): string
105105
{
106-
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');
106+
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');
107107
}
108108

109109
protected function formatRequestLine(string $line): string

0 commit comments

Comments
 (0)