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

Typings cleanup #6267

Closed
wants to merge 3 commits into from
Closed

Typings cleanup #6267

wants to merge 3 commits into from

Conversation

alexeagle
Copy link
Contributor

We had our own fork due to some custom typings, but these have been pushed upstream.

@alexeagle alexeagle assigned alexeagle and IgorMinar and unassigned alexeagle Jan 9, 2016
@alexeagle alexeagle added the action: review The PR is still awaiting reviews from at least one requested reviewer label Jan 9, 2016
@alexeagle
Copy link
Contributor Author

Something is fishy. In angular's fork we have "zone" (https://github.com/angular/DefinitelyTyped/blob/master/zone/zone.d.ts). The one on DefinitelyTyped has "zone.js" (https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/zone.js/zone.js.d.ts#L6)

This PR should have failed on Travis because the zone typings are missing.
the log has under npm install:

>> written 7 files:
    - angular-protractor/angular-protractor.d.ts
    - es6-shim/es6-shim.d.ts
    - hammerjs/hammerjs.d.ts
    - jasmine/jasmine.d.ts
    - node/node.d.ts
    - selenium-webdriver/selenium-webdriver.d.ts
    - zone/zone.d.ts

Where did it find zone.d.ts?? Did it come from the Travis cache even though this PR should bust the cache? Fishy.

@alexeagle
Copy link
Contributor Author

Hmm, I think it's because we give a SHA, and that can be resolved against a repo that doesn't have that in the tree anywhere: this works
DefinitelyTyped/DefinitelyTyped@31e7317
even though that change only appeared on the angular fork. So maybe it's legit that Travis passed.
I'll update the PR though'

@alexeagle
Copy link
Contributor Author

cc @vikerman

@@ -1,12 +1,12 @@
{
"version": "v4",
"repo": "angular/DefinitelyTyped",
"repo": "DefinitelyTyped/DefinitelyTyped",
Copy link
Contributor

Choose a reason for hiding this comment

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

no more forks!

@rkirov
Copy link
Contributor

rkirov commented Jan 29, 2016

looks good, make lint pass

@alexeagle alexeagle added action: merge The PR is ready for merge by the caretaker and removed action: review The PR is still awaiting reviews from at least one requested reviewer labels Jan 29, 2016
@alexeagle alexeagle removed the action: merge The PR is ready for merge by the caretaker label Jan 31, 2016
@alexeagle alexeagle force-pushed the unfork_dt branch 3 times, most recently from 5c8ae97 to 77ad163 Compare February 1, 2016 20:33
@btford
Copy link
Contributor

btford commented Feb 1, 2016

Is this ready to merge?

@alexeagle
Copy link
Contributor Author

not ready to merge yet

The upstream Jasmine typings don't define a type for the global
object with Jasmine methods polluting it, so just use any.

Also zone.js has a different name upstream.
@alexeagle alexeagle force-pushed the unfork_dt branch 4 times, most recently from 3013149 to 03c0314 Compare February 4, 2016 21:03
@alexeagle alexeagle removed the action: cleanup The PR is in need of cleanup, either due to needing a rebase or in response to comments from reviews label Feb 4, 2016
@alexeagle
Copy link
Contributor Author

Reviewed in person with @mhevery

@alexeagle
Copy link
Contributor Author

cc @blakeembrey who helped with the design for this - thank you!

This resolves Duplicate Identifier issues seen by many users,
at the expense of more typings installation required in some
cases.

Removes the quickstart hack of placing all needed dependencies
typings files in our distribution. Removes dependencies on
nodejs from angular2/core.

Fixes angular#5973
Fixes angular#5807
Fixes angular#6266

Angular now depends on es6-promise and es6-collections
(and a handful of manual typings) rather than all of es6-shim.

Fixes angular#5242

We previously had an undocumented breaking change, this is now
documented in this commit.

Fixes angular#6817

BREAKING CHANGE:

Transitive typings are no longer included in the distribution.
You may need to install typings in your project using
http://github.com/typings/typings

Users now must rely on getting typings from:
- one of the peerDependencies, such as rxjs, which exposes
  typings via the moduleResolution=node mechanism.
  (see https://github.com/Microsoft/TypeScript/wiki/Typings-for-npm-packages)
  This happens automatically.
- Using --target ES5 now requires manual installation of
  es6-promise and es6-collections typings.
- Using some angular APIs may introduce a dependency on eg. nodejs
  or jasmine, and those typings need manual installation as well.
@alexeagle alexeagle added the action: merge The PR is ready for merge by the caretaker label Feb 4, 2016
@alexeagle alexeagle assigned IgorMinar and unassigned rkirov Feb 4, 2016
@mary-poppins
Copy link

Merging PR #6267 on behalf of @IgorMinar to branch presubmit-IgorMinar-pr-6267.

@angular-automatic-lock-bot
Copy link

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-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Sep 7, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
action: merge The PR is ready for merge by the caretaker cla: yes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants