diff --git a/src/CommandRouteGenerator.php b/src/CommandRouteGenerator.php index cfa359ad..64330a88 100644 --- a/src/CommandRouteGenerator.php +++ b/src/CommandRouteGenerator.php @@ -42,7 +42,7 @@ public function handle(Filesystem $filesystem) if ($this->option('types') || $this->option('types-only')) { $types = config('ziggy.output.types', Types::class); - $filesystem->put(base_path("{$name}.d.ts"), new $types($ziggy)); + $filesystem->put(base_path("{$name}-types.d.ts"), new $types($ziggy)); } $this->info('Files generated!'); diff --git a/tests/Unit/CommandRouteGeneratorTest.php b/tests/Unit/CommandRouteGeneratorTest.php index 12956a9d..15e365be 100644 --- a/tests/Unit/CommandRouteGeneratorTest.php +++ b/tests/Unit/CommandRouteGeneratorTest.php @@ -119,18 +119,18 @@ if (windows_os()) { // `json_encode` always uses Unix line endings file_put_contents( - base_path('resources/js/ziggy.d.ts'), - preg_replace('/\r?\n/', "\r\n", file_get_contents(base_path('resources/js/ziggy.d.ts'))), + base_path('resources/js/ziggy-types.d.ts'), + preg_replace('/\r?\n/', "\r\n", file_get_contents(base_path('resources/js/ziggy-types.d.ts'))), ); } - expect(base_path('resources/js/ziggy.d.ts'))->toEqualFile('./tests/fixtures/ziggy.d.ts'); + expect(base_path('resources/js/ziggy-types.d.ts'))->toEqualFile('./tests/fixtures/ziggy.d.ts'); }); test('generate dts file without generating routes file', function () { artisan('ziggy:generate --types-only'); - expect(base_path('resources/js/ziggy.d.ts'))->toBeFile(); + expect(base_path('resources/js/ziggy-types.d.ts'))->toBeFile(); expect(base_path('resources/js/ziggy.js'))->not->toBeFile(); }); @@ -139,8 +139,8 @@ artisan('ziggy:generate --types-only'); - expect(base_path('resources/js/custom.d.ts'))->toBeFile(); - expect(base_path('resources/js/ziggy.d.ts'))->not->toBeFile(); + expect(base_path('resources/js/custom-types.d.ts'))->toBeFile(); + expect(base_path('resources/js/ziggy-types.d.ts'))->not->toBeFile(); }); test('generate correct routes and dts files based on provided arguments', function (string $args, array $files) { @@ -153,11 +153,11 @@ expect(array_map(base_path(...), $files))->each->toBeFile(); })->with([ - ['resources/js/x.js --types', ['resources/js/x.js', 'resources/js/x.d.ts']], - ['resources/js/y.ts --types', ['resources/js/y.js', 'resources/js/y.d.ts']], - ['resources/js/z.d.ts --types', ['resources/js/z.js', 'resources/js/z.d.ts']], - ['resources/scripts/foo --types', ['resources/scripts/foo.js', 'resources/scripts/foo.d.ts']], - ['resources/js --types', ['resources/js/ziggy.js', 'resources/js/ziggy.d.ts']], + ['resources/js/x.js --types', ['resources/js/x.js', 'resources/js/x-types.d.ts']], + ['resources/js/y.ts --types', ['resources/js/y.js', 'resources/js/y-types.d.ts']], + ['resources/js/z.d.ts --types', ['resources/js/z.js', 'resources/js/z-types.d.ts']], + ['resources/scripts/foo --types', ['resources/scripts/foo.js', 'resources/scripts/foo-types.d.ts']], + ['resources/js --types', ['resources/js/ziggy.js', 'resources/js/ziggy-types.d.ts']], ]); class CustomFile extends File