Merge branch 'release/2.4.50' into craft-webpack

CHANGELOG.md

@@ -1,5 +1,11 @@
 # nystudio107/craft Change Log
 
+## 2.4.50 - 2021.12.07
+### Changed
+* Use Node 16 for the webpack buildchain container
+* Updated deps for native ARM buildchain container
+* Updated the `Makefile` to accommodate _another_ change in Docker that switches back to using `_` instead of `-` in container names
+
 ## 2.4.49 - 2021.11.20
 ### Added
 * Use `tty: true` for nicer output in terminal from the PHP & webpack Docker containers

Makefile

@@ -1,5 +1,5 @@
-CONTAINER?=$(shell basename $(CURDIR))-php-1
-BUILDCHAIN?=$(shell basename $(CURDIR))-webpack-1
+CONTAINER?=$(shell basename $(CURDIR))_php_1
+BUILDCHAIN?=$(shell basename $(CURDIR))_webpack_1
 
 .PHONY: build clean composer dev npm pulldb restoredb up
 

buddy.yml

@@ -9,7 +9,7 @@
       type: "BUILD"
       working_directory: "/buddy/${PROJECT_SHORTNAME}"
       docker_image_name: "nystudio107/node-dev-base"
-      docker_image_tag: "14-alpine"
+      docker_image_tag: "16-alpine"
       execute_commands:
         - "cd buildchain"
         - "npm install"

buildchain/package.json

@@ -67,8 +67,8 @@
     "compression-webpack-plugin": "^6.0.0",
     "copy-webpack-plugin": "^6.3.0",
     "create-symlink-webpack-plugin": "^1.0.0",
-    "critical": "^2.0.0",
-    "critical-css-webpack-plugin": "^2.0.0",
+    "critical": "^4.0.0",
+    "critical-css-webpack-plugin": "^3.0.0",
     "css-loader": "^5.0.0",
     "css-minimizer-webpack-plugin": "^1.1.5",
     "cssnano": "^4.1.0",
@@ -112,7 +112,7 @@
     "webpack-bundle-analyzer": "^4.3.0",
     "webpack-cli": "^4.3.0",
     "webpack-dev-server": "^4.0.0-rc.0",
-    "webpack-manifest-plugin": "^3.0.0",
+    "webpack-manifest-plugin": "^4.0.0",
     "webpack-merge": "^5.7.0",
     "workbox-webpack-plugin": "^6.0.0"
   },

docker-config/node-dev-webpack/Dockerfile

@@ -1,4 +1,4 @@
-FROM nystudio107/node-dev-base:14-alpine
+FROM nystudio107/node-dev-base:16-alpine
 
 WORKDIR /var/www/project/buildchain/
 
@@ -11,6 +11,6 @@ WORKDIR /var/www/project/buildchain/
 # This automatic running adds to the startup overhead of `docker-compose up`
 # but saves far more time in not having to deal with out of sync versions
 # when working with teams or multiple environments
-CMD npm install \
+CMD export CPPFLAGS="-DPNG_ARM_NEON_OPT=0" \
     && \
     npm run debug