Merge pull request #8821 from turbo124/v5-develop

v5.7.22
invoiceninja · Sep 21, 2023 · 334d72f · 334d72f
2 parents cfd6a6c + 79936ad
commit 334d72f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -49,6 +49,7 @@ jobs:
           
           mkdir -p ../public/react/${{ github.event.release.tag_name }}/
           cp -r dist/react/* ../public/react/${{ github.event.release.tag_name }}/
+          cp -r dist/react/* ../public/react/
 
           mkdir -p ../public/tinymce_6.4.2/tinymce/js/
           cp -r node_modules/tinymce ../public/tinymce_6.4.2/tinymce/js/

diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-5.7.21
+5.7.22
diff --git a/app/Console/Commands/ReactBuilder.php b/app/Console/Commands/ReactBuilder.php
@@ -48,19 +48,19 @@ public function handle()
     {
         $includes = '';
 
-        $directoryIterator = new \RecursiveDirectoryIterator(public_path('react'), \RecursiveDirectoryIterator::SKIP_DOTS);
+        $directoryIterator = new \RecursiveDirectoryIterator(public_path('react/v'.config('ninja.app_version').'/'), \RecursiveDirectoryIterator::SKIP_DOTS);
 
         foreach (new \RecursiveIteratorIterator($directoryIterator) as $file) {
             if ($file->getExtension() == 'js') {
                 if (str_contains($file->getFileName(), 'index-')) {
-                    $includes .= '<script type="module" crossorigin src="/react/v'.config('ninja.app_version').'/'.$file->getFileName().'"></script>'."\n";
+                    $includes .= '<script type="module" crossorigin src="/react/'.$file->getFileName().'"></script>'."\n";
                 } else {
-                    $includes .= '<link rel="modulepreload" href="/react/v'.config('ninja.app_version').'/'.$file->getFileName().'">'."\n";
+                    $includes .= '<link rel="modulepreload" href="/react/'.$file->getFileName().'">'."\n";
                 }
             }
 
             if (str_contains($file->getFileName(), '.css')) {
-                $includes .= '<link rel="stylesheet" href="/react/v'.config('ninja.app_version').'/'.$file->getFileName().'">'."\n";
+                $includes .= '<link rel="stylesheet" href="/react/'.$file->getFileName().'">'."\n";
             }
         }
 

diff --git a/config/ninja.php b/config/ninja.php
@@ -15,8 +15,8 @@
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => env('APP_VERSION','5.7.21'),
-    'app_tag' => env('APP_TAG','5.7.21'),
+    'app_version' => env('APP_VERSION','5.7.22'),
+    'app_tag' => env('APP_TAG','5.7.22'),
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', ''),