Skip to content

Commit 5c038ea

Browse files
author
Alex Eagle
committed
chore: move karma_web_test to concatjs
BREAKING CHANGE: TODO
1 parent 2c73fde commit 5c038ea

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+277
-1174
lines changed

WORKSPACE

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -140,14 +140,6 @@ cypress_repository(
140140
fail_on_error = False,
141141
)
142142

143-
#
144-
# Install @bazel/karma dependencies
145-
#
146-
147-
load("//packages/karma:package.bzl", "npm_bazel_karma_dependencies")
148-
149-
npm_bazel_karma_dependencies()
150-
151143
# Setup the rules_webtesting toolchain
152144
load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories")
153145

commitlint.config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ module.exports = {
1313
'cypress',
1414
'examples',
1515
'jasmine',
16-
'karma',
1716
'labs',
1817
'protractor',
1918
'rollup',

docs/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ rules_nodejs_docs(
7676
"Concatjs": "//packages/concatjs:README.md",
7777
"Cypress": "//packages/cypress:README.md",
7878
"Jasmine": "//packages/jasmine:README.md",
79-
"Karma": "//packages/karma:README.md",
8079
"Labs": "//packages/labs:README.md",
8180
"Protractor": "//packages/protractor:README.md",
8281
"Rollup": "//packages/rollup:README.md",

docs/Karma.html

Lines changed: 0 additions & 483 deletions
This file was deleted.

docs/Karma.md

Lines changed: 0 additions & 235 deletions
This file was deleted.

examples/BUILD.bazel

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ example_integration_test(
2020
npm_packages = {
2121
"//packages/angular:npm_package": "@bazel/angular",
2222
"//packages/concatjs:npm_package": "@bazel/concatjs",
23-
"//packages/karma:npm_package": "@bazel/karma",
2423
"//packages/protractor:npm_package": "@bazel/protractor",
2524
"//packages/rollup:npm_package": "@bazel/rollup",
2625
"//packages/terser:npm_package": "@bazel/terser",
@@ -46,7 +45,6 @@ example_integration_test(
4645
timeout = "long",
4746
npm_packages = {
4847
"//packages/concatjs:npm_package": "@bazel/concatjs",
49-
"//packages/karma:npm_package": "@bazel/karma",
5048
"//packages/protractor:npm_package": "@bazel/protractor",
5149
"//packages/rollup:npm_package": "@bazel/rollup",
5250
"//packages/terser:npm_package": "@bazel/terser",
@@ -142,7 +140,7 @@ example_integration_test(
142140
example_integration_test(
143141
name = "examples_web_testing",
144142
npm_packages = {
145-
"//packages/karma:npm_package": "@bazel/karma",
143+
"//packages/concatjs:npm_package": "@bazel/concatjs",
146144
"//packages/typescript:npm_package": "@bazel/typescript",
147145
},
148146
)
@@ -190,7 +188,6 @@ example_integration_test(
190188
timeout = "long",
191189
npm_packages = {
192190
"//packages/concatjs:npm_package": "@bazel/concatjs",
193-
"//packages/karma:npm_package": "@bazel/karma",
194191
"//packages/labs:npm_package": "@bazel/labs",
195192
"//packages/protractor:npm_package": "@bazel/protractor",
196193
"//packages/rollup:npm_package": "@bazel/rollup",

examples/angular/WORKSPACE

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,12 @@ load("@npm//@bazel/protractor:package.bzl", "npm_bazel_protractor_dependencies")
5959

6060
npm_bazel_protractor_dependencies()
6161

62-
# Load @bazel/karma dependencies
63-
load("@npm//@bazel/karma:package.bzl", "npm_bazel_karma_dependencies")
64-
65-
npm_bazel_karma_dependencies()
62+
# Load concatjs_web_test dependencies
63+
http_archive(
64+
name = "io_bazel_rules_webtesting",
65+
sha256 = "9bb461d5ef08e850025480bab185fd269242d4e533bca75bfb748001ceb343c3",
66+
urls = ["https://github.com/bazelbuild/rules_webtesting/releases/download/0.3.3/rules_webtesting.tar.gz"],
67+
)
6668

6769
# Setup the rules_webtesting toolchain
6870
load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories")

examples/angular/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
"@bazel/buildifier": "^3.5.0",
4343
"@bazel/concatjs": "^2.2.2",
4444
"@bazel/ibazel": "^0.13.2",
45-
"@bazel/karma": "^2.2.2",
4645
"@bazel/protractor": "^2.2.2",
4746
"@bazel/rollup": "^2.2.2",
4847
"@bazel/terser": "^2.2.2",

examples/angular/src/app/hello-world/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
load("@io_bazel_rules_sass//:defs.bzl", "multi_sass_binary")
2-
load("@npm//@bazel/karma:index.bzl", "karma_web_test_suite")
2+
load("@npm//@bazel/concatjs:index.bzl", "concatjs_web_test_suite")
33
load("@npm//@bazel/typescript:index.bzl", "ts_library")
44
load("//tools:angular_ts_library.bzl", "ng_ts_library")
55

@@ -49,7 +49,7 @@ ts_library(
4949
],
5050
)
5151

52-
karma_web_test_suite(
52+
concatjs_web_test_suite(
5353
name = "test",
5454
srcs = [
5555
# We are manaully adding the bazel generated named-UMD date-fns bundle here as

examples/angular/yarn.lock

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -883,13 +883,6 @@
883883
resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.13.2.tgz#eb914c41c66af4606db786457a7b130634355e8f"
884884
integrity sha512-q5fGwjTY76MLNcYpF2zEu/y1Clu4DjdjhvJM9+yDKc3+3mBlbX+uiMJYiCz5b0oSYdJTlw1QSRptTYA7CID8EQ==
885885

886-
"@bazel/karma@^2.2.2":
887-
version "2.2.2"
888-
resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-2.2.2.tgz#89470c42c527973bb59a02527b55ef9225dcbfc0"
889-
integrity sha512-V5y2N5d6RXde/4TQ8UcNg3IBdLx1tob6drYlHB7nYF3soShucTOfvEyENCLzn4LVeFgTrR8gdob5b3TzvYUCCw==
890-
dependencies:
891-
tmp "0.1.0"
892-
893886
"@bazel/protractor@^2.2.2":
894887
version "2.2.2"
895888
resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-2.2.2.tgz#0660837a193994ee349e15cb022de76f3262af5e"

0 commit comments

Comments
 (0)