From d863a21c8061c60e085bbd4872cb76aba464fd5d Mon Sep 17 00:00:00 2001 From: Tyler Shambora Date: Wed, 26 Sep 2018 12:30:20 -0700 Subject: [PATCH 1/4] =make changes to webpack core.js to allow for subdirectories in snippets/ and sections/ --- .../tools/webpack/config/parts/core.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/packages/slate-tools/tools/webpack/config/parts/core.js b/packages/slate-tools/tools/webpack/config/parts/core.js index ba57b86ef..5d3132e80 100755 --- a/packages/slate-tools/tools/webpack/config/parts/core.js +++ b/packages/slate-tools/tools/webpack/config/parts/core.js @@ -104,6 +104,8 @@ module.exports = { test: /\.(liquid|json)$/, exclude: [ new RegExp('assets/styles'), + new RegExp('sections'), + new RegExp('snippets'), ...config.get('webpack.commonExcludes'), ], loader: 'file-loader', @@ -111,6 +113,20 @@ module.exports = { name: '../[path][name].[ext]', }, }, + { + test: /snippets\/.*\.liquid$/, + loader: 'file-loader', + options: { + name: `../snippets/[name].[ext]`, + } + }, + { + test: /sections\/.*\.liquid$/, + loader: 'file-loader', + options: { + name: `../sections/[name].[ext]`, + } + }, { test: /assets\/static\//, exclude: /node_modules/, From 4583e35b70cf461c1edb0ccb56f7dcb5b8e9a282 Mon Sep 17 00:00:00 2001 From: Tyler Shambora Date: Wed, 26 Sep 2018 13:17:25 -0700 Subject: [PATCH 2/4] adds extra commas --- packages/slate-tools/tools/webpack/config/parts/core.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/slate-tools/tools/webpack/config/parts/core.js b/packages/slate-tools/tools/webpack/config/parts/core.js index 5d3132e80..4cb88fb0b 100755 --- a/packages/slate-tools/tools/webpack/config/parts/core.js +++ b/packages/slate-tools/tools/webpack/config/parts/core.js @@ -118,14 +118,14 @@ module.exports = { loader: 'file-loader', options: { name: `../snippets/[name].[ext]`, - } + }, }, { test: /sections\/.*\.liquid$/, loader: 'file-loader', options: { name: `../sections/[name].[ext]`, - } + }, }, { test: /assets\/static\//, From 6ae95022d7aa1fc19da864d3a4f682d4494bfade Mon Sep 17 00:00:00 2001 From: Tyler Shambora Date: Wed, 26 Sep 2018 16:09:35 -0700 Subject: [PATCH 3/4] whitespace change to retrigger test --- packages/slate-tools/tools/webpack/config/parts/core.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/slate-tools/tools/webpack/config/parts/core.js b/packages/slate-tools/tools/webpack/config/parts/core.js index 4cb88fb0b..9167585ca 100755 --- a/packages/slate-tools/tools/webpack/config/parts/core.js +++ b/packages/slate-tools/tools/webpack/config/parts/core.js @@ -106,6 +106,7 @@ module.exports = { new RegExp('assets/styles'), new RegExp('sections'), new RegExp('snippets'), + ...config.get('webpack.commonExcludes'), ], loader: 'file-loader', From 6570fddc212219b60c214582ffa5df0a0f03c0bc Mon Sep 17 00:00:00 2001 From: Tyler Shambora Date: Wed, 26 Sep 2018 16:09:58 -0700 Subject: [PATCH 4/4] undo whitespace change --- packages/slate-tools/tools/webpack/config/parts/core.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/slate-tools/tools/webpack/config/parts/core.js b/packages/slate-tools/tools/webpack/config/parts/core.js index 9167585ca..4cb88fb0b 100755 --- a/packages/slate-tools/tools/webpack/config/parts/core.js +++ b/packages/slate-tools/tools/webpack/config/parts/core.js @@ -106,7 +106,6 @@ module.exports = { new RegExp('assets/styles'), new RegExp('sections'), new RegExp('snippets'), - ...config.get('webpack.commonExcludes'), ], loader: 'file-loader',