fix(webapps): refactor to use asset module instead of loaders (camund…

…a#3494) related to camunda#3401
vivekchand · Jul 3, 2023 · 3001745 · 3001745
1 parent da3c34d
commit 3001745
Show file tree

Hide file tree

Showing 174 changed files with 340 additions and 457 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...pps/frontend/camunda-commons-ui/lib/widgets/variables-table/cam-widget-variables-table.js b/...pps/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
diff --git 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
@@ -27,15 +27,15 @@ 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');
 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);
       });