From a85af49c58134ac09e6628fa29aa26f9d8da3416 Mon Sep 17 00:00:00 2001 From: Asher Date: Mon, 4 Feb 2019 14:30:35 -0600 Subject: [PATCH] Explicitly exclude markdown.css Apparently !! doesn't work as advertised (or I don't understand how it's supposed to work). --- scripts/webpack.general.config.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/webpack.general.config.js b/scripts/webpack.general.config.js index 0861983a6..533df2db1 100644 --- a/scripts/webpack.general.config.js +++ b/scripts/webpack.general.config.js @@ -20,8 +20,9 @@ module.exports = (options = {}) => ({ multiple: [{ // 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. + // The !! prefix causes it to ignore other loaders (doesn't work). 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", }, { search: "require\\.__\\$__nodeRequire", @@ -59,8 +60,10 @@ module.exports = (options = {}) => ({ test: /(^.?|\.[^d]|[^.]d|[^.][^d])\.tsx?$/, }, { // 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. - exclude: /test|code\/electron-browser\/.+\.css$/, + // pages or iframes so we don't need to include it here. Also excluding + // 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$/, // This is required otherwise it'll fail to resolve CSS in common. include: root,