Fixes microsoft#65040

alexdima · alexdima · commit e4b1db51cc36 · 2018-12-17T15:43:09.000+01:00
diff --git a/build/gulpfile.editor.js b/build/gulpfile.editor.js
@@ -95,7 +95,7 @@ gulp.task('extract-editor-src', ['clean-editor-src'], function () {
 			'vs/base/browser/ui/octiconLabel/octiconLabel': 'vs/base/browser/ui/octiconLabel/octiconLabel.mock',
 		},
 		shakeLevel: 2, // 0-Files, 1-InnerFile, 2-ClassMembers
-		importIgnorePattern: /^vs\/css!/,
+		importIgnorePattern: /(^vs\/css!)|(promise-polyfill\/polyfill)/,
 		destRoot: path.join(root, 'out-editor-src')
 	});
 });
diff --git a/build/lib/treeshaking.js b/build/lib/treeshaking.js
@@ -97,6 +97,11 @@ function discoverAndReadFiles(options) {
             FILES[`${moduleId}.d.ts`] = dts_filecontents;
             continue;
         }
+        const js_filename = path.join(options.sourcesRoot, moduleId + '.js');
+        if (fs.existsSync(js_filename)) {
+            // This is an import for a .js file, so ignore it...
+            continue;
+        }
         let ts_filename;
         if (options.redirects[moduleId]) {
             ts_filename = path.join(options.sourcesRoot, options.redirects[moduleId] + '.ts');
diff --git a/build/lib/treeshaking.ts b/build/lib/treeshaking.ts
@@ -69,7 +69,7 @@ function printDiagnostics(diagnostics: ReadonlyArray<ts.Diagnostic>): void {
 		}
 		if (diag.file && diag.start) {
 			let location = diag.file.getLineAndCharacterOfPosition(diag.start);
-			result += `- ${location.line + 1},${location.character} - `
+			result += `- ${location.line + 1},${location.character} - `;
 		}
 		result += JSON.stringify(diag.messageText);
 		console.log(result);
@@ -160,6 +160,12 @@ function discoverAndReadFiles(options: ITreeShakingOptions): IFileMap {
 			continue;
 		}
 
+		const js_filename = path.join(options.sourcesRoot, moduleId + '.js');
+		if (fs.existsSync(js_filename)) {
+			// This is an import for a .js file, so ignore it...
+			continue;
+		}
+
 		let ts_filename: string;
 		if (options.redirects[moduleId]) {
 			ts_filename = path.join(options.sourcesRoot, options.redirects[moduleId] + '.ts');
diff --git a/build/monaco/ThirdPartyNotices.txt b/build/monaco/ThirdPartyNotices.txt
@@ -8,22 +8,28 @@ herein, whether by implication, estoppel or otherwise.
 
 
 
-%% winjs version 4.4.0 (https://github.com/winjs/winjs)
+%% promise-polyfill version 8.1.0 (https://github.com/taylorhakes/promise-polyfill)
 =========================================
-WinJS
+Copyright (c) 2014 Taylor Hakes
+Copyright (c) 2014 Forbes Lindesay
 
-Copyright (c) Microsoft Corporation
-
-All rights reserved.
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ""Software""), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
 =========================================
 END OF winjs NOTICES AND INFORMATION
 
