From 90542cc8700f358898db912f6bd77e5fc067afe6 Mon Sep 17 00:00:00 2001 From: Jeff Parsons Date: Wed, 5 Nov 2014 15:55:28 -0800 Subject: [PATCH] Make the Grunt 'concat' task more Windows-friendly --- Gruntfile.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index d33b81b10..8b8a58b8b 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -170,7 +170,7 @@ module.exports = function(grunt) { options: { banner: '"use strict";\n\n', process: function(src, filepath) { - return "// " + filepath + "\n" + + return "// " + filepath + "\r\n\r\n" + src.replace(/(^|\n)[ \t]*(['"])use strict\2;?\s*/g, '$1').replace(/[ \t]*if\s*\(typeof\s+(module|APP_PCJS)\s*!==\s*(['"])undefined\2\)\s*(\{[^}]*}|[^\n]*)(\n|$)/g, ''); } } @@ -181,7 +181,7 @@ module.exports = function(grunt) { options: { banner: '"use strict";\n\n', process: function(src, filepath) { - return "// " + filepath + "\n" + + return "// " + filepath + "\r\n\r\n" + src.replace(/(^|\n)[ \t]*(['"])use strict\2;?\s*/g, '$1').replace(/[ \t]*if\s*\(typeof\s+(module|APP_PCJS)\s*!==\s*(['"])undefined\2\)\s*(\{[^}]*}|[^\n]*)(\n|$)/g, ''); } }