From f6b6a978073e7a1c102ec8f1ae2eb41d3a369ffb Mon Sep 17 00:00:00 2001 From: Alexandru Dima Date: Wed, 13 Nov 2019 09:59:15 +0100 Subject: [PATCH] Take typings from tsconfig.monaco.json --- build/gulpfile.editor.js | 8 -------- build/lib/standalone.js | 2 ++ build/lib/standalone.ts | 3 +++ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/build/gulpfile.editor.js b/build/gulpfile.editor.js index 6734a820cf1..77e512bdc56 100644 --- a/build/gulpfile.editor.js +++ b/build/gulpfile.editor.js @@ -71,14 +71,6 @@ const extractEditorSrcTask = task.define('extract-editor-src', () => { apiusages, extrausages ], - typings: [ - 'typings/lib.ie11_safe_es6.d.ts', - 'typings/thenable.d.ts', - 'typings/es6-promise.d.ts', - 'typings/require-monaco.d.ts', - "typings/lib.es2018.promise.d.ts", - 'vs/monaco.d.ts' - ], libs: [ `lib.es5.d.ts`, `lib.dom.d.ts`, diff --git a/build/lib/standalone.js b/build/lib/standalone.js index 56f89544dac..4457e1a56d1 100644 --- a/build/lib/standalone.js +++ b/build/lib/standalone.js @@ -44,6 +44,8 @@ function extractEditor(options) { compilerOptions.moduleResolution = ts.ModuleResolutionKind.Classic; options.compilerOptions = compilerOptions; console.log(`Running with shakeLevel ${tss.toStringShakeLevel(options.shakeLevel)}`); + // Take the extra included .d.ts files from `tsconfig.monaco.json` + options.typings = tsConfig.include.filter(includedFile => /\.d\.ts$/.test(includedFile)); let result = tss.shake(options); for (let fileName in result) { if (result.hasOwnProperty(fileName)) { diff --git a/build/lib/standalone.ts b/build/lib/standalone.ts index 07000331ad2..8ec71bfae5d 100644 --- a/build/lib/standalone.ts +++ b/build/lib/standalone.ts @@ -52,6 +52,9 @@ export function extractEditor(options: tss.ITreeShakingOptions & { destRoot: str console.log(`Running with shakeLevel ${tss.toStringShakeLevel(options.shakeLevel)}`); + // Take the extra included .d.ts files from `tsconfig.monaco.json` + options.typings = (tsConfig.include).filter(includedFile => /\.d\.ts$/.test(includedFile)); + let result = tss.shake(options); for (let fileName in result) { if (result.hasOwnProperty(fileName)) { -- GitLab