Merge pull request #26 from stefanpenner/dont-minify-min-files

don’t minify files that already advertise as minified.
ember-cli · Mar 4, 2016 · bda7838 · bda7838
2 parents 9fb9118 + 673f5f9
commit bda7838
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/index.js b/index.js
@@ -58,7 +58,7 @@ UglifyWriter.prototype.write = function (readTree, outDir) {
 
       mkdirp.sync(path.dirname(outFile));
 
-      if (relativePath.slice(-3) === '.js' && !writer.excludes.match(relativePath)) {
+      if (relativePath.slice(-3) === '.js' && !writer.excludes.match(relativePath) && !/\.min\./.test(relativePath)) {
         writer.processFile(inFile, outFile, relativePath, outDir);
       } else if (relativePath.slice(-4) === '.map') {
         if (writer.excludes.match(relativePath.slice(relativePath.lenth - 4) + '.js')) {

diff --git a/test/expected/unminified/already.min.js b/test/expected/unminified/already.min.js
@@ -0,0 +1,5 @@
+function alreadyMin(xxxx, bbbb) {
+  // so don't touch it
+  //
+  return [xxxx, bbbb];
+}
diff --git a/test/fixtures/already.min.js b/test/fixtures/already.min.js
@@ -0,0 +1,5 @@
+function alreadyMin(xxxx, bbbb) {
+  // so don't touch it
+  //
+  return [xxxx, bbbb];
+}
diff --git a/test/test.js b/test/test.js
@@ -20,6 +20,7 @@ describe('broccoli-uglify-sourcemap', function() {
       expectFile('no-upstream-sourcemap.js').in(result);
       expectFile('no-upstream-sourcemap.map').in(result);
       expectFile('something.css').in(result);
+      expectFile('already.min.js').unminified().in(result);
     });
   });
 
@@ -32,6 +33,7 @@ describe('broccoli-uglify-sourcemap', function() {
       expectFile('no-upstream-sourcemap.js').withoutSourcemapURL().in(result);
       expectFile('no-upstream-sourcemap.map').notIn(result);
       expectFile('something.css').in(result);
+      expectFile('already.min.js').unminified().in(result);
     });
   });
 
@@ -47,6 +49,7 @@ describe('broccoli-uglify-sourcemap', function() {
       expectFile('no-upstream-sourcemap.js').in(result);
       expectFile('no-upstream-sourcemap.map').in(result);
       expectFile('something.css').in(result);
+      expectFile('already.min.js').unminified().in(result);
     });
   });
 
@@ -60,6 +63,7 @@ describe('broccoli-uglify-sourcemap', function() {
       expectFile('no-upstream-sourcemap.js').withSourcemapURL('/maps/no-upstream-sourcemap.map').in(result);
       expectFile('no-upstream-sourcemap.map').in(result, 'maps');
       expectFile('something.css').in(result);
+      expectFile('already.min.js').unminified().in(result);
     });
   });