cargdev/angular
1
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases Wiki Activity

build: fix paths to typings files so tsickle resolves imports correctly

Browse Source 
Fixes #15080
This commit is contained in:
Jason Aden
2017-03-15 13:26:09 -07:00
committed by Chuck Jazdzewski
parent 0ab49d4cec
commit 410aa33005
60 changed files with 96 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/animations/browser/package.json
View File

@ -1,5 +1,5 @@
{
"typings": "../typings/browser/index.d.ts",
"typings": "../browser.d.ts",
"main": "../bundles/animation-browser.umd.js",
"module": "../@angular/animations/browser.es5.js",
"es2015": "../@angular/animations/browser.js"

2
packages/animations/browser/testing/package.json
View File

@ -1,5 +1,5 @@
{
"typings": "../../typings/animations/testing.d.ts",
"typings": "../testing.d.ts",
"main": "../../bundles/platform-browser-animations-testing.umd.js",
"module": "../../@angular/platform-browser/animations/testing.es5.js",
"es2015": "../../@angular/platform-browser/animations/testing.js"

2
packages/animations/package.json
View File

@ -5,7 +5,7 @@
"main": "./bundles/animations.umd.js",
"module": "./@angular/animations.es5.js",
"es2015": "./@angular/animations.js",
"typings": "./typings/animations.d.ts",
"typings": "./animations.d.ts",
"author": "angular",
"license": "MIT",
"peerDependencies": {

2
packages/common/package.json
View File

@ -5,7 +5,7 @@
"main": "./bundles/common.umd.js",
"module": "./@angular/common.es5.js",
"es2015": "./@angular/common.js",
"typings": "./typings/common.d.ts",
"typings": "./common.d.ts",
"author": "angular",
"license": "MIT",
"peerDependencies": {

2
packages/common/testing/package.json
View File

@ -1,5 +1,5 @@
{
"typings": "../typings/testing/index.d.ts",
"typings": "../testing.d.ts",
"main": "../bundles/common-testing.umd.js",
"module": "../@angular/common/testing.es5.js",
"es2015": "../@angular/common/testing.js"

2
packages/compiler-cli/src/compiler_host.ts
View File

@ -208,7 +208,7 @@ export class CompilerHost implements AotCompilerHost {
}
try {
let metadataOrMetadatas = JSON.parse(this.context.readFile(filePath));
while (metadataOrMetadatas.alias) {
while (metadataOrMetadatas && metadataOrMetadatas.alias) {
filePath = path.join(path.dirname(filePath), metadataOrMetadatas.alias);
metadataOrMetadatas = JSON.parse(this.context.readFile(filePath));
}

4
packages/compiler-cli/test/aot_host_spec.ts
View File

@ -244,9 +244,7 @@ const FILES: Entry = {
'alias': {
'file.d.ts': dummyModule,
'file.metadata.json': '{ "alias": "sub/index.metadata.json"}',
'sub': {
'index.metadata.json': JSON.stringify(dummyMetadata)
}
'sub': {'index.metadata.json': JSON.stringify(dummyMetadata)}
},
'metadata_versions': {
'v1.d.ts': `

2
packages/compiler/package.json
View File

@ -5,7 +5,7 @@
"main": "./bundles/compiler.umd.js",
"module": "./@angular/compiler.es5.js",
"es2015": "./@angular/compiler.js",
"typings": "./typings/compiler.d.ts",
"typings": "./compiler.d.ts",
"author": "angular",
"license": "MIT",
"peerDependencies": {

2
packages/compiler/testing/package.json
View File

@ -1,5 +1,5 @@
{
"typings": "../typings/testing/index.d.ts",
"typings": "../testing.d.ts",
"main": "../bundles/compiler-testing.umd.js",
"module": "../@angular/compiler/testing.es5.js",
"es2015": "../@angular/compiler/testing.js"

2
packages/core/package.json
View File

@ -5,7 +5,7 @@
"main": "./bundles/core.umd.js",
"module": "./@angular/core.es5.js",
"es2015": "./@angular/core.js",
"typings": "./typings/core.d.ts",
"typings": "./core.d.ts",
"author": "angular",
"license": "MIT",
"peerDependencies": {

2
packages/core/testing/package.json
View File

@ -1,5 +1,5 @@
{
"typings": "../typings/testing/index.d.ts",
"typings": "../testing.d.ts",
"main": "../bundles/core-testing.umd.js",
"module": "../@angular/core/testing.es5.js",
"es2015": "../@angular/core/testing.js"

2
packages/forms/package.json
View File

@ -5,7 +5,7 @@
"main": "./bundles/forms.umd.js",
"module": "./@angular/forms.es5.js",
"es2015": "./@angular/forms.js",
"typings": "./typings/forms.d.ts",
"typings": "./forms.d.ts",
"author": "angular",
"license": "MIT",
"peerDependencies": {

2
packages/http/package.json
View File

@ -5,7 +5,7 @@
"main": "./bundles/http.umd.js",
"module": "./@angular/http.es5.js",
"es2015": "./@angular/http.js",
"typings": "./typings/http.d.ts",
"typings": "./http.d.ts",
"author": "angular",
"license": "MIT",
"peerDependencies": {

2
packages/http/testing/package.json
View File

@ -1,5 +1,5 @@
{
"typings": "../typings/testing/index.d.ts",
"typings": "../testing.d.ts",
"main": "../bundles/http-testing.umd.js",
"module": "../@angular/http/testing.es5.js",
"es2015": "../@angular/http/testing.js"

2
packages/language-service/package.json
View File

@ -4,7 +4,7 @@
"description": "Angular - language services",
"main": "./bundles/language-service.umd.js",
"module": "./@angular/language-service.es5.js",
"typings": "./typings/language-service.d.ts",
"typings": "./language-service.d.ts",
"author": "angular",
"license": "MIT",
"repository": {

2
packages/platform-browser-dynamic/package.json
View File

@ -5,7 +5,7 @@
"main": "./bundles/platform-browser-dynamic.umd.js",
"module": "./@angular/platform-browser-dynamic.es5.js",
"es2015": "./@angular/platform-browser-dynamic.js",
"typings": "./typings/platform-browser-dynamic.d.ts",
"typings": "./platform-browser-dynamic.d.ts",
"author": "angular",
"license": "MIT",
"peerDependencies": {

2
packages/platform-browser-dynamic/testing/package.json
View File

@ -1,5 +1,5 @@
{
"typings": "../typings/testing/index.d.ts",
"typings": "../testing.d.ts",
"main": "../bundles/platform-browser-dynamic-testing.umd.js",
"module": "../@angular/platform-browser-dynamic/testing.es5.js",
"es2015": "../@angular/platform-browser-dynamic/testing.js"

2
packages/platform-browser/animations/package.json
View File

@ -1,5 +1,5 @@
{
"typings": "../typings/animations/index.d.ts",
"typings": "../animations.d.ts",
"main": "../bundles/platform-browser-animations.umd.js",
"module": "../@angular/platform-browser/animations.es5.js",
"es2015": "../@angular/platform-browser/animations.js"

2
packages/platform-browser/package.json
View File

@ -5,7 +5,7 @@
"main": "./bundles/platform-browser.umd.js",
"module": "./@angular/platform-browser.es5.js",
"es2015": "./@angular/platform-browser.js",
"typings": "./typings/platform-browser.d.ts",
"typings": "./platform-browser.d.ts",
"author": "angular",
"license": "MIT",
"peerDependencies": {

2
packages/platform-browser/testing/package.json
View File

@ -1,5 +1,5 @@
{
"typings": "../typings/testing/index.d.ts",
"typings": "../testing.d.ts",
"main": "../bundles/platform-browser-testing.umd.js",
"module": "../@angular/platform-browser/testing.es5.js",
"es2015": "../@angular/platform-browser/testing.js"

2
packages/platform-server/package.json
View File

@ -5,7 +5,7 @@
"main": "./bundles/platform-server.umd.js",
"module": "./@angular/platform-server.es5.js",
"es2015": "./@angular/platform-server.js",
"typings": "./typings/platform-server.d.ts",
"typings": "./platform-server.d.ts",
"author": "angular",
"license": "MIT",
"peerDependencies": {

2
packages/platform-server/testing/package.json
View File

@ -1,5 +1,5 @@
{
"typings": "../typings/testing/index.d.ts",
"typings": "../testing.d.ts",
"main": "../bundles/platform-server-testing.umd.js",
"module": "../@angular/platform-server/testing.es5.js",
"es2015": "../@angular/platform-server/testing.js"

2
packages/platform-webworker-dynamic/package.json
View File

@ -5,7 +5,7 @@
"main": "./bundles/platform-webworker-dynamic.umd.js",
"module": "./@angular/platform-webworker-dynamic.es5.js",
"es2015": "./@angular/platform-webworker-dynamic.js",
"typings": "./typings/platform-webworker-dynamic.d.ts",
"typings": "./platform-webworker-dynamic.d.ts",
"author": "angular",
"license": "MIT",
"peerDependencies": {

2
packages/platform-webworker/package.json
View File

@ -5,7 +5,7 @@
"main": "./bundles/platform-webworker.umd.js",
"module": "./@angular/platform-webworker.es5.js",
"es2015": "./@angular/platform-webworker.js",
"typings": "./typings/platform-webworker.d.ts",
"typings": "./platform-webworker.d.ts",
"author": "angular",
"license": "MIT",
"peerDependencies": {

2
packages/router/package.json
View File

@ -5,7 +5,7 @@
"main": "./bundles/router.umd.js",
"module": "./@angular/router.es5.js",
"es2015": "./@angular/router.js",
"typings": "./typings/router.d.ts",
"typings": "./router.d.ts",
"keywords": [
"angular",
"router"

2
packages/router/testing/package.json
View File

@ -1,5 +1,5 @@
{
"typings": "../typings/testing/index.d.ts",
"typings": "../testing.d.ts",
"main": "../bundles/router-testing.umd.js",
"module": "../@angular/router/testing.es5.js",
"es2015": "../@angular/router/testing.js"

2
packages/router/upgrade/package.json
View File

@ -1,5 +1,5 @@
{
"typings": "../typings/upgrade/index.d.ts",
"typings": "../upgrade.d.ts",
"main": "../bundles/router-upgrade.umd.js",
"module": "../@angular/router/upgrade.es5.js",
"es2015": "../@angular/router/upgrade.js"

2
packages/upgrade/package.json
View File

@ -5,7 +5,7 @@
"main": "./bundles/upgrade.umd.js",
"module": "./@angular/upgrade.es5.js",
"es2015": "./@angular/upgrade.js",
"typings": "./typings/upgrade.d.ts",
"typings": "./upgrade.d.ts",
"author": "angular",
"license": "MIT",
"peerDependencies": {

2
packages/upgrade/static/package.json
View File

@ -1,5 +1,5 @@
{
"typings": "../typings/static/index.d.ts",
"typings": "../static.d.ts",
"main": "../bundles/upgrade-static.umd.js",
"module": "../@angular/upgrade/static.es5.js",
"es2015": "../@angular/upgrade/static.js"

10
packages/upgrade/static/public_api.ts
View File

@ -12,10 +12,10 @@
* Entry point for all public APIs of the upgrade/static package, allowing
* Angular 1 and Angular 2+ to run side by side in the same application.
*/
export {downgradeComponent} from '../src/common/downgrade_component';
export {downgradeInjectable} from '../src/common/downgrade_injectable';
export {VERSION} from '../src/common/version';
export {UpgradeComponent} from '../src/static/upgrade_component';
export {UpgradeModule} from '../src/static/upgrade_module';
export {downgradeComponent} from './src/common/downgrade_component';
export {downgradeInjectable} from './src/common/downgrade_injectable';
export {VERSION} from './src/common/version';
export {UpgradeComponent} from './src/static/upgrade_component';
export {UpgradeModule} from './src/static/upgrade_module';
// This file only re-exports content of the `src` folder. Keep it that way.

1
packages/upgrade/static/src Symbolic link
View File

@ -0,0 +1 @@
../src