Merging master

slub · Aug 12, 2024 · 21232c9 · 21232c9
2 parents aad6c51 + 84a6894
commit 21232c9
Show file tree

Hide file tree

Showing 38 changed files with 1,848 additions and 2,379 deletions.
diff --git a/.github/workflows/npm-grunt.yml b/.github/workflows/npm-grunt.yml
@@ -42,6 +42,6 @@ jobs:
         if [ -n "$(git status --porcelain -- ./Resources/Public/)" ]; then
             echo "Changes detected in compiled files"
             exit 1
-        else
+        else 
             echo "No changes detected in compiled files"
         fi
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,9 @@
 .idea/
 .vscode/
-public/
-vendor/
 .DS_Store
 node_modules
 *.css.map
 Documentation-GENERATED-temp/
+public/
+vendor/
 composer.lock
diff --git a/Build/Gruntfile.js b/Build/Gruntfile.js
@@ -1,5 +1,5 @@
 
-module.exports = function (grunt) {
+module.exports = function(grunt) {
     require('jit-grunt')(grunt);
 
     grunt.initConfig({
@@ -12,26 +12,25 @@ module.exports = function (grunt) {
                     optimization: 2
                 },
                 files: {
-                    "Resources/Public/Css/allStyles.css": "Resources/Private/Less/all.less",
-                    "Resources/Public/Css/webStyles.css": "Resources/Private/Less/website.less",
-                    "Resources/Public/Css/rte.css": "Resources/Private/Less/rte.less",
+                    "Resources/Public/Css/allStyles.css" : "Resources/Private/Less/all.less",
+                    "Resources/Public/Css/webStyles.css" : "Resources/Private/Less/website.less",
+                    "Resources/Public/Css/rte.css" : "Resources/Private/Less/rte.less",
                 }
             }
         },
         terser: {
-            options: {
-                compress: true,
-                mangle: true,
-            },
             development: {
+                options: {
+                    compress: false,
+                },
                 files: {
-                    "Resources/Public/JavaScript/allScripts.js": [
+                    "Resources/Public/JavaScript/allScripts.js" : [
                         'Resources/Private/JavaScript/modernizrCustom.js',
                         'Resources/Private/JavaScript/js.cookie.js',
                         'Resources/Private/JavaScript/dfgviewerSru.js',
                         'Resources/Private/JavaScript/dfgviewerScripts.js',
                     ],
-                    "Resources/Public/JavaScript/webScripts.js": [
+                    "Resources/Public/JavaScript/webScripts.js" : [
                         'Resources/Private/JavaScript/modernizrCustom.js',
                         'Resources/Public/JavaScript/Highlight/highlight.pack.js',
                         'Resources/Private/JavaScript/websiteScripts.js',
@@ -58,5 +57,5 @@ module.exports = function (grunt) {
     });
 
     grunt.file.setBase('../')
-    grunt.registerTask('default', ['less', 'terser', 'watch']);
+    grunt.registerTask('default', ['less','terser','watch']);
 };