Skip to content

feat(deps): Unblock the version of Angular to >= 2.3 - #3569

Merged
hansl merged 10 commits into
angular:masterfrom
hansl:private-api
Dec 15, 2016
Merged

feat(deps): Unblock the version of Angular to >= 2.3#3569
hansl merged 10 commits into
angular:masterfrom
hansl:private-api

Conversation

@hansl

Copy link
Copy Markdown
Contributor

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.

"@angular/compiler": "~2.3.1",
"@angular/compiler-cli": "~2.3.1",
"@angular/core": "~2.3.1",
"@angular/tsc-wrapped": "0.4.0",

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

0.5.0 ?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Done.

const split = entry.split('#');
return new ModuleRoute(split[0], split[1]);
}
// We do not have an include because tsconfig can be used for that.

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

// Use tsconfig to include (positive form)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Done.

get done() { return this._donePromise; }
get entryModule() { return this._entryModule; }
get entryModule() {
const splitted = this._entryModule.split('#');

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

const {path, className} = this._entryModule.split('#');
return {path, className: className || 'default'};

const basePathPattern = '(' + basePath.replace(/\\/g, '/')
.replace(/[\-\[\]\/{}()+?.\\^$|*]/g, '\\$&') + ')?';
pattern = pattern
// Replace windows path separators to forward slashes.

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

with

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Donezzzo

"@angular/platform-browser-dynamic": "~2.3.1",
"@angular/router": "3.2.3",
"core-js": "^2.4.1",
"rxjs": "5.0.0-beta.12",

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

update?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

done.

"core-js": "^2.4.1",
"rxjs": "5.0.0-beta.12",
"ts-helpers": "^1.1.1",
"zone.js": "^0.6.23"

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

update

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

done.

const project = this.project;

// Check angular version.
Version.assertAngularVersionIs2_3_1OrBetter(project.root);

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

I would say "Higher" :)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Good point.

isReleaseCandidate() { return this.qualifier == 'rc'; }
isKnown() { return this._version !== null; }

isLocal() { return this.isKnown() ? path.isAbsolute(this._version) : false; }

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

return this.isKnown() && path.isAbsolute(this._version);

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Done.

upgrade your angular version, e.g. by running:

npm install @angular/core@latest
` + '\n')));

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

nit ... + '\n' ?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

stripIndents remove \ns so we have to concatenate the string.

@vicb

vicb commented Dec 15, 2016

Copy link
Copy Markdown

lgtm with a few comments

@hansl

Copy link
Copy Markdown
ContributorAuthor

Thanks a lot @vicb !

MRHarrison pushed a commit to MRHarrison/angular-cli that referenced this pull request Feb 9, 2017
@hansl
hansl deleted the private-api branch August 2, 2018 19:56
@angular-automatic-lock-bot

Copy link
Copy Markdown

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-botangular-automatic-lock-botBot locked and limited conversation to collaborators Sep 12, 2019
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@hansl@vicb@googlebot