Skip to content
This repository was archived by the owner on Apr 4, 2025. It is now read-only.

Conversation

@Teamop
Copy link
Contributor

@Teamop Teamop commented May 29, 2018

Fix angular/angular-cli#11012
Remove invalid property angularCli when updating from 1.x to 6.x

@Teamop Teamop requested review from Brocco and hansl as code owners May 29, 2018 05:55
@Teamop
Copy link
Contributor Author

Teamop commented May 29, 2018

3 irrelevant cases failed, waiting for #978 to be merged.

@clydin
Copy link
Member

clydin commented May 29, 2018

Looks good. Please rebase on master

@Teamop
Copy link
Contributor Author

Teamop commented May 30, 2018

@clydin done
btw, could you also review this one #952? thanks

content = content.replace(`{ pattern: './src/test.ts', watched: false }`, '');
content = content.replace(`'./src/test.ts': ['@angular/cli'],`, '');
content = content.replace(`'./src/test.ts': ['@angular/cli']`, '');
content = content.replace(/angularCli[^]*,?/, '');
Copy link
Contributor

Choose a reason for hiding this comment

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

Heya, can you change the regexp to /angularCli[^}]*},?/, so that it will try to match up to the },?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

Copy link
Contributor

@filipesilva filipesilva left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@clydin clydin merged commit 342614e into angular:master May 31, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

5 participants