Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 368ea28

Browse files
atscottatscott
committed
Revert "build: update integration/bazel & @angular/bazel schematics to rules_nodejs 1.0.0 (#34589)" (#34730)
This reverts commit 7203169. PR Close #34730
1 parent c9fdc66 commit 368ea28

File tree

8 files changed

+260
-364
lines changed

8 files changed

+260
-364
lines changed

‎integration/bazel/WORKSPACE

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,16 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
88
# Fetch rules_nodejs so we can install our npm dependencies
99
http_archive(
1010
name = "build_bazel_rules_nodejs",
11-
sha256 = "3887b948779431ac443e6a64f31b9e1e17b8d386a31eebc50ec1d9b0a6cabd2b",
12-
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/1.0.0/rules_nodejs-1.0.0.tar.gz"],
11+
sha256 = "9901bc17138a79135048fb0c107ee7a56e91815ec6594c08cb9a17b80276d62b",
12+
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.40.0/rules_nodejs-0.40.0.tar.gz"],
1313
)
1414

1515
# Fetch sass rules for compiling sass files
1616
http_archive(
1717
name = "io_bazel_rules_sass",
18-
sha256 = "77e241148f26d5dbb98f96fe0029d8f221c6cb75edbb83e781e08ac7f5322c5f",
19-
strip_prefix = "rules_sass-1.24.0",
20-
urls = [
21-
"https://github.com/bazelbuild/rules_sass/archive/1.24.0.zip",
22-
"https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/1.24.0.zip",
23-
],
18+
sha256 = "4f05239080175a3f4efa8982d2b7775892d656bb47e8cf56914d5f9441fb5ea6",
19+
strip_prefix = "rules_sass-86ca977cf2a8ed481859f83a286e164d07335116",
20+
url = "https://github.com/bazelbuild/rules_sass/archive/86ca977cf2a8ed481859f83a286e164d07335116.zip",
2421
)
2522

2623
# Check the bazel version and download npm dependencies

‎integration/bazel/package.json

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,26 +23,18 @@
2323
"@angular/compiler": "file:../../dist/packages-dist/compiler",
2424
"@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
2525
"@bazel/bazel": "file:../../node_modules/@bazel/bazel",
26-
"@bazel/karma": "1.0.0",
27-
"@bazel/protractor": "1.0.0",
28-
"@bazel/rollup": "1.0.0",
29-
"@bazel/terser": "1.0.0",
30-
"@bazel/typescript": "1.0.0",
26+
"@bazel/karma": "0.40.0",
27+
"@bazel/protractor": "0.40.0",
28+
"@bazel/rollup": "0.40.0",
29+
"@bazel/terser": "0.40.0",
30+
"@bazel/typescript": "0.40.0",
3131
"@types/jasmine": "2.8.8",
32-
"http-server": "0.12.0",
33-
"karma": "4.4.1",
34-
"karma-chrome-launcher": "3.1.0",
35-
"karma-firefox-launcher": "1.2.0",
36-
"karma-jasmine": "2.0.1",
37-
"karma-requirejs": "1.1.0",
38-
"karma-sourcemap-loader": "0.3.7",
39-
"protractor": "5.4.2",
40-
"requirejs": "2.3.6",
41-
"rollup": "1.27.5",
32+
"http-server": "0.11.1",
33+
"rollup": "1.25.2",
4234
"rollup-plugin-commonjs": "10.1.0",
4335
"rollup-plugin-node-resolve": "5.2.0",
4436
"rollup-plugin-sourcemaps": "0.4.2",
45-
"terser": "4.4.0",
37+
"terser": "4.3.9",
4638
"typescript": "3.6.4"
4739
},
4840
"scripts": {

‎integration/bazel/src/BUILD.bazel

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package(default_visibility = ["//visibility:public"])
22

3-
load("@build_bazel_rules_nodejs//:index.bzl", "pkg_web")
4-
load("@npm//http-server:index.bzl", "http_server")
53
load("@npm_angular_bazel//:index.bzl", "ng_module")
4+
load("@npm//http-server:index.bzl", "http_server")
5+
load("@build_bazel_rules_nodejs//internal/web_package:web_package.bzl", "web_package")
66
load("@npm_bazel_rollup//:index.bzl", "rollup_bundle")
77
load("@npm_bazel_terser//:index.bzl", "terser_minified")
88
load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
@@ -36,16 +36,13 @@ filegroup(
3636

3737
ts_devserver(
3838
name = "devserver",
39-
additional_root_paths = ["npm/node_modules/zone.js/dist"],
4039
entry_module = "bazel_integration_test/src/main",
40+
index_html = "index.html",
4141
scripts = [
4242
":rxjs_umd_modules",
4343
],
44-
# Use the same bundle serving path as prodserver so that we can share
45-
# an index.html file.
4644
serving_path = "/bundle.min.js",
4745
static_files = [
48-
"index.html",
4946
"@npm//:node_modules/zone.js/dist/zone.min.js",
5047
],
5148
deps = ["//src"],
@@ -67,14 +64,14 @@ terser_minified(
6764
src = ":bundle",
6865
)
6966

70-
pkg_web(
67+
web_package(
7168
name = "prodapp",
72-
srcs = [
73-
"index.html",
74-
":bundle.min",
69+
assets = [
70+
# do not sort
7571
"@npm//:node_modules/zone.js/dist/zone.min.js",
72+
":bundle.min",
7673
],
77-
additional_root_paths = ["npm/node_modules/zone.js/dist"],
74+
index_html = "index.html",
7875
)
7976

8077
http_server(

‎integration/bazel/src/index.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,5 @@
99
<body>
1010
<!-- The Angular application will be bootstrapped into this element. -->
1111
<app-component></app-component>
12-
<script src="/zone.min.js"></script>
13-
<script src="/bundle.min.js"></script>
1412
</body>
1513
</html>

0 commit comments

Comments
 (0)