From b72ba94a3323f30eab352b843b6a7b3b6d717a15 Mon Sep 17 00:00:00 2001 From: Bill Ticehurst Date: Fri, 17 Nov 2017 11:38:51 -0800 Subject: [PATCH 1/2] Moved minified file exclusion --- src/server/editorServices.ts | 8 +++++++- src/server/typesMap.json | 6 +++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts index c00e1b3cd7620..45bedfeb2fed5 100644 --- a/src/server/editorServices.ts +++ b/src/server/editorServices.ts @@ -1881,7 +1881,13 @@ namespace ts.server { } } if (!exclude) { - filesToKeep.push(proj.rootFiles[i]); + // Exclude any minified files that get this far + if (/^.+[\.-]min\.js$/.test(normalizedNames[i])) { + excludedFiles.push(normalizedNames[i]); + } + else { + filesToKeep.push(proj.rootFiles[i]); + } } } } diff --git a/src/server/typesMap.json b/src/server/typesMap.json index 5e7df046dbea0..93e9c2502f86f 100644 --- a/src/server/typesMap.json +++ b/src/server/typesMap.json @@ -10,7 +10,7 @@ "types": ["winjs"] }, "Kendo": { - "match": "^(.*\\/kendo)\\/kendo\\.all\\.min\\.js$", + "match": "^(.*\\/kendo(-ui)?)\\/kendo\\.all(\\.min)?\\.js$", "exclude": [["^", 1, "/.*"]], "types": ["kendo-ui"] }, @@ -19,8 +19,8 @@ "exclude": [["^", 1, "/.*"]], "types": ["office"] }, - "Minified files": { - "match": "^(.+\\.min\\.js)$", + "References": { + "match": "^(.*\\/_references\\.js)$", "exclude": [["^", 1, "$"]] } }, From c391c7c23befff3dd0a0538f17779740cfa791ea Mon Sep 17 00:00:00 2001 From: Bill Ticehurst Date: Fri, 17 Nov 2017 12:49:56 -0800 Subject: [PATCH 2/2] Fixed internal safelist --- src/server/editorServices.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts index 45bedfeb2fed5..6c0cdf0017210 100644 --- a/src/server/editorServices.ts +++ b/src/server/editorServices.ts @@ -156,9 +156,8 @@ namespace ts.server { "exclude": [["^", 1, "/.*"]], // Exclude that whole folder if the file indicated above is found in it "types": ["office"] // @types package to fetch instead }, - "Minified files": { - // e.g. /whatever/blah.min.js - "match": /^(.+\.min\.js)$/i, + "References": { + "match": /^(.*\/_references\.js)$/i, "exclude": [["^", 1, "$"]] } };