Merge branch 'release/2.4.15' into craft-webpack

nystudio107 · Jan 9, 2021 · aeca60c · aeca60c
2 parents d4f9a03 + dd30099
commit aeca60c
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 28 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # nystudio107/craft Change Log
 
+## 2.4.15 - 2021.01.09
+### Changed
+* Update to Axios `^0.21.1`
+* Tabs -> Spaces in the Dockerfiles
+
 ## 2.4.14 - 2021.01.04
 ### Changed
 * Use slimmed down Alpine images for Docker

diff --git a/buildchain/package.json b/buildchain/package.json
@@ -34,7 +34,7 @@
     "url": "https://github.com/example-developer/example-project/issues"
   },
   "dependencies": {
-    "axios": "^0.19.0",
+    "axios": "^0.21.1",
     "core-js": "^3.0.0",
     "lazysizes": "^5.2.2",
     "regenerator-runtime": "^0.13.2",

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.14",
+  "version": "2.4.15",
   "keywords": [
     "craft",
     "cms",

diff --git a/docker-config/php-dev-craft/Dockerfile b/docker-config/php-dev-craft/Dockerfile
@@ -3,23 +3,23 @@ FROM nystudio107/php-dev-base:7.4-alpine
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
 ENV PHPIZE_DEPS \
-		autoconf \
-		dpkg-dev \
-		dpkg \
-		file \
-		g++ \
-		gcc \
-		libc-dev \
-		make \
-		pkgconf \
-		re2c \
-		wget
+        autoconf \
+        dpkg-dev \
+        dpkg \
+        file \
+        g++ \
+        gcc \
+        libc-dev \
+        make \
+        pkgconf \
+        re2c \
+        wget
 
 # Install packages
 RUN set -eux; \
     # Packages needed only for build
-	apk add --no-cache --virtual .build-deps \
-		$PHPIZE_DEPS \
+    apk add --no-cache --virtual .build-deps \
+        $PHPIZE_DEPS \
     && \
     # Packages to install
     apk add --no-cache \

diff --git a/docker-config/php-prod-craft/Dockerfile b/docker-config/php-prod-craft/Dockerfile
@@ -3,23 +3,23 @@ FROM nystudio107/php-prod-base:7.4-alpine
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
 ENV PHPIZE_DEPS \
-		autoconf \
-		dpkg-dev \
-		dpkg \
-		file \
-		g++ \
-		gcc \
-		libc-dev \
-		make \
-		pkgconf \
-		re2c \
-		wget
+        autoconf \
+        dpkg-dev \
+        dpkg \
+        file \
+        g++ \
+        gcc \
+        libc-dev \
+        make \
+        pkgconf \
+        re2c \
+        wget
 
 # Install packages
 RUN set -eux; \
     # Packages needed only for build
-	apk add --no-cache --virtual .build-deps \
-		$PHPIZE_DEPS \
+    apk add --no-cache --virtual .build-deps \
+        $PHPIZE_DEPS \
     && \
     # Packages to install
     apk add --no-cache \