Skip to content

Commit 16dfe3c

Browse files
committed
build: consolidate tsc to ease migration to @types/ based typings delivery
I actually tried to use @types/* directly but came across several issues which prevented me from switching over: - microsoft/TypeScript#8715 - microsoft/TypeScript#8723
1 parent b4a467e commit 16dfe3c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+56
-200
lines changed

build.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,10 @@ do
107107
$(npm bin)/tsc \
108108
--out ${UMD_ES5_PATH} \
109109
--target es5 \
110+
--lib "es6,dom" \
110111
--allowJs \
111-
${UMD_ES6_PATH} \
112-
modules/\@angular/manual_typings/globals.d.ts \
113-
modules/\@angular/typings/es6-collections/es6-collections.d.ts \
114-
modules/\@angular/typings/es6-promise/es6-promise.d.ts
112+
${UMD_ES6_PATH}
113+
115114
rm ${UMD_ES6_PATH}
116115

117116
cat ./modules/@angular/license-banner.txt > ${UMD_ES5_PATH}.tmp

gulpfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ gulp.task('enforce-format', function() {
325325
});
326326
});
327327

328-
gulp.task('lint', ['build.tools'], function() {
328+
gulp.task('lint', function() {
329329
var tslint = require('gulp-tslint');
330330
// Built-in rules are at
331331
// https://github.com/palantir/tslint#supported-rules

modules/@angular/common/tsconfig-es5.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,12 @@
1717
"rootDir": ".",
1818
"sourceMap": true,
1919
"inlineSources": true,
20+
"lib": ["es6", "dom"],
2021
"target": "es5"
2122
},
2223
"files": [
2324
"index.ts",
2425
"testing.ts",
25-
"../typings/es6-collections/es6-collections.d.ts",
26-
"../typings/es6-promise/es6-promise.d.ts",
27-
"../manual_typings/globals.d.ts",
2826
"../../../node_modules/zone.js/dist/zone.js.d.ts"
29-
3027
]
3128
}

modules/@angular/compiler/tsconfig-es2015.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,5 @@
2424
"index.ts",
2525
"testing.ts",
2626
"../../../node_modules/zone.js/dist/zone.js.d.ts"
27-
2827
]
2928
}

modules/@angular/compiler/tsconfig-es5.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,12 @@
1818
"rootDir": ".",
1919
"sourceMap": true,
2020
"inlineSources": true,
21+
"lib": ["es6", "dom"],
2122
"target": "es5"
2223
},
2324
"files": [
2425
"index.ts",
2526
"testing.ts",
26-
"../typings/es6-collections/es6-collections.d.ts",
27-
"../typings/es6-promise/es6-promise.d.ts",
28-
"../manual_typings/globals.d.ts",
2927
"../../../node_modules/zone.js/dist/zone.js.d.ts"
30-
3128
]
3229
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
/// <reference path="../../typings/node/node.d.ts" />
2-
/// <reference path="../../typings/jasmine/jasmine.d.ts" />
1+
/// <reference path="../../../../typings/node/node.d.ts" />
2+
/// <reference path="../../../../typings/jasmine/jasmine.d.ts" />

modules/@angular/compiler_cli/tsconfig-es5.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
"files": [
2828
"index.ts",
2929
"src/main.ts",
30-
"../typings/node/node.d.ts",
31-
"../typings/jasmine/jasmine.d.ts",
30+
"../../../typings/node/node.d.ts",
31+
"../../../typings/jasmine/jasmine.d.ts",
3232
"../../../node_modules/zone.js/dist/zone.js.d.ts"
3333
]
3434
}

modules/@angular/core/test/typings.d.ts

Lines changed: 0 additions & 6 deletions
This file was deleted.

modules/@angular/core/tsconfig-es5.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,13 @@
1717
"rootDir": ".",
1818
"sourceMap": true,
1919
"inlineSources": true,
20+
"lib": ["es6", "dom"],
2021
"target": "es5"
2122
},
2223
"files": [
2324
"index.ts",
2425
"testing.ts",
25-
"../typings/es6-collections/es6-collections.d.ts",
26-
"../typings/es6-promise/es6-promise.d.ts",
27-
"../typings/jasmine/jasmine.d.ts",
28-
"../manual_typings/globals.d.ts",
26+
"../../../typings/jasmine/jasmine.d.ts",
2927
"../../../node_modules/zone.js/dist/zone.js.d.ts"
3028
]
3129
}

modules/@angular/http/tsconfig-es5.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,12 @@
1717
"rootDir": ".",
1818
"sourceMap": true,
1919
"inlineSources": true,
20+
"lib": ["es6", "dom"],
2021
"target": "es5"
2122
},
2223
"files": [
2324
"index.ts",
2425
"testing.ts",
25-
"../typings/es6-collections/es6-collections.d.ts",
26-
"../typings/es6-promise/es6-promise.d.ts",
27-
"../manual_typings/globals.d.ts",
2826
"../../../node_modules/zone.js/dist/zone.js.d.ts"
2927
]
3028
}

0 commit comments

Comments
 (0)