From 4e30b47ffbea21d2cd06ddb95694d0e6f046fa8d Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Thu, 16 Apr 2020 10:47:13 -0700
Subject: [PATCH] fix(core): enable `esModule` for style loaders

---
 packages/core/config/index.js  | 1 +
 packages/core/webpack/style.js | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/core/config/index.js b/packages/core/config/index.js
index 8dc3be7..c60b183 100644
--- a/packages/core/config/index.js
+++ b/packages/core/config/index.js
@@ -22,6 +22,7 @@ exports.babel = {
 exports.css = {
 	ignoreOrder: false,
 	importLoaders: 2,
+	esModule: true,
 	modules: {
 		localIdentName: '[hash:base64:5]',
 	}
diff --git a/packages/core/webpack/style.js b/packages/core/webpack/style.js
index f385fad..a1e8d68 100644
--- a/packages/core/webpack/style.js
+++ b/packages/core/webpack/style.js
@@ -32,16 +32,19 @@ module.exports = function (postcss, css, opts) {
 	};
 
 	// assume dev/HMR values initially
-	let fallback = 'style-loader';
-	let chunkFilename = '[id].chunk.css';
 	let filename = '[name].css';
+	let chunkFilename = '[id].chunk.css';
+	let fallback = {
+		loader: 'style-loader',
+		options: { esModule: true }
+	};
 
 	if (css.modules) {
 		css.modules = toModulesObject(css.modules);
 	}
 
 	if (production) {
-		fallback = ExtractCSS.loader; // prepare extraction
+		fallback.loader = ExtractCSS.loader; // prepare extraction
 		chunkFilename = '[id].chunk.[contenthash:8].css';
 		filename = '[name].[contenthash:8].css';
 		// Expose production configuration