Merge pull request #1543 from srod/develop

Merge Develop to Master: 7.0.0
srod · Aug 9, 2022 · d8867b9 · d8867b9
2 parents d529747 + 219f63d
commit d8867b9
Show file tree

Hide file tree

Showing 31 changed files with 4,040 additions and 4,594 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,13 +1,14 @@
 version: 2
 updates:
-- package-ecosystem: npm
-  directory: "/"
-  schedule:
-    interval: monthly
-    time: "04:00"
-  open-pull-requests-limit: 10
-  ignore:
-  - dependency-name: google-closure-compiler
-    versions:
-    - 20210202.0.0
-    - 20210302.0.0
+  - package-ecosystem: npm
+    directory: '/'
+    schedule:
+      interval: monthly
+      time: '04:00'
+    open-pull-requests-limit: 10
+    ignore:
+      - dependency-name: 'chalk'
+      - dependency-name: 'globby'
+      - dependency-name: 'gzip-size'
+      - dependency-name: 'jest'
+      - dependency-name: 'ora'
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -8,13 +8,18 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
-        node-version: [12.x, 14.x, 16.x]
+        node-version: [14.x, 16.x, 18.x]
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - name: Use Node.js ${{ matrix.node-version }} on ${{ matrix.os }}
         uses: actions/setup-node@v1
         with:
           node-version: ${{ matrix.node-version }}
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          java-version: '11'
+          distribution: 'adopt'
       - name: yarn install and test
         run: |
           yarn install

diff --git a/.mergify.yml b/.mergify.yml
@@ -2,12 +2,12 @@ pull_request_rules:
   - name: automatic merge for Dependabot pull requests
     conditions:
       - author=dependabot-preview[bot]
-      - status-success=test (ubuntu-latest, 12.x)
       - status-success=test (ubuntu-latest, 14.x)
       - status-success=test (ubuntu-latest, 16.x)
-      - status-success=test (windows-latest, 12.x)
+      - status-success=test (ubuntu-latest, 18.x)
       - status-success=test (windows-latest, 14.x)
       - status-success=test (windows-latest, 16.x)
+      - status-success=test (windows-latest, 18.x)
     actions:
       merge:
         method: merge
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+16
diff --git a/babel.config.js b/babel.config.js
@@ -7,7 +7,7 @@ module.exports = api => {
         '@babel/preset-env',
         {
           targets: {
-            node: '12'
+            node: '14'
           }
         }
       ]

diff --git a/examples/server.js b/examples/server.js
@@ -12,14 +12,28 @@ const cssnano = require('@node-minify/cssnano');
 const cleanCSS = require('@node-minify/clean-css');
 const jsonminify = require('@node-minify/jsonminify');
 
+const contentJS = `var tools = true; if(tools){ console.log('true'); }`;
+
+minify({
+  compressor: gcc,
+  content: contentJS,
+  output: 'public/js-dist/gcc-contentJS.js',
+  sync: true,
+  callback: function (err, min) {
+    console.log('contentJS GCC');
+    console.log(err);
+    //console.log(min);
+  }
+});
+
 console.log('sync 1');
 minify({
   compressor: yui,
   input: ['public/js/sample.js', 'public/js/sample2.js'],
   output: 'public/js-dist/yui-publicfolder-concat.js',
   type: 'js',
   sync: true,
-  callback: function(err, value) {
+  callback: function (err, value) {
     console.log('sync 2', value);
   }
 });
@@ -29,7 +43,7 @@ minify({
   compressor: terser,
   input: ['public/js/sample.js', 'public/js/sample2.js'],
   output: 'public/js-dist/terser-concat.js'
-}).then(function(min) {
+}).then(function (min) {
   console.log('terser min');
   console.log(min);
 });
@@ -49,11 +63,11 @@ minify({
   options: {
     minifyJS: false
   },
-  callback: function(err, min) {
+  callback: function (err, min) {
     console.log('callback min');
     console.log(min);
   }
-}).then(function(min) {
+}).then(function (min) {
   console.log('html min');
   console.log(min);
 });
@@ -64,7 +78,7 @@ minify({
   input: '**/*.html',
   output: '$1.min.html',
   replaceInPlace: true,
-  callback: function(err, _min) {
+  callback: function (err, _min) {
     if (err) console.log(err);
     console.log(_min);
   }
@@ -77,7 +91,7 @@ minify({
   options: {
     minifyJS: false
   }
-}).then(function(min) {
+}).then(function (min) {
   console.log('html min');
   console.log(min);
 });
@@ -90,7 +104,7 @@ minify({
   options: {
     minifyJS: false
   }
-}).then(function(min) {
+}).then(function (min) {
   console.log('html min');
   console.log(min);
 });
@@ -103,7 +117,7 @@ minify({
   options: {
     minifyJS: false
   }
-}).then(function(min) {
+}).then(function (min) {
   console.log('html min');
   console.log(min);
 });
@@ -122,11 +136,11 @@ const json = `
 minify({
   compressor: jsonminify,
   content: json,
-  callback: function(err, min) {
+  callback: function (err, min) {
     console.log('callback min');
     console.log(min);
   }
-}).then(function(min) {
+}).then(function (min) {
   console.log('json min');
   console.log(min);
 });
@@ -135,15 +149,15 @@ minify({
   compressor: babelMinify,
   input: 'public/js-es6/**/*.js',
   output: 'public/js-dist/babel-minify-$1.js'
-}).then(function(min) {
+}).then(function (min) {
   //console.log(min);
 });
 
 minify({
   compressor: babelMinify,
   input: 'public/js-es6/**/*.js',
   output: 'public/js-dist/babel-minify-es6.js'
-}).then(function(min) {
+}).then(function (min) {
   //console.log(min);
 });
 
@@ -152,7 +166,7 @@ minify({
   input: 'public/js/**/*.js',
   output: 'public/js-dist/gcc-wildcards.js',
   sync: true,
-  callback: function(err, min) {
+  callback: function (err, min) {
     console.log('wildcards GCC');
     console.log(err);
     //console.log(min);
@@ -164,7 +178,7 @@ minify({
   input: 'public/js/**/*.js',
   output: 'public/js-dist/yui-wildcards.js',
   type: 'js',
-  callback: function(err, min) {
+  callback: function (err, min) {
     console.log('wildcards YUI JS');
     console.log(err);
     //console.log(min);
@@ -175,7 +189,7 @@ minify({
   compressor: uglifyjs,
   input: 'public/js/**/*.js',
   output: 'public/js-dist/uglifyjs-wildcards.js',
-  callback: function(err, min) {
+  callback: function (err, min) {
     console.log('wildcards Uglifyjs');
     console.log(err);
     //console.log(min);
@@ -186,7 +200,7 @@ minify({
   compressor: noCompress,
   input: 'public/js/**/*.js',
   output: 'public/js-dist/no-compress-wildcards.js',
-  callback: function(err, min) {
+  callback: function (err, min) {
     console.log('wildcards no-compress');
     console.log(err);
     //console.log(min);
@@ -197,7 +211,7 @@ minify({
   compressor: gcc,
   input: 'public/js/sample.js',
   output: 'public/js-dist/gcc-onefile.js',
-  callback: function(err, min) {
+  callback: function (err, min) {
     console.log('GCC one file');
     console.log(err);
     //console.log(min);
@@ -208,7 +222,7 @@ minify({
   compressor: gcc,
   input: ['public/js/sample.js', 'public/js/sample2.js'],
   output: 'public/js-dist/gcc-concat.js',
-  callback: function(err, min) {
+  callback: function (err, min) {
     console.log('GCC concat multi files');
     console.log(err);
     //console.log(min);
@@ -221,7 +235,7 @@ minify({
   input: 'public/css/sample.css',
   output: 'public/css-dist/yui-onefile.css',
   type: 'css',
-  callback: function(err, min) {
+  callback: function (err, min) {
     console.log('YUI CSS one file');
     console.log(err);
     //console.log(min);
@@ -233,7 +247,7 @@ minify({
   input: 'public/js/sample.js',
   output: 'public/js-dist/yui-onefile.js',
   type: 'js',
-  callback: function(err, min) {
+  callback: function (err, min) {
     console.log('YUI JS one file');
     console.log(err);
     //console.log(min);
@@ -245,7 +259,7 @@ minify({
   compressor: uglifyjs,
   input: 'public/js/sample.js',
   output: 'public/js-dist/uglify-onefile.js',
-  callback: function(err, min) {
+  callback: function (err, min) {
     console.log('Uglifyjs one file');
     console.log(err);
     //console.log(min);
@@ -256,7 +270,7 @@ minify({
   compressor: uglifyjs,
   input: ['public/js/sample.js', 'public/js/sample2.js'],
   output: 'public/js-dist/uglify-concat.js',
-  callback: function(err, min) {
+  callback: function (err, min) {
     console.log('Uglifyjs concat multi files');
     console.log(err);
     //console.log(min);
@@ -267,7 +281,7 @@ minify({
   compressor: noCompress,
   input: ['public/js/sample.js', 'public/js/sample2.js'],
   output: 'public/js-dist/no-compress-concat.js',
-  callback: function(err, min) {
+  callback: function (err, min) {
     console.log('No compress concat');
     console.log(err);
     //console.log(min);
@@ -279,7 +293,7 @@ minify({
   compressor: sqwish,
   input: ['public/css/sample.css', 'public/css/sample2.css'],
   output: 'public/css-dist/sqwish-concat.css',
-  callback: function(err, min) {
+  callback: function (err, min) {
     console.log('Sqwish concat');
     console.log(err);
     //console.log(min);
@@ -291,7 +305,7 @@ minify({
   compressor: crass,
   input: ['public/css/sample.css', 'public/css/sample2.css'],
   output: 'public/css-dist/crass-concat.css',
-  callback: function(err, min) {
+  callback: function (err, min) {
     console.log('Crass concat');
     console.log(err);
     //console.log(min);
@@ -305,7 +319,7 @@ minify({
   input: 'sample.js',
   output: 'public/js-dist/yui-publicfolder.js',
   type: 'js',
-  callback: function(err, min) {
+  callback: function (err, min) {
     console.log('YUI JS with publicFolder option');
     console.log(err);
     //console.log(min);
@@ -318,7 +332,7 @@ minify({
   input: ['sample.js', 'sample2.js'],
   output: 'public/js-dist/yui-publicfolder-concat.js',
   type: 'js',
-  callback: function(err, min) {
+  callback: function (err, min) {
     console.log('YUI JS with publicFolder option and array');
     console.log(err);
     //console.log(min);
@@ -330,7 +344,7 @@ minify({
   compressor: cssnano,
   input: ['public/css/sample.css', 'public/css/sample2.css'],
   output: 'public/css-dist/cssnano-concat.css',
-  callback: function(err, min) {
+  callback: function (err, min) {
     console.log('cssnano concat');
     console.log(err);
     //console.log(min);
@@ -342,7 +356,7 @@ minify({
   compressor: cleanCSS,
   input: ['public/css/sample.css', 'public/css/sample2.css'],
   output: 'public/css-dist/cleancss-concat.css',
-  callback: function(err, min) {
+  callback: function (err, min) {
     console.log('cleancss concat');
     console.log(err);
     //console.log(min);

diff --git a/package.json b/package.json
@@ -25,31 +25,31 @@
     "pretest": "npm run build && npm run eslint",
     "test": "jest",
     "posttest": "npm run clean:coverage",
-    "clean:build": "rimraf packages/*/lib",
-    "clean:coverage": "rimraf tests/tmp/*.{js,js.map,css,html}",
-    "clean:packages": "rimraf node_modules packages/*/node_modules",
+    "clean:build": "npx rimraf packages/*/lib",
+    "clean:coverage": "npx rimraf tests/tmp/*.{js,js.map,css,html}",
+    "clean:packages": "npx rimraf node_modules packages/*/node_modules",
     "showpack": "lerna pack --dry",
     "publish-latest": "NPM_CONFIG_OTP=xxx lerna publish --tag-version-prefix ''",
     "publish-next": "NPM_CONFIG_OTP=xxx lerna publish --tag-version-prefix '' --preid beta --npm-tag next",
     "prettier-project": "prettier --write './packages/**/{bin,src,__tests__}/**/*.js'"
   },
   "devDependencies": {
-    "@babel/cli": "7.16.8",
-    "@babel/core": "7.18.9",
-    "@babel/preset-env": "7.18.9",
+    "@babel/cli": "7.18.10",
+    "@babel/core": "7.18.10",
+    "@babel/preset-env": "7.18.10",
     "babel-core": "6.26.3",
     "babel-jest": "28.1.3",
     "babel-preset-env": "1.7.0",
     "codecov": "3.8.3",
     "eslint": "8.21.0",
-    "eslint-config-prettier": "8.3.0",
-    "eslint-plugin-prettier": "4.0.0",
-    "husky": "7.0.4",
+    "eslint-config-prettier": "8.5.0",
+    "eslint-plugin-prettier": "4.2.1",
+    "husky": "8.0.1",
     "jest": "27.4.5",
-    "lerna": "4.0.0",
-    "lint-staged": "12.1.4",
-    "node-notifier": "10.0.0",
-    "prettier": "2.5.1",
+    "lerna": "5.4.0",
+    "lint-staged": "13.0.3",
+    "node-notifier": "10.0.1",
+    "prettier": "2.7.1",
     "rimraf": "3.0.2"
   },
   "lint-staged": {