Merge pull request #883 from Shopify/fix-liquid-styles

Fix liquid styles not uploading to Shopify
Shopify · Nov 22, 2018 · ee43c20 · ee43c20
2 parents 5a115cf + f555f82
commit ee43c20
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/packages/slate-tools/tools/asset-server/index.js b/packages/slate-tools/tools/asset-server/index.js
@@ -62,11 +62,15 @@ module.exports = class DevServer {
   _isChunk(key, chunks) {
     return (
       chunks.filter((chunk) => {
-        return key.indexOf(chunk.id) > -1;
+        return key.indexOf(chunk.id) > -1 && !this._isLiquidStyle(key);
       }).length > 0
     );
   }
 
+  _isLiquidStyle(key) {
+    return key.indexOf('styleLiquid.scss.liquid') > -1;
+  }
+
   _hasAssetChanged(key, asset) {
     const oldHash = this.assetHashes[key];
     const newHash = this._updateAssetHash(key, asset);

diff --git a/packages/slate-tools/tools/webpack/config/parts/core.js b/packages/slate-tools/tools/webpack/config/parts/core.js
@@ -50,22 +50,14 @@ module.exports = {
       {
         test: /\.(liquid|json)$/,
         exclude: [
-          new RegExp('assets/styles'),
+          /(css|scss|sass)\.liquid$/,
           ...config.get('webpack.commonExcludes'),
         ],
         loader: 'file-loader',
         options: {
           name: '../[path][name].[ext]',
         },
       },
-      {
-        test: /assets\/static\//,
-        exclude: /node_modules/,
-        loader: 'file-loader',
-        options: {
-          name: '[name].[ext]',
-        },
-      },
       {
         test: /(css|scss|sass)\.liquid$/,
         exclude: config.get('webpack.commonExcludes'),