Skip to content

build: include typings/index in root metadata export #7190

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Sep 28, 2017
Merged

build: include typings/index in root metadata export #7190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 37 additions & 60 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 12 additions & 12 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
"node": ">= 5.4.1"
},
"dependencies": {
"@angular/animations": "~4.4.1",
"@angular/common": "~4.4.1",
"@angular/compiler": "~4.4.1",
"@angular/core": "~4.4.1",
"@angular/forms": "~4.4.1",
"@angular/http": "~4.4.1",
"@angular/platform-browser": "~4.4.1",
"@angular/animations": "~4.4.3",
"@angular/common": "~4.4.3",
"@angular/compiler": "~4.4.3",
"@angular/core": "~4.4.3",
"@angular/forms": "~4.4.3",
"@angular/http": "~4.4.3",
"@angular/platform-browser": "~4.4.3",
"core-js": "^2.4.1",
"rxjs": "^5.0.1",
"systemjs": "0.19.43",
Expand All @@ -40,11 +40,11 @@
"zone.js": "^0.8.12"
},
"devDependencies": {
"@angular/compiler-cli": "~4.4.1",
"@angular/platform-browser-dynamic": "~4.4.1",
"@angular/platform-server": "~4.4.1",
"@angular/router": "~4.4.1",
"@angular/tsc-wrapped": "~4.4.1",
"@angular/compiler-cli": "~4.4.3",
"@angular/platform-browser-dynamic": "~4.4.3",
"@angular/platform-server": "~4.4.3",
"@angular/router": "~4.4.3",
"@angular/tsc-wrapped": "~4.4.3",
"@google-cloud/storage": "^1.1.1",
"@types/chalk": "^0.4.31",
"@types/fs-extra": "^3.0.1",
Expand Down
2 changes: 1 addition & 1 deletion tools/package-tools/build-release.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export function composeRelease(buildPackage: BuildPackage) {
// re-exports everything.
createMetadataReexportFile(
releasePath,
buildPackage.secondaryEntryPoints.map(p => `./${p}`),
buildPackage.secondaryEntryPoints.concat(['typings/index']).map(p => `./${p}`),
Copy link
Member

Choose a reason for hiding this comment

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

Isn't that already handled a few lines above?

https://github.com/jelbourn/material2/blob/31ea051ca341e63d3f2f4b0e5e98316d60c9cf54/tools/package-tools/build-release.ts#L51

Copy link
Member Author

Choose a reason for hiding this comment

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

This call to createMetadataReexportFile overwrites the file generated by the earlier call

Copy link
Member

Choose a reason for hiding this comment

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

Okay that makes sense. I wonder if it would be more obvious if we place the earlier call in the else clause.

name);
}
}
Expand Down