Skip to content

Commit c40c7f9

Browse files
committed
Merge branch 'master' into moveModuleTransformToEnd
2 parents 5e2bd6b + 46f7a0f commit c40c7f9

File tree

180 files changed

+92815
-89274
lines changed

Some content is hidden

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

180 files changed

+92815
-89274
lines changed

CONTRIBUTING.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,5 +183,3 @@ jake baseline-accept
183183
```
184184

185185
to establish the new baselines as the desired behavior. This will change the files in `tests\baselines\reference`, which should be included as part of your commit. It's important to carefully validate changes in the baselines.
186-
187-
**Note** that `baseline-accept` should only be run after a full test run! Accepting baselines after running a subset of tests will delete baseline files for the tests that didn't run.

Jakefile.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ var compilerSources = [
7474
"transformers/es2017.ts",
7575
"transformers/es2016.ts",
7676
"transformers/es2015.ts",
77-
"transformers/es5.ts",
7877
"transformers/generators.ts",
78+
"transformers/es5.ts",
7979
"transformers/module/es2015.ts",
8080
"transformers/module/system.ts",
8181
"transformers/module/module.ts",
@@ -111,6 +111,7 @@ var servicesSources = [
111111
"transformers/es2016.ts",
112112
"transformers/es2015.ts",
113113
"transformers/generators.ts",
114+
"transformers/es5.ts",
114115
"transformers/module/es2015.ts",
115116
"transformers/module/system.ts",
116117
"transformers/module/module.ts",
@@ -356,6 +357,7 @@ function concatenateFiles(destinationFile, sourceFiles) {
356357
if (!fs.existsSync(sourceFiles[i])) {
357358
fail(sourceFiles[i] + " does not exist!");
358359
}
360+
fs.appendFileSync(temp, "\n\n");
359361
fs.appendFileSync(temp, fs.readFileSync(sourceFiles[i]));
360362
}
361363
// Move the file to the final destination
@@ -446,6 +448,8 @@ function compileFile(outFile, sources, prereqs, prefixes, useBuiltCompiler, opts
446448
options += " --stripInternal";
447449
}
448450

451+
options += " --target es5 --noUnusedLocals --noUnusedParameters";
452+
449453
var cmd = host + " " + compilerPath + " " + options + " ";
450454
cmd = cmd + sources.join(" ");
451455
console.log(cmd + "\n");

jenkins.sh

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/usr/bin/env bash
2+
3+
# Set up NVM
4+
export NVM_DIR="/home/dotnet-bot/.nvm"
5+
[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
6+
7+
nvm install $1
8+
9+
npm uninstall typescript
10+
npm uninstall tslint
11+
npm install
12+
npm update
13+
npm test

lib/cancellationToken.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/lib.d.ts

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ See the Apache Version 2.0 License for specific language governing permissions
1313
and limitations under the License.
1414
***************************************************************************** */
1515

16+
17+
1618
/// <reference no-default-lib="true"/>
19+
20+
1721
/////////////////////////////
1822
/// ECMAScript APIs
1923
/////////////////////////////
@@ -4149,6 +4153,8 @@ interface Date {
41494153
*/
41504154
toLocaleTimeString(locales?: string | string[], options?: Intl.DateTimeFormatOptions): string;
41514155
}
4156+
4157+
41524158

41534159
/////////////////////////////
41544160
/// IE DOM APIs
@@ -18774,12 +18780,16 @@ type ScrollLogicalPosition = "start" | "center" | "end" | "nearest";
1877418780
type IDBValidKey = number | string | Date | IDBArrayKey;
1877518781
type BufferSource = ArrayBuffer | ArrayBufferView;
1877618782
type MouseWheelEvent = WheelEvent;
18777-
type ScrollRestoration = "auto" | "manual";
18783+
type ScrollRestoration = "auto" | "manual";
18784+
18785+
1877818786
/////////////////////////////
1877918787
/// WorkerGlobalScope APIs
1878018788
/////////////////////////////
1878118789
// These are only available in a Web Worker
1878218790
declare function importScripts(...urls: string[]): void;
18791+
18792+
1878318793

1878418794

1878518795
/////////////////////////////

lib/lib.dom.d.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ See the Apache Version 2.0 License for specific language governing permissions
1313
and limitations under the License.
1414
***************************************************************************** */
1515

16+
17+
1618
/// <reference no-default-lib="true"/>
19+
20+
1721

1822
/////////////////////////////
1923
/// IE DOM APIs

lib/lib.dom.iterable.d.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ See the Apache Version 2.0 License for specific language governing permissions
1313
and limitations under the License.
1414
***************************************************************************** */
1515

16+
17+
1618
/// <reference no-default-lib="true"/>
19+
20+
1721
/// <reference path="lib.dom.d.ts" />
1822

1923
interface DOMTokenList {

lib/lib.es2015.collection.d.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ See the Apache Version 2.0 License for specific language governing permissions
1313
and limitations under the License.
1414
***************************************************************************** */
1515

16+
17+
1618
/// <reference no-default-lib="true"/>
19+
20+
1721
interface Map<K, V> {
1822
clear(): void;
1923
delete(key: K): boolean;

lib/lib.es2015.core.d.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ See the Apache Version 2.0 License for specific language governing permissions
1313
and limitations under the License.
1414
***************************************************************************** */
1515

16+
17+
1618
/// <reference no-default-lib="true"/>
19+
20+
1721
declare type PropertyKey = string | number | symbol;
1822

1923
interface Array<T> {

lib/lib.es2015.d.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ See the Apache Version 2.0 License for specific language governing permissions
1313
and limitations under the License.
1414
***************************************************************************** */
1515

16+
17+
1618
/// <reference no-default-lib="true"/>
19+
20+
1721
/// <reference path="lib.es2015.core.d.ts" />
1822
/// <reference path="lib.es2015.collection.d.ts" />
1923
/// <reference path="lib.es2015.generator.d.ts" />

0 commit comments

Comments
 (0)