Partial revert to fix try.js

Terser seems to break this, so just concat originals again.
textile · Apr 7, 2021 · f06652e · f06652e
1 parent 93b44c3
commit f06652e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -39,9 +39,18 @@ module.exports = function (grunt)
             '<%= paths.dest.templates %>'
         ],
 
+        // Concat JavaScript that has already been minified (because Uglify mangles Prototype.js)
+        concat: {
+            dist: {
+                src: ['<%= paths.src.js %>lib/prototype.min.js', '<%= paths.src.js %>lib/try.min.js'],
+                dest: '<%= paths.dest.js %>try.js',
+            }
+        },
+
         // Run some tasks in parallel to speed up the build process.
         concurrent: {
             dist: [
+                'concat',
                 'copy',
                 'css',
                 'jshint'
@@ -218,11 +227,6 @@ module.exports = function (grunt)
                             '<%= paths.src.js %>lib/controller.js',
                             '<%= paths.src.js %>lib/converter.js'
                         ],
-
-                        '<%= paths.dest.js %>try.js': [
-                            '<%= paths.src.js %>lib/prototype.min.js',
-                            '<%= paths.src.js %>lib/try.js'
-                        ],
                     }
                 ]
             }

diff --git a/package.json b/package.json
@@ -17,6 +17,7 @@
     "grunt-cli": "1.4.2",
     "grunt-concurrent": "3.0.0",
     "grunt-contrib-clean": "2.0.0",
+    "grunt-contrib-concat": "1.0.1",
     "grunt-contrib-copy": "1.0.0",
     "grunt-contrib-jshint": "3.0.0",
     "grunt-contrib-watch": "1.1.0",

diff --git a/src/assets/js/lib/try.min.js b/src/assets/js/lib/try.min.js