From b244907074c2835feb38c4d074f15f8f85919ab7 Mon Sep 17 00:00:00 2001 From: Bill Ticehurst Date: Fri, 17 Nov 2017 12:49:56 -0800 Subject: [PATCH 1/3] Fixed internal safelist --- src/server/editorServices.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts index 9ac0997f11..6ba10ba28a 100644 --- a/src/server/editorServices.ts +++ b/src/server/editorServices.ts @@ -155,10 +155,9 @@ 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, - exclude: [["^", 1, "$"]] + "References": { + "match": /^(.*\/_references\.js)$/i, + "exclude": [["^", 1, "$"]] } }; From 805f191a57793aa407e4080a6223e010497a44a7 Mon Sep 17 00:00:00 2001 From: Bill Ticehurst Date: Fri, 17 Nov 2017 11:38:51 -0800 Subject: [PATCH 2/3] Moved minified file exclusion --- src/server/editorServices.ts | 8 +++++++- src/server/typesMap.json | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts index 6ba10ba28a..d75b3581e5 100644 --- a/src/server/editorServices.ts +++ b/src/server/editorServices.ts @@ -2284,7 +2284,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 c3d2b9af83..93e9c2502f 100644 --- a/src/server/typesMap.json +++ b/src/server/typesMap.json @@ -19,8 +19,8 @@ "exclude": [["^", 1, "/.*"]], "types": ["office"] }, - "Minified files": { - "match": "^(.+\\.min\\.js)$", + "References": { + "match": "^(.*\\/_references\\.js)$", "exclude": [["^", 1, "$"]] } }, From 574ceccf0addeb62a5db395593b7be334e9b0ca9 Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Fri, 17 Nov 2017 16:12:42 -0800 Subject: [PATCH 3/3] Update editorServices.ts Fix lint --- src/server/editorServices.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts index d75b3581e5..2793f2daee 100644 --- a/src/server/editorServices.ts +++ b/src/server/editorServices.ts @@ -156,8 +156,8 @@ namespace ts.server { types: ["office"] // @types package to fetch instead }, "References": { - "match": /^(.*\/_references\.js)$/i, - "exclude": [["^", 1, "$"]] + match: /^(.*\/_references\.js)$/i, + exclude: [["^", 1, "$"]] } };