Skip to content

Commit

Permalink
chore: move karma_web_test to concatjs (#2313)
Browse files Browse the repository at this point in the history
* chore: move karma_web_test to concatjs

BREAKING CHANGE:

`packages/karma:package.bzl` is gone, in your WORKSPACE replace

```
load("//packages/karma:package.bzl", "npm_bazel_karma_dependencies")

npm_bazel_karma_dependencies()
```

with the equivalent

```
http_archive(
    name = "io_bazel_rules_webtesting",
    sha256 = "9bb461d5ef08e850025480bab185fd269242d4e533bca75bfb748001ceb343c3",
    urls = ["https://github.com/bazelbuild/rules_webtesting/releases/download/0.3.3/rules_webtesting.tar.gz"],
)
```

Then in BUILD files replace
`load("@npm//@bazel/karma:index.bzl", "karma_web_test_suite")`
with
`load("@npm//@bazel/concatjs:index.bzl", "concatjs_web_test_suite")`

finally drop npm dependencies on `@bazel/karma` and depend on `@bazel/concatjs` instead

* concatjs_web back to karma_web
  • Loading branch information
alexeagle authored Dec 2, 2020
1 parent f01e319 commit 252b8e5
Show file tree
Hide file tree
Showing 70 changed files with 248 additions and 1,130 deletions.
8 changes: 0 additions & 8 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -140,14 +140,6 @@ cypress_repository(
fail_on_error = False,
)

#
# Install @bazel/karma dependencies
#

load("//packages/karma:package.bzl", "npm_bazel_karma_dependencies")

npm_bazel_karma_dependencies()

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

Expand Down
1 change: 0 additions & 1 deletion commitlint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ module.exports = {
'cypress',
'examples',
'jasmine',
'karma',
'labs',
'protractor',
'rollup',
Expand Down
1 change: 0 additions & 1 deletion docs/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ rules_nodejs_docs(
"Concatjs": "//packages/concatjs:README.md",
"Cypress": "//packages/cypress:README.md",
"Jasmine": "//packages/jasmine:README.md",
"Karma": "//packages/karma:README.md",
"Labs": "//packages/labs:README.md",
"Protractor": "//packages/protractor:README.md",
"Rollup": "//packages/rollup:README.md",
Expand Down
483 changes: 0 additions & 483 deletions docs/Karma.html

This file was deleted.

235 changes: 0 additions & 235 deletions docs/Karma.md

This file was deleted.

5 changes: 1 addition & 4 deletions examples/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ example_integration_test(
npm_packages = {
"//packages/angular:npm_package": "@bazel/angular",
"//packages/concatjs:npm_package": "@bazel/concatjs",
"//packages/karma:npm_package": "@bazel/karma",
"//packages/protractor:npm_package": "@bazel/protractor",
"//packages/rollup:npm_package": "@bazel/rollup",
"//packages/terser:npm_package": "@bazel/terser",
Expand All @@ -46,7 +45,6 @@ example_integration_test(
timeout = "long",
npm_packages = {
"//packages/concatjs:npm_package": "@bazel/concatjs",
"//packages/karma:npm_package": "@bazel/karma",
"//packages/protractor:npm_package": "@bazel/protractor",
"//packages/rollup:npm_package": "@bazel/rollup",
"//packages/terser:npm_package": "@bazel/terser",
Expand Down Expand Up @@ -142,7 +140,7 @@ example_integration_test(
example_integration_test(
name = "examples_web_testing",
npm_packages = {
"//packages/karma:npm_package": "@bazel/karma",
"//packages/concatjs:npm_package": "@bazel/concatjs",
"//packages/typescript:npm_package": "@bazel/typescript",
},
)
Expand Down Expand Up @@ -190,7 +188,6 @@ example_integration_test(
timeout = "long",
npm_packages = {
"//packages/concatjs:npm_package": "@bazel/concatjs",
"//packages/karma:npm_package": "@bazel/karma",
"//packages/labs:npm_package": "@bazel/labs",
"//packages/protractor:npm_package": "@bazel/protractor",
"//packages/rollup:npm_package": "@bazel/rollup",
Expand Down
10 changes: 6 additions & 4 deletions examples/angular/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,12 @@ load("@npm//@bazel/protractor:package.bzl", "npm_bazel_protractor_dependencies")

npm_bazel_protractor_dependencies()

# Load @bazel/karma dependencies
load("@npm//@bazel/karma:package.bzl", "npm_bazel_karma_dependencies")

npm_bazel_karma_dependencies()
# Load karma_web_test dependencies
http_archive(
name = "io_bazel_rules_webtesting",
sha256 = "9bb461d5ef08e850025480bab185fd269242d4e533bca75bfb748001ceb343c3",
urls = ["https://github.com/bazelbuild/rules_webtesting/releases/download/0.3.3/rules_webtesting.tar.gz"],
)

# Setup the rules_webtesting toolchain
load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories")
Expand Down
1 change: 0 additions & 1 deletion examples/angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
"@bazel/buildifier": "^3.5.0",
"@bazel/concatjs": "^2.2.2",
"@bazel/ibazel": "^0.13.2",
"@bazel/karma": "^2.2.2",
"@bazel/protractor": "^2.2.2",
"@bazel/rollup": "^2.2.2",
"@bazel/terser": "^2.2.2",
Expand Down
2 changes: 1 addition & 1 deletion examples/angular/src/app/hello-world/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@io_bazel_rules_sass//:defs.bzl", "multi_sass_binary")
load("@npm//@bazel/karma:index.bzl", "karma_web_test_suite")
load("@npm//@bazel/concatjs:index.bzl", "karma_web_test_suite")
load("@npm//@bazel/typescript:index.bzl", "ts_library")
load("//tools:angular_ts_library.bzl", "ng_ts_library")

Expand Down
7 changes: 0 additions & 7 deletions examples/angular/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -883,13 +883,6 @@
resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.13.2.tgz#eb914c41c66af4606db786457a7b130634355e8f"
integrity sha512-q5fGwjTY76MLNcYpF2zEu/y1Clu4DjdjhvJM9+yDKc3+3mBlbX+uiMJYiCz5b0oSYdJTlw1QSRptTYA7CID8EQ==

"@bazel/karma@^2.2.2":
version "2.2.2"
resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-2.2.2.tgz#89470c42c527973bb59a02527b55ef9225dcbfc0"
integrity sha512-V5y2N5d6RXde/4TQ8UcNg3IBdLx1tob6drYlHB7nYF3soShucTOfvEyENCLzn4LVeFgTrR8gdob5b3TzvYUCCw==
dependencies:
tmp "0.1.0"

"@bazel/protractor@^2.2.2":
version "2.2.2"
resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-2.2.2.tgz#0660837a193994ee349e15cb022de76f3262af5e"
Expand Down
10 changes: 6 additions & 4 deletions examples/angular_view_engine/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,12 @@ load("@npm//@bazel/protractor:package.bzl", "npm_bazel_protractor_dependencies")

npm_bazel_protractor_dependencies()

# Load @bazel/karma dependencies
load("@npm//@bazel/karma:package.bzl", "npm_bazel_karma_dependencies")

npm_bazel_karma_dependencies()
# Load karma dependencies
http_archive(
name = "io_bazel_rules_webtesting",
sha256 = "9bb461d5ef08e850025480bab185fd269242d4e533bca75bfb748001ceb343c3",
urls = ["https://github.com/bazelbuild/rules_webtesting/releases/download/0.3.3/rules_webtesting.tar.gz"],
)

# Setup the rules_webtesting toolchain
load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories")
Expand Down
1 change: 0 additions & 1 deletion examples/angular_view_engine/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
"@bazel/buildifier": "^3.5.0",
"@bazel/ibazel": "^0.13.2",
"@bazel/concatjs": "^2.2.2",
"@bazel/karma": "^2.2.2",
"@bazel/protractor": "^2.2.2",
"@bazel/rollup": "^2.2.2",
"@bazel/terser": "^2.2.2",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@io_bazel_rules_sass//:defs.bzl", "sass_binary")
load("@npm//@bazel/karma:index.bzl", "karma_web_test_suite")
load("@npm//@bazel/concatjs:index.bzl", "karma_web_test_suite")
load("@npm//@bazel/typescript:index.bzl", "ts_library")
load("@npm_angular_bazel//:index.bzl", "ng_module")

Expand Down
7 changes: 0 additions & 7 deletions examples/angular_view_engine/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -833,13 +833,6 @@
resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.13.2.tgz#eb914c41c66af4606db786457a7b130634355e8f"
integrity sha512-q5fGwjTY76MLNcYpF2zEu/y1Clu4DjdjhvJM9+yDKc3+3mBlbX+uiMJYiCz5b0oSYdJTlw1QSRptTYA7CID8EQ==

"@bazel/karma@^2.2.2":
version "2.2.2"
resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-2.2.2.tgz#89470c42c527973bb59a02527b55ef9225dcbfc0"
integrity sha512-V5y2N5d6RXde/4TQ8UcNg3IBdLx1tob6drYlHB7nYF3soShucTOfvEyENCLzn4LVeFgTrR8gdob5b3TzvYUCCw==
dependencies:
tmp "0.1.0"

"@bazel/protractor@^2.2.2":
version "2.2.2"
resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-2.2.2.tgz#0660837a193994ee349e15cb022de76f3262af5e"
Expand Down
3 changes: 1 addition & 2 deletions examples/protocol_buffers/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
load("@npm//@bazel/concatjs:index.bzl", "concatjs_devserver")
load("@npm//@bazel/karma:index.bzl", "karma_web_test_suite")
load("@npm//@bazel/concatjs:index.bzl", "concatjs_devserver", "karma_web_test_suite")
load("@npm//@bazel/labs:index.bzl", "ts_proto_library")
load("@npm//@bazel/protractor:index.bzl", "protractor_web_test_suite")
load("@npm//@bazel/rollup:index.bzl", "rollup_bundle")
Expand Down
Loading

0 comments on commit 252b8e5

Please sign in to comment.