refactor: make benchmarking syncing easier and add comments for future insight (angular#48521)

devversion · devversion · commit 6f429ae8e05c · 2022-12-19T19:50:45.000Z
The way the benchmarking code is used and wired up in g3 is rather magical. This change makes it easier to sync into g3 by using conditional blocks, and also consistnetly using a single bundle name (like it was before— we regressed here as part of the ESM initial changes- but now with clear comments, it's more future-proof..) PR Close angular#48521
diff --git a/modules/benchmarks/src/change_detection/transplanted_views/BUILD.bazel b/modules/benchmarks/src/change_detection/transplanted_views/BUILD.bazel
@@ -27,11 +27,19 @@ app_bundle(
     ],
 )
 
+# The script needs to be called `app_bundle` for easier syncing into g3.
+genrule(
+    name = "app_bundle",
+    srcs = [":bundle.debug.min.js"],
+    outs = ["app_bundle.js"],
+    cmd = "cp $< $@",
+)
+
 http_server(
     name = "prodserver",
     srcs = ["index.html"],
     deps = [
-        ":bundle.debug.min.js",
+        ":app_bundle",
         "//packages/zone.js/bundles:zone.umd.js",
     ],
 )
diff --git a/modules/benchmarks/src/change_detection/transplanted_views/index.html b/modules/benchmarks/src/change_detection/transplanted_views/index.html
@@ -26,7 +26,11 @@ <h2>Render3 Transplanted View Benchmark</h2>
       <declaration-component id="root"></declaration-component>
     </div>
 
+    <!-- BEGIN-EXTERNAL -->
     <script src="/angular/packages/zone.js/bundles/zone.umd.js"></script>
-    <script src="/bundle.debug.min.js"></script>
+    <!-- END-EXTERNAL -->
+
+    <!-- Needs to be named `app_bundle` for sync into Google. -->
+    <script src="/app_bundle.js"></script>
   </body>
 </html>
diff --git a/modules/benchmarks/src/expanding_rows/BUILD.bazel b/modules/benchmarks/src/expanding_rows/BUILD.bazel
@@ -40,11 +40,19 @@ app_bundle(
     ],
 )
 
+# The script needs to be called `app_bundle` for easier syncing into g3.
+genrule(
+    name = "app_bundle",
+    srcs = [":bundle.debug.min.js"],
+    outs = ["app_bundle.js"],
+    cmd = "cp $< $@",
+)
+
 http_server(
     name = "prodserver",
     srcs = ["index.html"],
     deps = [
-        ":bundle.debug.min.js",
+        ":app_bundle",
         "//packages/zone.js/bundles:zone.umd.js",
     ],
 )
diff --git a/modules/benchmarks/src/expanding_rows/index.html b/modules/benchmarks/src/expanding_rows/index.html
@@ -11,7 +11,11 @@ <h1>Change Detection Benchmark</h1>
 
     <benchmark-root>Loading...</benchmark-root>
 
+    <!-- BEGIN-EXTERNAL -->
     <script src="/angular/packages/zone.js/bundles/zone.umd.js"></script>
-    <script src="/bundle.debug.min.js"></script>
+    <!-- END-EXTERNAL -->
+
+    <!-- Needs to be named `app_bundle` for sync into Google. -->
+    <script src="/app_bundle.js"></script>
   </body>
 </html>
diff --git a/modules/benchmarks/src/js-web-frameworks/ng2/BUILD.bazel b/modules/benchmarks/src/js-web-frameworks/ng2/BUILD.bazel
@@ -24,11 +24,19 @@ app_bundle(
     ],
 )
 
+# The script needs to be called `app_bundle` for easier syncing into g3.
+genrule(
+    name = "app_bundle",
+    srcs = [":bundle.debug.min.js"],
+    outs = ["app_bundle.js"],
+    cmd = "cp $< $@",
+)
+
 http_server(
     name = "prodserver",
     srcs = ["index.html"],
     deps = [
-        ":bundle.debug.min.js",
+        ":app_bundle",
         "//packages/zone.js/bundles:zone.umd.js",
     ],
 )
diff --git a/modules/benchmarks/src/js-web-frameworks/ng2/index.html b/modules/benchmarks/src/js-web-frameworks/ng2/index.html
@@ -24,7 +24,11 @@ <h2>
       <js-web-frameworks id="root">Loading...</js-web-frameworks>
     </div>
 
+    <!-- BEGIN-EXTERNAL -->
     <script src="/angular/packages/zone.js/bundles/zone.umd.js"></script>
-    <script src="/bundle.debug.min.js"></script>
+    <!-- END-EXTERNAL -->
+
+    <!-- Needs to be named `app_bundle` for sync into Google. -->
+    <script src="/app_bundle.js"></script>
   </body>
 </html>
diff --git a/modules/benchmarks/src/largeform/ng2/index.html b/modules/benchmarks/src/largeform/ng2/index.html
@@ -20,6 +20,7 @@ <h2>Ng2 Large Form Benchmark</h2>
       <app id="root">Loading...</app>
     </div>
 
+    <!-- Needs to be named `app_bundle` for sync into Google. -->
     <script src="/app_bundle.js"></script>
   </body>
 </html>
diff --git a/modules/benchmarks/src/largeform/ng2/index.ts b/modules/benchmarks/src/largeform/ng2/index.ts
@@ -6,8 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+// BEGIN-EXTERNAL
 import 'zone.js/lib/browser/rollup-main';
 
+// END-EXTERNAL
+
 import {enableProdMode} from '@angular/core';
 import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
 
diff --git a/modules/benchmarks/src/largeform/ng2/index_aot.ts b/modules/benchmarks/src/largeform/ng2/index_aot.ts
@@ -6,8 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+// BEGIN-EXTERNAL
 import 'zone.js/lib/browser/rollup-main';
 
+// END-EXTERNAL
+
 import {enableProdMode} from '@angular/core';
 import {platformBrowser} from '@angular/platform-browser';
 
diff --git a/modules/benchmarks/src/largetable/baseline/BUILD.bazel b/modules/benchmarks/src/largetable/baseline/BUILD.bazel
@@ -15,11 +15,19 @@ ts_library(
 )
 
 app_bundle(
-    name = "app_bundle",
+    name = "bundle",
     entry_point = ":index.ts",
     deps = [":baseline"],
 )
 
+# The script needs to be called `app_bundle` for easier syncing into g3.
+genrule(
+    name = "app_bundle",
+    srcs = [":bundle.debug.min.js"],
+    outs = ["app_bundle.js"],
+    cmd = "cp $< $@",
+)
+
 http_server(
     name = "devserver",
     srcs = ["index.html"],
diff --git a/modules/benchmarks/src/largetable/baseline/index.html b/modules/benchmarks/src/largetable/baseline/index.html
@@ -28,6 +28,7 @@ <h2>Baseline Largetable Benchmark</h2>
       <largetable id="root">Loading...</largetable>
     </div>
 
+    <!-- Needs to be named `app_bundle` for sync into Google. -->
     <script src="/app_bundle.js"></script>
   </body>
 </html>
diff --git a/modules/benchmarks/src/largetable/incremental_dom/BUILD.bazel b/modules/benchmarks/src/largetable/incremental_dom/BUILD.bazel
@@ -15,11 +15,19 @@ ts_library(
 )
 
 app_bundle(
-    name = "app_bundle",
+    name = "bundle",
     entry_point = ":index.ts",
     deps = [":incremental_dom"],
 )
 
+# The script needs to be called `app_bundle` for easier syncing into g3.
+genrule(
+    name = "app_bundle",
+    srcs = [":bundle.debug.min.js"],
+    outs = ["app_bundle.js"],
+    cmd = "cp $< $@",
+)
+
 http_server(
     name = "devserver",
     srcs = [
diff --git a/modules/benchmarks/src/largetable/incremental_dom/index.html b/modules/benchmarks/src/largetable/incremental_dom/index.html
@@ -28,7 +28,11 @@ <h2>Incremental-Dom Largetable Benchmark</h2>
       <largetable id="root"></largetable>
     </div>
 
+    <!-- BEGIN-EXTERNAL -->
     <script src="/npm/node_modules/incremental-dom/dist/incremental-dom.js"></script>
+    <!-- END-EXTERNAL -->
+
+    <!-- Needs to be named `app_bundle` for sync into Google. -->
     <script src="/app_bundle.js"></script>
   </body>
 </html>
diff --git a/modules/benchmarks/src/largetable/iv/BUILD.bazel b/modules/benchmarks/src/largetable/iv/BUILD.bazel
@@ -7,8 +7,8 @@ package(default_visibility = ["//modules/benchmarks:__subpackages__"])
 http_server(
     name = "devserver",
     srcs = [
+        "app_bundle.js",
         "index.html",
-        "largetable.js",
     ],
 )
 
diff --git a/modules/benchmarks/src/largetable/iv/app_bundle.js b/modules/benchmarks/src/largetable/iv/app_bundle.js
diff --git a/modules/benchmarks/src/largetable/iv/index.html b/modules/benchmarks/src/largetable/iv/index.html
@@ -28,6 +28,7 @@ <h2>IV Largetable Benchmark</h2>
       <largetable id="root"></largetable>
     </div>
 
-    <script src="/largetable.js"></script>
+    <!-- Needs to be named `app_bundle` for sync into Google. -->
+    <script src="/app_bundle.js"></script>
   </body>
 </html>
diff --git a/modules/benchmarks/src/largetable/ng2/BUILD.bazel b/modules/benchmarks/src/largetable/ng2/BUILD.bazel
@@ -30,11 +30,19 @@ app_bundle(
     ],
 )
 
+# The script needs to be called `app_bundle` for easier syncing into g3.
+genrule(
+    name = "app_bundle",
+    srcs = [":bundle.debug.min.js"],
+    outs = ["app_bundle.js"],
+    cmd = "cp $< $@",
+)
+
 http_server(
     name = "prodserver",
     srcs = ["index.html"],
     deps = [
-        ":bundle.debug.min.js",
+        ":app_bundle",
         "//packages/zone.js/bundles:zone.umd.js",
     ],
 )
diff --git a/modules/benchmarks/src/largetable/ng2/index.html b/modules/benchmarks/src/largetable/ng2/index.html
@@ -28,7 +28,11 @@ <h2>Ng2 Largetable Benchmark</h2>
       <largetable id="root">Loading...</largetable>
     </div>
 
+    <!-- BEGIN-EXTERNAL -->
     <script src="/angular/packages/zone.js/bundles/zone.umd.js"></script>
-    <script src="/bundle.debug.min.js"></script>
+    <!-- END-EXTERNAL -->
+
+    <!-- Needs to be named `app_bundle` for sync into Google. -->
+    <script src="/app_bundle.js"></script>
   </body>
 </html>
diff --git a/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel b/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel
@@ -19,11 +19,19 @@ ng_module(
 )
 
 app_bundle(
-    name = "app_bundle",
+    name = "bundle",
     entry_point = ":index.ts",
     deps = [":ng2_switch"],
 )
 
+# The script needs to be called `app_bundle` for easier syncing into g3.
+genrule(
+    name = "app_bundle",
+    srcs = [":bundle.debug.min.js"],
+    outs = ["app_bundle.js"],
+    cmd = "cp $< $@",
+)
+
 http_server(
     name = "devserver",
     srcs = ["index.html"],
diff --git a/modules/benchmarks/src/largetable/ng2_switch/index.html b/modules/benchmarks/src/largetable/ng2_switch/index.html
@@ -28,7 +28,11 @@ <h2>Ng2 with NgSwitch Largetable Benchmark</h2>
       <largetable id="root">Loading...</largetable>
     </div>
 
+    <!-- BEGIN-EXTERNAL -->
     <script src="/angular/packages/zone.js/bundles/zone.umd.js"></script>
+    <!-- END-EXTERNAL -->
+
+    <!-- Needs to be named `app_bundle` for sync into Google. -->
     <script src="/app_bundle.js"></script>
   </body>
 </html>
diff --git a/modules/benchmarks/src/styling/ng2/BUILD.bazel b/modules/benchmarks/src/styling/ng2/BUILD.bazel
@@ -24,11 +24,19 @@ app_bundle(
     ],
 )
 
+# The script needs to be called `app_bundle` for easier syncing into g3.
+genrule(
+    name = "app_bundle",
+    srcs = [":bundle.debug.min.js"],
+    outs = ["app_bundle.js"],
+    cmd = "cp $< $@",
+)
+
 http_server(
     name = "prodserver",
     srcs = ["index.html"],
     deps = [
-        ":bundle.debug.min.js",
+        ":app_bundle",
         "//packages/zone.js/bundles:zone.umd.js",
     ],
 )
diff --git a/modules/benchmarks/src/styling/ng2/index.html b/modules/benchmarks/src/styling/ng2/index.html
@@ -49,7 +49,11 @@ <h2>Styling bindings benchmark</h2>
       <styling-bindings id="root">Loading...</styling-bindings>
     </div>
 
+    <!-- BEGIN-EXTERNAL -->
     <script src="/angular/packages/zone.js/bundles/zone.umd.js"></script>
-    <script src="/bundle.debug.min.js"></script>
+    <!-- END-EXTERNAL -->
+
+    <!-- Needs to be named `app_bundle` for sync into Google. -->
+    <script src="/app_bundle.js"></script>
   </body>
 </html>
diff --git a/modules/benchmarks/src/tree/baseline/BUILD.bazel b/modules/benchmarks/src/tree/baseline/BUILD.bazel
@@ -15,11 +15,19 @@ ts_library(
 )
 
 app_bundle(
-    name = "app_bundle",
+    name = "bundle",
     entry_point = ":index.ts",
     deps = [":baseline"],
 )
 
+# The script needs to be called `app_bundle` for easier syncing into g3.
+genrule(
+    name = "app_bundle",
+    srcs = [":bundle.debug.min.js"],
+    outs = ["app_bundle.js"],
+    cmd = "cp $< $@",
+)
+
 http_server(
     name = "devserver",
     srcs = ["index.html"],
diff --git a/modules/benchmarks/src/tree/baseline/index.html b/modules/benchmarks/src/tree/baseline/index.html
@@ -25,6 +25,7 @@ <h2>Baseline Tree Benchmark</h2>
       <tree id="root">Loading...</tree>
     </div>
 
+    <!-- Needs to be named `app_bundle` for sync into Google. -->
     <script src="/app_bundle.js"></script>
   </body>
 </html>
diff --git a/modules/benchmarks/src/tree/incremental_dom/BUILD.bazel b/modules/benchmarks/src/tree/incremental_dom/BUILD.bazel
@@ -16,11 +16,19 @@ ts_library(
 )
 
 app_bundle(
-    name = "app_bundle",
+    name = "bundle",
     entry_point = ":index.ts",
     deps = [":incremental_dom"],
 )
 
+# The script needs to be called `app_bundle` for easier syncing into g3.
+genrule(
+    name = "app_bundle",
+    srcs = [":bundle.debug.min.js"],
+    outs = ["app_bundle.js"],
+    cmd = "cp $< $@",
+)
+
 http_server(
     name = "devserver",
     srcs = [
diff --git a/modules/benchmarks/src/tree/incremental_dom/index.html b/modules/benchmarks/src/tree/incremental_dom/index.html
@@ -25,7 +25,11 @@ <h2>Incremental-Dom Tree Benchmark</h2>
       <tree id="root"></tree>
     </div>
 
+    <!-- BEGIN-EXTERNAL -->
     <script src="/npm/node_modules/incremental-dom/dist/incremental-dom.js"></script>
+    <!-- END-EXTERNAL -->
+
+    <!-- Needs to be named `app_bundle` for sync into Google. -->
     <script src="/app_bundle.js"></script>
   </body>
 </html>
diff --git a/modules/benchmarks/src/tree/iv/BUILD.bazel b/modules/benchmarks/src/tree/iv/BUILD.bazel
@@ -7,8 +7,8 @@ package(default_visibility = ["//modules/benchmarks:__subpackages__"])
 http_server(
     name = "devserver",
     srcs = [
+        "app_bundle.js",
         "index.html",
-        "tree.js",
     ],
 )
 
diff --git a/modules/benchmarks/src/tree/iv/app_bundle.js b/modules/benchmarks/src/tree/iv/app_bundle.js
diff --git a/modules/benchmarks/src/tree/iv/index.html b/modules/benchmarks/src/tree/iv/index.html
@@ -26,6 +26,7 @@ <h2>IV Tree Benchmark</h2>
     <div>Change detection runs:<span id="numberOfChecks"></span></div>
     <div id="root"></div>
 
-    <script src="/tree.js"></script>
+    <!-- Needs to be named `app_bundle` for sync into Google. -->
+    <script src="/app_bundle.js"></script>
   </body>
 </html>
diff --git a/modules/benchmarks/src/tree/ng1/BUILD.bazel b/modules/benchmarks/src/tree/ng1/BUILD.bazel
diff --git a/modules/benchmarks/src/tree/ng1/index.html b/modules/benchmarks/src/tree/ng1/index.html
diff --git a/modules/benchmarks/src/tree/ng2/BUILD.bazel b/modules/benchmarks/src/tree/ng2/BUILD.bazel
diff --git a/modules/benchmarks/src/tree/ng2/index.html b/modules/benchmarks/src/tree/ng2/index.html
diff --git a/modules/benchmarks/src/tree/ng2_static/index.html b/modules/benchmarks/src/tree/ng2_static/index.html
diff --git a/modules/benchmarks/src/tree/ng2_switch/BUILD.bazel b/modules/benchmarks/src/tree/ng2_switch/BUILD.bazel
diff --git a/modules/benchmarks/src/tree/ng2_switch/index.html b/modules/benchmarks/src/tree/ng2_switch/index.html
diff --git a/modules/benchmarks/src/views/BUILD.bazel b/modules/benchmarks/src/views/BUILD.bazel
