From feaa4a261d0cce8e322ebf415e5ccdf541634dab Mon Sep 17 00:00:00 2001 From: Alexander Pepper Date: Thu, 26 Mar 2020 12:03:52 +0100 Subject: [PATCH 1/2] [webpack] file-loader 5 => 6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit > npm i file-loader@latest > ⚠ BREAKING CHANGES > use md4 by default for hashing [previously md5] Source: https://github.com/webpack-contrib/file-loader/releases/tag/v6.0.0 --- package-lock.json | 33 ++++++++++++++++++++++++++++----- package.json | 2 +- 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2c98fdf75..4e0e9b7a2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4345,14 +4345,37 @@ } }, "file-loader": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-5.1.0.tgz", - "integrity": "sha512-u/VkLGskw3Ue59nyOwUwXI/6nuBCo7KBkniB/l7ICwr/7cPNGsL1WCXUp3GB0qgOOKU1TiP49bv4DZF/LJqprg==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.0.0.tgz", + "integrity": "sha512-/aMOAYEFXDdjG0wytpTL5YQLfZnnTmLNjn+AIrJ/6HVnTfDqLsVKUUwkDf4I4kgex36BvjuXEn/TX9B/1ESyqQ==", "requires": { - "loader-utils": "^1.4.0", - "schema-utils": "^2.5.0" + "loader-utils": "^2.0.0", + "schema-utils": "^2.6.5" }, "dependencies": { + "json5": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.2.tgz", + "integrity": "sha512-MoUOQ4WdiN3yxhm7NEVJSJrieAo5hNSLQ5sj05OTRHPL9HOBy8u4Bu88jsC1jvqAdN+E1bJmsUcZH+1HQxliqQ==", + "requires": { + "minimist": "^1.2.5" + } + }, + "loader-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" + }, "schema-utils": { "version": "2.6.5", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.5.tgz", diff --git a/package.json b/package.json index 255150b1a..fc9ea2178 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "eslint-plugin-react": "^7.19.0", "eslint-plugin-react-hooks": "^2.5.1", "express": "^4.17.1", - "file-loader": "^5.1.0", + "file-loader": "^6.0.0", "filesize": "^6.1.0", "fs-extra": "^9.0.0", "fuse.js": "^3.6.1", From 4835030d68c0bfaf461762c4f0bcb23c1dcbbd83 Mon Sep 17 00:00:00 2001 From: Alexander Pepper Date: Thu, 26 Mar 2020 12:51:59 +0100 Subject: [PATCH 2/2] [prerender] contentHash: md5 => md4. Webpack uses md4 for all hashes by default (see [1] and [2]) [1] https://github.com/webpack/webpack/pull/6549 [2] https://github.com/webpack/loader-utils/issues/114 --- package-lock.json | 10 +++++----- package.json | 2 +- src/prerenderContent/contentHash.js | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4e0e9b7a2..c1682963c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6338,6 +6338,11 @@ "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-2.2.1.tgz", "integrity": "sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ==" }, + "js-md4": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/js-md4/-/js-md4-0.3.2.tgz", + "integrity": "sha1-zTs9wEWwxARVbIHdtXVsI+WdfPU=" + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -9488,11 +9493,6 @@ "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=" }, - "spark-md5": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/spark-md5/-/spark-md5-3.0.1.tgz", - "integrity": "sha512-0tF3AGSD1ppQeuffsLDIOWlKUd3lS92tFxcsrh5Pe3ZphhnoK+oXIBTzOAThZCiuINZLvpiLH/1VS1/ANEJVig==" - }, "spawn-sync": { "version": "1.0.15", "resolved": "https://registry.npmjs.org/spawn-sync/-/spawn-sync-1.0.15.tgz", diff --git a/package.json b/package.json index fc9ea2178..9cc148493 100644 --- a/package.json +++ b/package.json @@ -48,6 +48,7 @@ "html-webpack-plugin": "^3.2.0", "is-empty": "^1.2.0", "jquery": "^3.4.1", + "js-md4": "^0.3.2", "jsontoxml": "^1.0.1", "lodash": "^4.17.15", "lodash-es": "^4.17.15", @@ -71,7 +72,6 @@ "sass-loader": "^8.0.2", "scrivito": "^1.11.0", "slick-carousel": "^1.6.0", - "spark-md5": "^3.0.1", "terser-webpack-plugin": "^2.3.5", "typescript": "^3.8.3", "webpack": "^4.42.1", diff --git a/src/prerenderContent/contentHash.js b/src/prerenderContent/contentHash.js index 70ad5d15c..34bb52a4e 100644 --- a/src/prerenderContent/contentHash.js +++ b/src/prerenderContent/contentHash.js @@ -1,6 +1,6 @@ -import { hash as md5 } from "spark-md5"; +import md4 from "js-md4"; -/** Generates a 20 long hex value, based the md5 of the given string */ +/** Generates a 20 long hex value, based the md4 of the given string */ export default async function contentHash(input) { - return md5(input).substr(0, 20); + return md4(input).substr(0, 20); }