Fixes #22950: In rudder 7.3, we need to use npm for jsondiffpatch

Normation · Jun 23, 2023 · a6152c0 · a6152c0
1 parent 85d5a03
commit a6152c0
Show file tree

Hide file tree

Showing 7 changed files with 160 additions and 5,041 deletions.
diff --git a/...udder-core/src/test/scala/com/normation/rudder/domain/properties/NodePropertiesTest.scala b/...udder-core/src/test/scala/com/normation/rudder/domain/properties/NodePropertiesTest.scala
@@ -37,8 +37,6 @@
 
 package com.normation.rudder.domain.properties
 
-import com.normation.rudder.domain.policies.PolicyMode.Audit
-import com.normation.rudder.domain.policies.PolicyMode.Enforce
 import net.liftweb.common._
 import org.junit.runner.RunWith
 import org.specs2.mutable._

diff --git a/webapp/sources/rudder/rudder-web/src/main/gulpfile.js b/webapp/sources/rudder/rudder-web/src/main/gulpfile.js
@@ -26,12 +26,14 @@ const paths = {
             'node_modules/*/*.min.js*',
             'node_modules/datatables.net-plugins/sorting/natural.js',
             'node_modules/showdown-xss-filter/showdown-xss-filter.js',
+            'node_modules/jsondiffpatch/dist/jsondiffpatch.umd.slim.js',
         ],
         'dest': 'webapp/javascript/libs',
     },
     'vendor_css': {
         'src': [
             'node_modules/*/dist/**/*.min.css*',
+            'node_modules/jsondiffpatch/dist/formatters-styles/html.css',
         ],
         'dest': 'webapp/style/libs',
     },

diff --git a/webapp/sources/rudder/rudder-web/src/main/package-lock.json b/webapp/sources/rudder/rudder-web/src/main/package-lock.json
diff --git a/webapp/sources/rudder/rudder-web/src/main/package.json b/webapp/sources/rudder/rudder-web/src/main/package.json
@@ -16,7 +16,8 @@
     "jstree": "^3.3.12",
     "showdown": "^2.1.0",
     "showdown-xss-filter": "^0.2.0",
-    "xss": "^1.0.14"
+    "xss": "^1.0.14",
+    "jsondiffpatch": "0.4.1"
   },
   "devDependencies": {
     "better-npm-audit": "^3.7.3",