Skip to content

Commit c3efba9

Browse files
jriekenjrieken
authored
Merge pull request microsoft#90682 from microsoft/joh/es6
ES6 everywhere
2 parents 452e16a + 1bcceca commit c3efba9

12 files changed

Lines changed: 65 additions & 1025 deletions

‎build/gulpfile.editor.js‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,6 @@ const extractEditorSrcTask = task.define('extract-editor-src', () => {
7272
apiusages,
7373
extrausages
7474
],
75-
libs: [
76-
`lib.es5.d.ts`,
77-
`lib.dom.d.ts`,
78-
`lib.webworker.importscripts.d.ts`
79-
],
8075
shakeLevel: 2, // 0-Files, 1-InnerFile, 2-ClassMembers
8176
importIgnorePattern: /(^vs\/css!)|(promise-polyfill\/polyfill)/,
8277
destRoot: path.join(root, 'out-editor-src'),

‎build/lib/treeshaking.js‎

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,7 @@ function createTypeScriptLanguageService(options) {
7676
FILES[typing] = fs.readFileSync(filePath).toString();
7777
});
7878
// Resolve libs
79-
const RESOLVED_LIBS = {};
80-
options.libs.forEach((filename) => {
81-
const filepath = path.join(TYPESCRIPT_LIB_FOLDER, filename);
82-
RESOLVED_LIBS[`defaultLib:${filename}`] = fs.readFileSync(filepath).toString();
83-
});
79+
const RESOLVED_LIBS = processLibFiles(options);
8480
const compilerOptions = ts.convertCompilerOptionsFromJson(options.compilerOptions, options.sourcesRoot).options;
8581
const host = new TypeScriptLanguageServiceHost(RESOLVED_LIBS, FILES, compilerOptions);
8682
return ts.createLanguageService(host);
@@ -138,6 +134,29 @@ function discoverAndReadFiles(options) {
138134
}
139135
return FILES;
140136
}
137+
/**
138+
* Read lib files and follow lib references
139+
*/
140+
function processLibFiles(options) {
141+
const stack = [...options.compilerOptions.lib];
142+
const result = {};
143+
while (stack.length > 0) {
144+
const filename = `lib.${stack.shift().toLowerCase()}.d.ts`;
145+
const key = `defaultLib:${filename}`;
146+
if (!result[key]) {
147+
// add this file
148+
const filepath = path.join(TYPESCRIPT_LIB_FOLDER, filename);
149+
const sourceText = fs.readFileSync(filepath).toString();
150+
result[key] = sourceText;
151+
// precess dependencies and "recurse"
152+
const info = ts.preProcessFile(sourceText);
153+
for (let ref of info.libReferenceDirectives) {
154+
stack.push(ref.fileName);
155+
}
156+
}
157+
}
158+
return result;
159+
}
141160
/**
142161
* A TypeScript language service host
143162
*/

‎build/lib/treeshaking.ts‎

Lines changed: 31 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export const enum ShakeLevel {
1818
}
1919

2020
export function toStringShakeLevel(shakeLevel: ShakeLevel): string {
21-
switch(shakeLevel) {
21+
switch (shakeLevel) {
2222
case ShakeLevel.Files:
2323
return 'Files (0)';
2424
case ShakeLevel.InnerFile:
@@ -42,11 +42,6 @@ export interface ITreeShakingOptions {
4242
* Inline usages.
4343
*/
4444
inlineEntryPoints: string[];
45-
/**
46-
* TypeScript libs.
47-
* e.g. `lib.d.ts`, `lib.es2015.collection.d.ts`
48-
*/
49-
libs: string[];
5045
/**
5146
* Other .d.ts files
5247
*/
@@ -130,11 +125,7 @@ function createTypeScriptLanguageService(options: ITreeShakingOptions): ts.Langu
130125
});
131126

132127
// Resolve libs
133-
const RESOLVED_LIBS: ILibMap = {};
134-
options.libs.forEach((filename) => {
135-
const filepath = path.join(TYPESCRIPT_LIB_FOLDER, filename);
136-
RESOLVED_LIBS[`defaultLib:${filename}`] = fs.readFileSync(filepath).toString();
137-
});
128+
const RESOLVED_LIBS = processLibFiles(options);
138129

139130
const compilerOptions = ts.convertCompilerOptionsFromJson(options.compilerOptions, options.sourcesRoot).options;
140131

@@ -205,6 +196,34 @@ function discoverAndReadFiles(options: ITreeShakingOptions): IFileMap {
205196
return FILES;
206197
}
207198

199+
/**
200+
* Read lib files and follow lib references
201+
*/
202+
function processLibFiles(options: ITreeShakingOptions): ILibMap {
203+
204+
const stack: string[] = [...options.compilerOptions.lib];
205+
const result: ILibMap = {};
206+
207+
while (stack.length > 0) {
208+
const filename = `lib.${stack.shift()!.toLowerCase()}.d.ts`;
209+
const key = `defaultLib:${filename}`;
210+
if (!result[key]) {
211+
// add this file
212+
const filepath = path.join(TYPESCRIPT_LIB_FOLDER, filename);
213+
const sourceText = fs.readFileSync(filepath).toString();
214+
result[key] = sourceText;
215+
216+
// precess dependencies and "recurse"
217+
const info = ts.preProcessFile(sourceText);
218+
for (let ref of info.libReferenceDirectives) {
219+
stack.push(ref.fileName);
220+
}
221+
}
222+
}
223+
224+
return result;
225+
}
226+
208227
interface ILibMap { [libName: string]: string; }
209228
interface IFileMap { [fileName: string]: string; }
210229

@@ -475,7 +494,7 @@ function markNodes(languageService: ts.LanguageService, options: ITreeShakingOpt
475494
}
476495

477496
if (black_queue.length === 0) {
478-
for (let i = 0; i< gray_queue.length; i++) {
497+
for (let i = 0; i < gray_queue.length; i++) {
479498
const node = gray_queue[i];
480499
const nodeParent = node.parent;
481500
if ((ts.isClassDeclaration(nodeParent) || ts.isInterfaceDeclaration(nodeParent)) && nodeOrChildIsBlack(nodeParent)) {

‎src/tsconfig.base.json‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@
1212
"vs/*": [
1313
"./vs/*"
1414
]
15-
}
15+
},
16+
"lib": [
17+
"ES2015",
18+
"ES2018.Promise",
19+
"DOM",
20+
"DOM.Iterable",
21+
"WebWorker.ImportScripts"
22+
]
1623
}
1724
}

‎src/tsconfig.json‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@
66
"sourceMap": false,
77
"outDir": "../out",
88
"target": "es2017",
9-
"lib": [
10-
"dom",
11-
"es5",
12-
"es2015.iterable"
13-
],
149
"types": [
1510
"keytar",
1611
"mocha",
@@ -22,8 +17,5 @@
2217
"include": [
2318
"./typings",
2419
"./vs"
25-
],
26-
"exclude": [
27-
"./typings/es6-promise.d.ts"
2820
]
2921
}

‎src/tsconfig.monaco.json‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,14 @@
88
"moduleResolution": "classic",
99
"removeComments": false,
1010
"preserveConstEnums": true,
11-
"target": "es5",
11+
"target": "es6",
1212
"sourceMap": false,
1313
"declaration": true
1414
},
1515
"include": [
1616
"typings/require.d.ts",
1717
"typings/thenable.d.ts",
18-
"typings/es6-promise.d.ts",
19-
"typings/lib.es2018.promise.d.ts",
2018
"typings/lib.array-ext.d.ts",
21-
"typings/lib.ie11_safe_es6.d.ts",
2219
"vs/css.d.ts",
2320
"vs/monaco.d.ts",
2421
"vs/nls.d.ts",

‎src/typings/es2015-proxy.d.ts‎

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

‎src/typings/es6-promise.d.ts‎

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

‎src/typings/lib.es2018.promise.d.ts‎

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

0 commit comments

Comments
 (0)