From 9f5590897b64657b6bd92af3dc9608ea747d2786 Mon Sep 17 00:00:00 2001 From: Kyle Milloy Date: Mon, 19 Jul 2021 12:49:10 -0600 Subject: [PATCH 1/4] add gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e43b0f9 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.DS_Store From 60e9d110f19f72f8b4250ef87ea4d4cb89e9ac98 Mon Sep 17 00:00:00 2001 From: Ron Yu Date: Mon, 26 Jul 2021 11:18:46 -0600 Subject: [PATCH 2/4] fixed issue #2 --- src/Preset.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Preset.php b/src/Preset.php index 94b8541..74e55c0 100644 --- a/src/Preset.php +++ b/src/Preset.php @@ -63,7 +63,7 @@ private static function updateFiles() $filesystem = new Filesystem(); // Append the default .gitignore - $filesystem->append(base_path('.gitignore'), "\n".implode("\n", static::GITIGNORES)); + $filesystem->append(base_path('.gitignore'), "\n".implode("\n", static::GITIGNORES)."\n"); // Code style configuration $filesystem->copy(__DIR__.'/../stubs/.editorconfig', base_path('.editorconfig')); @@ -123,7 +123,7 @@ private static function updateDirectories() $filesystem = new Filesystem(); // copy github actions configurations - $filesystem->copyDirectory(__DIR__ . '/../stubs/.github', base_path('.github')); + $filesystem->copyDirectory(__DIR__.'/../stubs/.github', base_path('.github')); } protected static function updatePackageArray(array $packages) @@ -154,7 +154,6 @@ protected static function updatePackageScripts() $packages = json_decode(file_get_contents(base_path('package.json')), true); - $packages[$configurationKey] = array_merge( static::NPM_SCRIPT_TO_ADD, $packages[$configurationKey] From 28f0c8aaabb108af78e278ea316257bb16978e5c Mon Sep 17 00:00:00 2001 From: Ron Yu Date: Mon, 26 Jul 2021 11:20:38 -0600 Subject: [PATCH 3/4] fixed issue #3 --- stubs/.editorconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stubs/.editorconfig b/stubs/.editorconfig index c2fc31a..bab4c37 100644 --- a/stubs/.editorconfig +++ b/stubs/.editorconfig @@ -14,5 +14,5 @@ trim_trailing_whitespace = false [*.{yml,yaml}] indent_size = 2 -[*.vue] +[*.{vue,js}] indent_size = 2 From 2d78af09804d3371b7b89433e6ce12f61c81d6c6 Mon Sep 17 00:00:00 2001 From: Ron Yu Date: Mon, 26 Jul 2021 11:56:29 -0600 Subject: [PATCH 4/4] added auth.json to .gitignore list for preset --- src/Preset.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Preset.php b/src/Preset.php index 74e55c0..d731c76 100644 --- a/src/Preset.php +++ b/src/Preset.php @@ -38,7 +38,8 @@ class Preset extends BasePreset const GITIGNORES = [ '.DS_Store', - '.php-cs-fixer.cache' + '.php-cs-fixer.cache', + 'auth.json', ]; public static function install()