From 77fcca19f864578825d4f8a6576e75f3f918005b Mon Sep 17 00:00:00 2001 From: Adam Weston Date: Sun, 8 Jan 2023 12:28:50 -0500 Subject: [PATCH] fix/copy-configure-stubs --- .gitignore | 1 + configure.php | 22 ++++++++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 83c9b9f..a185f75 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ phpstan.neon testbench.yaml vendor node_modules +.DS_Store diff --git a/configure.php b/configure.php index b378f06..0609ad9 100644 --- a/configure.php +++ b/configure.php @@ -8,8 +8,10 @@ $gitEmail = run('git config user.email'); $authorEmail = ask('Author email', $gitEmail); $usernameGuess = explode(':', run('git config remote.origin.url'))[1]; -$usernameGuess = dirname($usernameGuess); -$usernameGuess = basename($usernameGuess); +if ($usernameGuess) { + $usernameGuess = dirname($usernameGuess); + $usernameGuess = basename($usernameGuess); +} $authorUsername = ask('Author username', $usernameGuess); $vendorName = ask('Vendor name', $authorUsername); @@ -83,9 +85,6 @@ if ($formsOnly) { ]); } else { if ($isTheme) { - copy(__DIR__.'/configure-stubs/theme/package.json', __DIR__.'/package.json'); - copy(__DIR__.'/configure-stubs/theme/plugin.css', __DIR__.'/resources/css/plugin.css'); - copy(__DIR__.'/configure-stubs/theme/tailwind.config.js', __DIR__.'/tailwind.config.js'); safeUnlink(__DIR__.'/src/SkeletonServiceProvider.php'); safeUnlink(__DIR__.'/src/Skeleton.php'); removeDirectory(__DIR__.'/config'); @@ -99,9 +98,6 @@ if ($formsOnly) { removeDirectory(__DIR__.'/src/Testing'); } else { safeUnlink(__DIR__.'/src/SkeletonTheme.php'); - copy(__DIR__.'/configure-stubs/package/package.json', __DIR__.'/package.json'); - copy(__DIR__.'/configure-stubs/package/plugin.css', __DIR__.'/resources/css/plugin.css'); - copy(__DIR__.'/configure-stubs/package/tailwind.config.js', __DIR__.'/tailwind.config.js'); } remove_composer_filament_deps([ @@ -110,6 +106,16 @@ if ($formsOnly) { ]); } +if ($isTheme) { + copy(__DIR__.'/configure-stubs/theme/package.json', __DIR__.'/package.json'); + copy(__DIR__.'/configure-stubs/theme/plugin.css', __DIR__.'/resources/css/plugin.css'); + copy(__DIR__.'/configure-stubs/theme/tailwind.config.js', __DIR__.'/tailwind.config.js'); +} else { + copy(__DIR__.'/configure-stubs/admin/package.json', __DIR__.'/package.json'); + copy(__DIR__.'/configure-stubs/admin/plugin.css', __DIR__.'/resources/css/plugin.css'); + copy(__DIR__.'/configure-stubs/admin/tailwind.config.js', __DIR__.'/tailwind.config.js'); +} + $files = (str_starts_with(strtoupper(PHP_OS), 'WIN') ? replaceForWindows() : replaceForAllOtherOSes()); foreach ($files as $file) {