feat(deps): Unblock the version of Angular to >= 2.3 #3569
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 tasks
vicb
reviewed
Dec 15, 2016
| "@angular/core": "2.2.3", | ||
| "@angular/compiler": "~2.3.1", | ||
| "@angular/compiler-cli": "~2.3.1", | ||
| "@angular/core": "~2.3.1", | ||
| "@angular/tsc-wrapped": "0.4.0", |
vicb
reviewed
Dec 15, 2016
| const split = entry.split('#'); | ||
| return new ModuleRoute(split[0], split[1]); | ||
| } | ||
| // We do not have an include because tsconfig can be used for that. |
There was a problem hiding this comment.
// Use tsconfig to include (positive form)
vicb
reviewed
Dec 15, 2016
| @@ -93,7 +65,12 @@ export class AotPlugin implements Tapable { | |||
| get compilerHost() { return this._compilerHost; } | |||
| get compilerOptions() { return this._compilerOptions; } | |||
| get done() { return this._donePromise; } | |||
| get entryModule() { return this._entryModule; } | |||
| get entryModule() { | |||
| const splitted = this._entryModule.split('#'); | |||
There was a problem hiding this comment.
const {path, className} = this._entryModule.split('#');
return {path, className: className || 'default'};
vicb
reviewed
Dec 15, 2016
| const basePathPattern = '(' + basePath.replace(/\\/g, '/') | ||
| .replace(/[\-\[\]\/{}()+?.\\^$|*]/g, '\\$&') + ')?'; | ||
| pattern = pattern | ||
| // Replace windows path separators to forward slashes. |
vicb
reviewed
Dec 15, 2016
| "@angular/forms": "~2.3.1", | ||
| "@angular/http": "~2.3.1", | ||
| "@angular/platform-browser": "~2.3.1", | ||
| "@angular/platform-browser-dynamic": "~2.3.1", | ||
| "@angular/router": "3.2.3", | ||
| "core-js": "^2.4.1", | ||
| "rxjs": "5.0.0-beta.12", |
vicb
reviewed
Dec 15, 2016
| "@angular/forms": "~2.3.1", | ||
| "@angular/http": "~2.3.1", | ||
| "@angular/platform-browser": "~2.3.1", | ||
| "@angular/platform-browser-dynamic": "~2.3.1", | ||
| "@angular/router": "3.2.3", | ||
| "core-js": "^2.4.1", | ||
| "rxjs": "5.0.0-beta.12", | ||
| "ts-helpers": "^1.1.1", | ||
| "zone.js": "^0.6.23" |
vicb
reviewed
Dec 15, 2016
| @@ -59,6 +60,10 @@ const BuildCommand = Command.extend({ | |||
| } | |||
|
|
|||
| const project = this.project; | |||
|
|
|||
| // Check angular version. | |||
| Version.assertAngularVersionIs2_3_1OrBetter(project.root); | |||
vicb
reviewed
Dec 15, 2016
| @@ -45,6 +45,8 @@ export class Version { | |||
| isReleaseCandidate() { return this.qualifier == 'rc'; } | |||
| isKnown() { return this._version !== null; } | |||
|
|
|||
| isLocal() { return this.isKnown() ? path.isAbsolute(this._version) : false; } | |||
There was a problem hiding this comment.
return this.isKnown() && path.isAbsolute(this._version);
vicb
reviewed
Dec 15, 2016
| upgrade your angular version, e.g. by running: | ||
|
|
||
| npm install @angular/core@latest | ||
| ` + '\n'))); |
There was a problem hiding this comment.
stripIndents remove \ns so we have to concatenate the string.
|
lgtm with a few comments |
vicb
approved these changes
Dec 15, 2016
|
Thanks a lot @vicb ! |
MRHarrison
pushed a commit
to MRHarrison/angular-cli
that referenced
this pull request
Feb 9, 2017
|
This issue has been automatically locked due to inactivity. Read more about our automatic conversation locking policy. This action has been performed automatically by a bot. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This includes using a private API not published.
Also added a SHA option when running e2e to install a SHA of Angular. This is the first 7 digits of an angular SHA that is on master.