OCram85/code-server
Archived
1
0
Fork 0
Code Pull Requests 2 Activity

Explicitly exclude markdown.css

Browse Source 
Apparently !! doesn't work as advertised (or I don't understand how it's
supposed to work).
This commit is contained in:
Asher 2019-02-04 14:30:35 -06:00 committed by Kyle Carberry
parent c80b2fabc3
commit a85af49c58
No known key found for this signature in database
GPG Key ID: A0409BDB6B0B3EDB
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/webpack.general.config.js
View File

@ -20,8 +20,9 @@ module.exports = (options = {}) => ({
multiple: [{ multiple: [{
// These will be handled by file-loader. We need the location because // These will be handled by file-loader. We need the location because
// they are parsed as URIs and will throw errors if not fully formed. // they are parsed as URIs and will throw errors if not fully formed.
// The !! prefix causes it to ignore other loaders (doesn't work).
search: "require\\.toUrl\\(", search: "require\\.toUrl\\(",
replace: "location.protocol + '//' + location.host + '/' + require('file-loader?name=[path][name].[ext]!' + ", replace: "location.protocol + '//' + location.host + '/' + require('!!file-loader?name=[path][name].[ext]!' + ",
flags: "g", flags: "g",
}, { }, {
search: "require\\.__\\$__nodeRequire", search: "require\\.__\\$__nodeRequire",
@ -59,8 +60,10 @@ module.exports = (options = {}) => ({
test: /(^.?|\.[^d]|[^.]d|[^.][^d])\.tsx?$/, test: /(^.?|\.[^d]|[^.]d|[^.][^d])\.tsx?$/,
}, { }, {
// Test CSS isn't required. The rest is supposed to be served in separate // Test CSS isn't required. The rest is supposed to be served in separate
// pages or iframes so we don't need to include it here. // pages or iframes so we don't need to include it here. Also excluding
exclude: /test|code\/electron-browser\/.+\.css$/, // markdown.css because even though it uses the file-loader as shown above
// in the string replace, it's still making its way into the main CSS.
exclude: /test|code\/electron-browser\/.+\.css$|markdown.css$/,
test: /\.s?css$/, test: /\.s?css$/,
// This is required otherwise it'll fail to resolve CSS in common. // This is required otherwise it'll fail to resolve CSS in common.
include: root, include: root,