Skip to content

Commit bfc5f5f

Browse files
devversionamysorto
authored andcommitted
build: update to latest snapshot of ESM ng-dev (#25083)
(cherry picked from commit 8eacf97)
1 parent 08c3867 commit bfc5f5f

File tree

3 files changed

+10
-29
lines changed

3 files changed

+10
-29
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
"@angular/bazel": "^14.0.1",
7777
"@angular/cli": "^14.0.1",
7878
"@angular/compiler-cli": "^14.0.1",
79-
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#136fa6e336fd635db4e16cd582e1fd9b6cf444a6",
79+
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#f2f440e6c5ae7ca7e98a51f3f476fda5612dd948",
8080
"@angular/localize": "^14.0.1",
8181
"@angular/platform-browser-dynamic": "^14.0.1",
8282
"@angular/platform-server": "^14.0.1",

tools/defaults.bzl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ def protractor_web_test_suite(name, deps, **kwargs):
318318
spec_bundle(
319319
name = "%s_bundle" % name,
320320
deps = deps,
321-
platform = "node",
321+
platform = "cjs-legacy",
322322
external = ["protractor", "selenium-webdriver"],
323323
)
324324

@@ -349,8 +349,8 @@ def node_integration_test(setup_chromium = False, node_repository = "nodejs", **
349349
# If Chromium should be configured, add it to the runfiles and expose its binaries
350350
# through test environment variables. The variables are auto-detected by e.g. Karma.
351351
if setup_chromium:
352-
data += ["@npm//@angular/dev-infra-private/bazel/browsers/chromium"]
353-
toolchains += ["@npm//@angular/dev-infra-private/bazel/browsers/chromium:toolchain_alias"]
352+
data.append("@npm//@angular/dev-infra-private/bazel/browsers/chromium")
353+
toolchains.append("@npm//@angular/dev-infra-private/bazel/browsers/chromium:toolchain_alias")
354354
environment.update({
355355
"CHROMEDRIVER_BIN": "$(CHROMEDRIVER)",
356356
"CHROME_BIN": "$(CHROMIUM)",
@@ -396,7 +396,7 @@ def ng_web_test_suite(deps = [], static_css = [], exclude_init_script = False, *
396396
# loads the given CSS file.
397397
for css_label in static_css:
398398
css_id = "static-css-file-%s" % (css_label.replace("/", "_").replace(":", "-"))
399-
bootstrap += [":%s" % css_id]
399+
bootstrap.append(":%s" % css_id)
400400

401401
native.genrule(
402402
name = css_id,

yarn.lock

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -327,9 +327,9 @@
327327
dependencies:
328328
tslib "^2.3.0"
329329

330-
"@angular/dev-infra-private@https://github.com/angular/dev-infra-private-builds.git#136fa6e336fd635db4e16cd582e1fd9b6cf444a6":
331-
version "0.0.0-a5c2fb281ba9b0fa3b8d30d10f50bc909415b8e4"
332-
resolved "https://github.com/angular/dev-infra-private-builds.git#136fa6e336fd635db4e16cd582e1fd9b6cf444a6"
330+
"@angular/dev-infra-private@https://github.com/angular/dev-infra-private-builds.git#f2f440e6c5ae7ca7e98a51f3f476fda5612dd948":
331+
version "0.0.0-a84eef14d3990a24765684f12b89470ae1b9a3eb"
332+
resolved "https://github.com/angular/dev-infra-private-builds.git#f2f440e6c5ae7ca7e98a51f3f476fda5612dd948"
333333
dependencies:
334334
"@angular-devkit/build-angular" "14.1.0-next.0"
335335
"@angular/benchpress" "0.3.0"
@@ -349,10 +349,10 @@
349349
"@types/tmp" "^0.2.1"
350350
"@types/uuid" "^8.3.1"
351351
"@types/yargs" "^17.0.0"
352+
"@yarnpkg/lockfile" "^1.1.0"
352353
browser-sync "^2.27.7"
353354
clang-format "1.8.0"
354355
prettier "2.6.2"
355-
protobufjs "^6.11.3"
356356
protractor "^7.0.0"
357357
selenium-webdriver "4.2.0"
358358
send "^0.18.0"
@@ -4255,7 +4255,7 @@
42554255
resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
42564256
integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
42574257

4258-
"@yarnpkg/[email protected]":
4258+
"@yarnpkg/[email protected]", "@yarnpkg/lockfile@^1.1.0":
42594259
version "1.1.0"
42604260
resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
42614261
integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
@@ -13341,25 +13341,6 @@ [email protected]:
1334113341
"@types/node" "^10.1.0"
1334213342
long "^4.0.0"
1334313343

13344-
protobufjs@^6.11.3:
13345-
version "6.11.3"
13346-
resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.3.tgz#637a527205a35caa4f3e2a9a4a13ddffe0e7af74"
13347-
integrity sha512-xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg==
13348-
dependencies:
13349-
"@protobufjs/aspromise" "^1.1.2"
13350-
"@protobufjs/base64" "^1.1.2"
13351-
"@protobufjs/codegen" "^2.0.4"
13352-
"@protobufjs/eventemitter" "^1.1.0"
13353-
"@protobufjs/fetch" "^1.1.0"
13354-
"@protobufjs/float" "^1.0.2"
13355-
"@protobufjs/inquire" "^1.1.0"
13356-
"@protobufjs/path" "^1.1.2"
13357-
"@protobufjs/pool" "^1.1.0"
13358-
"@protobufjs/utf8" "^1.1.0"
13359-
"@types/long" "^4.0.1"
13360-
"@types/node" ">=13.7.0"
13361-
long "^4.0.0"
13362-
1336313344
protractor@^7.0.0:
1336413345
version "7.0.0"
1336513346
resolved "https://registry.yarnpkg.com/protractor/-/protractor-7.0.0.tgz#c3e263608bd72e2c2dc802b11a772711a4792d03"

0 commit comments

Comments
 (0)