Skip to content

Commit e589bc6

Browse files
sumitarorathePunderWoman
authored andcommitted
feat(devtools): added string flag for browser support (angular#44952)
* Added `flag_browser` to toggle between different browser builds chrome and firefox * Updated build command to support new flag configuration PR Close angular#44952
1 parent bc0b6fe commit e589bc6

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

devtools/projects/shell-browser/src/BUILD.bazel

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ load("//devtools/tools:ng_module.bzl", "ng_module")
44
load("//devtools/tools:typescript.bzl", "ts_library")
55
load("//tools:defaults.bzl", "esbuild")
66
load("//devtools/tools/esbuild:index.bzl", "LINKER_PROCESSED_FW_PACKAGES")
7+
load("@bazel_skylib//rules:common_settings.bzl", "string_flag")
78

89
package(default_visibility = ["//visibility:public"])
910

@@ -292,14 +293,23 @@ filegroup(
292293
],
293294
)
294295

296+
string_flag(
297+
name = "flag_browser",
298+
build_setting_default = "chrome",
299+
values = [
300+
"chrome",
301+
"firefox",
302+
],
303+
)
304+
295305
config_setting(
296306
name = "browser_chrome",
297-
values = {"define": "browser=chrome"},
307+
flag_values = {":flag_browser": "chrome"},
298308
)
299309

300310
config_setting(
301311
name = "browser_firefox",
302-
values = {"define": "browser=firefox"},
312+
flag_values = {":flag_browser": "firefox"},
303313
)
304314

305315
genrule(

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
"ts-circular-deps:approve": "yarn -s ng-dev ts-circular-deps approve --config ./packages/circular-deps-test.conf.js",
3838
"check-tooling-setup": "yarn tsc --project .ng-dev/tsconfig.json",
3939
"devtools:devserver": "ibazel run //devtools/src:devserver",
40-
"devtools:build:chrome": "bazelisk build --config snapshot //devtools/projects/shell-browser/src:prodapp --define browser=chrome",
41-
"devtools:build:firefox": "bazelisk build --config snapshot //devtools/projects/shell-browser/src:prodapp --define browser=firefox",
42-
"devtools:test": "bazelisk test --config snapshot //devtools/... --define browser=chrome"
40+
"devtools:build:chrome": "bazelisk build --config snapshot --//devtools/projects/shell-browser/src:flag_browser=chrome -- devtools/projects/shell-browser/src:prodapp",
41+
"devtools:build:firefox": "bazelisk build --config snapshot --//devtools/projects/shell-browser/src:flag_browser=firefox -- devtools/projects/shell-browser/src:prodapp",
42+
"devtools:test": "bazelisk test --config snapshot --//devtools/projects/shell-browser/src:flag_browser=chrome -- //devtools/..."
4343
},
4444
"// 1": "dependencies are used locally and by bazel",
4545
"dependencies": {

0 commit comments

Comments
 (0)