Skip to content

Commit 3d5712d

Browse files
authored
Merge pull request #20109 from Microsoft/dev/billti/fixMinifiedLibraries
Moved minified file exclusion
2 parents 465a2c5 + c391c7c commit 3d5712d

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

src/server/editorServices.ts

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,8 @@ namespace ts.server {
156156
"exclude": [["^", 1, "/.*"]], // Exclude that whole folder if the file indicated above is found in it
157157
"types": ["office"] // @types package to fetch instead
158158
},
159-
"Minified files": {
160-
// e.g. /whatever/blah.min.js
161-
"match": /^(.+\.min\.js)$/i,
159+
"References": {
160+
"match": /^(.*\/_references\.js)$/i,
162161
"exclude": [["^", 1, "$"]]
163162
}
164163
};
@@ -1881,7 +1880,13 @@ namespace ts.server {
18811880
}
18821881
}
18831882
if (!exclude) {
1884-
filesToKeep.push(proj.rootFiles[i]);
1883+
// Exclude any minified files that get this far
1884+
if (/^.+[\.-]min\.js$/.test(normalizedNames[i])) {
1885+
excludedFiles.push(normalizedNames[i]);
1886+
}
1887+
else {
1888+
filesToKeep.push(proj.rootFiles[i]);
1889+
}
18851890
}
18861891
}
18871892
}

src/server/typesMap.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"types": ["winjs"]
1111
},
1212
"Kendo": {
13-
"match": "^(.*\\/kendo)\\/kendo\\.all\\.min\\.js$",
13+
"match": "^(.*\\/kendo(-ui)?)\\/kendo\\.all(\\.min)?\\.js$",
1414
"exclude": [["^", 1, "/.*"]],
1515
"types": ["kendo-ui"]
1616
},
@@ -19,8 +19,8 @@
1919
"exclude": [["^", 1, "/.*"]],
2020
"types": ["office"]
2121
},
22-
"Minified files": {
23-
"match": "^(.+\\.min\\.js)$",
22+
"References": {
23+
"match": "^(.*\\/_references\\.js)$",
2424
"exclude": [["^", 1, "$"]]
2525
}
2626
},

0 commit comments

Comments
 (0)