CLJS-3321: Upgrade to Closure Compiler v20210808 (#101)

CLJS-3321: Upgrade to Closure Compiler v20210808

Author: swannodette

deps.edn

@@ -1,6 +1,6 @@
 {:paths ["src/main/clojure" "src/main/cljs" "resources"]
  :deps
- {com.google.javascript/closure-compiler-unshaded {:mvn/version "v20210505"}
+ {com.google.javascript/closure-compiler-unshaded {:mvn/version "v20210808"}
   com.cognitect/transit-clj {:mvn/version "0.8.309"}
   org.clojure/clojure {:mvn/version "1.10.0"}
   org.clojure/core.specs.alpha {:mvn/version "0.1.24"}

pom.template.xml

@@ -30,7 +30,7 @@
         <dependency>
             <groupId>com.google.javascript</groupId>
             <artifactId>closure-compiler-unshaded</artifactId>
-            <version>v20210505</version>
+            <version>v20210808</version>
         </dependency>
         <dependency>
             <groupId>org.clojure</groupId>

project.clj

@@ -16,7 +16,7 @@
                  [org.clojure/test.check "0.10.0-alpha3" :scope "test"]
                  [com.cognitect/transit-clj "0.8.309"]
                  [org.clojure/google-closure-library "0.0-20201211-3e6c510d"]
-                 [com.google.javascript/closure-compiler-unshaded "v20210505"]]
+                 [com.google.javascript/closure-compiler-unshaded "v20210808"]]
   :profiles {:1.6 {:dependencies [[org.clojure/clojure "1.6.0"]]}
              :uberjar {:aot :all :main cljs.main}
              :closure-snapshot {:dependencies [[com.google.javascript/closure-compiler-unshaded "1.0-SNAPSHOT"]]}}

script/bootstrap

@@ -5,7 +5,7 @@ set -e
 CLOJURE_RELEASE="1.9.0"
 SPEC_ALPHA_RELEASE="0.1.143"
 CORE_SPECS_ALPHA_RELEASE="0.1.24"
-CLOSURE_RELEASE="20210505"
+CLOSURE_RELEASE="20210808"
 DJSON_RELEASE="0.2.6"
 TRANSIT_RELEASE="0.8.309"
 GCLOSURE_LIB_RELEASE="0.0-20201211-3e6c510d"

src/main/clojure/cljs/closure.clj

@@ -26,7 +26,7 @@
             [cljs.module-graph :as module-graph])
   (:import [java.lang ProcessBuilder]
            [java.io
-            File BufferedInputStream BufferedReader
+            File BufferedReader BufferedInputStream
             Writer InputStreamReader IOException StringWriter ByteArrayInputStream]
            [java.net URI URL]
            [java.util.logging Level]
@@ -39,9 +39,8 @@
                                          SourceMap$DetailLevel ClosureCodingConvention SourceFile
                                          Result JSError CheckLevel DiagnosticGroup DiagnosticGroups
                                          CommandLineRunner
-                                         JSModule SourceMap VariableMap PrintStreamErrorManager DiagnosticType
+                                         JSChunk SourceMap VariableMap PrintStreamErrorManager DiagnosticType
                                          VariableRenamingPolicy PropertyRenamingPolicy]
-           [com.google.javascript.jscomp.bundle Transpiler]
            [com.google.javascript.jscomp.deps ClosureBundler ModuleLoader$ResolutionMode ModuleNames
                                               SimpleDependencyInfo]
            [com.google.javascript.rhino Node]
@@ -117,16 +116,25 @@
 (defmulti js-source-file (fn [_ source] (class source)))
 
 (defmethod js-source-file String [^String name ^String source]
-  (SourceFile/fromCode name source))
+  (-> (SourceFile/builder)
+    (.withPath name)
+    (.withContent source)
+    (.build)))
 
 (defmethod js-source-file File [_ ^File source]
-  (SourceFile/fromPath (.toPath source) StandardCharsets/UTF_8))
+  (-> (SourceFile/builder)
+    (.withPath (.toPath source))
+    (.withCharset StandardCharsets/UTF_8)
+    (.build)))
 
 (defmethod js-source-file URL [_ ^URL source]
   (js-source-file _ (io/file (.getPath source))))
 
 (defmethod js-source-file BufferedInputStream [^String name ^BufferedInputStream source]
-  (SourceFile/fromInputStream name source))
+  (-> (SourceFile/builder)
+    (.withPath name)
+    (.withContent source)
+    (.build)))
 
 (def check-level
   {:error CheckLevel/ERROR
@@ -180,7 +188,6 @@
    :too-many-type-params DiagnosticGroups/TOO_MANY_TYPE_PARAMS
    :tweaks DiagnosticGroups/TWEAKS
    :type-invalidation DiagnosticGroups/TYPE_INVALIDATION
-   :undefined-names DiagnosticGroups/UNDEFINED_NAMES
    :undefined-variables DiagnosticGroups/UNDEFINED_VARIABLES
    :underscore DiagnosticGroups/UNDERSCORE
    :unknown-defines DiagnosticGroups/UNKNOWN_DEFINES
@@ -1262,7 +1269,7 @@
   "Given a list of IJavaScript sources in dependency order and compiler options
    return a dependency sorted list of module name / description tuples. The
    module descriptions will be augmented with a :closure-module entry holding
-   the Closure JSModule. Each module description will also be augmented with
+   the Closure JSChunk. Each module description will also be augmented with
    a :foreign-deps vector containing foreign IJavaScript sources in dependency
    order."
   [sources opts]
@@ -1287,7 +1294,7 @@
               (str "Module " name " does not define any :entries"))
             (when (:verbose opts)
               (util/debug-prn "Building module" name))
-            (let [js-module (JSModule. (clojure.core/name name))
+            (let [js-module (JSChunk. (clojure.core/name name))
                   module-sources
                   (reduce
                     (fn [ret entry-sym]
@@ -1315,7 +1322,7 @@
                   (do
                     (when (:verbose opts)
                       (util/debug-prn "  module" name "depends on" dep))
-                    (.addDependency js-module ^JSModule parent-module))
+                    (.addDependency js-module ^JSChunk parent-module))
                   (throw (util/compilation-error (IllegalArgumentException.
                                                    (str "Parent module " dep " does not exist"))))))
               (conj ret
@@ -1424,7 +1431,7 @@
         (io/file prop-out)))))
 
 (defn optimize-modules
-  "Use the Closure Compiler to optimize one or more Closure JSModules. Returns
+  "Use the Closure Compiler to optimize one or more Closure JSChunks. Returns
    a dependency sorted list of module name and description tuples."
   [opts & sources]
   ;; the following pre-condition can't be enabled
@@ -1445,7 +1452,7 @@
                   sources)
         modules (build-modules sources opts)
         ^List inputs (map (comp :closure-module second) modules)
-        _ (doseq [^JSModule input inputs]
+        _ (doseq [^JSChunk input inputs]
             (.sortInputsByDeps input closure-compiler))
         _ (when (or ana/*verbose* (:verbose opts))
             (util/debug-prn "Applying optimizations" (:optimizations opts) "to" (count sources) "sources"))
@@ -1465,7 +1472,7 @@
                  :source
                  (do
                    (when source-map (.reset source-map))
-                   (.toSource closure-compiler ^JSModule closure-module)))
+                   (.toSource closure-compiler ^JSChunk closure-module)))
                (when source-map
                  (let [sw (StringWriter.)
                        source-map-name (str output-to ".map.closure")]

src/main/clojure/cljs/externs.clj

@@ -16,6 +16,7 @@
            [com.google.javascript.jscomp.parsing Config$JsDocParsing]
            [com.google.javascript.rhino
             Node Token JSTypeExpression JSDocInfo$Visibility]
+           [java.nio.charset StandardCharsets]
            [java.util.logging Level]))
 
 (def ^:dynamic *ignore-var* false)
@@ -237,7 +238,10 @@
        {:name ns
         :defs (parsed->defs
                 (parse-externs
-                  (SourceFile/fromInputStream f (io/input-stream rsrc))))}))))
+                  (-> (SourceFile/builder)
+                    (.withPath (.toPath (io/file (.getPath rsrc))))
+                    (.withContent (io/input-stream rsrc))
+                    (.build))))}))))
 
 (comment
   (require '[clojure.java.io :as io]

src/test/clojure/cljs/closure_tests.clj

@@ -19,7 +19,7 @@
             [clojure.java.io :as io]
             [clojure.string :as string])
   (:import [java.io File]
-           [com.google.javascript.jscomp JSModule]))
+           [com.google.javascript.jscomp JSChunk]))
 
 (deftest test-make-preamble
   (testing "no options"
@@ -60,7 +60,7 @@
     (test/delete-out-files out)
     (build/build (build/inputs (:inputs project)) (:opts project))
     (let [compiler (closure/make-closure-compiler)
-          module (JSModule. "module-c")]
+          module (JSChunk. "module-c")]
       (.initOptions compiler (closure/make-options (:opts project)))
       (doseq [file ["cljs/core/constants.js"
                     "module_test/modules/a.js"