Skip to content

Commit e2aed60

Browse files
VITE_INBOX: update HMR
VITE_INBOX: update AGENTS.md VITE_INBOX: remove webpack-login, change to vite VITE_INBOX: update task controller, remove unnecesary files changed VITE_INBOX: remove unnecesary files changed by extension, reduce the PR VITE_INBOX: remove tasks js files from webpack VITE_INBOX: remove tasks js files from webpack VITE_INBOX: update testCase VITE_INBOX: update rutes password/* because the last changes in login
1 parent c4365ce commit e2aed60

52 files changed

Lines changed: 548 additions & 45812 deletions

Some content is hidden

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

ProcessMaker/Http/Controllers/Auth/LoginController.php

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -115,14 +115,7 @@ public function showLoginForm(Request $request)
115115
false,
116116
$this->sessionSameSite()
117117
);
118-
119-
$viteView = json_decode(config('app.vite_view') ?: '{}', true);
120-
if (!empty($viteView['app.login_view'])) {
121-
$loginView = $viteView['app.login_view'];
122-
} else {
123-
$loginView = empty(config('app.login_view')) ? 'auth.login' : config('app.login_view');
124-
}
125-
118+
$loginView = empty(config('app.login_view')) ? 'auth.login' : config('app.login_view');
126119
$response = response(view($loginView, compact('addons', 'block')));
127120
$response->withCookie($cookie);
128121

ProcessMaker/Http/Controllers/TaskController.php

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,7 @@ public function index()
8383
$metricsApiEndpoint = EnvironmentVariable::getMetricsApiEndpoint();
8484
}
8585

86-
$viteView = json_decode(config('app.vite_view') ?: '{}', true);
87-
$tasksView = 'tasks.index';
88-
if (!empty($viteView['tasks.index'])) {
89-
$tasksView = $viteView['tasks.index'];
90-
}
91-
92-
return view($tasksView, compact(
86+
return view('tasks.index', compact(
9387
// User and Authentication related
9488
'currentUser',
9589
'userFilter',

ProcessMaker/Providers/ProcessMakerServiceProvider.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
use Illuminate\Support\Facades\Log;
2121
use Illuminate\Support\Facades\Route;
2222
use Illuminate\Support\Facades\URL;
23+
use Illuminate\Support\Facades\Vite;
2324
use Laravel\Horizon\Horizon;
2425
use Laravel\Horizon\SystemProcessCounter;
2526
use Laravel\Horizon\WorkerCommandString;
@@ -83,6 +84,10 @@ public function boot(): void
8384
// Track the start time for service providers boot
8485
self::$bootStart = microtime(true);
8586

87+
// Vite hot file must not be public/hot — that file is reserved for Mix HMR
88+
// and would make mix('js/...') URLs point at the Vite dev server (404).
89+
Vite::useHotFile(storage_path('vite.hot'));
90+
8691
// Set the current tenant
8792
$this->setCurrentTenantForConsoleCommands();
8893

config/app.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,5 +331,4 @@
331331
'claim_timeout_minutes' => env('SCHEDULER_CLAIM_TIMEOUT_MINUTES', 5),
332332
'bpmn_timer_overlap_minutes' => env('SCHEDULER_BPMN_TIMER_OVERLAP_MINUTES', 5),
333333
],
334-
'vite_view' => env('VITE_VIEW', ''),
335334
];

package.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
"private": true,
99
"scripts": {
1010
"postinstall": "mkdir -p public/css/precompiled && cp -rf node_modules/npm-font-open-sans public/css/precompiled/npm-font-open-sans && cp -rf node_modules/bootstrap/scss public/css/precompiled/bootstrap && cp -rf node_modules/@fortawesome/fontawesome-free public/css/precompiled/fontawesome-free && cp -rf node_modules/@fontsource/poppins public/css/precompiled/poppins && cp -rf node_modules/@processmaker/vue-multiselect/dist/vue-multiselect.min.css public/css/precompiled",
11-
"dev": "npm run development && mix --mix-config=webpack-login.mix.js",
11+
"dev": "npm run development",
1212
"development": "mix",
1313
"watch": "mix watch",
1414
"watch-poll": "mix watch -- --watch-options-poll=1000",
1515
"hot": "mix watch --hot",
1616
"prod": "npm run production",
17-
"production": "mix --production && mix --mix-config=webpack-login.mix.js --production",
17+
"production": "mix --production && vite build",
1818
"test": "cross-env NODE_ENV=test jest",
1919
"test-submission": "cross-env NODE_ENV=test jest tests/js/SubmissionDataFilter.test.js tests/js/SubmitMethod.test.js",
2020
"test-watch": "npm run test -- --watch --notify",
@@ -160,5 +160,8 @@
160160
"engines": {
161161
"npm": ">=8",
162162
"node": ">=16"
163+
},
164+
"overrides": {
165+
"webpack": "5.88.2"
163166
}
164167
}

0 commit comments

Comments
 (0)