Skip to content

Commit 7ea656b

Browse files
authored
Merge pull request #8916 from ProcessMaker/VITE_INBOX
VITE LOGIN INBOX: Migrating Login and Inbox paths to Vite
2 parents 30a0c64 + 91b5ca2 commit 7ea656b

194 files changed

Lines changed: 6380 additions & 47062 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ yarn-error.log
2020
/public/img
2121
/public/fonts
2222
/public/mix-manifest.json
23+
/public/build
24+
/public/hot
2325
/public/stats.json
2426
tests/js/coverage
2527
tests/coverage-report

ProcessMaker/Http/Controllers/Process/ScreenBuilderController.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ public function edit(ScreenBuilderManager $manager, Screen $screen, $processId =
4343

4444
return view('processes.screen-builder.screen', [
4545
'screen' => $screen,
46+
'type' => strtoupper($screen->type ?? 'FORM'),
4647
'manager' => $manager,
4748
'autoSaveDelay' => config('versions.delay.process', 5000),
4849
'isVersionsInstalled' => PackageHelper::isPmPackageVersionsInstalled(),

ProcessMaker/Http/Controllers/RequestController.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,9 @@ public function screenPreview(ProcessRequest $request, ProcessRequestToken $task
269269
$manager = app(ScreenBuilderManager::class);
270270
event(new ScreenBuilderStarting($manager, ($request->summary_screen) ? $request->summary_screen->type : 'FORM'));
271271

272-
return view('requests.preview', compact('request', 'screen', 'manager', 'data'));
272+
$type = strtoupper($screen->type ?? 'FORM');
273+
274+
return view('requests.preview', compact('request', 'screen', 'manager', 'data', 'type'));
273275
}
274276

275277
/**

ProcessMaker/Providers/ProcessMakerServiceProvider.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
use Illuminate\Support\Facades\Log;
2222
use Illuminate\Support\Facades\Route;
2323
use Illuminate\Support\Facades\URL;
24+
use Illuminate\Support\Facades\Vite;
2425
use Laravel\Horizon\Horizon;
2526
use Laravel\Horizon\SystemProcessCounter;
2627
use Laravel\Horizon\WorkerCommandString;
@@ -87,6 +88,10 @@ public function boot(): void
8788
// Track the start time for service providers boot
8889
self::$bootStart = microtime(true);
8990

91+
// Vite hot file must not be public/hot — that file is reserved for Mix HMR
92+
// and would make mix('js/...') URLs point at the Vite dev server (404).
93+
Vite::useHotFile(storage_path('vite.hot'));
94+
9095
// Set the current tenant
9196
$this->setCurrentTenantForConsoleCommands();
9297

0 commit comments

Comments
 (0)