Remove remaining references and logic related to soy (#634)

gkdn · web-flow · commit 85de39166f98 · 2024-12-18T17:08:17.000-08:00
diff --git a/README.md b/README.md
@@ -2,9 +2,9 @@
 
 JavaScript | Templating | Stylesheets | Miscellaneous
 --- | --- | --- | ---
-[closure_js_library] | [closure_js_template_library] | [closure_css_library] | [closure_js_proto_library]
-[closure_js_binary] | [closure_java_template_library] | [closure_css_binary] | [phantomjs_test]
-[closure_js_test] | [closure_py_template_library] | | [closure_proto_library] \(Experimental\)
+[closure_js_library] | [closure_css_library] | [closure_js_proto_library]
+[closure_js_binary] | [closure_css_binary] | [phantomjs_test]
+[closure_js_test] | [closure_proto_library] \(Experimental\)
 | | | | [closure_grpc_web_library] \(Experimental\)
 
 ## Overview
@@ -27,9 +27,7 @@ play games. It enforces a type system that can be stricter than Java. From a
 stylistic perspective, Closure is [verbose] like Java; there's no cryptic
 symbols or implicit behavior; the code says exactly what it's doing.  This sets
 Closure apart from traditional JavaScript development, where terseness was
-favored over readability, because minifiers weren't very good. Furthermore, the
-Closure Library and Templates help you follow security best practices which will
-keep your users safe.
+favored over readability, because minifiers weren't very good.
 
 ### What's Included
 
@@ -41,7 +39,6 @@ Closure Rules bundles the following tools and makes them "just work."
   transpiles [ECMASCRIPT6] to minified ES3 JavaScript that can run in any
   browser.
 - [Closure Library]: Google's core JavaScript libraries.
-- [Closure Templates]: Type-safe HTML templating system that compiles to both
   JavaScript and Java. This is one of the most secure templating systems
   available. It's where Google has put the most thought into preventing things
   like XSS attacks. It also supports i18n and l10n.
@@ -136,7 +133,6 @@ Please see the test directories within this project for concrete examples of usa
 
 - [//closure/testing/test](https://github.com/bazelbuild/rules_closure/tree/master/closure/testing/test)
 - [//closure/compiler/test](https://github.com/bazelbuild/rules_closure/tree/master/closure/compiler/test)
-- [//closure/templates/test](https://github.com/bazelbuild/rules_closure/tree/master/closure/templates/test)
 - [//closure/stylesheets/test](https://github.com/bazelbuild/rules_closure/tree/master/closure/stylesheets/test)
 - [//closure/protobuf/test](https://github.com/bazelbuild/rules_closure/tree/master/closure/protobuf/test)
 
@@ -190,8 +186,7 @@ This rule can be referenced as though it were the following:
   list that image here, so it ends up in the webserver runfiles.
 
 - **deps:** (List of [labels]; optional) Direct [dependency] list. These can
-  point to [closure_js_library], [closure_js_template_library],
-  [closure_css_library] and [closure_js_proto_library] rules.
+  point to [closure_js_library], [closure_css_library] and [closure_js_proto_library] rules.
 
 - **exports:** (List of [labels]; optional) Listing dependencies here will cause
   them to become *direct* dependencies in parent rules. This functions similarly
@@ -284,14 +279,14 @@ This rule can be referenced as though it were the following:
 
 - **deps:** (List of [labels]; required) Direct dependency list. This attribute
   has the same meaning as it does in [closure_js_library].  These can point to
-  [closure_js_library] and [closure_js_template_library] rules.
+  [closure_js_library] rules.
 
 - **css:** (Label; optional) CSS class renaming target, which must point to a
   [closure_css_binary] rule. This causes the CSS name mapping file generated by
   the CSS compiler to be included in the compiled JavaScript.  This tells
   Closure Compiler how to minify CSS class names.
 
-  This attribute is required if any of JavaScript or template sources depend on
+  This attribute is required if any of JavaScript sources depend on
   a [closure_css_library]. This rule will check that all the referenced CSS
   libraries are present in the CSS binary.
 
@@ -499,158 +494,6 @@ This rule can be referenced as though it were the following:
   to report the result to the `harness`.
 
 
-## closure\_js\_template\_library
-
-```starlark
-load("@io_bazel_rules_closure//closure:defs.bzl", "closure_js_template_library")
-closure_js_template_library(name, srcs, data, deps, globals, plugin_modules,
-                            should_generate_js_doc,
-                            should_generate_soy_msg_defs,
-                            bidi_global_dir,
-                            soy_msgs_are_external,
-                            defs)
-```
-
-Compiles Closure templates to JavaScript source files.
-
-This rule is necessary in order to render Closure templates from within
-JavaScript code.
-
-This rule pulls in a transitive dependency on the Closure Library.
-
-The documentation on using Closure Templates can be found
-[here][Closure Templates].
-
-For additional help on using some of these attributes, please see the output of
-the following:
-
-    bazel run @com_google_template_soy//:SoyToJsSrcCompiler -- --help
-
-#### Implicit Output Targets
-
-- *src*.js: A separate JavaScript source file is generated for each file listed
-  under `srcs`. The filename will be the same as the template with a `.js`
-  suffix. For example `foo.soy` would become `foo.soy.js`.
-
-#### Rule Polymorphism
-
-This rule can be referenced as though it were the following:
-
-- [filegroup]: `srcs` will be the generated JS output files and `data` will
-  contain all transitive JS sources and data.
-
-- [closure_js_library]: `srcs` will be the generated JS output files, `data`
-  will contain the transitive data, `deps` will contain necessary libraries, and
-  `no_closure_library` will be `False`.
-
-### Arguments
-
-- **name:** ([Name]; required) A unique name for this rule.
-
-- **srcs:** (List of [labels]; required) A list of `.soy` source files that
-  represent this library.
-
-- **data:** (List of [labels]; optional) Runfiles directly referenced by Soy
-  sources in this rule. For example, if the template has an `<img src=foo.png>`
-  tag, then the data attribute of its rule should be set to `["foo.png"]` so the
-  image is available in the web server runfiles.
-
-- **deps:** (List of [labels]; optional) List of [closure_js_library],
-  [closure_js_template_library] and [closure_js_proto_library] targets which
-  define symbols referenced by the template.
-
-- **globals:** (List of [labels]; optional) List of text files containing symbol
-  definitions that are only considered at compile-time. For example, this file
-  might look as follows:
-
-      com.foo.bar.Debug.PRODUCTION = 0
-      com.foo.bar.Debug.DEBUG = 1
-      com.foo.bar.Debug.RAW = 2
-
-- **plugin_modules:** (List of [labels]; optional; default is `[]`) Passed along
-  verbatim to the SoyToJsSrcCompiler above.
-
-- **should_generate_js_doc:** (Boolean; optional; default is `True`) Passed
-  along verbatim to the SoyToJsSrcCompiler above.
-
-- **should_generate_soy_msg_defs:** (Boolean; optional; default is `False`)
-  Passed along verbatim to the SoyToJsSrcCompiler above.
-
-- **bidi_global_dir:** (Integer; optional; default is `1`)
-  Passed along verbatim to the SoyToJsSrcCompiler above.
-  Valid values are 1 (LTR) or -1 (RTL).
-
-- **soy_msgs_are_external:** (Boolean; optional; default is `False`) Passed
-  along verbatim to the SoyToJsSrcCompiler above.
-
-- **defs:** (List of strings; optional) Passed along verbatim to the
-  SoyToJsSrcCompiler above.
-
-## closure\_java\_template\_library
-
-```starlark
-load("@io_bazel_rules_closure//closure:defs.bzl", "closure_java_template_library")
-closure_java_template_library(name, srcs, data, deps, java_package)
-```
-
-Compiles Closure templates to Java source files.
-
-This rule is necessary in order to serve Closure templates from a Java backend.
-
-Unlike [closure_js_template_library], globals are not specified by this rule.
-They get added at runtime by your Java code when serving templates.
-
-This rule pulls in a transitive dependency on Guava, Guice, and ICU4J.
-
-The documentation on using Closure Templates can be found
-[here][Closure Templates].
-
-For additional help on using some of these attributes, please see the output of
-the following:
-
-    bazel run @com_google_template_soy//:SoyParseInfoGenerator -- --help
-
-#### Implicit Output Targets
-
-- SrcSoyInfo.java: A separate Java source file is generated for each file
-  listed under `srcs`. The filename will be the same as the template, converted
-  to upper camel case, with a `SoyInfo.java` suffix. For example `foo_bar.soy`
-  would become `FooBarSoyInfo.java`.
-
-#### Rule Polymorphism
-
-This rule can be referenced as though it were the following:
-
-- [filegroup]: `srcs` will be the compiled jar file and `data` will contain all
-  transitive data.
-
-- [java_library]: `srcs` will be the generated Java source files, and `data`
-  will contain the transitive data.
-
-### Arguments
-
-- **name:** ([Name]; required) A unique name for this rule.
-
-- **srcs:** (List of [labels]; required) A list of `.soy` source files that
-  represent this library.
-
-- **data:** (List of [labels]; optional) Runfiles directly referenced by Soy
-  sources in this rule. For example, if the template has an `<img src=foo.png>`
-  tag, then the data attribute of its rule should be set to `["foo.png"]` so the
-  image is available in the web server runfiles.
-
-- **deps:** (List of [labels]; optional) Soy files to parse but not to generate
-  outputs for.
-
-- **java_package:** (List of [labels]; required) The package for the Java files
-  that are generated, e.g. `"com.foo.soy"`.
-
-
-## closure\_py\_template\_library
-
-TODO
-
-
 ## closure\_css\_library
 
 ```starlark
@@ -665,8 +508,7 @@ This rule does not compile your stylesheets; it is used in conjunction with
 
 This rule should be referenced by any [closure_js_library] rule whose sources
 contain a `goog.getCssName('foo')` call if `foo` is a CSS class name defined by
-this rule. The same concept applies to [closure_js_template_library] rules that
-contain `{css('foo')}` expressions.
+this rule.
 
 #### Rule Polymorphism
 
@@ -783,10 +625,6 @@ This rule can be referenced as though it were the following:
   target, so the build system can verify (at compile time) that your CSS and
   JS binaries are both being compiled in a harmonious way.
 
-  You'll also need update your templates to say `{css('foo-bar')}` in place of
-  class names. The [closure_js_template_library] must also depend on the
-  appropriate CSS library.
-
 - **debug:** (Boolean; optional; default is `False`) Enables debug mode, which
   causes the compiled stylesheet to be pretty printed. If `renaming = True` then
   class names will be renamed, but still readable to humans.
@@ -844,9 +682,6 @@ Defines a set of Protocol Buffer files.
 
 - *name*.js: A generated protocol buffer JavaScript library.
 
-- *name*.descriptor: A protoc FileDescriptorsSet representation of the .proto
-  files.
-
 #### Rule Polymorphism
 
 This rule can be referenced as though it were the following:
@@ -909,7 +744,6 @@ This rule can be referenced as though it were the following:
 [Closure Compiler]: https://developers.google.com/closure/compiler/
 [Closure Library]: https://developers.google.com/closure/library/
 [Closure Stylesheets]: https://github.com/google/closure-stylesheets
-[Closure Templates]: https://developers.google.com/closure/templates/
 [Closure Tools]: https://developers.google.com/closure/
 [Closure coding conventions]: https://github.com/google/closure-compiler/blob/master/src/com/google/javascript/jscomp/ClosureCodingConvention.java
 [ECMASCRIPT6]: http://es6-features.org/
@@ -928,14 +762,11 @@ This rule can be referenced as though it were the following:
 [closure_css_binary]: #closure_css_binary
 [closure_css_library]: #closure_css_library
 [closure_grpc_web_library]: https://github.com/grpc/grpc-web/blob/9b7b2d5411c486aa646ba2491cfd894d5352775b/bazel/closure_grpc_web_library.bzl#L149
-[closure_java_template_library]: #closure_java_template_library
 [closure_js_binary]: #closure_js_binary
 [closure_js_library]: #closure_js_library
 [closure_js_proto_library]: #closure_js_proto_library
-[closure_js_template_library]: #closure_js_template_library
 [closure_js_test]: #closure_js_test
 [closure_proto_library]: #closure_proto_library
-[closure_py_template_library]: #closure_py_template_library
 [coffeescript]: http://coffeescript.org/
 [compiler-issue]: https://github.com/google/closure-compiler/issues/new
 [css-sourcemap]: https://developer.chrome.com/devtools/docs/css-preprocessors
diff --git a/closure/compiler/closure_js_library.bzl b/closure/compiler/closure_js_library.bzl
@@ -102,7 +102,6 @@ def _closure_js_library_impl(
         includes = (),
         exports = depset(),
         deps_stylesheets = [],
-        internal_descriptors = depset(),
         no_closure_library = False,
         internal_expect_failure = False,
         artifact_suffix = "",
@@ -299,9 +298,6 @@ def _closure_js_library_impl(
         unusable_type_definition = unusable_type_definition,
     )
 
-    if type(internal_descriptors) == "list":
-        internal_descriptors = depset(internal_descriptors)
-
     # We now export providers to any parent Target. This is considered a public
     # interface because other Skylark rules can be designed to do things with
     # this data. Other Skylark rules can even export their own provider with the
@@ -336,11 +332,6 @@ def _closure_js_library_impl(
         # within any given transitive closure, no namespace collisions
         # exist. These MUST NOT begin with "/" or ".", or contain "..".
         modules = depset(modules, transitive = [js.modules]),
-        # NestedSet<File> of all protobuf definitions in the transitive
-        # closure. It is used so Closure Templates can have information about
-        # the structure of protobufs so they can be easily rendered in .soy
-        # files with type safety. See closure_js_template_library.bzl.
-        descriptors = depset(transitive = [js.descriptors, internal_descriptors]),
         # NestedSet<Label> of all closure_css_library rules in the transitive
         # closure. This is used by closure_js_binary can guarantee the
         # completeness of goog.getCssName() substitutions.
@@ -395,7 +386,6 @@ def _closure_js_library(ctx):
         getattr(ctx.attr, "includes", []),
         extract_providers(ctx.attr.exports, ClosureJsLibraryInfo),
         extract_providers(ctx.attr.deps, ClosureCssLibraryInfo),
-        ctx.files.internal_descriptors,
         ctx.attr.no_closure_library,
         ctx.attr.internal_expect_failure,
         "",  # artifact_suffix
@@ -447,7 +437,6 @@ closure_js_library = rule(
         "language": attr.string(),
 
         # internal only
-        "internal_descriptors": attr.label_list(allow_files = True),
         "internal_expect_failure": attr.bool(default = False),
     }, **CLOSURE_JS_TOOLCHAIN_ATTRS),
     # TODO(yannic): Deprecate.
diff --git a/closure/private/defs.bzl b/closure/private/defs.bzl
@@ -19,7 +19,6 @@ CSS_FILE_TYPE = [".css", ".gss"]
 HTML_FILE_TYPE = [".html"]
 JS_FILE_TYPE = [".js"]
 JS_TEST_FILE_TYPE = ["_test.js"]
-SOY_FILE_TYPE = [".soy"]
 
 JS_LANGUAGE_IN = "STABLE"
 JS_LANGUAGE_OUT_DEFAULT = "ECMASCRIPT5"
@@ -92,11 +91,6 @@ closure. These are generated from the source file path relative to
 the longest matching root prefix. It is used to guarantee that
 within any given transitive closure, no namespace collisions
 exist. These MUST NOT begin with "/" or ".", or contain "..".""",
-    "descriptors": """
-NestedSet<File> of all protobuf definitions in the transitive
-closure. It is used so Closure Templates can have information about
-the structure of protobufs so they can be easily rendered in .soy
-files with type safety. See closure_js_template_library.bzl.""",
     "stylesheets": """
 NestedSet<Label> of all closure_css_library rules in the transitive
 closure. This is used by closure_js_binary can guarantee the
@@ -156,7 +150,6 @@ def collect_js(
     ijs_files = []
     infos = []
     modules = []
-    descriptors = []
     stylesheets = []
     js_module_roots = []
     has_closure_library = False
@@ -165,7 +158,6 @@ def collect_js(
         ijs_files.append(getattr(dep, "ijs_files", depset()))
         infos.append(getattr(dep, "infos", depset()))
         modules.append(getattr(dep, "modules", depset()))
-        descriptors.append(getattr(dep, "descriptors", depset()))
         stylesheets.append(getattr(dep, "stylesheets", depset()))
         js_module_roots.append(getattr(dep, "js_module_roots", depset()))
         has_closure_library = (
@@ -188,7 +180,6 @@ def collect_js(
         ijs_files = depset(transitive = ijs_files),
         infos = depset(transitive = infos),
         modules = depset(transitive = modules),
-        descriptors = depset(transitive = descriptors),
         stylesheets = depset(transitive = stylesheets),
         has_closure_library = has_closure_library,
     )
diff --git a/closure/protobuf/closure_js_proto_library.bzl b/closure/protobuf/closure_js_proto_library.bzl
@@ -50,7 +50,6 @@ def closure_js_proto_library(
 
     cmd += ["-I%s" % i for i in _collect_includes(srcs)]
     cmd.append("--js_out=%s:$(@D)" % ",".join(js_out_options))
-    cmd.append("--descriptor_set_out=$(@D)/%s.descriptor" % name)
     cmd += ["$(locations " + src + ")" for src in srcs]
 
     native.genrule(
@@ -59,7 +58,7 @@ def closure_js_proto_library(
         testonly = testonly,
         visibility = ["//visibility:private"],
         message = "Generating JavaScript Protocol Buffer file",
-        outs = [name + ".js", name + ".descriptor"],
+        outs = [name + ".js"],
         tools = [protocbin],
         cmd = " ".join(cmd),
     )
@@ -72,7 +71,6 @@ def closure_js_proto_library(
             str(Label("@com_google_javascript_closure_library//closure/goog/array")),
             str(Label("//closure/protobuf:jspb")),
         ],
-        internal_descriptors = [name + ".descriptor"],
         suppress = suppress + [
             "missingProperties",
             "unusedLocalVariables",
diff --git a/closure/repositories.bzl b/closure/repositories.bzl
diff --git a/closure/soy_build.patch b/closure/soy_build.patch
