Add default keys to remove

mpociot · mpociot · commit 8d405f45b1c0 · 2023-08-09T22:44:37.000+02:00
diff --git a/config/nativephp.php b/config/nativephp.php
@@ -41,8 +41,17 @@
     /**
      * A list of environment keys that should be removed from the
      * .env file when the application is bundled for production.
+     * You may use wildcards to match multiple keys.
      */
-    'cleanup_env_keys' => [],
+    'cleanup_env_keys' => [
+        'AWS_*',
+        'DO_SPACES_*',
+        '*_SECRET',
+        'NATIVEPHP_UPDATER_PATH',
+        'NATIVEPHP_APPLE_ID',
+        'NATIVEPHP_APPLE_ID_PASS',
+        'NATIVEPHP_APPLE_TEAM_ID',
+    ],
 
     /**
      * The NativePHP updater configuration.
diff --git a/src/Commands/MinifyApplicationCommand.php b/src/Commands/MinifyApplicationCommand.php
@@ -55,7 +55,7 @@ protected function cleanUpEnvFile(string $appPath): void
             ->filter(function (string $line) use ($cleanUpKeys) {
                 $key = Str::before($line, '=');
 
-                return ! in_array($key, $cleanUpKeys);
+                return ! Str::is($cleanUpKeys, $key);
             })
             ->join("\n");
 
diff --git a/src/NativeServiceProvider.php b/src/NativeServiceProvider.php
@@ -20,6 +20,7 @@ public function configurePackage(Package $package): void
             ->name('nativephp')
             ->hasCommands([
                 MigrateCommand::class,
+                MinifyApplicationCommand::class,
             ])
             ->hasConfigFile()
             ->hasRoute('api')
@@ -37,7 +38,6 @@ public function packageRegistered()
         if (config('nativephp-internal.running')) {
             Artisan::starting(function ($artisan) {
                 $artisan->resolveCommands([
-                    MinifyApplicationCommand::class,
                     LoadStartupConfigurationCommand::class,
                     LoadPHPConfigurationCommand::class,
                 ]);
