Merge pull request #122704 from cockroachdb/blathers/backport-release…

…-23.2-121380 release-23.2: ui: add static images to asset build step
cockroachdb · Jun 3, 2024 · c479fe4 · c479fe4
2 parents 2982a0a + 5cb2446
commit c479fe4
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 0 deletions.
diff --git a/pkg/ui/workspaces/db-console/BUILD.bazel b/pkg/ui/workspaces/db-console/BUILD.bazel
@@ -58,7 +58,38 @@ webpack_bin.webpack_cli(
         ":node_modules",
     ],
     outs = [
+        "db-console-ccl/assets/Inconsolata-Regular.woff",
+        "db-console-ccl/assets/Inconsolata-Regular.woff2",
+        "db-console-ccl/assets/Lato-Bold.woff",
+        "db-console-ccl/assets/Lato-Bold.woff2",
+        "db-console-ccl/assets/Lato-Light.woff",
+        "db-console-ccl/assets/Lato-Light.woff2",
+        "db-console-ccl/assets/Lato-Medium.woff",
+        "db-console-ccl/assets/Lato-Medium.woff2",
+        "db-console-ccl/assets/Lato-Regular.woff",
+        "db-console-ccl/assets/Lato-Regular.woff2",
+        "db-console-ccl/assets/RobotoMono-Bold.woff",
+        "db-console-ccl/assets/RobotoMono-Bold.woff2",
+        "db-console-ccl/assets/RobotoMono-Medium.woff",
+        "db-console-ccl/assets/RobotoMono-Medium.woff2",
+        "db-console-ccl/assets/RobotoMono-Regular.woff",
+        "db-console-ccl/assets/RobotoMono-Regular.woff2",
+        "db-console-ccl/assets/SFMono-Semibold.woff",
+        "db-console-ccl/assets/SFMono-Semibold.woff2",
+        "db-console-ccl/assets/SourceSansPro-Bold.woff",
+        "db-console-ccl/assets/SourceSansPro-Bold.woff2",
+        "db-console-ccl/assets/SourceSansPro-Regular.woff",
+        "db-console-ccl/assets/SourceSansPro-Regular.woff2",
+        "db-console-ccl/assets/SourceSansPro-SemiBold.woff",
+        "db-console-ccl/assets/SourceSansPro-SemiBold.woff2",
         "db-console-ccl/assets/bundle.js",
+        "db-console-ccl/assets/email_signup_bg.png",
+        "db-console-ccl/assets/favicon.ico",
+        "db-console-ccl/assets/heroBannerLp.png",
+        "db-console-ccl/assets/login-background.png",
+        "db-console-ccl/assets/not-found.svg",
+        "db-console-ccl/assets/questionMap.svg",
+        "db-console-ccl/assets/spinner.gif",
     ],
     args = [
         "--config webpack.config.js",
@@ -79,7 +110,37 @@ webpack_bin.webpack_cli(
         ":node_modules",
     ],
     outs = [
+        "db-console-oss/assets/Inconsolata-Regular.woff",
+        "db-console-oss/assets/Inconsolata-Regular.woff2",
+        "db-console-oss/assets/Lato-Bold.woff",
+        "db-console-oss/assets/Lato-Bold.woff2",
+        "db-console-oss/assets/Lato-Light.woff",
+        "db-console-oss/assets/Lato-Light.woff2",
+        "db-console-oss/assets/Lato-Medium.woff",
+        "db-console-oss/assets/Lato-Medium.woff2",
+        "db-console-oss/assets/Lato-Regular.woff",
+        "db-console-oss/assets/Lato-Regular.woff2",
+        "db-console-oss/assets/RobotoMono-Bold.woff",
+        "db-console-oss/assets/RobotoMono-Bold.woff2",
+        "db-console-oss/assets/RobotoMono-Medium.woff",
+        "db-console-oss/assets/RobotoMono-Medium.woff2",
+        "db-console-oss/assets/RobotoMono-Regular.woff",
+        "db-console-oss/assets/RobotoMono-Regular.woff2",
+        "db-console-oss/assets/SFMono-Semibold.woff",
+        "db-console-oss/assets/SFMono-Semibold.woff2",
+        "db-console-oss/assets/SourceSansPro-Bold.woff",
+        "db-console-oss/assets/SourceSansPro-Bold.woff2",
+        "db-console-oss/assets/SourceSansPro-Regular.woff",
+        "db-console-oss/assets/SourceSansPro-Regular.woff2",
+        "db-console-oss/assets/SourceSansPro-SemiBold.woff",
+        "db-console-oss/assets/SourceSansPro-SemiBold.woff2",
         "db-console-oss/assets/bundle.js",
+        "db-console-oss/assets/email_signup_bg.png",
+        "db-console-oss/assets/favicon.ico",
+        "db-console-oss/assets/heroBannerLp.png",
+        "db-console-oss/assets/login-background.png",
+        "db-console-oss/assets/not-found.svg",
+        "db-console-oss/assets/spinner.gif",
     ],
     args = [
         "--config webpack.config.js",

diff --git a/pkg/ui/workspaces/db-console/webpack.config.js b/pkg/ui/workspaces/db-console/webpack.config.js
@@ -165,6 +165,9 @@ module.exports = (env, argv) => {
           loader: "url-loader",
           options: {
             limit: 10000,
+            // Preserve the original filename instead of using hash
+            // in order to play nice with bazel.
+            name: "[name].[ext]",
           },
         },
         { test: /\.html$/, loader: "file-loader" },