This commit is contained in:
David Bomba 2023-09-21 13:38:46 +10:00
parent cfd6a6ce7a
commit 79936adbb9
4 changed files with 8 additions and 7 deletions

View File

@ -49,6 +49,7 @@ jobs:
mkdir -p ../public/react/${{ github.event.release.tag_name }}/ 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/${{ github.event.release.tag_name }}/
cp -r dist/react/* ../public/react/
mkdir -p ../public/tinymce_6.4.2/tinymce/js/ mkdir -p ../public/tinymce_6.4.2/tinymce/js/
cp -r node_modules/tinymce ../public/tinymce_6.4.2/tinymce/js/ cp -r node_modules/tinymce ../public/tinymce_6.4.2/tinymce/js/

View File

@ -1 +1 @@
5.7.21 5.7.22

View File

@ -48,19 +48,19 @@ class ReactBuilder extends Command
{ {
$includes = ''; $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) { foreach (new \RecursiveIteratorIterator($directoryIterator) as $file) {
if ($file->getExtension() == 'js') { if ($file->getExtension() == 'js') {
if (str_contains($file->getFileName(), 'index-')) { 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 { } 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')) { 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";
} }
} }

View File

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