From 3001745a171940871675232b42c41c99c54aabec Mon Sep 17 00:00:00 2001
From: tasso94 <3015690+tasso94@users.noreply.github.com>
Date: Mon, 3 Jul 2023 14:50:04 +0200
Subject: [PATCH] fix(webapps): refactor to use asset module instead of loaders
(#3494)
related to camunda/camunda-bpm-platform#3401
---
.../camunda-commons-ui/lib/analytics/index.js | 2 +-
.../camunda-commons-ui/lib/auth/page/login.js | 2 +-
.../lib/directives/engineSelect.js | 2 +-
.../lib/directives/inPlaceTextField.js | 2 +-
.../widgets/annotation/cam-annotation-edit.js | 2 +-
.../annotation/cam-annotation-modal.js | 2 +-
.../bpmn-viewer/cam-widget-bpmn-viewer.js | 2 +-
.../widgets/cam-share-link/cam-share-link.js | 2 +-
.../widgets/clipboard/cam-widget-clipboard.js | 2 +-
.../cmmn-viewer/cam-widget-cmmn-viewer.js | 2 +-
.../lib/widgets/debug/cam-widget-debug.js | 2 +-
.../dmn-viewer/cam-widget-dmn-viewer.js | 2 +-
.../lib/widgets/footer/cam-widget-footer.js | 2 +-
.../lib/widgets/header/cam-widget-header.js | 4 +-
.../inline-field/cam-widget-inline-field.js | 4 +-
.../lib/widgets/loader/cam-widget-loader.js | 2 +-
.../widgets/password/cam-widget-password.js | 2 +-
.../search-pill/cam-widget-search-pill.js | 2 +-
.../lib/widgets/search/cam-widget-search.js | 2 +-
.../cam-widget-selection-type.js | 2 +-
.../widgets/variable/cam-variable-utils.js | 4 +-
.../widgets/variable/cam-widget-variable.js | 2 +-
.../cam-widget-variables-table.js | 4 +-
webapps/frontend/package-lock.json | 79 ------------
webapps/frontend/package.json | 2 -
.../client/scripts/camunda-admin-bootstrap.js | 6 +-
.../ui/admin/client/scripts/index.html | 22 ++--
.../admin/client/scripts/pages/analytics.js | 2 +-
.../client/scripts/pages/authorizations.js | 4 +-
.../admin/client/scripts/pages/dashboard.js | 2 +-
.../admin/client/scripts/pages/diagnostics.js | 2 +-
.../client/scripts/pages/execution-metrics.js | 2 +-
.../admin/client/scripts/pages/groupCreate.js | 2 +-
.../admin/client/scripts/pages/groupEdit.js | 6 +-
.../ui/admin/client/scripts/pages/groups.js | 2 +-
.../ui/admin/client/scripts/pages/setup.js | 2 +-
.../ui/admin/client/scripts/pages/system.js | 2 +-
.../scripts/pages/systemSettingsGeneral.js | 2 +-
.../client/scripts/pages/tenantCreate.js | 2 +-
.../admin/client/scripts/pages/tenantEdit.js | 4 +-
.../ui/admin/client/scripts/pages/tenants.js | 2 +-
.../admin/client/scripts/pages/userCreate.js | 2 +-
.../ui/admin/client/scripts/pages/userEdit.js | 8 +-
.../ui/admin/client/scripts/pages/users.js | 2 +-
.../app/views/dashboard/authorizations.js | 2 +-
.../base/app/views/dashboard/groups.js | 2 +-
.../base/app/views/dashboard/system.js | 2 +-
.../base/app/views/dashboard/tenants.js | 2 +-
.../plugins/base/app/views/dashboard/users.js | 2 +-
.../client/scripts/batches/config/routes.js | 2 +-
.../scripts/batches/controllers/view-ctrl.js | 4 +-
.../scripts/camunda-cockpit-bootstrap.js | 6 +-
.../callActivityOverlay.js | 2 +-
.../variables/variable-add-dialog.js | 2 +-
.../variables/variable-inspect-dialog.js | 2 +-
.../variables/variable-upload-dialog.js | 2 +-
.../directives/activityInstanceTree.js | 2 +-
.../scripts/directives/change-version.js | 2 +-
.../scripts/directives/decisionTable.js | 2 +-
.../directives/diagramStatisticsLoader.js | 2 +-
.../client/scripts/directives/incidentsTab.js | 4 +-
.../scripts/directives/processDiagram.js | 2 +-
.../directives/processDiagramPreview.js | 2 +-
.../client/scripts/directives/quickFilter.js | 2 +-
.../scripts/directives/sortableTableHead.js | 2 +-
.../time-to-live/time-to-live-dialog.js | 2 +-
.../directives/time-to-live/time-to-live.js | 2 +-
.../client/scripts/directives/variable.js | 2 +-
.../ui/cockpit/client/scripts/index.html | 22 ++--
.../cockpit/client/scripts/pages/dashboard.js | 2 +-
.../scripts/pages/decisionDefinition.js | 2 +-
.../client/scripts/pages/decisionInstance.js | 2 +-
.../cockpit/client/scripts/pages/decisions.js | 2 +-
.../client/scripts/pages/processDefinition.js | 2 +-
.../client/scripts/pages/processInstance.js | 2 +-
.../cockpit/client/scripts/pages/processes.js | 2 +-
.../ui/cockpit/client/scripts/pages/tasks.js | 2 +-
.../reports/controllers/reports-view-ctrl.js | 2 +-
.../reports/directives/reports-plugin.js | 2 +-
.../reports/directives/reports-type.js | 2 +-
.../scripts/repository/config/routes.js | 2 +-
.../directives/cam-cockpit-deployment.js | 2 +-
...cam-cockpit-deployments-sorting-choices.js | 2 +-
.../directives/cam-cockpit-deployments.js | 2 +-
.../cam-cockpit-delete-deployment-plugin.js | 4 +-
.../resource/directives/cam-cockpit-form.js | 2 +-
.../directives/cam-cockpit-html-source.js | 2 +-
.../cam-cockpit-resource-content.js | 2 +-
.../directives/cam-cockpit-resource-meta.js | 2 +-
.../cam-cockpit-resource-wrapper.js | 2 +-
.../resource/directives/cam-cockpit-source.js | 2 +-
...cockpit-resource-action-download-plugin.js | 2 +-
.../cam-cockpit-definitions-plugin.js | 2 +-
.../directives/cam-cockpit-resources.js | 2 +-
.../common/diagramPlugins/instanceCount.js | 2 +-
.../calledProcessDefinitionTable.js | 2 +-
.../diagramPlugins/instanceCount.js | 2 +-
.../views/processDefinition/pdIncidentsTab.js | 2 +-
.../processDefinition/processInstanceTable.js | 2 +-
.../updateSuspensionStateAction.js | 4 +-
.../processInstance/addVariableAction.js | 2 +-
.../calledProcessInstanceTable.js | 2 +-
.../cancelProcessInstanceAction.js | 4 +-
.../incident-externalTask-retry-action.js | 4 +-
.../processInstance/incidentJobRetryAction.js | 4 +-
.../app/views/processInstance/incidentsTab.js | 2 +-
.../processInstance/jobRetryBulkAction.js | 4 +-
.../base/app/views/processInstance/jobsTab.js | 4 +-
.../updateSuspensionStateAction.js | 4 +-
.../views/processInstance/userTasksTable.js | 4 +-
.../processInstance/variableInstancesTab.js | 2 +-
.../processesDashboard/process-definitions.js | 2 +-
.../dashboard/components/decisions-table.js | 2 +-
.../views/dashboard/views/decision-list.js | 2 +-
.../decisionInstanceTable.js | 2 +-
.../app/views/decisionInstance/inputTable.js | 2 +-
.../app/views/decisionInstance/outputTable.js | 2 +-
.../view-provider.config.js | 2 +-
.../bulk-override-job-priority-action.js | 4 +-
.../override-job-priority-action.js | 4 +-
.../diagramPlugins/jobSuspension.js | 2 +-
.../jobDefinitionSuspensionOverlay.js | 2 +-
.../processDefinition/jobDefinitionTable.js | 2 +-
.../suspensionStateAction.js | 4 +-
.../app/views/dashboard/task-dashboard.js | 2 +-
.../common/scripts/directives/breadcrumbs.js | 2 +-
.../module/components/cam-pagination.js | 2 +-
.../module/components/cam-searchable-area.js | 2 +-
.../scripts/module/components/cam-tabs.js | 2 +-
.../scripts/module/components/cam-toolbar.js | 2 +-
.../directives/cam-sortable-table-column.js | 2 +-
.../components/external-task-activity-link.js | 2 +-
.../external-task-error-message-link.js | 2 +-
.../components/external-tasks-tab.js | 2 +-
.../scripts/services/plugins/loadPlugins.js | 2 +-
.../frontend/ui/tasklist/client/index.html | 24 ++--
.../scripts/camunda-tasklist-bootstrap.js | 6 +-
.../tasklist/client/scripts/config/routes.js | 2 +-
.../controllers/cam-tasklist-filters-ctrl.js | 2 +-
...cam-tasklist-filter-modal-form-criteria.js | 2 +-
.../cam-tasklist-filter-modal-form-general.js | 2 +-
...m-tasklist-filter-modal-form-permission.js | 2 +-
...cam-tasklist-filter-modal-form-variable.js | 2 +-
.../cam-tasklist-filter-modal-form.js | 2 +-
.../filter/directives/cam-tasklist-filters.js | 2 +-
.../directives/cam-tasklist-form-embedded.js | 2 +-
.../directives/cam-tasklist-form-external.js | 2 +-
.../cam-tasklist-form-generic-variables.js | 2 +-
.../directives/cam-tasklist-form-generic.js | 2 +-
.../form/directives/cam-tasklist-form.js | 2 +-
...list-navbar-action-start-process-plugin.js | 4 +-
.../cam-tasklist-shortcut-help-plugin.js | 4 +-
.../task/directives/cam-tasklist-task-meta.js | 4 +-
.../task/directives/cam-tasklist-task.js | 2 +-
...cam-tasklist-task-action-comment-plugin.js | 4 +-
...tasklist-task-detail-description-plugin.js | 2 +-
...cam-tasklist-task-detail-diagram-plugin.js | 2 +-
.../cam-tasklist-task-detail-form-plugin.js | 2 +-
...cam-tasklist-task-detail-history-plugin.js | 2 +-
.../tasklist/directives/cam-tasklist-tasks.js | 2 +-
.../plugins/cam-tasklist-search-plugin.js | 2 +-
...sklist-navbar-action-create-task-plugin.js | 4 +-
.../directives/cam-tasklist-variables.js | 4 +-
.../cam-tasklist-sorting-choices.js | 2 +-
.../cam-tasklist-sorting-dropdown.js | 2 +-
.../cam-tasklist-sorting-inputs.js | 2 +-
.../scripts/camunda-welcome-bootstrap.js | 6 +-
.../client/scripts/directives/custom-links.js | 2 +-
.../client/scripts/directives/user-profile.js | 2 +-
.../ui/welcome/client/scripts/index.html | 22 ++--
.../welcome/client/scripts/pages/welcome.js | 2 +-
webapps/frontend/webpack.common.js | 57 +++------
webapps/frontend/webpack.dev.js | 117 +++++++-----------
webapps/frontend/webpack.prod.js | 44 ++++---
174 files changed, 340 insertions(+), 457 deletions(-)
diff --git a/webapps/frontend/camunda-commons-ui/lib/analytics/index.js b/webapps/frontend/camunda-commons-ui/lib/analytics/index.js
index d502395e79b..a916d613288 100644
--- a/webapps/frontend/camunda-commons-ui/lib/analytics/index.js
+++ b/webapps/frontend/camunda-commons-ui/lib/analytics/index.js
@@ -17,7 +17,7 @@
var angular = require('angular');
-var modalTemplate = require('./modal.html')();
+var modalTemplate = require('./modal.html?raw');
// CAMUNDA_VERSION has a structure of 'major.minor.patch[-SNAPSHOT]', but we only need 'major.minor' for doc links
var camundaVersion = (CAMUNDA_VERSION || '').match(/([0-9]+.[0-9]+)/); // eslint-disable-line
diff --git a/webapps/frontend/camunda-commons-ui/lib/auth/page/login.js b/webapps/frontend/camunda-commons-ui/lib/auth/page/login.js
index 02db9f9fa16..a6799f57b1c 100644
--- a/webapps/frontend/camunda-commons-ui/lib/auth/page/login.js
+++ b/webapps/frontend/camunda-commons-ui/lib/auth/page/login.js
@@ -17,7 +17,7 @@
'use strict';
-var template = require('./login.html')();
+var template = require('./login.html?raw');
var logo = require('svg-inline-loader?classPrefix&removeSVGTagAttrs=false!./logo.svg');
var $ = require('jquery');
diff --git a/webapps/frontend/camunda-commons-ui/lib/directives/engineSelect.js b/webapps/frontend/camunda-commons-ui/lib/directives/engineSelect.js
index 784f805b1e9..aa428384596 100644
--- a/webapps/frontend/camunda-commons-ui/lib/directives/engineSelect.js
+++ b/webapps/frontend/camunda-commons-ui/lib/directives/engineSelect.js
@@ -18,7 +18,7 @@
'use strict';
var angular = require('camunda-bpm-sdk-js/vendor/angular');
-var template = require('./engineSelect.html')();
+var template = require('./engineSelect.html?raw');
var $ = require('jquery');
diff --git a/webapps/frontend/camunda-commons-ui/lib/directives/inPlaceTextField.js b/webapps/frontend/camunda-commons-ui/lib/directives/inPlaceTextField.js
index 332d6fe604a..87fb3f15a29 100644
--- a/webapps/frontend/camunda-commons-ui/lib/directives/inPlaceTextField.js
+++ b/webapps/frontend/camunda-commons-ui/lib/directives/inPlaceTextField.js
@@ -18,7 +18,7 @@
'use strict';
var angular = require('camunda-bpm-sdk-js/vendor/angular');
-var template = require('./inPlaceTextField.html')();
+var template = require('./inPlaceTextField.html?raw');
/**
* @name inPlaceTextField
diff --git a/webapps/frontend/camunda-commons-ui/lib/widgets/annotation/cam-annotation-edit.js b/webapps/frontend/camunda-commons-ui/lib/widgets/annotation/cam-annotation-edit.js
index d2d239e98f5..415ac0aff50 100644
--- a/webapps/frontend/camunda-commons-ui/lib/widgets/annotation/cam-annotation-edit.js
+++ b/webapps/frontend/camunda-commons-ui/lib/widgets/annotation/cam-annotation-edit.js
@@ -17,7 +17,7 @@
'use strict';
-const template = require('./cam-annotation-edit.html')();
+const template = require('./cam-annotation-edit.html?raw');
const annotationModal = require('./cam-annotation-modal');
module.exports = [
diff --git a/webapps/frontend/camunda-commons-ui/lib/widgets/annotation/cam-annotation-modal.js b/webapps/frontend/camunda-commons-ui/lib/widgets/annotation/cam-annotation-modal.js
index 9cea590af31..863e3d433b3 100644
--- a/webapps/frontend/camunda-commons-ui/lib/widgets/annotation/cam-annotation-modal.js
+++ b/webapps/frontend/camunda-commons-ui/lib/widgets/annotation/cam-annotation-modal.js
@@ -17,7 +17,7 @@
'use strict';
-var template = require('./cam-annotation-modal.html')();
+var template = require('./cam-annotation-modal.html?raw');
module.exports = (annotation, readOnly, callback) => {
return {
diff --git a/webapps/frontend/camunda-commons-ui/lib/widgets/bpmn-viewer/cam-widget-bpmn-viewer.js b/webapps/frontend/camunda-commons-ui/lib/widgets/bpmn-viewer/cam-widget-bpmn-viewer.js
index b45a4a4f888..d9dcd918d35 100644
--- a/webapps/frontend/camunda-commons-ui/lib/widgets/bpmn-viewer/cam-widget-bpmn-viewer.js
+++ b/webapps/frontend/camunda-commons-ui/lib/widgets/bpmn-viewer/cam-widget-bpmn-viewer.js
@@ -21,7 +21,7 @@ var ModuleLoader = require('../../util/moduleLoader');
var angular = require('camunda-bpm-sdk-js/vendor/angular'),
Viewer = require('../../util/viewer'),
- template = require('./cam-widget-bpmn-viewer.html')();
+ template = require('./cam-widget-bpmn-viewer.html?raw');
module.exports = [
'$q',
diff --git a/webapps/frontend/camunda-commons-ui/lib/widgets/cam-share-link/cam-share-link.js b/webapps/frontend/camunda-commons-ui/lib/widgets/cam-share-link/cam-share-link.js
index b33b0891958..dc4d754a792 100644
--- a/webapps/frontend/camunda-commons-ui/lib/widgets/cam-share-link/cam-share-link.js
+++ b/webapps/frontend/camunda-commons-ui/lib/widgets/cam-share-link/cam-share-link.js
@@ -17,7 +17,7 @@
'use strict';
-var template = require('./cam-share-link.html')();
+var template = require('./cam-share-link.html?raw');
module.exports = [
'$location',
diff --git a/webapps/frontend/camunda-commons-ui/lib/widgets/clipboard/cam-widget-clipboard.js b/webapps/frontend/camunda-commons-ui/lib/widgets/clipboard/cam-widget-clipboard.js
index 7ac3a89b383..30d4744bc23 100644
--- a/webapps/frontend/camunda-commons-ui/lib/widgets/clipboard/cam-widget-clipboard.js
+++ b/webapps/frontend/camunda-commons-ui/lib/widgets/clipboard/cam-widget-clipboard.js
@@ -19,7 +19,7 @@
var Clipboard = require('clipboard');
-var template = require('./cam-widget-clipboard.html')();
+var template = require('./cam-widget-clipboard.html?raw');
module.exports = [
'$timeout',
diff --git a/webapps/frontend/camunda-commons-ui/lib/widgets/cmmn-viewer/cam-widget-cmmn-viewer.js b/webapps/frontend/camunda-commons-ui/lib/widgets/cmmn-viewer/cam-widget-cmmn-viewer.js
index 251e0851446..4ead1d5aff9 100644
--- a/webapps/frontend/camunda-commons-ui/lib/widgets/cmmn-viewer/cam-widget-cmmn-viewer.js
+++ b/webapps/frontend/camunda-commons-ui/lib/widgets/cmmn-viewer/cam-widget-cmmn-viewer.js
@@ -19,7 +19,7 @@
var Viewer = require('cmmn-js/lib/NavigatedViewer');
-var template = require('./cam-widget-cmmn-viewer.html')();
+var template = require('./cam-widget-cmmn-viewer.html?raw');
module.exports = [
'$compile',
diff --git a/webapps/frontend/camunda-commons-ui/lib/widgets/debug/cam-widget-debug.js b/webapps/frontend/camunda-commons-ui/lib/widgets/debug/cam-widget-debug.js
index d616628d864..226723cda5b 100644
--- a/webapps/frontend/camunda-commons-ui/lib/widgets/debug/cam-widget-debug.js
+++ b/webapps/frontend/camunda-commons-ui/lib/widgets/debug/cam-widget-debug.js
@@ -17,7 +17,7 @@
'use strict';
-var template = require('./cam-widget-debug.html')();
+var template = require('./cam-widget-debug.html?raw');
module.exports = [
function() {
diff --git a/webapps/frontend/camunda-commons-ui/lib/widgets/dmn-viewer/cam-widget-dmn-viewer.js b/webapps/frontend/camunda-commons-ui/lib/widgets/dmn-viewer/cam-widget-dmn-viewer.js
index 883af4f0239..6f780ec286a 100644
--- a/webapps/frontend/camunda-commons-ui/lib/widgets/dmn-viewer/cam-widget-dmn-viewer.js
+++ b/webapps/frontend/camunda-commons-ui/lib/widgets/dmn-viewer/cam-widget-dmn-viewer.js
@@ -24,7 +24,7 @@ var Viewer = require('./lib/navigatedViewer').default;
var Modeler = require('camunda-dmn-js').CamundaPlatformModeler;
var changeDmnNamespace = require('../../util/change-dmn-namespace');
-var template = require('./cam-widget-dmn-viewer.html')();
+var template = require('./cam-widget-dmn-viewer.html?raw');
// This is only relevant when editMode===true,
// but we only want to rewrite the function once
diff --git a/webapps/frontend/camunda-commons-ui/lib/widgets/footer/cam-widget-footer.js b/webapps/frontend/camunda-commons-ui/lib/widgets/footer/cam-widget-footer.js
index eb4c3140c32..05aaea464db 100644
--- a/webapps/frontend/camunda-commons-ui/lib/widgets/footer/cam-widget-footer.js
+++ b/webapps/frontend/camunda-commons-ui/lib/widgets/footer/cam-widget-footer.js
@@ -17,7 +17,7 @@
'use strict';
-var template = require('./cam-widget-footer.html')();
+var template = require('./cam-widget-footer.html?raw');
module.exports = [
function() {
diff --git a/webapps/frontend/camunda-commons-ui/lib/widgets/header/cam-widget-header.js b/webapps/frontend/camunda-commons-ui/lib/widgets/header/cam-widget-header.js
index 4b6b56a649f..c1f49f84379 100644
--- a/webapps/frontend/camunda-commons-ui/lib/widgets/header/cam-widget-header.js
+++ b/webapps/frontend/camunda-commons-ui/lib/widgets/header/cam-widget-header.js
@@ -20,8 +20,8 @@
var $ = require('jquery');
var angular = require('camunda-bpm-sdk-js/vendor/angular'),
- template = require('./cam-widget-header.html'),
- logo = require('raw-loader!./logo-2020-round.svg').default;
+ template = require('./cam-widget-header.html?raw'),
+ logo = require('./logo-2020-round.svg?raw');
var apps = {
welcome: {
diff --git a/webapps/frontend/camunda-commons-ui/lib/widgets/inline-field/cam-widget-inline-field.js b/webapps/frontend/camunda-commons-ui/lib/widgets/inline-field/cam-widget-inline-field.js
index d714451b62f..fe78613c4d8 100644
--- a/webapps/frontend/camunda-commons-ui/lib/widgets/inline-field/cam-widget-inline-field.js
+++ b/webapps/frontend/camunda-commons-ui/lib/widgets/inline-field/cam-widget-inline-field.js
@@ -19,10 +19,10 @@
var angular = require('camunda-bpm-sdk-js/vendor/angular'),
$ = require('jquery'),
- template = require('./cam-widget-inline-field.html')();
+ template = require('./cam-widget-inline-field.html?raw');
const dialogController = require('./dialog/controller');
-const dialogTemplate = require('./dialog/template.html')();
+const dialogTemplate = require('./dialog/template.html?raw');
function getScrollParent(element) {
var style = getComputedStyle(element);
diff --git a/webapps/frontend/camunda-commons-ui/lib/widgets/loader/cam-widget-loader.js b/webapps/frontend/camunda-commons-ui/lib/widgets/loader/cam-widget-loader.js
index 79952202173..1f3c89b2c52 100644
--- a/webapps/frontend/camunda-commons-ui/lib/widgets/loader/cam-widget-loader.js
+++ b/webapps/frontend/camunda-commons-ui/lib/widgets/loader/cam-widget-loader.js
@@ -18,7 +18,7 @@
'use strict';
var angular = require('camunda-bpm-sdk-js/vendor/angular'),
- template = require('./cam-widget-loader.html')();
+ template = require('./cam-widget-loader.html?raw');
module.exports = [
'$translate',
diff --git a/webapps/frontend/camunda-commons-ui/lib/widgets/password/cam-widget-password.js b/webapps/frontend/camunda-commons-ui/lib/widgets/password/cam-widget-password.js
index e468c18eaad..1e1f63a61b6 100644
--- a/webapps/frontend/camunda-commons-ui/lib/widgets/password/cam-widget-password.js
+++ b/webapps/frontend/camunda-commons-ui/lib/widgets/password/cam-widget-password.js
@@ -18,7 +18,7 @@
'use strict';
var angular = require('camunda-bpm-sdk-js/vendor/angular'),
- template = require('./cam-widget-password.html')();
+ template = require('./cam-widget-password.html?raw');
module.exports = [
'camAPI',
diff --git a/webapps/frontend/camunda-commons-ui/lib/widgets/search-pill/cam-widget-search-pill.js b/webapps/frontend/camunda-commons-ui/lib/widgets/search-pill/cam-widget-search-pill.js
index 888bb8b94df..35aea1f7a43 100644
--- a/webapps/frontend/camunda-commons-ui/lib/widgets/search-pill/cam-widget-search-pill.js
+++ b/webapps/frontend/camunda-commons-ui/lib/widgets/search-pill/cam-widget-search-pill.js
@@ -18,7 +18,7 @@
'use strict';
var $ = require('jquery'),
- template = require('./cam-widget-search-pill.html')();
+ template = require('./cam-widget-search-pill.html?raw');
module.exports = [
'$timeout',
diff --git a/webapps/frontend/camunda-commons-ui/lib/widgets/search/cam-widget-search.js b/webapps/frontend/camunda-commons-ui/lib/widgets/search/cam-widget-search.js
index cf6df076b3c..d3d7167536a 100644
--- a/webapps/frontend/camunda-commons-ui/lib/widgets/search/cam-widget-search.js
+++ b/webapps/frontend/camunda-commons-ui/lib/widgets/search/cam-widget-search.js
@@ -20,7 +20,7 @@
var angular = require('camunda-bpm-sdk-js/vendor/angular'),
copy = angular.copy,
$ = require('jquery'),
- template = require('./cam-widget-search.html')();
+ template = require('./cam-widget-search.html?raw');
var dateRegex = /(\d\d\d\d)-(\d\d)-(\d\d)T(\d\d):(\d\d):(\d\d)(?:.(\d\d\d)| )?$/;
diff --git a/webapps/frontend/camunda-commons-ui/lib/widgets/selection-type/cam-widget-selection-type.js b/webapps/frontend/camunda-commons-ui/lib/widgets/selection-type/cam-widget-selection-type.js
index 1260ea39ea7..9ec887e808b 100644
--- a/webapps/frontend/camunda-commons-ui/lib/widgets/selection-type/cam-widget-selection-type.js
+++ b/webapps/frontend/camunda-commons-ui/lib/widgets/selection-type/cam-widget-selection-type.js
@@ -17,7 +17,7 @@
'use strict';
-var template = require('./cam-widget-selection-type.html');
+var template = require('./cam-widget-selection-type.html?raw');
module.exports = [
'$location',
diff --git a/webapps/frontend/camunda-commons-ui/lib/widgets/variable/cam-variable-utils.js b/webapps/frontend/camunda-commons-ui/lib/widgets/variable/cam-variable-utils.js
index 200874df0d2..6320e611fbc 100644
--- a/webapps/frontend/camunda-commons-ui/lib/widgets/variable/cam-variable-utils.js
+++ b/webapps/frontend/camunda-commons-ui/lib/widgets/variable/cam-variable-utils.js
@@ -19,8 +19,8 @@
var angular = require('camunda-bpm-sdk-js/vendor/angular'),
typeUtils = require('camunda-bpm-sdk-js/lib/forms/type-util'),
- templateDialog = require('./cam-widget-variable-dialog.html')(),
- templateStringDialog = require('./cam-widget-string-dialog.html')();
+ templateDialog = require('./cam-widget-variable-dialog.html?raw'),
+ templateStringDialog = require('./cam-widget-string-dialog.html?raw');
var varUtils = {};
diff --git a/webapps/frontend/camunda-commons-ui/lib/widgets/variable/cam-widget-variable.js b/webapps/frontend/camunda-commons-ui/lib/widgets/variable/cam-widget-variable.js
index fef729efa3b..7836fd10b44 100644
--- a/webapps/frontend/camunda-commons-ui/lib/widgets/variable/cam-widget-variable.js
+++ b/webapps/frontend/camunda-commons-ui/lib/widgets/variable/cam-widget-variable.js
@@ -19,7 +19,7 @@
var angular = require('camunda-bpm-sdk-js/vendor/angular'),
varUtils = require('./cam-variable-utils'),
- template = require('./cam-widget-variable.html')();
+ template = require('./cam-widget-variable.html?raw');
var variableTypes = varUtils.types;
diff --git a/webapps/frontend/camunda-commons-ui/lib/widgets/variables-table/cam-widget-variables-table.js b/webapps/frontend/camunda-commons-ui/lib/widgets/variables-table/cam-widget-variables-table.js
index a82f3151e31..7b77b78c241 100644
--- a/webapps/frontend/camunda-commons-ui/lib/widgets/variables-table/cam-widget-variables-table.js
+++ b/webapps/frontend/camunda-commons-ui/lib/widgets/variables-table/cam-widget-variables-table.js
@@ -19,8 +19,8 @@
var angular = require('camunda-bpm-sdk-js/vendor/angular'),
varUtils = require('../variable/cam-variable-utils'),
- template = require('./cam-widget-variables-table.html'),
- confirmationTemplate = require('./cam-widget-variables-deletion-dialog.html')();
+ template = require('./cam-widget-variables-table.html?raw'),
+ confirmationTemplate = require('./cam-widget-variables-deletion-dialog.html?raw');
var typeUtils = varUtils.typeUtils;
diff --git a/webapps/frontend/package-lock.json b/webapps/frontend/package-lock.json
index b47c848d1a3..625cd2a63c5 100644
--- a/webapps/frontend/package-lock.json
+++ b/webapps/frontend/package-lock.json
@@ -61,7 +61,6 @@
"babel-loader": "9.1.2",
"copy-webpack-plugin": "11.0.0",
"css-loader": "6.7.3",
- "ejs-loader": "0.5.0",
"eslint": "8.38.0",
"eslint-config-prettier": "8.8.0",
"eslint-plugin-camunda-licensed": "0.4.6",
@@ -81,7 +80,6 @@
"mini-css-extract-plugin": "2.7.5",
"prettier": "1.19.1",
"raw-loader": "4.0.2",
- "string-replace-loader": "3.1.0",
"svg-inline-loader": "0.8.2",
"terser-webpack-plugin": "5.3.7",
"webpack": "5.79.0",
@@ -89,9 +87,6 @@
"webpack-cli": "5.0.1",
"webpack-dev-server": "4.13.2",
"webpack-merge": "5.8.0"
- },
- "engines": {
- "node": ">=12.20.0"
}
},
"node_modules/@ampproject/remapping": {
@@ -5763,16 +5758,6 @@
"integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
"dev": true
},
- "node_modules/ejs-loader": {
- "version": "0.5.0",
- "resolved": "https://registry.npmjs.org/ejs-loader/-/ejs-loader-0.5.0.tgz",
- "integrity": "sha512-iirFqlP3tiFoedNZ7dQcjvechunl054VbW6Ki38T/pabgXMAncduSE0ZXLeVGn1NbmcUJF9Z5TC0EvQ4RIpP9Q==",
- "dev": true,
- "dependencies": {
- "loader-utils": "^2.0.0",
- "lodash": "^4.17.15"
- }
- },
"node_modules/electron-to-chromium": {
"version": "1.4.311",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.311.tgz",
@@ -10820,37 +10805,6 @@
"safe-buffer": "~5.2.0"
}
},
- "node_modules/string-replace-loader": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/string-replace-loader/-/string-replace-loader-3.1.0.tgz",
- "integrity": "sha512-5AOMUZeX5HE/ylKDnEa/KKBqvlnFmRZudSOjVJHxhoJg9QYTwl1rECx7SLR8BBH7tfxb4Rp7EM2XVfQFxIhsbQ==",
- "dev": true,
- "dependencies": {
- "loader-utils": "^2.0.0",
- "schema-utils": "^3.0.0"
- },
- "peerDependencies": {
- "webpack": "^5"
- }
- },
- "node_modules/string-replace-loader/node_modules/schema-utils": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
- "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
- "dev": true,
- "dependencies": {
- "@types/json-schema": "^7.0.8",
- "ajv": "^6.12.5",
- "ajv-keywords": "^3.5.2"
- },
- "engines": {
- "node": ">= 10.13.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/webpack"
- }
- },
"node_modules/string-width": {
"version": "4.2.3",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
@@ -16720,16 +16674,6 @@
"integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
"dev": true
},
- "ejs-loader": {
- "version": "0.5.0",
- "resolved": "https://registry.npmjs.org/ejs-loader/-/ejs-loader-0.5.0.tgz",
- "integrity": "sha512-iirFqlP3tiFoedNZ7dQcjvechunl054VbW6Ki38T/pabgXMAncduSE0ZXLeVGn1NbmcUJF9Z5TC0EvQ4RIpP9Q==",
- "dev": true,
- "requires": {
- "loader-utils": "^2.0.0",
- "lodash": "^4.17.15"
- }
- },
"electron-to-chromium": {
"version": "1.4.311",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.311.tgz",
@@ -20587,29 +20531,6 @@
"safe-buffer": "~5.2.0"
}
},
- "string-replace-loader": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/string-replace-loader/-/string-replace-loader-3.1.0.tgz",
- "integrity": "sha512-5AOMUZeX5HE/ylKDnEa/KKBqvlnFmRZudSOjVJHxhoJg9QYTwl1rECx7SLR8BBH7tfxb4Rp7EM2XVfQFxIhsbQ==",
- "dev": true,
- "requires": {
- "loader-utils": "^2.0.0",
- "schema-utils": "^3.0.0"
- },
- "dependencies": {
- "schema-utils": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
- "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
- "dev": true,
- "requires": {
- "@types/json-schema": "^7.0.8",
- "ajv": "^6.12.5",
- "ajv-keywords": "^3.5.2"
- }
- }
- }
- },
"string-width": {
"version": "4.2.3",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
diff --git a/webapps/frontend/package.json b/webapps/frontend/package.json
index 11d9bf763fb..ba441907ed7 100644
--- a/webapps/frontend/package.json
+++ b/webapps/frontend/package.json
@@ -71,7 +71,6 @@
"babel-loader": "9.1.2",
"copy-webpack-plugin": "11.0.0",
"css-loader": "6.7.3",
- "ejs-loader": "0.5.0",
"eslint": "8.38.0",
"eslint-config-prettier": "8.8.0",
"eslint-plugin-camunda-licensed": "0.4.6",
@@ -91,7 +90,6 @@
"mini-css-extract-plugin": "2.7.5",
"prettier": "1.19.1",
"raw-loader": "4.0.2",
- "string-replace-loader": "3.1.0",
"svg-inline-loader": "0.8.2",
"terser-webpack-plugin": "5.3.7",
"webpack": "5.79.0",
diff --git a/webapps/frontend/ui/admin/client/scripts/camunda-admin-bootstrap.js b/webapps/frontend/ui/admin/client/scripts/camunda-admin-bootstrap.js
index dbcd9f3d14b..49a6ff614eb 100644
--- a/webapps/frontend/ui/admin/client/scripts/camunda-admin-bootstrap.js
+++ b/webapps/frontend/ui/admin/client/scripts/camunda-admin-bootstrap.js
@@ -27,7 +27,7 @@ import {
window.define = define;
window.require = rjsrequire;
-window.bust = '$CACHE_BUST';
+window.bust = CAMUNDA_VERSION; // eslint-disable-line
// camunda-admin-bootstrap is copied as-is, so we have to inline everything
const appRoot = document.querySelector('base').getAttribute('app-root');
@@ -35,7 +35,7 @@ const baseImportPath = `${appRoot}/app/admin/`;
requirejs.config({
baseUrl: baseImportPath,
- urlArgs: 'bust=$CACHE_BUST'
+ urlArgs: `bust=${CAMUNDA_VERSION}` // eslint-disable-line
});
const loadConfig = (async function() {
@@ -86,7 +86,7 @@ define('camunda-admin-bootstrap', function() {
node.setAttribute('rel', 'stylesheet');
node.setAttribute(
'href',
- plugin.location + '/plugin.css?bust=$CACHE_BUST'
+ plugin.location + `/plugin.css?bust=${CAMUNDA_VERSION}` // eslint-disable-line
);
document.head.appendChild(node);
});
diff --git a/webapps/frontend/ui/admin/client/scripts/index.html b/webapps/frontend/ui/admin/client/scripts/index.html
index ff0046a32b9..b20d87a2ced 100644
--- a/webapps/frontend/ui/admin/client/scripts/index.html
+++ b/webapps/frontend/ui/admin/client/scripts/index.html
@@ -16,13 +16,13 @@
content="camunda services GmbH"/>
-