Skip to content

Commit f8ab1a5

Browse files
sandersnsandersn
committed
Merge branch 'master' into transforms
2 parents a6649b4 + 79a3e77 commit f8ab1a5

889 files changed

Lines changed: 88081 additions & 67612 deletions

File tree

Some content is hidden

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

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ rwc-report.html
2828
*.swp
2929
build.json
3030
*.actual
31+
tests/webTestServer.js
32+
tests/webTestServer.js.map
3133
tests/webhost/*.d.ts
3234
tests/webhost/webtsc.js
3335
tests/cases/**/*.js

‎Jakefile.js‎

Lines changed: 50 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -193,17 +193,57 @@ var harnessSources = harnessCoreSources.concat([
193193
}));
194194

195195
var librarySourceMap = [
196-
{ target: "lib.core.d.ts", sources: ["header.d.ts", "core.d.ts"] },
197-
{ target: "lib.dom.d.ts", sources: ["importcore.d.ts", "intl.d.ts", "dom.generated.d.ts"] },
198-
{ target: "lib.webworker.d.ts", sources: ["importcore.d.ts", "intl.d.ts", "webworker.generated.d.ts"] },
199-
{ target: "lib.scriptHost.d.ts", sources: ["importcore.d.ts", "scriptHost.d.ts"] },
200-
{ target: "lib.d.ts", sources: ["header.d.ts", "core.d.ts", "intl.d.ts", "dom.generated.d.ts", "webworker.importscripts.d.ts", "scriptHost.d.ts"] },
201-
{ target: "lib.core.es6.d.ts", sources: ["header.d.ts", "core.d.ts", "es6.d.ts"] },
202-
{ target: "lib.es6.d.ts", sources: ["header.d.ts", "es6.d.ts", "core.d.ts", "intl.d.ts", "dom.generated.d.ts", "dom.es6.d.ts", "webworker.importscripts.d.ts", "scriptHost.d.ts"] },
203-
{ target: "lib.core.es7.d.ts", sources: ["header.d.ts", "core.d.ts", "es6.d.ts", "es7.d.ts"] },
204-
{ target: "lib.es7.d.ts", sources: ["header.d.ts", "es6.d.ts", "es7.d.ts", "core.d.ts", "intl.d.ts", "dom.generated.d.ts", "dom.es6.d.ts", "webworker.importscripts.d.ts", "scriptHost.d.ts"] }
196+
{ target: "lib.core.d.ts", sources: ["header.d.ts", "core.d.ts"] },
197+
{ target: "lib.dom.d.ts", sources: ["importcore.d.ts", "intl.d.ts", "dom.generated.d.ts"] },
198+
{ target: "lib.webworker.d.ts", sources: ["importcore.d.ts", "intl.d.ts", "webworker.generated.d.ts"] },
199+
{ target: "lib.scriptHost.d.ts", sources: ["importcore.d.ts", "scriptHost.d.ts"] },
200+
{ target: "lib.d.ts", sources: ["header.d.ts", "core.d.ts", "intl.d.ts", "dom.generated.d.ts", "webworker.importscripts.d.ts", "scriptHost.d.ts"] },
201+
{ target: "lib.core.es6.d.ts", sources: ["header.d.ts", "core.d.ts", "es6.d.ts"] },
202+
{ target: "lib.es6.d.ts", sources: ["header.d.ts", "es6.d.ts", "core.d.ts", "intl.d.ts", "dom.generated.d.ts", "dom.es6.d.ts", "webworker.importscripts.d.ts", "scriptHost.d.ts"] },
203+
{ target: "lib.core.es7.d.ts", sources: ["header.d.ts", "core.d.ts", "es6.d.ts", "es7.d.ts"] },
204+
{ target: "lib.es7.d.ts", sources: ["header.d.ts", "es6.d.ts", "es7.d.ts", "core.d.ts", "intl.d.ts", "dom.generated.d.ts", "dom.es6.d.ts", "webworker.importscripts.d.ts", "scriptHost.d.ts"] }
205+
];
206+
var es2015LibrarySources = [
207+
"es2015.core.d.ts",
208+
"es2015.collection.d.ts",
209+
"es2015.generator.d.ts",
210+
"es2015.iterable.d.ts",
211+
"es2015.promise.d.ts",
212+
"es2015.proxy.d.ts",
213+
"es2015.reflect.d.ts",
214+
"es2015.symbol.d.ts",
215+
"es2015.symbol.wellknown.d.ts",
205216
];
206217

218+
var es2015LibrarySourceMap = es2015LibrarySources.map(function(source) {
219+
return { target: "lib." + source, sources: ["header.d.ts", source] };
220+
});
221+
222+
var es2016LibrarySource = [ "es2016.array.include.d.ts" ];
223+
224+
var es2016LibrarySourceMap = es2016LibrarySource.map(function(source) {
225+
return { target: "lib." + source, sources: ["header.d.ts", source] };
226+
})
227+
228+
var hostsLibrarySources = ["dom.generated.d.ts", "webworker.importscripts.d.ts", "scripthost.d.ts"]
229+
230+
var librarySourceMap = [
231+
// Host library
232+
{ target: "lib.dom.d.ts", sources: ["header.d.ts", "dom.generated.d.ts"], },
233+
{ target: "lib.dom.iterable.d.ts", sources: ["header.d.ts", "dom.iterable.d.ts"], },
234+
{ target: "lib.webworker.d.ts", sources: ["header.d.ts", "webworker.generated.d.ts"], },
235+
{ target: "lib.scripthost.d.ts", sources: ["header.d.ts", "scripthost.d.ts"], },
236+
237+
// JavaScript library
238+
{ target: "lib.es5.d.ts", sources: ["header.d.ts", "es5.d.ts"] },
239+
{ target: "lib.es2015.d.ts", sources: ["header.d.ts", "es2015.d.ts"] },
240+
{ target: "lib.es2016.d.ts", sources: ["header.d.ts", "es2016.d.ts"] },
241+
242+
// JavaScript + all host library
243+
{ target: "lib.d.ts", sources: ["header.d.ts", "es5.d.ts"].concat(hostsLibrarySources), },
244+
{ target: "lib.es6.d.ts", sources: ["header.d.ts", "es5.d.ts"].concat(es2015LibrarySources, hostsLibrarySources), },
245+
].concat(es2015LibrarySourceMap, es2016LibrarySourceMap);
246+
207247
var libraryTargets = librarySourceMap.map(function (f) {
208248
return path.join(builtLocalDirectory, f.target);
209249
});
@@ -242,7 +282,7 @@ function concatenateFiles(destinationFile, sourceFiles) {
242282
}
243283

244284
var useDebugMode = true;
245-
var host = process.env.host || process.env.TYPESCRIPT_HOST || "node";
285+
var host = (process.env.TYPESCRIPT_HOST || process.env.host || "node");
246286
var compilerFilename = "tsc.js";
247287
var LKGCompiler = path.join(LKGDirectory, compilerFilename);
248288
var builtLocalCompiler = path.join(builtLocalDirectory, compilerFilename);
@@ -1056,7 +1096,6 @@ task("update-sublime", ["local", serverFile], function() {
10561096
var tslintRuleDir = "scripts/tslint";
10571097
var tslintRules = [
10581098
"nextLineRule",
1059-
"noNullRule",
10601099
"preferConstRule",
10611100
"booleanTriviaRule",
10621101
"typeOperatorSpacingRule",

0 commit comments

Comments
 (0)