Merge pull request #137 from srod/develop

Merge Develop to Master : 2.0.3
srod · Apr 9, 2017 · 38cf790 · 38cf790
2 parents e7812e0 + fe39109
commit 38cf790
Show file tree

Hide file tree

Showing 22 changed files with 786 additions and 1,017 deletions.
diff --git a/.npmrc b/.npmrc
@@ -1 +1,2 @@
 tag-version-prefix=
+save-prefix=
diff --git a/.yarnrc b/.yarnrc
@@ -0,0 +1 @@
+save-prefix false
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016 Rodolphe Stoclin
+Copyright (c) 2017 Rodolphe Stoclin
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.
diff --git a/appveyor.yml b/appveyor.yml
@@ -20,7 +20,7 @@ install:
   - set PATH=%APPDATA%\npm;%PATH%
   - node --version
   - npm --version
-  - npm install
+  - appveyor-retry npm install
 
 test_script:
   - cmd: npm run test
diff --git a/index.js b/index.js
@@ -1,6 +1,6 @@
 /*!
  * node-minify
- * Copyright(c) 2011-2016 Rodolphe Stoclin
+ * Copyright(c) 2011-2017 Rodolphe Stoclin
  * MIT Licensed
  */
 

diff --git a/lib/compress.js b/lib/compress.js
@@ -1,6 +1,6 @@
 /*!
  * node-minify
- * Copyright(c) 2011-2016 Rodolphe Stoclin
+ * Copyright(c) 2011-2017 Rodolphe Stoclin
  * MIT Licensed
  */
 

diff --git a/lib/compressors/babili.js b/lib/compressors/babili.js
@@ -1,6 +1,6 @@
 /*!
  * node-minify
- * Copyright(c) 2011-2016 Rodolphe Stoclin
+ * Copyright(c) 2011-2017 Rodolphe Stoclin
  * MIT Licensed
  */
 
@@ -12,6 +12,7 @@
 
 var Promise = require('bluebird');
 var babel = require('babel-core');
+var babelPresetBabili = require('babel-preset-babili');
 var utils = require('../utils');
 
 /**
@@ -43,7 +44,7 @@ function compressBabili(settings, content) {
     }
 
     if (babelOptions.presets.indexOf('babili') === -1) {
-      babelOptions.presets = babelOptions.presets.concat(['babili']);
+      babelOptions.presets = babelOptions.presets.concat([babelPresetBabili]);
     }
 
     var contentMinified = babel.transform(content, babelOptions);

diff --git a/lib/compressors/clean-css.js b/lib/compressors/clean-css.js
@@ -1,6 +1,6 @@
 /*!
  * node-minify
- * Copyright(c) 2011-2016 Rodolphe Stoclin
+ * Copyright(c) 2011-2017 Rodolphe Stoclin
  * MIT Licensed
  */
 

diff --git a/lib/compressors/csso.js b/lib/compressors/csso.js
@@ -1,6 +1,6 @@
 /*!
  * node-minify
- * Copyright(c) 2011-2016 Rodolphe Stoclin
+ * Copyright(c) 2011-2017 Rodolphe Stoclin
  * MIT Licensed
  */
 

diff --git a/lib/compressors/gcc-java.js b/lib/compressors/gcc-java.js
@@ -1,6 +1,6 @@
 /*!
  * node-minify
- * Copyright(c) 2011-2016 Rodolphe Stoclin
+ * Copyright(c) 2011-2017 Rodolphe Stoclin
  * MIT Licensed
  */
 

diff --git a/lib/compressors/gcc.js b/lib/compressors/gcc.js
@@ -1,6 +1,6 @@
 /*!
  * node-minify
- * Copyright(c) 2011-2016 Rodolphe Stoclin
+ * Copyright(c) 2011-2017 Rodolphe Stoclin
  * MIT Licensed
  */
 

diff --git a/lib/compressors/no-compress.js b/lib/compressors/no-compress.js
@@ -1,6 +1,6 @@
 /*!
  * node-minify
- * Copyright(c) 2011-2016 Rodolphe Stoclin
+ * Copyright(c) 2011-2017 Rodolphe Stoclin
  * MIT Licensed
  */
 

diff --git a/lib/compressors/sqwish.js b/lib/compressors/sqwish.js
@@ -1,6 +1,6 @@
 /*!
  * node-minify
- * Copyright(c) 2011-2016 Rodolphe Stoclin
+ * Copyright(c) 2011-2017 Rodolphe Stoclin
  * MIT Licensed
  */
 

diff --git a/lib/compressors/uglifyjs.js b/lib/compressors/uglifyjs.js
@@ -1,6 +1,6 @@
 /*!
  * node-minify
- * Copyright(c) 2011-2016 Rodolphe Stoclin
+ * Copyright(c) 2011-2017 Rodolphe Stoclin
  * MIT Licensed
  */
 

diff --git a/lib/compressors/yui.js b/lib/compressors/yui.js
@@ -1,6 +1,6 @@
 /*!
  * node-minify
- * Copyright(c) 2011-2016 Rodolphe Stoclin
+ * Copyright(c) 2011-2017 Rodolphe Stoclin
  * MIT Licensed
  */
 

diff --git a/lib/deprecated.js b/lib/deprecated.js
@@ -1,6 +1,6 @@
 /*!
  * node-minify
- * Copyright(c) 2011-2016 Rodolphe Stoclin
+ * Copyright(c) 2011-2017 Rodolphe Stoclin
  * MIT Licensed
  */
 

diff --git a/lib/node-minify.js b/lib/node-minify.js
@@ -1,6 +1,6 @@
 /*!
  * node-minify
- * Copyright(c) 2011-2016 Rodolphe Stoclin
+ * Copyright(c) 2011-2017 Rodolphe Stoclin
  * MIT Licensed
  */
 

diff --git a/lib/runner.js b/lib/runner.js
@@ -1,6 +1,6 @@
 /*!
  * node-minify
- * Copyright(c) 2011-2016 Rodolphe Stoclin
+ * Copyright(c) 2011-2017 Rodolphe Stoclin
  * MIT Licensed
  */
 

diff --git a/lib/setup.js b/lib/setup.js
@@ -1,6 +1,6 @@
 /*!
  * node-minify
- * Copyright(c) 2011-2016 Rodolphe Stoclin
+ * Copyright(c) 2011-2017 Rodolphe Stoclin
  * MIT Licensed
  */
 

diff --git a/lib/utils.js b/lib/utils.js
@@ -1,6 +1,6 @@
 /*!
  * node-minify
- * Copyright(c) 2011-2016 Rodolphe Stoclin
+ * Copyright(c) 2011-2017 Rodolphe Stoclin
  * MIT Licensed
  */
 

diff --git a/package.json b/package.json
@@ -15,23 +15,7 @@
     "url": "https://github.com/srod/node-minify.git"
   },
   "engines": {
-    "node": ">=0.12.0",
-    "iojs": ">=1.0.0"
-  },
-  "dependencies": {
-    "babel-core": "^6.18.0",
-    "babel-preset-babili": "0.0.5",
-    "bluebird": "^3.4.6",
-    "clean-css": "^3.4.19",
-    "csso": "^2.3.0",
-    "depd": "^1.1.0",
-    "glob": "^7.1.1",
-    "google-closure-compiler-js": "^20161024.0.0",
-    "mkdirp": "^0.5.1",
-    "node-version": "^1.0.0",
-    "sqwish": "^0.2.2",
-    "uglify-js": "^2.7.4",
-    "xtend": "^4.0.1"
+    "node": ">=4.0.0"
   },
   "keywords": [
     "compressor",
@@ -59,21 +43,36 @@
     "posttest": "npm run clean",
     "clean": "rm -f ./examples/public/dist/*",
     "clean-cov": "npm run clean && rm -Rf ./coverage",
-    "release-patch": "npm version patch -m 'Bump %s' && git push --tags origin HEAD:develop",
-    "release-minor": "npm version minor -m 'Bump %s' && git push --tags origin HEAD:develop",
-    "release-major": "npm version major -m 'Bump %s' && git push --tags origin HEAD:develop",
+    "release-patch": "npm version patch -m 'Bump %s' && git push --tags origin HEAD:master",
+    "release-minor": "npm version minor -m 'Bump %s' && git push --tags origin HEAD:master",
+    "release-major": "npm version major -m 'Bump %s' && git push --tags origin HEAD:master",
     "publish-latest": "npm publish",
     "publish-beta": "npm publish --tag beta"
   },
+  "dependencies": {
+    "babel-core": "6.22.1",
+    "babel-preset-babili": "0.0.11",
+    "bluebird": "3.4.7",
+    "clean-css": "4.0.6",
+    "csso": "2.3.1",
+    "depd": "1.1.0",
+    "glob": "7.1.1",
+    "google-closure-compiler-js": "20170124.0.0",
+    "mkdirp": "0.5.1",
+    "node-version": "1.0.0",
+    "sqwish": "0.2.2",
+    "uglify-js": "2.7.5",
+    "xtend": "4.0.1"
+  },
   "devDependencies": {
-    "babel-preset-es2015": "^6.18.0",
-    "chai": "^3.5.0",
-    "coveralls": "^2.11.12",
-    "decache": "^4.1.0",
-    "eslint": "^3.9.1",
-    "istanbul": "^0.4.5",
-    "mocha": "^3.1.2",
-    "should": "^11.1.1",
-    "sinon": "^1.17.5"
+    "babel-preset-es2015": "6.24.1",
+    "chai": "3.5.0",
+    "coveralls": "2.13.0",
+    "decache": "4.1.0",
+    "eslint": "3.19.0",
+    "istanbul": "0.4.5",
+    "mocha": "3.2.0",
+    "should": "11.2.1",
+    "sinon": "2.1.0"
   }
 }