Keep array-based entries relative-order during injectRefreshEntry (#165)

pmmmwh · Jul 27, 2020 · 31b8b92 · 31b8b92
1 parent 899b28a
commit 31b8b92
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/lib/utils/injectRefreshEntry.js b/lib/utils/injectRefreshEntry.js
@@ -79,12 +79,12 @@ function injectRefreshEntry(originalEntry, options) {
   if (Array.isArray(originalEntry)) {
     const socketEntryIndex = originalEntry.findIndex(isSocketEntry);
 
-    let socketEntry = [];
+    let socketAndPreceedingEntries = [];
     if (socketEntryIndex !== -1) {
-      socketEntry = originalEntry.splice(socketEntryIndex, 1);
+      socketAndPreceedingEntries = originalEntry.splice(0, socketEntryIndex + 1);
     }
 
-    return [...prependEntries, ...socketEntry, ...overlayEntries, ...originalEntry];
+    return [...prependEntries, ...socketAndPreceedingEntries, ...overlayEntries, ...originalEntry];
   }
   // Multiple entry points
   if (typeof originalEntry === 'object') {

diff --git a/test/unit/injectRefreshEntry.test.js b/test/unit/injectRefreshEntry.test.js
@@ -146,10 +146,16 @@ describe('injectRefreshEntry', () => {
     ]);
   });
 
-  it('should append overlay entry for an array after socket-related entries', () => {
+  it('should append overlay entry for an array after socket-related entries, while keeping relative order on the original entries', () => {
     expect(
-      injectRefreshEntry(['webpack-dev-server/client', 'test.js'], DEFAULT_OPTIONS)
-    ).toStrictEqual([ReactRefreshEntry, 'webpack-dev-server/client', ErrorOverlayEntry, 'test.js']);
+      injectRefreshEntry(['setup-env.js', 'webpack-dev-server/client', 'test.js'], DEFAULT_OPTIONS)
+    ).toStrictEqual([
+      ReactRefreshEntry,
+      'setup-env.js',
+      'webpack-dev-server/client',
+      ErrorOverlayEntry,
+      'test.js',
+    ]);
   });
 
   it('should throw when non-parsable entry is received', () => {