Merge branch 'upgrade/node-20lts' into feature/introduce-frontend-tes…

…ting # Conflicts: # .gitignore # build.gradle # nodel-webui-js/Gruntfile.js # nodel-webui-js/build.gradle # nodel-webui-js/package-lock.json # nodel-webui-js/package.json
scroix · Apr 6, 2024 · 4173ead · 4173ead
2 parents 5d6d89d + 0cdb687
commit 4173ead
Show file tree

Hide file tree

Showing 4 changed files with 1,371 additions and 975 deletions.
diff --git a/nodel-webui-js/Gruntfile.js b/nodel-webui-js/Gruntfile.js
@@ -36,19 +36,23 @@ module.exports = function(grunt) {
         }]
       }
     },
-    twbs: {
+    less: {
       dark: {
         options: {
-          bootstrap: './node_modules/bootstrap',
-          less: './src/dark/'
-        }
+          paths: ['./node_modules/bootstrap/less'],
+        },
+        files: {
+          './build/grunt/v1/css/bootstrap-dark.css': './src/dark/theme.less',
+        },
       },
       light: {
         options: {
-          bootstrap: './node_modules/bootstrap',
-          less: './src/light/'
-        }
-      }
+          paths: ['./node_modules/bootstrap/less'],
+        },
+        files: {
+          './build/grunt/v1/css/bootstrap-light.css': './src/light/theme.less',
+        },
+      },
     },
     copy: {
       updatetheme: {
@@ -267,12 +271,12 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-copy');
   grunt.loadNpmTasks('grunt-concat-css');
   grunt.loadNpmTasks('grunt-contrib-uglify');
-  grunt.loadNpmTasks('grunt-twbs');
+  grunt.loadNpmTasks('grunt-contrib-less');
   grunt.loadNpmTasks('grunt-text-replace');
   grunt.loadNpmTasks('grunt-google-fonts');
   // Task definition
-  grunt.registerTask('default', ['googlefonts', 'copy:updatetheme','replace','twbs:dark','concat_css:dark','twbs:light','concat_css:light','copy:main','concat','uglify']);
-  grunt.registerTask('build', ['copy:updatetheme','replace','twbs:dark','concat_css:dark','twbs:light','concat_css:light','copy:main','concat','uglify']);
+  grunt.registerTask('default', ['googlefonts', 'copy:updatetheme', 'replace', 'less:dark', 'concat_css:dark', 'less:light', 'concat_css:light', 'copy:main', 'concat', 'uglify']);
+  grunt.registerTask('build', ['copy:updatetheme', 'replace', 'less:dark', 'concat_css:dark', 'less:light', 'concat_css:light', 'copy:main', 'concat', 'uglify']);
   grunt.registerTask('gfonts', ['googlefonts']);
   grunt.registerTask('deploy', ['copy:main','copy:deploy']);
 };
diff --git a/nodel-webui-js/build.gradle b/nodel-webui-js/build.gradle
@@ -27,7 +27,7 @@ dependencies {
 }
 
 node {
-    version = '12.19.0'
+    version = '20.12.0'
     download = true
 
     workDir = file("${project.buildDir}/nodejs")
@@ -75,6 +75,7 @@ tasks.register('gruntRun', NpxTask) {
     }
 
     command = "grunt"
+    args = ["build"]
     inputs.property('filesChanged', shouldInstall)
     inputs.dir("node_modules")
     outputs.dir("build/grunt")