Merge branch 'release/2.4.13' into craft-webpack

nystudio107 · Dec 22, 2020 · db49baa · db49baa
2 parents e4c01f5 + 569c1bb
commit db49baa
Show file tree

Hide file tree

Showing 14 changed files with 11 additions and 226 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # nystudio107/craft Change Log
 
+## 2.4.13 - 2020.12.21
+### Changed
+* Refactored `output.path` to `app.config.js`
+* Remove unused base Docker configs
+* Use PHP 7.4
+
 ## 2.4.12 - 2020.12.17
 ### Added
 * Added some useful PostCSS plugins

diff --git a/buildchain/webpack-configs/app.config.js b/buildchain/webpack-configs/app.config.js
@@ -18,7 +18,6 @@ module.exports = (type = 'modern', settings) => {
         name: pkg.name,
         output: {
             path: path.resolve(__dirname, settings.paths.dist),
-            publicPath: settings.urls.publicPath()
         },
         resolve: {
             alias: settings.alias,

diff --git a/buildchain/webpack-configs/build.config.js b/buildchain/webpack-configs/build.config.js
@@ -11,7 +11,6 @@ module.exports = (type = 'modern', settings) => {
         entry: {},
         mode: 'production',
         output: {
-            path: path.resolve(__dirname, settings.paths.dist),
             publicPath: settings.urls.publicPath()
         },
         resolve: {

diff --git a/buildchain/webpack-configs/production.config.js b/buildchain/webpack-configs/production.config.js
@@ -60,6 +60,7 @@ module.exports = (type = 'modern', settings) => {
                 },
                 output: {
                     filename: path.join('./js', '[name]-legacy.[contenthash].js'),
+                    publicPath: settings.urls.publicPath(),
                 },
                 plugins: [
                     new MiniCssExtractPlugin({
@@ -84,6 +85,7 @@ module.exports = (type = 'modern', settings) => {
                 },
                 output: {
                     filename: path.join('./js', '[name].[contenthash].js'),
+                    publicPath: settings.urls.publicPath(),
                 },
             },
         }

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

diff --git a/docker-config/node-dev-base/Dockerfile b/docker-config/node-dev-base/Dockerfile
diff --git a/docker-config/php-dev-base/Dockerfile b/docker-config/php-dev-base/Dockerfile
diff --git a/docker-config/php-dev-base/xdebug.ini b/docker-config/php-dev-base/xdebug.ini
diff --git a/docker-config/php-dev-base/zzz-docker.conf b/docker-config/php-dev-base/zzz-docker.conf
diff --git a/docker-config/php-dev-craft/Dockerfile b/docker-config/php-dev-craft/Dockerfile
@@ -1,4 +1,4 @@
-FROM nystudio107/php-dev-base
+FROM nystudio107/php-dev-base:7.4
 
 # Install packages
 RUN apt-get update \

diff --git a/docker-config/php-prod-base/Dockerfile b/docker-config/php-prod-base/Dockerfile
diff --git a/docker-config/php-prod-base/zzz-docker.conf b/docker-config/php-prod-base/zzz-docker.conf
diff --git a/docker-config/php-prod-craft/Dockerfile b/docker-config/php-prod-craft/Dockerfile
@@ -1,4 +1,4 @@
-FROM nystudio107/php-prod-base
+FROM nystudio107/php-prod-base:7.4
 
 # Install packages
 RUN apt-get update \

diff --git a/docker-config/postgres/Dockerfile b/docker-config/postgres/Dockerfile