diff --git a/package-lock.json b/package-lock.json index d4e55888..716a233f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "@typescript/vfs": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@typescript/vfs/-/vfs-1.2.0.tgz", - "integrity": "sha512-3YhBC+iyngEHjEedSAWk9rbJHoBwa2cd4h/tzb2TXmZc2CUclTl3x5AQRKNoRqm7t+X9PGTc2q2/Dpray/O4mA==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@typescript/vfs/-/vfs-1.3.0.tgz", + "integrity": "sha512-Bd1LdvQpm0uU2eclcCfO8H8oAGAfEJiKn0acKy/xeZV4sARwXx9MHBMuDX0XDPLmI2JpIm+mFV9Ers65xnoaQg==", "dev": true, "requires": { "debug": "^4.1.1" @@ -47,9 +47,9 @@ "dev": true }, "monaco-plugin-helpers": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/monaco-plugin-helpers/-/monaco-plugin-helpers-1.0.2.tgz", - "integrity": "sha512-7kUx8dtd5qVNVgUARBRhnM8oftPglYwlINfigC4yGUiuzqtIN22u1tly8umiOCIPR0eFiBLjt6aN23oZh2QJgg==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/monaco-plugin-helpers/-/monaco-plugin-helpers-1.0.3.tgz", + "integrity": "sha512-6AYI3ONAy8ki74qG2JqtFrLdiJHQlgeO5l4Rwr0OMyIpGXhc94y5rZuFxOtgGkxgSrZfHSwOt/MulUNZ/mOQOw==", "dev": true, "requires": { "typescript": "^2.7.2" @@ -82,9 +82,9 @@ "dev": true }, "source-map-support": { - "version": "0.5.16", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz", - "integrity": "sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==", + "version": "0.5.19", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz", + "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", "dev": true, "requires": { "buffer-from": "^1.0.0", @@ -92,9 +92,9 @@ } }, "terser": { - "version": "4.6.3", - "resolved": "https://registry.npmjs.org/terser/-/terser-4.6.3.tgz", - "integrity": "sha512-Lw+ieAXmY69d09IIc/yqeBqXpEQIpDGZqT34ui1QWXIUpR2RjbqEkT8X7Lgex19hslSqcWM5iMN2kM11eMsESQ==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.3.0.tgz", + "integrity": "sha512-XTT3D3AwxC54KywJijmY2mxZ8nJiEjBHVYzq8l9OaYuRFWeQNBwvipuzzYEP4e+/AVcd1hqG/CqgsdIRyT45Fg==", "dev": true, "requires": { "commander": "^2.20.0", @@ -103,9 +103,9 @@ } }, "typescript": { - "version": "3.8.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz", - "integrity": "sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==", + "version": "3.9.7", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz", + "integrity": "sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==", "dev": true } } diff --git a/package.json b/package.json index d2eb1993..b28b507b 100644 --- a/package.json +++ b/package.json @@ -20,12 +20,12 @@ "url": "https://github.com/Microsoft/monaco-typescript/issues" }, "devDependencies": { - "@typescript/vfs": "^1.2.0", + "@typescript/vfs": "^1.3.0", "monaco-editor-core": "^0.20.0", "monaco-languages": "^1.10.0", - "monaco-plugin-helpers": "^1.0.2", + "monaco-plugin-helpers": "^1.0.3", "requirejs": "^2.3.6", - "terser": "^4.6.3", + "terser": "^5.3.0", "typescript": "^3.8.2" } } diff --git a/scripts/bundle.js b/scripts/bundle.js index 524c6253..58eb20af 100644 --- a/scripts/bundle.js +++ b/scripts/bundle.js @@ -39,13 +39,13 @@ function bundleOne(moduleId, exclude) { 'vs/language/typescript': REPO_ROOT + '/release/dev' }, optimize: 'none' - }, function(buildResponse) { + }, async function(buildResponse) { const filePath = path.join(REPO_ROOT, 'release/min/' + moduleId + '.js'); const fileContents = fs.readFileSync(filePath).toString(); console.log(); console.log(`Minifying ${filePath}...`); - const result = terser.minify(fileContents); - console.log(`Done.`); + const result = await terser.minify(fileContents); + console.log(`Done minifying ${filePath}.`); fs.writeFileSync(filePath, BUNDLED_FILE_HEADER + result.code); }) } diff --git a/src/tsWorker.ts b/src/tsWorker.ts index c785d75d..aba62fbc 100644 --- a/src/tsWorker.ts +++ b/src/tsWorker.ts @@ -259,7 +259,7 @@ export interface ICreateData { /** The shape of the factory */ export interface CustomTSWebWorkerFactory { - (TSWorkerClass: typeof TypeScriptWorker, ts: typeof import("typescript"), libs: Record): typeof TypeScriptWorker + (TSWorkerClass: typeof TypeScriptWorker, tsc: typeof ts, libs: Record): typeof TypeScriptWorker } export function create(ctx: IWorkerContext, createData: ICreateData): TypeScriptWorker {