From 57623025e03c99f6c59dc6341cee146e7262642a Mon Sep 17 00:00:00 2001 From: Adam Weston Date: Sun, 8 Jan 2023 12:34:01 -0500 Subject: [PATCH] Revert "fix/copy-configure-stubs" This reverts commit 77fcca19f864578825d4f8a6576e75f3f918005b. --- .gitignore | 1 - configure.php | 22 ++++++++-------------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index a185f75..83c9b9f 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,3 @@ phpstan.neon testbench.yaml vendor node_modules -.DS_Store diff --git a/configure.php b/configure.php index 0609ad9..b378f06 100644 --- a/configure.php +++ b/configure.php @@ -8,10 +8,8 @@ $gitEmail = run('git config user.email'); $authorEmail = ask('Author email', $gitEmail); $usernameGuess = explode(':', run('git config remote.origin.url'))[1]; -if ($usernameGuess) { - $usernameGuess = dirname($usernameGuess); - $usernameGuess = basename($usernameGuess); -} +$usernameGuess = dirname($usernameGuess); +$usernameGuess = basename($usernameGuess); $authorUsername = ask('Author username', $usernameGuess); $vendorName = ask('Vendor name', $authorUsername); @@ -85,6 +83,9 @@ 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'); @@ -98,6 +99,9 @@ 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([ @@ -106,16 +110,6 @@ 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) {