@node-minify/google-closure-compiler 6.4.0 → 7.1.0

package/lib/google-closure-compiler.js

@@ -1,11 +1,9 @@
 "use strict";
 
-var _googleClosureCompiler = _interopRequireDefault(require("google-closure-compiler"));
-
+var _googleClosureCompilerJava = _interopRequireDefault(require("google-closure-compiler-java"));
 var _utils = require("@node-minify/utils");
-
+var _run = require("@node-minify/run");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 /*!
  * node-minify
  * Copyright(c) 2011-2022 Rodolphe Stoclin
@@ -16,12 +14,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * Module dependencies.
  */
 
-/**
- * Module variables.
- */
-const ClosureCompiler = _googleClosureCompiler.default.jsCompiler; // the allowed flags, taken from https://github.com/google/closure-compiler
+// the allowed flags, taken from https://github.com/google/closure-compiler/wiki/Flags-and-Options
+const allowedFlags = ['angular_pass', 'assume_function_wrapper', 'checks_only', 'compilation_level', 'create_source_map', 'define', 'env', 'externs', 'export_local_property_definitions', 'generate_exports', 'language_in', 'language_out', 'output_wrapper', 'polymer_version', 'process_common_js_modules', 'rename_prefix_namespace', 'rewrite_polyfills', 'use_types_for_optimization', 'warning_level'];
 
-const allowedFlags = ['angularPass', 'applyInputSourceMaps', 'assumeFunctionWrapper', 'checksOnly', 'compilationLevel', 'createSourceMap', 'dartPass', 'defines', 'env', 'externs', 'exportLocalPropertyDefinitions', 'generateExports', 'languageIn', 'languageOut', 'newTypeInf', 'outputWrapper', 'polymerVersion', 'preserveTypeAnnotations', 'processCommonJsModules', 'renamePrefixNamespace', 'rewritePolyfills', 'useTypesForOptimization', 'warningLevel'];
 /**
  * Run Google Closure Compiler.
  *
@@ -29,7 +24,6 @@ const allowedFlags = ['angularPass', 'applyInputSourceMaps', 'assumeFunctionWrap
  * @param {String} content
  * @param {Function} callback
  */
-
 const minifyGCC = ({
   settings,
   content,
@@ -37,65 +31,56 @@ const minifyGCC = ({
   index
 }) => {
   const options = applyOptions({}, settings.options);
-  const gcc = new ClosureCompiler(options);
-  const contentMinified = gcc.run([{
-    src: content
-  }], (exitCode, stdOut, stdErr) => {
-    if (exitCode > 0 && callback) {
-      return callback(stdErr);
+  return (0, _run.runCommandLine)({
+    args: gccCommand(options),
+    data: content,
+    settings,
+    callback: (err, content) => {
+      if (err) {
+        if (callback) {
+          return callback(err);
+        } else {
+          throw err;
+        }
+      }
+      if (!settings.content) {
+        _utils.utils.writeFile({
+          file: settings.output,
+          content,
+          index
+        });
+      }
+      if (callback) {
+        return callback(null, content);
+      }
+      return content;
     }
   });
-
-  if (!settings.content) {
-    _utils.utils.writeFile({
-      file: settings.output,
-      content: contentMinified.compiledCode,
-      index
-    });
-  }
-  /**
-   * Write GCC sourceMap
-   * If the createSourceMap option is passed we'll write the sourceMap file
-   * If createSourceMap is a boolean we'll append .map to the settings.output file path
-   * otherwise use createSourceMap as the file path.
-   */
-
-
-  if (settings.options.createSourceMap) {
-    const sourceMapOutput = typeof settings.options.createSourceMap === 'boolean' ? settings.output + '.map' : settings.options.createSourceMap;
-
-    _utils.utils.writeFile({
-      file: sourceMapOutput,
-      content: contentMinified.sourceMap,
-      index
-    });
-  }
-
-  if (callback) {
-    return callback(null, contentMinified.compiledCode);
-  }
-
-  return contentMinified.compiledCode;
 };
+
 /**
  * Adds any valid options passed in the options parameters to the flags parameter and returns the flags object.
  * @param {Object} flags
  * @param {Object} options
  * @returns {Object} flags
  */
-
-
 const applyOptions = (flags, options) => {
   if (!options || Object.keys(options).length === 0) {
     return flags;
   }
-
   Object.keys(options).filter(option => allowedFlags.indexOf(option) > -1).forEach(option => flags[option] = options[option]);
   return flags;
 };
+
 /**
- * Expose `minifyGCC()`.
+ * GCC command line.
  */
 
+const gccCommand = options => {
+  return ['-jar', _googleClosureCompilerJava.default].concat(_utils.utils.buildArgs(options || {}));
+};
 
+/**
+ * Expose `minifyGCC()`.
+ */
 module.exports = minifyGCC;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@node-minify/google-closure-compiler",
-  "version": "6.4.0",
+  "version": "7.1.0",
   "description": "google closure compiler plugin for @node-minify",
   "keywords": [
     "compressor",
@@ -14,7 +14,7 @@
   "license": "MIT",
   "main": "lib/google-closure-compiler.js",
   "engines": {
-    "node": ">=12.0.0"
+    "node": ">=14.0.0"
   },
   "directories": {
     "lib": "lib",
@@ -34,8 +34,9 @@
     "url": "https://github.com/srod/node-minify/issues"
   },
   "dependencies": {
-    "@node-minify/utils": "^6.4.0",
-    "google-closure-compiler": "20200719.0.0"
+    "@node-minify/run": "^7.1.0",
+    "@node-minify/utils": "^7.1.0",
+    "google-closure-compiler-java": "20221102.0.1"
   },
-  "gitHead": "d529747a661487597e9be510d3d9e2df1bc0f556"
+  "gitHead": "94cef2d5d653c3bddc3e603b4e25c135b0b6f4b3"
 }