Simplify assets

packages/slate-config/common/paths.schema.js

@@ -15,18 +15,13 @@ module.exports = {
   // Source directory of theme
   'paths.theme.src': (config) => path.join(config.get('paths.theme'), 'src'),
 
+  'paths.theme.src.assets': (config) =>
+    path.join(config.get('paths.theme.src'), 'assets'),
+
   // Source of theme configuration files
   'paths.theme.src.config': (config) =>
     path.join(config.get('paths.theme.src'), 'config'),
 
-  // Source font directory for theme
-  'paths.theme.src.fonts': (config) =>
-    path.join(config.get('paths.theme.src'), 'assets', 'fonts'),
-
-  // Source of images directory
-  'paths.theme.src.images': (config) =>
-    path.join(config.get('paths.theme.src'), 'assets', 'images'),
-
   // Source of theme liquid layout files
   'paths.theme.src.layouts': (config) =>
     path.join(config.get('paths.theme.src'), 'layout'),
@@ -37,15 +32,15 @@ module.exports = {
 
   // Source scripts directory for theme
   'paths.theme.src.scripts': (config) =>
-    path.join(config.get('paths.theme.src'), 'assets', 'scripts'),
+    path.join(config.get('paths.theme.src'), 'scripts'),
 
   // Source snippets directory
   'paths.theme.src.snippets': (config) =>
     path.join(config.get('paths.theme.src'), 'snippets'),
 
   // Static asset directory for files that statically copied to paths.theme.dist.assets
-  'paths.theme.src.static': (config) =>
-    path.join(config.get('paths.theme.src'), 'assets', 'static'),
+  'paths.theme.src.sections': (config) =>
+    path.join(config.get('paths.theme.src'), 'sections'),
 
   // Main SVG source directory for theme
   'paths.theme.src.svgs': (config) =>
@@ -78,6 +73,12 @@ module.exports = {
   'paths.theme.dist.locales': (config) =>
     path.join(config.get('paths.theme.dist'), 'locales'),
 
+  'paths.theme.dist.sections': (config) =>
+    path.join(config.get('paths.theme.dist'), 'sections'),
+
+  'paths.theme.dist.templates': (config) =>
+    path.join(config.get('paths.theme.dist'), 'templates'),
+
   // Directory for storing all temporary and/or cache files
   'paths.theme.cache': (config) =>
     path.join(config.get('paths.theme'), '.cache'),

packages/slate-sync/index.js

@@ -223,6 +223,8 @@ module.exports = {
       return Promise.reject(new Error('No files to deploy.'));
     }
 
+    console.log(files);
+
     filesToDeploy = [...new Set([...filesToDeploy, ...files])];
 
     return maybeDeploy();

packages/slate-tools/slate-tools.schema.js

@@ -109,7 +109,5 @@ module.exports = {
   'webpack.cssnano.settings': {zindex: false, reduceIdents: false},
 
   // Object which contains entrypoints used in webpack's config.entry key
-  'webpack.entrypoints': {
-    static: path.resolve(__dirname, 'tools/webpack/static-files-glob.js'),
-  },
+  'webpack.entrypoints': {},
 };

packages/slate-tools/tools/asset-server/app.js

@@ -10,6 +10,7 @@ module.exports = class App {
     app.webpackDevMiddleware = webpackDevMiddleware(compiler, {
       logLevel: 'silent',
       reload: true,
+      writeToDisk: true,
     });
     app.webpackHotMiddleware = webpackHotMiddleware(compiler, {
       log: false,

packages/slate-tools/tools/asset-server/index.js

@@ -16,6 +16,7 @@ module.exports = class DevServer {
     }/`;
 
     this.assetHashes = {};
+    this.chunkHashes = {};
     this.domain = options.domain;
     this.options = options;
     this.port = options.port;
@@ -48,7 +49,7 @@ module.exports = class DevServer {
   }
 
   _onCompileDone(stats) {
-    const files = this._getChangedLiquidFiles(stats);
+    const files = this._getChangedFiles(stats);
 
     return this.client.sync(files);
   }
@@ -60,20 +61,40 @@ module.exports = class DevServer {
     });
   }
 
-  _getChangedLiquidFiles(stats) {
+  _getChangedFiles(stats) {
     const assets = Object.entries(stats.compilation.assets);
+    const allChunks = stats.compilation.chunks;
 
     return (
       assets
         .filter(([key, asset]) => {
+          const matchedChunks = allChunks.filter((chunk) => {
+            return key.indexOf(chunk.id) > -1;
+          });
+
+          const changedChunks = matchedChunks.filter((chunk) => {
+            const oldChunkHash = this.chunkHashes[chunk.id];
+            this.chunkHashes[chunk.id] = chunk.hash;
+
+            return oldChunkHash !== chunk.hash;
+          });
+
           const oldHash = this.assetHashes[key];
           const newHash = this._updateAssetHash(key, asset);
+          let hasChanged;
+
+          if (matchedChunks.length > 0) {
+            hasChanged = changedChunks.length > 0;
+          } else {
+            hasChanged = oldHash !== newHash;
+          }
 
           return (
             asset.emitted &&
-            (/\.liquid$/.test(key) || /\.json$/.test(key)) &&
+            !/\.hot-update\.json$/.test(key) &&
+            !/\.hot-update\.js$/.test(key) &&
             fs.existsSync(asset.existsAt) &&
-            oldHash !== newHash
+            hasChanged
           );
         })
         /* eslint-disable-next-line no-unused-vars */

packages/slate-tools/tools/webpack/config/dev.js

@@ -34,22 +34,6 @@ module.exports = merge([
 
     devtool: '#eval-source-map',
 
-    module: {
-      rules: [
-        {
-          test: /^(?:(?!(css|scss|sass)).)*\.(liquid)$/,
-          exclude: config.get('webpack.commonExcludes'),
-          use: [
-            {loader: 'extract-loader'},
-            {
-              loader: '@shopify/slate-liquid-asset-loader',
-              options: {devServer: true},
-            },
-          ],
-        },
-      ],
-    },
-
     plugins: [
       new webpack.HotModuleReplacementPlugin(),
 
@@ -80,6 +64,7 @@ module.exports = merge([
         },
         // necessary to consistently work with multiple chunks via CommonsChunkPlugin
         chunksSortMode: 'dependency',
+        isDevServer: true,
         liquidTemplates: getTemplateEntrypoints(),
         liquidLayouts: getLayoutEntrypoints(),
       }),