Merge branch 'release/2.4.11' into craft-webpack

nystudio107 · Dec 6, 2020 · 43c5903 · 43c5903
2 parents bb6e2f0 + a5e99d5
commit 43c5903
Show file tree

Hide file tree

Showing 4 changed files with 1,267 additions and 872 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # nystudio107/craft Change Log
 
+## 2.4.11 - 2020.12.06
+### Changed
+* Ensure poll is always an integer
+* Updated seed db
+
 ## 2.4.10 - 2020.12.05
 ### Changed
 * Updated to latest buildchain semver deps

diff --git a/buildchain/webpack-configs/dev-server.config.js b/buildchain/webpack-configs/dev-server.config.js
@@ -32,7 +32,7 @@ module.exports = (type = 'modern', settings) => {
                 directory: path.resolve(__dirname, settings.contentBase()),
                 publicPath: '/',
                 watch: {
-                    poll: !!parseInt(settings.poll()),
+                    poll: settings.poll() | 0,
                     ignored: /node_modules/,
                 },
             },
@@ -55,6 +55,9 @@ module.exports = (type = 'modern', settings) => {
                 exclude: /\.(pcss|css)($|\?)/i,
             }),
         ],
+        watchOptions: {
+            poll: settings.poll() | 0,
+        },
     });
     // configs
     const configs = {

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "craftcms/craft",
   "description": "nystudio107 Craft 3.4 CMS scaffolding project",
-  "version": "2.4.10",
+  "version": "2.4.11",
   "keywords": [
     "craft",
     "cms",