fix(webapps): add direct dependency to dmn-font

related to CAM-13946, closes camunda#1624
www-jrtorres042-github-enterprise-org · Sep 27, 2021 · cfe7e64 · cfe7e64
1 parent 376d2f3
commit cfe7e64
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/webapps/package-lock.json b/webapps/package-lock.json
diff --git a/webapps/package.json b/webapps/package.json
@@ -44,6 +44,7 @@
     "camunda-webapp-translations": "git://github.com/camunda/camunda-webapp-translations#master",
     "clipboard": "2.0.6",
     "cmmn-js": "0.20.0",
+    "dmn-font": "0.5.0",
     "dmn-js": "10.0.0",
     "dmn-js-decision-table": "10.0.0",
     "dmn-js-drd": "10.0.0",

diff --git a/webapps/ui/cockpit/grunt/config/copy.js b/webapps/ui/cockpit/grunt/config/copy.js
@@ -116,22 +116,21 @@ module.exports = function(config, copyConf) {
       {
         expand: true,
         cwd: 'node_modules/bpmn-font/dist/font',
-        src: ['*.{eot,ttf,svg,woff}'],
+        src: ['*.{eot,svg,ttf,woff,woff2}'],
         dest: '<%= pkg.gruntConfig.cockpitBuildTarget %>/fonts/'
       },
-      // open sans
+      // dmn fonts
       {
         expand: true,
-        cwd: '<%= pkg.gruntConfig.commonsUiDir %>/vendor/fonts',
-        src: ['*.{eot,svg,ttf,woff,woff2,otf}'],
+        cwd: 'node_modules/dmn-font/dist/font',
+        src: ['*.{eot,svg,ttf,woff,woff2}'],
         dest: '<%= pkg.gruntConfig.cockpitBuildTarget %>/fonts/'
       },
-      // dmn
+      // open sans
       {
         expand: true,
-        cwd:
-          'node_modules/dmn-js/dist/assets/dmn-font/font/',
-        src: ['*.{eot,svg,ttf,woff,woff2}'],
+        cwd: '<%= pkg.gruntConfig.commonsUiDir %>/vendor/fonts',
+        src: ['*.{eot,svg,ttf,woff,woff2,otf}'],
         dest: '<%= pkg.gruntConfig.cockpitBuildTarget %>/fonts/'
       }
     ]