Skip to content

Commit 81c0bd5

Browse files
committed
Add --lib es6 to @types/node dependent targets
1 parent 0fb415a commit 81c0bd5

File tree

7 files changed

+26
-9
lines changed

7 files changed

+26
-9
lines changed

Jakefile.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -584,16 +584,16 @@ compileFile(
584584
file(typescriptServicesDts, [servicesFile]);
585585

586586
var cancellationTokenFile = path.join(builtLocalDirectory, "cancellationToken.js");
587-
compileFile(cancellationTokenFile, cancellationTokenSources, [builtLocalDirectory].concat(cancellationTokenSources), /*prefixes*/ [copyright], /*useBuiltCompiler*/ true, { outDir: builtLocalDirectory, noOutFile: true });
587+
compileFile(cancellationTokenFile, cancellationTokenSources, [builtLocalDirectory].concat(cancellationTokenSources), /*prefixes*/ [copyright], /*useBuiltCompiler*/ true, { types: ["node"], outDir: builtLocalDirectory, noOutFile: true, lib: "es6" });
588588

589589
var typingsInstallerFile = path.join(builtLocalDirectory, "typingsInstaller.js");
590-
compileFile(typingsInstallerFile, typingsInstallerSources, [builtLocalDirectory].concat(typingsInstallerSources), /*prefixes*/ [copyright], /*useBuiltCompiler*/ true, { outDir: builtLocalDirectory, noOutFile: false });
590+
compileFile(typingsInstallerFile, typingsInstallerSources, [builtLocalDirectory].concat(typingsInstallerSources), /*prefixes*/ [copyright], /*useBuiltCompiler*/ true, { types: ["node"], outDir: builtLocalDirectory, noOutFile: false, lib: "es6,scripthost" });
591591

592592
var watchGuardFile = path.join(builtLocalDirectory, "watchGuard.js");
593-
compileFile(watchGuardFile, watchGuardSources, [builtLocalDirectory].concat(watchGuardSources), /*prefixes*/ [copyright], /*useBuiltCompiler*/ true, { outDir: builtLocalDirectory, noOutFile: false });
593+
compileFile(watchGuardFile, watchGuardSources, [builtLocalDirectory].concat(watchGuardSources), /*prefixes*/ [copyright], /*useBuiltCompiler*/ true, { types: ["node"], outDir: builtLocalDirectory, noOutFile: false, lib: "es6" });
594594

595595
var serverFile = path.join(builtLocalDirectory, "tsserver.js");
596-
compileFile(serverFile, serverSources, [builtLocalDirectory, copyright, cancellationTokenFile, typingsInstallerFile, watchGuardFile].concat(serverSources).concat(servicesSources), /*prefixes*/ [copyright], /*useBuiltCompiler*/ true, { types: ["node"], preserveConstEnums: true });
596+
compileFile(serverFile, serverSources, [builtLocalDirectory, copyright, cancellationTokenFile, typingsInstallerFile, watchGuardFile].concat(serverSources).concat(servicesSources), /*prefixes*/ [copyright], /*useBuiltCompiler*/ true, { types: ["node"], preserveConstEnums: true, lib: "es6,scripthost" });
597597
var tsserverLibraryFile = path.join(builtLocalDirectory, "tsserverlibrary.js");
598598
var tsserverLibraryDefinitionFile = path.join(builtLocalDirectory, "tsserverlibrary.d.ts");
599599
compileFile(
@@ -717,7 +717,7 @@ compileFile(
717717
/*prereqs*/[builtLocalDirectory, tscFile].concat(libraryTargets).concat(servicesSources).concat(harnessSources),
718718
/*prefixes*/[],
719719
/*useBuiltCompiler:*/ true,
720-
/*opts*/ { inlineSourceMap: true, types: ["node", "mocha", "chai"] });
720+
/*opts*/ { inlineSourceMap: true, types: ["node", "mocha", "chai"], lib: "es6,scripthost" });
721721

722722
var internalTests = "internal/";
723723

src/harness/tsconfig.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
"declaration": false,
77
"types": [
88
"node", "mocha", "chai"
9+
],
10+
"lib": [
11+
"es6",
12+
"scripthost"
913
]
1014
},
1115
"files": [

src/server/builder.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/// <reference path="..\compiler\commandLineParser.ts" />
22
/// <reference path="..\services\services.ts" />
33
/// <reference path="session.ts" />
4-
/// <reference types="node" />
54

65
namespace ts.server {
76

src/server/cancellationToken/tsconfig.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
"module": "commonjs",
66
"types": [
77
"node"
8+
],
9+
"lib": [
10+
"es6"
811
]
912
},
1013
"files": [

src/server/tsconfig.library.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
"target": "es5",
1111
"noUnusedLocals": true,
1212
"noUnusedParameters": true,
13-
"declaration": true
13+
"declaration": true,
14+
"types": []
1415
},
1516
"files": [
1617
"editorServices.ts",

src/server/typingsInstaller/tsconfig.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
"outFile": "../../../built/local/typingsInstaller.js",
66
"types": [
77
"node"
8+
],
9+
"lib": [
10+
"es6",
11+
"scripthost"
812
]
913
},
1014
"files": [

src/server/watchGuard/tsconfig.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
{
2-
"extends": "../../tsconfig-base",
2+
"extends": "../../tsconfig-base",
33
"compilerOptions": {
44
"removeComments": true,
5-
"outFile": "../../../built/local/watchGuard.js"
5+
"outFile": "../../../built/local/watchGuard.js",
6+
"types": [
7+
"node"
8+
],
9+
"lib": [
10+
"es6"
11+
]
612
},
713
"files": [
814
"watchGuard.ts"

0 commit comments

Comments
 (0)