Merge branch 'release/2.3.2' into craft-webpack

nystudio107 · Aug 13, 2020 · 199f62f · 199f62f
2 parents 282a127 + 2f0971f
commit 199f62f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # nystudio107/craft Change Log
 
+## 2.3.2 - 2020.08.12
+### Changed
+* Remove `[hash]` from dev config to eliminate potential [memory errors](https://github.com/webpack/webpack-dev-server/issues/438)
+* Use `[contenthash]` in production instead of [hash or chunkhash](https://github.com/webpack/webpack.js.org/issues/2096)
+
 ## 2.3.1 - 2020.08.10
 ### Added
 * Added `init` to the `docker-compose.yml` to processes are sent signals

diff --git a/buildchain/webpack.dev.js b/buildchain/webpack.dev.js
@@ -46,7 +46,7 @@ const configureImageLoader = (buildType) => {
                 {
                     loader: 'file-loader',
                     options: {
-                        name: 'img/[name].[hash].[ext]'
+                        name: 'img/[name].[ext]'
                     }
                 }
             ]
@@ -59,7 +59,7 @@ const configureImageLoader = (buildType) => {
                 {
                     loader: 'file-loader',
                     options: {
-                        name: 'img/[name].[hash].[ext]'
+                        name: 'img/[name].[ext]'
                     }
                 }
             ]
@@ -116,7 +116,7 @@ module.exports = [
         common.legacyConfig,
         {
             output: {
-                filename: path.join('./js', '[name]-legacy.[hash].js'),
+                filename: path.join('./js', '[name]-legacy.js'),
                 publicPath: settings.devServerConfig.public() + '/',
             },
             mode: 'development',
@@ -137,7 +137,7 @@ module.exports = [
         common.modernConfig,
         {
             output: {
-                filename: path.join('./js', '[name].[hash].js'),
+                filename: path.join('./js', '[name].js'),
                 publicPath: settings.devServerConfig.public() + '/',
             },
             mode: 'development',

diff --git a/buildchain/webpack.prod.js b/buildchain/webpack.prod.js
@@ -167,7 +167,7 @@ const configureImageLoader = (buildType) => {
                 {
                     loader: 'file-loader',
                     options: {
-                        name: 'img/[name].[hash].[ext]'
+                        name: 'img/[name].[contenthash].[ext]'
                     }
                 }
             ]
@@ -180,7 +180,7 @@ const configureImageLoader = (buildType) => {
                 {
                     loader: 'file-loader',
                     options: {
-                        name: 'img/[name].[hash].[ext]'
+                        name: 'img/[name].[contenthash].[ext]'
                     }
                 },
                 {
@@ -352,7 +352,7 @@ module.exports = [
         common.legacyConfig,
         {
             output: {
-                filename: path.join('./js', '[name]-legacy.[chunkhash].js'),
+                filename: path.join('./js', '[name]-legacy.[contenthash].js'),
             },
             mode: 'production',
             devtool: 'source-map',
@@ -366,7 +366,7 @@ module.exports = [
             plugins: [
                 new MiniCssExtractPlugin({
                     path: path.resolve(__dirname, settings.paths.dist.base),
-                    filename: path.join('./css', '[name].[chunkhash].css'),
+                    filename: path.join('./css', '[name].[contenthash].css'),
                 }),
                 new PurgecssPlugin(
                     configurePurgeCss()
@@ -402,7 +402,7 @@ module.exports = [
         common.modernConfig,
         {
             output: {
-                filename: path.join('./js', '[name].[chunkhash].js'),
+                filename: path.join('./js', '[name].[contenthash].js'),
             },
             mode: 'production',
             devtool: 'source-map',

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