Skip to content

build: bump to angular 6.0.0-rc.1 and rxjs 6.0.0-rc.0 #10642

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 3, 2018
Merged

build: bump to angular 6.0.0-rc.1 and rxjs 6.0.0-rc.0 #10642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ filegroup(
"protobufjs",
"protractor",
"reflect-metadata",
"rxjs",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rxjs is actually not supposed to be here because it has its own bazel rules. Can you share the error you were getting?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't have the exact error, but it was something along the lines of "Can't find module rxjs/index".

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Chatted w/ Alex, this seems like an issue w/ the ngsummary files being generated, we're figuring out the right way for core to fix this

"tsickle",
"tslib",
"tsutils",
Expand Down
12 changes: 6 additions & 6 deletions WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ workspace(name = "angular_material")
# Add nodejs rules
http_archive(
name = "build_bazel_rules_nodejs",
url = "https://github.com/bazelbuild/rules_nodejs/archive/0.5.3.zip",
strip_prefix = "rules_nodejs-0.5.3",
sha256 = "17a5515f59777b00cb25dbc710017a14273f825029b2ec60e0969d28914870be",
url = "https://github.com/bazelbuild/rules_nodejs/archive/0.6.0.zip",
strip_prefix = "rules_nodejs-0.6.0",
sha256 = "e8a2bb5ca51fbafb244bc507bcebcae33a63d969f47413b319a8dcce032845bf",
)

# NOTE: this rule installs nodejs, npm, and yarn, but does NOT install
Expand All @@ -28,9 +28,9 @@ sass_repositories()
# Add TypeScript rules
http_archive(
name = "build_bazel_rules_typescript",
url = "https://github.com/bazelbuild/rules_typescript/archive/0.11.1.zip",
strip_prefix = "rules_typescript-0.11.1",
sha256 = "7406bea7954e1c906f075115dfa176551a881119f6820b126ea1eacb09f34a1a",
url = "https://github.com/bazelbuild/rules_typescript/archive/df4a1a561d88e187438ac7791a5ac33995f2d317.zip",
strip_prefix = "rules_typescript-df4a1a561d88e187438ac7791a5ac33995f2d317",
sha256 = "51a84f156eeddf126e9370b5c193b4709eeb330448e2de5afcda40232e0b56bc",
)

# Setup TypeScript Bazel workspace
Expand Down
3 changes: 2 additions & 1 deletion angular.tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
],
"exclude": [
"node_modules/@angular/bazel/**",
"node_modules/@angular/compiler-cli/**"
"node_modules/@angular/compiler-cli/**",
"node_modules/@angular/**/testing/**"
]
}
115 changes: 43 additions & 72 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 14 additions & 14 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@
"node": ">= 5.4.1"
},
"dependencies": {
"@angular/animations": "6.0.0-rc.0",
"@angular/common": "6.0.0-rc.0",
"@angular/compiler": "6.0.0-rc.0",
"@angular/core": "6.0.0-rc.0",
"@angular/forms": "6.0.0-rc.0",
"@angular/platform-browser": "6.0.0-rc.0",
"@angular/animations": "6.0.0-rc.1",
"@angular/common": "6.0.0-rc.1",
"@angular/compiler": "6.0.0-rc.1",
"@angular/core": "6.0.0-rc.1",
"@angular/forms": "6.0.0-rc.1",
"@angular/platform-browser": "6.0.0-rc.1",
"core-js": "^2.4.1",
"rxjs": "6.0.0-beta.1",
"rxjs": "6.0.0-rc.0",
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jelbourn I'm not completely sure why Bazel is complaining about not being able to find rxjs. Do you have any ideas?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to bump the Bazel rules for nodejs and typescript in WORKSPACE. See here for the correct versions

You may also need to add @rxjs//operators to some BUILD files if Bazel still complains

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One more thing, you also need to add "rxjs" to the list of node_modules in the top-level BUILD file. Then the only errors left should be the operators import.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After pulling and running locally, the following are the only BUILD files that need to be modified: cdk/a11y, cdk/overlay, and cdk/tree, and only the test sources need @rxjs//operators to build correctly

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for looking into it, but I'm not sure that's the case. I tried adding it to all of them and it ended up erroring on the cdk/portal.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You never added rxjs to the top-level BUILD node_modules

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See here for reference

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like that did it, although it still feels weird to add rxjs/operators when it was complaining about rxjs/index.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The rxjs/index issue was resolved by adding the rxjs to top-level BUILD and updating the bazel rules. The operators are to reflect the latest changes in structure for RxJS RC

"systemjs": "0.19.43",
"tsickle": "^0.27.2",
"tslib": "^1.9.0",
Expand All @@ -42,13 +42,13 @@
"devDependencies": {
"@angular-devkit/core": "^0.4.5",
"@angular-devkit/schematics": "^0.4.5",
"@angular/bazel": "6.0.0-rc.0",
"@angular/compiler-cli": "6.0.0-rc.0",
"@angular/http": "6.0.0-rc.0",
"@angular/platform-browser-dynamic": "6.0.0-rc.0",
"@angular/platform-server": "6.0.0-rc.0",
"@angular/router": "6.0.0-rc.0",
"@angular/upgrade": "6.0.0-rc.0",
"@angular/bazel": "6.0.0-rc.1",
"@angular/compiler-cli": "6.0.0-rc.1",
"@angular/http": "6.0.0-rc.1",
"@angular/platform-browser-dynamic": "6.0.0-rc.1",
"@angular/platform-server": "6.0.0-rc.1",
"@angular/router": "6.0.0-rc.1",
"@angular/upgrade": "6.0.0-rc.1",
"@bazel/ibazel": "0.3.1",
"@google-cloud/storage": "^1.1.1",
"@schematics/angular": "^0.4.5",
Expand Down
1 change: 1 addition & 0 deletions src/cdk/a11y/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ ts_library(
"//src/cdk/platform",
"//src/cdk/testing",
"@rxjs",
"@rxjs//operators",
],
tsconfig = "//src/cdk:tsconfig-build.json",
)
Expand Down
1 change: 1 addition & 0 deletions src/cdk/overlay/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ ts_library(
"//src/cdk/scrolling",
"//src/cdk/testing",
"@rxjs",
"@rxjs//operators",
],
tsconfig = "//src/cdk:tsconfig-build.json",
)
Expand Down
1 change: 1 addition & 0 deletions src/cdk/tree/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ ts_library(
":tree",
"//src/cdk/collections",
"@rxjs",
"@rxjs//operators",
],
tsconfig = "//src/cdk:tsconfig-build.json",
)
Expand Down