From 25955c69fa7f1f1d07d485d6d242626ca91bff63 Mon Sep 17 00:00:00 2001
From: Mikael Korpela <mikael@ihminen.org>
Date: Fri, 17 Aug 2018 17:21:06 +0300
Subject: [PATCH] Simplify namespacing inclusion/exclusion

---
 bin/sdk/gutenberg.js |  1 -
 webpack.config.js    | 31 +++++++++++++++----------------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/bin/sdk/gutenberg.js b/bin/sdk/gutenberg.js
index f9995bd3806afb..13f2f05212ed0d 100644
--- a/bin/sdk/gutenberg.js
+++ b/bin/sdk/gutenberg.js
@@ -12,7 +12,6 @@ exports.config = ( {
 	const baseConfig = getBaseConfig( {
 		externalizeWordPressPackages: true,
 		stylesNamespacing: 'calypso',
-		stylesNamespacingExclude: path.join( __rootDir, 'client', 'gutenberg' ),
 	} );
 	const name = path.basename( path.dirname( editorScript ).replace( /\/$/, '' ) );
 
diff --git a/webpack.config.js b/webpack.config.js
index ba9f2a15d8acdd..deef131b3e554a 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -93,6 +93,9 @@ const sassLoader = {
 	},
 };
 
+// When styles-namespacing is enabled, these are the files we want to namespace
+const stylesNamespacingDirectories = [ path.join( __dirname, 'client', 'components' ) ];
+
 /**
  * Converts @wordpress require into window reference
  *
@@ -128,16 +131,11 @@ const wordpressExternals = ( context, request, callback ) =>
  *
  * @param {object}  env                               environment options
  * @param {boolean} env.externalizeWordPressPackages  whether to bundle or extern the `@wordpress/` packages
- * @param {string}  env.stylesNamespacing             prefix styles with CSS class or ID
- * @param {string}  env.stylesNamespacingExclude      paths to exlude from namespacing when `stylesNamespacing` is defined
+ * @param {string}  env.stylesNamespacing             prefix Calypso component styles with CSS class or ID
  *
  * @return {object}                                    webpack config
  */
-function getWebpackConfig( {
-	stylesNamespacingExclude = '',
-	externalizeWordPressPackages = false,
-	stylesNamespacing = '',
-} = {} ) {
+function getWebpackConfig( { externalizeWordPressPackages = false, stylesNamespacing = '' } = {} ) {
 	const webpackConfig = {
 		bail: ! isDevelopment,
 		context: __dirname,
@@ -203,20 +201,21 @@ function getWebpackConfig( {
 				},
 				{
 					test: /\.(sc|sa|c)ss$/,
-					use: _.compact( [
+					use: [ ...preSassLoaders, sassLoader ],
+					// When styles-namespacing is enabled, these files are handled by separate loader below
+					...( stylesNamespacing ? { exclude: stylesNamespacingDirectories } : {} ),
+				},
+				stylesNamespacing && {
+					test: /\.(sc|sa|c)ss$/,
+					include: stylesNamespacingDirectories,
+					use: [
 						...preSassLoaders,
-						stylesNamespacing && {
+						{
 							loader: 'namespace-css-loader',
 							options: `.${ stylesNamespacing }`,
 						},
 						sassLoader,
-					] ),
-					...( stylesNamespacingExclude ? { exclude: stylesNamespacingExclude } : {} ),
-				},
-				stylesNamespacingExclude && {
-					test: /\.(sc|sa|c)ss$/,
-					include: stylesNamespacingExclude,
-					use: [ ...preSassLoaders, sassLoader ],
+					],
 				},
 				{
 					test: /extensions[\/\\]index/,