Skip to content
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.

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

refactor: fix typescript 3.7 compilation errors. #18141

Merged
merged 1 commit into from Jan 13, 2020

Conversation

@andrius-pra
Copy link
Contributor

andrius-pra commented Jan 9, 2020

Fixes Import declaration conflicts with local declaration error.

@googlebot googlebot added the cla: yes label Jan 9, 2020
@jelbourn jelbourn added this to the 9.0.0 milestone Jan 9, 2020
Copy link
Member

jelbourn left a comment

LGTM

@jelbourn

This comment has been minimized.

Copy link
Member

jelbourn commented Jan 9, 2020

Caretaker: cherrypick this into the 9.0.x branch

@devversion

This comment has been minimized.

Copy link
Member

devversion commented Jan 9, 2020

Actually, the FloatLabelType should not be deleted, and the import should be removed.

@devversion devversion assigned devversion and unassigned devversion Jan 9, 2020
@andrius-pra andrius-pra force-pushed the andrius-pra:fix-ts3.7 branch from b57116f to 9659138 Jan 9, 2020
@devversion

This comment has been minimized.

Copy link
Member

devversion commented Jan 9, 2020

Thanks for updating @andrius-pra. Looks like this unveiled another issue. Can you update src/dev-app/mdc-input/mdc-input-demo.ts#L11 to not import FloatLabelType from core, but from the mdc-form-field import? I think/hope that this should make CI green.

…tion conflicts with local declaration` error.
@andrius-pra andrius-pra force-pushed the andrius-pra:fix-ts3.7 branch from 9659138 to 6c2c9d4 Jan 9, 2020
@andrius-pra

This comment has been minimized.

Copy link
Contributor Author

andrius-pra commented Jan 10, 2020

Done

Copy link
Member

devversion left a comment

LGTM. Thanks!

@devversion

This comment has been minimized.

Copy link
Member

devversion commented Jan 13, 2020

Marking as P2 to unblock the TypeScript 3.7 update PR on framework.

Copy link
Member

Splaktar left a comment

LGTM

@mmalerba mmalerba added P1 and removed P2 labels Jan 13, 2020
@jelbourn jelbourn merged commit 7cced9c into angular:master Jan 13, 2020
12 checks passed
12 checks passed
ci/angular: merge status All checks passed!
ci/circleci: api_golden_checks Your tests passed on CircleCI!
Details
ci/circleci: bazel_build Your tests passed on CircleCI!
Details
ci/circleci: build_release_packages Your tests passed on CircleCI!
Details
ci/circleci: e2e_tests Your tests passed on CircleCI!
Details
ci/circleci: lint Your tests passed on CircleCI!
Details
ci/circleci: ngcc_compatibility Your tests passed on CircleCI!
Details
ci/circleci: tests_browserstack Your tests passed on CircleCI!
Details
ci/circleci: tests_local_browsers Your tests passed on CircleCI!
Details
ci/circleci: tests_saucelabs Your tests passed on CircleCI!
Details
ci/circleci: view_engine_test Your tests passed on CircleCI!
Details
cla/google All necessary CLAs are signed
jelbourn added a commit that referenced this pull request Jan 13, 2020
…tion conflicts with local declaration` error. (#18141)

(cherry picked from commit 7cced9c)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.