Merge branch 'release/2.4.36' into craft-webpack

nystudio107 · May 9, 2021 · 4ba047f · 4ba047f
2 parents 6587588 + ebe1e08
commit 4ba047f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # nystudio107/craft Change Log
 
+## 2.4.36 - 2020.05.09
+### Changed
+* Silence errors from the root `post-create-project-cmd` script
+
+### Fixed
+* Fixed a breaking change of `dev` to `devMiddleware` in `webpack-dev-server` `^4.0.0-beta.3`
+
 ## 2.4.35 - 2021.04.27
 ### Changed
 * Delegate all of `storage` & `cpresources` volumes, let the container own it

diff --git a/buildchain/package.json b/buildchain/package.json
@@ -111,7 +111,7 @@
     "webpack": "^5.13.0",
     "webpack-bundle-analyzer": "^4.3.0",
     "webpack-cli": "^4.3.0",
-    "webpack-dev-server": "^4.0.0-beta.1",
+    "webpack-dev-server": "^4.0.0-beta.3",
     "webpack-manifest-plugin": "^3.0.0",
     "webpack-merge": "^5.7.0",
     "workbox-webpack-plugin": "^6.0.0"

diff --git a/buildchain/webpack-configs/dev-server.config.js b/buildchain/webpack-configs/dev-server.config.js
@@ -16,7 +16,7 @@ module.exports = (type = 'modern', settings) => {
                 overlay: true,
                 progress: false,
             },
-            dev: {
+            devMiddleware: {
                 publicPath: '/',
             },
             firewall: false,

diff --git a/composer.json b/composer.json
@@ -22,10 +22,10 @@
     "post-create-project-cmd": [
       "@php -r \"copy('./cms/example.env', './cms/.env');\"",
       "@php -r \"copy('./scripts/example.env.sh', './scripts/.env.sh');\"",
-      "@php -r \"unlink('composer.json');\"",
-      "@php -r \"unlink('composer.lock');\"",
-      "@php -r \"unlink('LICENSE.md');\"",
-      "@php -r \"unlink('README.md');\""
+      "@php -r \"@unlink('composer.json');\"",
+      "@php -r \"@unlink('composer.lock');\"",
+      "@php -r \"@unlink('LICENSE.md');\"",
+      "@php -r \"@unlink('README.md');\""
     ]
   }
 }