Skip to content

Moved minified file exclusion #20109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 17, 2017
Merged

Moved minified file exclusion #20109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b72ba94
Moved minified file exclusion
billti Nov 17, 2017
c391c7c
Fixed internal safelist
billti Nov 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions src/server/editorServices.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, "$"]]
}
};
Expand Down Expand Up @@ -1881,7 +1880,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]);
}
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/server/typesMap.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
},
Expand All @@ -19,8 +19,8 @@
"exclude": [["^", 1, "/.*"]],
"types": ["office"]
},
"Minified files": {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also make this change in editorServices.ts#158

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

"match": "^(.+\\.min\\.js)$",
"References": {
"match": "^(.*\\/_references\\.js)$",
"exclude": [["^", 1, "$"]]
}
},
Expand Down