From 1819641df987bebc024e2dbb0e6340d283c2196b Mon Sep 17 00:00:00 2001 From: Artem Yavorsky Date: Wed, 21 Feb 2018 14:51:15 +0200 Subject: [PATCH 1/2] Make compatible with webpack 4 rootContext --- lib/getLocalIdent.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/getLocalIdent.js b/lib/getLocalIdent.js index d671fb64..be547365 100644 --- a/lib/getLocalIdent.js +++ b/lib/getLocalIdent.js @@ -7,7 +7,13 @@ var path = require("path"); module.exports = function getLocalIdent(loaderContext, localIdentName, localName, options) { if(!options.context) - options.context = loaderContext.options && typeof loaderContext.options.context === "string" ? loaderContext.options.context : loaderContext.context; + if (loaderContext.rootContext) { + options.context = loaderContext.rootContext; + } else if (loaderContext.options && typeof loaderContext.options.context === "string") { + options.context = loaderContext.options.context; + } else { + options.context = loaderContext.context; + } var request = path.relative(options.context, loaderContext.resourcePath); options.content = options.hashPrefix + request + "+" + localName; localIdentName = localIdentName.replace(/\[local\]/gi, localName); From 7ba18a3c034afc2ae436b6b5f5401209ec008ea0 Mon Sep 17 00:00:00 2001 From: Artem Yavorsky Date: Thu, 22 Feb 2018 11:07:24 +0200 Subject: [PATCH 2/2] Wrap condition in curly brackets --- lib/getLocalIdent.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/getLocalIdent.js b/lib/getLocalIdent.js index be547365..79c7ab57 100644 --- a/lib/getLocalIdent.js +++ b/lib/getLocalIdent.js @@ -6,7 +6,7 @@ var loaderUtils = require("loader-utils"); var path = require("path"); module.exports = function getLocalIdent(loaderContext, localIdentName, localName, options) { - if(!options.context) + if(!options.context) { if (loaderContext.rootContext) { options.context = loaderContext.rootContext; } else if (loaderContext.options && typeof loaderContext.options.context === "string") { @@ -14,6 +14,7 @@ module.exports = function getLocalIdent(loaderContext, localIdentName, localName } else { options.context = loaderContext.context; } + } var request = path.relative(options.context, loaderContext.resourcePath); options.content = options.hashPrefix + request + "+" + localName; localIdentName = localIdentName.replace(/\[local\]/gi, localName);