From 7c7b708467a10cfbbbcbb178c2c894a79c873a06 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Fri, 29 Jul 2022 16:02:47 +0200 Subject: [PATCH] Revert "[v3.0] New hashing algorithm that "fixes (nearly) everything" (#4543)" This reverts commit 53db7999559fd53857c900be92f4fa301e13e874. --- .../_expected/amd/entry-main-5940aabc-amd.js | 4 ---- .../_expected/cjs/entry-main-9cf3a232-cjs.js | 4 ---- 2 files changed, 8 deletions(-) diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/entry-main-5940aabc-amd.js b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/entry-main-5940aabc-amd.js index b863b98285e..bed6a1ef6b4 100644 --- a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/entry-main-5940aabc-amd.js +++ b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/entry-main-5940aabc-amd.js @@ -1,10 +1,6 @@ define(['require'], (function (require) { 'use strict'; console.log('main'); -<<<<<<<< HEAD:test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/entry-main-5940aabc-amd.js new Promise(function (resolve, reject) { require(['./chunk-deb-87ce45a9-amd'], resolve, reject); }).then(console.log); -======== - new Promise(function (resolve, reject) { require(['./chunk-deb-faae56f2-amd'], resolve, reject); }).then(console.log); ->>>>>>>> 3030e2f11 ([v3.0] New hashing algorithm that "fixes (nearly) everything" (#4543)):test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/entry-main-aaf15a0c-amd.js })); diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/entry-main-9cf3a232-cjs.js b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/entry-main-9cf3a232-cjs.js index ec32df29945..e28e6fa0c72 100644 --- a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/entry-main-9cf3a232-cjs.js +++ b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/entry-main-9cf3a232-cjs.js @@ -1,8 +1,4 @@ 'use strict'; console.log('main'); -<<<<<<<< HEAD:test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/entry-main-9cf3a232-cjs.js Promise.resolve().then(function () { return require('./chunk-deb-69905607-cjs.js'); }).then(console.log); -======== -Promise.resolve().then(function () { return require('./chunk-deb-2221fa83-cjs.js'); }).then(console.log); ->>>>>>>> 3030e2f11 ([v3.0] New hashing algorithm that "fixes (nearly) everything" (#4543)):test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/entry-main-69b6552e-cjs.js