Update to closure compiler v20220601, add flag closureIsolatePolyfills

Author: blutorange

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 See also the [closure compiler changelog](https://github.com/google/closure-compiler/wiki/Releases).
 
+## 2.23.0
+
+* Update to closure compiler `v20220601`
+* Set default input language of JSCompiler to `ES_NEXT`
+* Add flag for isolating polyfills (`closureIsolatePolyfills`)
+
 ## 2.22.0
 
 * Compiled against Java 11.

README.md

@@ -38,7 +38,7 @@ Configure your project's `pom.xml` to run the plugin during the project's build
     <plugin>
       <groupId>com.github.blutorange</groupId>
       <artifactId>closure-compiler-maven-plugin</artifactId>
-      <version>2.22.0</version>
+      <version>2.23.0</version>
       <configuration>
         <!-- Base configuration for all executions (bundles) -->
         <baseSourceDir>${project.basedir}/src/main/resources</baseSourceDir>

pom.xml

@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.blutorange</groupId>
     <artifactId>closure-compiler-maven-plugin</artifactId>
-    <version>2.22.0</version>
+    <version>2.23.0</version>
     <packaging>maven-plugin</packaging>
 
     <name>Closure Compiler Maven Plugin</name>
@@ -75,19 +75,19 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <github.global.server>github</github.global.server>
-        <maven.version>3.8.3</maven.version>
-        <maven.embedder.version>3.6.3</maven.embedder.version>
+        <maven.version>3.8.5</maven.version>
+        <maven.embedder.version>3.8.5</maven.embedder.version>
         <maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
         <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
-        <maven-plugin-plugin.version>3.6.1</maven-plugin-plugin.version>
+        <maven-plugin-plugin.version>3.6.4</maven-plugin-plugin.version>
         <maven-jar-plugin.version>3.1.0</maven-jar-plugin.version>
         <maven-javadoc-plugin.version>3.0.1</maven-javadoc-plugin.version>
         <maven-jar-plugin>3.1.0</maven-jar-plugin>
         <maven-release-plugin-version>2.5.3</maven-release-plugin-version>
         <maven-site-plugin.version>3.7.1</maven-site-plugin.version>
         <maven-jxr-plugin.version>2.1</maven-jxr-plugin.version>
-        <maven.plugin.api.version>3.6.3</maven.plugin.api.version>
-        <maven.plugin.annotations.version>3.6.1</maven.plugin.annotations.version>
+        <maven.plugin.api.version>3.8.5</maven.plugin.api.version>
+        <maven.plugin.annotations.version>3.6.4</maven.plugin.annotations.version>
         <maven-source-plugin.version>3.0.1</maven-source-plugin.version>
         <maven-project-info-reports-plugin.version>3.0.0</maven-project-info-reports-plugin.version>
         <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
@@ -97,13 +97,13 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <junit.version>4.13.2</junit.version>
         <nexus-staging.version>1.6.8</nexus-staging.version>
-        <closure.compiler.version>v20211006</closure.compiler.version>
+        <closure.compiler.version>v20220601</closure.compiler.version>
         <dataurl-version>2.0.0</dataurl-version>
         <commons-io-version>2.11.0</commons-io-version>
         <commons.collections4.version>4.4</commons.collections4.version>
         <commons-lang3-version>3.12.0</commons-lang3-version>
         <commons-text.version>1.9</commons-text.version>
-        <gson.version>2.8.8</gson.version>
+        <gson.version>2.9.0</gson.version>
         <plexus.build.api.version>0.0.7</plexus.build.api.version>
         <site-maven-plugin.version>0.12</site-maven-plugin.version>
     </properties>

src/main/java/com/github/blutorange/maven/plugin/closurecompiler/common/ClosureConfig.java

@@ -82,6 +82,7 @@ private static CompilerOptions createCompilerOptions(MinifyMojo mojo) throws Moj
     options.setOutputCharset(Charset.forName(mojo.getEncoding()));
     options.setPreferLineBreakAtEndOfFile(true);
     options.setPreferSingleQuotes(mojo.isClosurePreferSingleQuotes());
+    options.setIsolatePolyfills(mojo.isClosureIsolatePolyfills());
     options.setPrettyPrint(mojo.isClosurePrettyPrint());
     options.setPreventLibraryInjection(!mojo.isClosureInjectLibraries());
     options.setProcessCommonJSModules(mojo.isClosureProcessCommonJsModules());

src/main/java/com/github/blutorange/maven/plugin/closurecompiler/plugin/MinifyMojo.java

@@ -369,6 +369,36 @@ public class MinifyMojo extends AbstractMojo {
   @Parameter(property = "closureJsModuleRoots", defaultValue = "")
   private ArrayList<String> closureJsModuleRoots;
 
+  /**
+   * Whether to isolate polyfills from the global scope.
+   * <p>
+   * Polyfill isolation is an output mode that may optionally be used alongside
+   * polyfill injection.
+   * <p>
+   * Polyfill isolation was motivated by two related issues.
+   * <ul>
+   * <li>sometimes, the existence of Closure polyfills on the page would cause
+   * other non-Closure-compiled code to break, because of conflicting
+   * assumptions in a polyfill implementation used by third-party code.<li>
+   * <li>sometimes, Closure-compiled code would break, because of existing
+   * polyfills on the page that violated some assumption Closure Compiler makes.
+   * </li>
+   * </ul>
+   * These issues were generally seen by projects compiling code for inclusion
+   * as a script on third-party websites, along with arbitrary JavaScript not
+   * under their control.
+   * <p>
+   * Polyfill isolation mode attempts to solve these problems by "isolating"
+   * Closure polyfills and code from other code & polyfills. It is not intended
+   * to protect against malicious actors; it is instead intended to solve cases
+   * where other polyfill implementations are either buggy or (more likely) make
+   * conflicting assumptions.
+   * 
+   * @since 2.23.0
+   */
+  @Parameter(property = "closureIsolatePolyfills", defaultValue = "false")
+  private boolean closureIsolatePolyfills;
+
   /**
    * Refers to which version of ECMAScript to assume when checking for errors in your code.<br/>
    * Possible values are:
@@ -388,14 +418,12 @@ public class MinifyMojo extends AbstractMojo {
    * <li>{@code ECMASCRIPT_2020}: Checks code assuming ECMAScript 2020 compliance.</li>
    * <li>{@code ECMASCRIPT_2021}: Checks code assuming ECMAScript 2021 compliance.</li>
    * <li>{@code ECMASCRIPT_NEXT}: Checks code assuming ECMAScript latest draft standard.</li>
-   * <li>{@code ECMASCRIPT_NEXT_IN}: Checks code assuming ECMAScript latest draft standard (latest
-   * features supported for input, but not output yet).</li>
    * <li>{@code STABLE} Use stable features</li>
    * </ul>
    * 
    * @since 1.7.2
    */
-  @Parameter(property = "closureLanguageIn", defaultValue = "ECMASCRIPT_2021")
+  @Parameter(property = "closureLanguageIn", defaultValue = "ECMASCRIPT_NEXT")
   private LanguageMode closureLanguageIn;
 
   /**
@@ -412,6 +440,7 @@ public class MinifyMojo extends AbstractMojo {
    * <li>{@code ECMASCRIPT_2018}: Outputs code with ECMAScript 2018.</li>
    * <li>{@code ECMASCRIPT_2019}: Outputs code with ECMAScript 2019.</li>
    * <li>{@code STABLE}: Use stable features</li>
+   * <li>{@code NO_TRANSPILE}: Do not perform any transpilation.</li>
    * </ul>
    * 
    * @since 1.7.5
@@ -424,6 +453,10 @@ public class MinifyMojo extends AbstractMojo {
    * <ul>
    * <li><code>BROWSER</code>: Requires all module imports to begin with a '.' or '/' and have a
    * file extension. Mimics the behavior of MS Edge.</li>
+   * <li><code>BROWSER_WITH_TRANSFORMED_PREFIXES</code>: A limited superset of
+   * <code>BROWSER</code> that transforms some path prefixes. For example, one
+   * could configure this so that "@root/" is replaced with
+   * "/my/path/to/project/" within import paths.</li>
    * <li><code>NODE</code>: Uses the node module rules. Modules which do not begin with a "." or "/"
    * character are looked up from the appropriate node_modules folder. Includes the ability to
    * require directories and JSON files. Exact match, then ".js", then ".json" file extensions are
@@ -1149,6 +1182,10 @@ public boolean isClosureInjectLibraries() {
     return closureInjectLibraries;
   }
 
+  public boolean isClosureIsolatePolyfills() {
+    return closureIsolatePolyfills;
+  }
+
   public boolean isClosurePreferSingleQuotes() {
     return closurePreferSingleQuotes;
   }
@@ -1305,6 +1342,10 @@ public void setClosureInjectLibraries(boolean closureInjectLibraries) {
     this.closureInjectLibraries = closureInjectLibraries;
   }
 
+  public void setClosureIsolatePolyfills(boolean closureIsolatePolyfills) {
+    this.closureIsolatePolyfills = closureIsolatePolyfills;
+  }
+
   public void setClosureJsModuleRoots(ArrayList<String> closureJsModuleRoots) {
     this.closureJsModuleRoots = closureJsModuleRoots;
   }

src/test/java/com/github/blutorange/maven/plugin/closurecompiler/test/MinifyMojoTest.java

@@ -289,6 +289,11 @@ public void testRewritePolyfills() throws Exception {
     runMinifyAndAssertDirContent("rewritepolyfills");
   }
 
+  @Test
+  public void testIsolatePolyfills() throws Exception {
+    runMinifyAndAssertDirContent("isolatepolyfills");
+  }
+
   @Test
   public void testSkip() throws Exception {
     runMinifyAndAssertDirContent("skip");

src/test/resources/projects/allowdynamicimport/expected/dynamic-imports-false.js

@@ -72,7 +72,7 @@ $jscomp.polyfillIsolated = function(a, b, c, d) {
   e = e[e.length - 1];
   c = $jscomp.IS_SYMBOL_NATIVE && "es6" === c ? d[e] : null;
   b = b(c);
-  null != b && (a ? $jscomp.defineProperty($jscomp.polyfills, e, {configurable:!0, writable:!0, value:b}) : b !== c && (void 0 === $jscomp.propertyToPolyfillSymbol[e] && (c = 1e9 * Math.random() >>> 0, $jscomp.propertyToPolyfillSymbol[e] = $jscomp.IS_SYMBOL_NATIVE ? $jscomp.global.Symbol(e) : $jscomp.POLYFILL_PREFIX + c + "$" + e), $jscomp.defineProperty(d, $jscomp.propertyToPolyfillSymbol[e], {configurable:!0, writable:!0, value:b})));
+  null != b && (a ? $jscomp.defineProperty($jscomp.polyfills, e, {configurable:!0, writable:!0, value:b}) : b !== c && (void 0 === $jscomp.propertyToPolyfillSymbol[e] && (c = 1E9 * Math.random() >>> 0, $jscomp.propertyToPolyfillSymbol[e] = $jscomp.IS_SYMBOL_NATIVE ? $jscomp.global.Symbol(e) : $jscomp.POLYFILL_PREFIX + c + "$" + e), $jscomp.defineProperty(d, $jscomp.propertyToPolyfillSymbol[e], {configurable:!0, writable:!0, value:b})));
 };
 $jscomp.underscoreProtoCanBeSet = function() {
   var a = {a:!0}, b = {};

src/test/resources/projects/externs/expected/with-externs.js

@@ -1,2 +1,2 @@
-'use strict';for(var a=[{title:"Note 1",content:"Content of Note 1"},{title:"Note 2",content:"Content of Note 2"}],b=document.getElementById("notes"),c=0;c<a.length;c++){var d=a[c].content,e=b,f=textDiv(a[c].title),g=textDiv(d),h=document.createElement("div");h.appendChild(f);h.appendChild(g);e.appendChild(h)}
+'use strict';for(var a=document.getElementById("notes"),b=[{title:"Note 1",content:"Content of Note 1"},{title:"Note 2",content:"Content of Note 2"}],c=0;c<b.length;c++){var d=b[c].content,e=a,f=textDiv(b[c].title),g=textDiv(d),h=document.createElement("div");h.appendChild(f);h.appendChild(g);e.appendChild(h)}
 ;

src/test/resources/projects/isolatepolyfills/expected/isolate-polyfills-false.js

@@ -0,0 +1,125 @@
+'use strict';
+var $jscomp = $jscomp || {};
+$jscomp.scope = {};
+$jscomp.arrayIteratorImpl = function(a) {
+  var c = 0;
+  return function() {
+    return c < a.length ? {done:!1, value:a[c++],} : {done:!0};
+  };
+};
+$jscomp.arrayIterator = function(a) {
+  return {next:$jscomp.arrayIteratorImpl(a)};
+};
+$jscomp.ASSUME_ES5 = !1;
+$jscomp.ASSUME_NO_NATIVE_MAP = !1;
+$jscomp.ASSUME_NO_NATIVE_SET = !1;
+$jscomp.SIMPLE_FROUND_POLYFILL = !1;
+$jscomp.ISOLATE_POLYFILLS = !1;
+$jscomp.FORCE_POLYFILL_PROMISE = !1;
+$jscomp.FORCE_POLYFILL_PROMISE_WHEN_NO_UNHANDLED_REJECTION = !1;
+$jscomp.defineProperty = $jscomp.ASSUME_ES5 || "function" == typeof Object.defineProperties ? Object.defineProperty : function(a, c, b) {
+  if (a == Array.prototype || a == Object.prototype) {
+    return a;
+  }
+  a[c] = b.value;
+  return a;
+};
+$jscomp.getGlobal = function(a) {
+  a = ["object" == typeof globalThis && globalThis, a, "object" == typeof window && window, "object" == typeof self && self, "object" == typeof global && global,];
+  for (var c = 0; c < a.length; ++c) {
+    var b = a[c];
+    if (b && b.Math == Math) {
+      return b;
+    }
+  }
+  throw Error("Cannot find global object");
+};
+$jscomp.global = $jscomp.getGlobal(this);
+$jscomp.IS_SYMBOL_NATIVE = "function" === typeof Symbol && "symbol" === typeof Symbol("x");
+$jscomp.TRUST_ES6_POLYFILLS = !$jscomp.ISOLATE_POLYFILLS || $jscomp.IS_SYMBOL_NATIVE;
+$jscomp.polyfills = {};
+$jscomp.propertyToPolyfillSymbol = {};
+$jscomp.POLYFILL_PREFIX = "$jscp$";
+var $jscomp$lookupPolyfilledValue = function(a, c) {
+  var b = $jscomp.propertyToPolyfillSymbol[c];
+  if (null == b) {
+    return a[c];
+  }
+  b = a[b];
+  return void 0 !== b ? b : a[c];
+};
+$jscomp.polyfill = function(a, c, b, d) {
+  c && ($jscomp.ISOLATE_POLYFILLS ? $jscomp.polyfillIsolated(a, c, b, d) : $jscomp.polyfillUnisolated(a, c, b, d));
+};
+$jscomp.polyfillUnisolated = function(a, c, b, d) {
+  b = $jscomp.global;
+  a = a.split(".");
+  for (d = 0; d < a.length - 1; d++) {
+    var e = a[d];
+    if (!(e in b)) {
+      return;
+    }
+    b = b[e];
+  }
+  a = a[a.length - 1];
+  d = b[a];
+  c = c(d);
+  c != d && null != c && $jscomp.defineProperty(b, a, {configurable:!0, writable:!0, value:c});
+};
+$jscomp.polyfillIsolated = function(a, c, b, d) {
+  var e = a.split(".");
+  a = 1 === e.length;
+  d = e[0];
+  d = !a && d in $jscomp.polyfills ? $jscomp.polyfills : $jscomp.global;
+  for (var f = 0; f < e.length - 1; f++) {
+    var g = e[f];
+    if (!(g in d)) {
+      return;
+    }
+    d = d[g];
+  }
+  e = e[e.length - 1];
+  b = $jscomp.IS_SYMBOL_NATIVE && "es6" === b ? d[e] : null;
+  c = c(b);
+  null != c && (a ? $jscomp.defineProperty($jscomp.polyfills, e, {configurable:!0, writable:!0, value:c}) : c !== b && (void 0 === $jscomp.propertyToPolyfillSymbol[e] && (b = 1E9 * Math.random() >>> 0, $jscomp.propertyToPolyfillSymbol[e] = $jscomp.IS_SYMBOL_NATIVE ? $jscomp.global.Symbol(e) : $jscomp.POLYFILL_PREFIX + b + "$" + e), $jscomp.defineProperty(d, $jscomp.propertyToPolyfillSymbol[e], {configurable:!0, writable:!0, value:c})));
+};
+$jscomp.initSymbol = function() {
+};
+$jscomp.iteratorPrototype = function(a) {
+  a = {next:a};
+  a[Symbol.iterator] = function() {
+    return this;
+  };
+  return a;
+};
+$jscomp.iteratorFromArray = function(a, c) {
+  a instanceof String && (a += "");
+  var b = 0, d = !1, e = {next:function() {
+    if (!d && b < a.length) {
+      var f = b++;
+      return {value:c(f, a[f]), done:!1};
+    }
+    d = !0;
+    return {done:!0, value:void 0};
+  }};
+  e[Symbol.iterator] = function() {
+    return e;
+  };
+  return e;
+};
+$jscomp.polyfill("Array.prototype.values", function(a) {
+  return a ? a : function() {
+    return $jscomp.iteratorFromArray(this, function(c, b) {
+      return b;
+    });
+  };
+}, "es8", "es3");
+function makeUnique(a) {
+  a = new Set(a);
+  return Array.from(a);
+}
+function uniqueByKey(a, c) {
+  a = new Map(a.map(b => [c(b), b]));
+  return Array.from(a.values());
+}
+;