fix tests

felixmosh · Sep 12, 2023 · d1c3729 · d1c3729
1 parent 8ad5db2
commit d1c3729
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 12 deletions.
diff --git a/__tests__/utils/preprocessor.js b/__tests__/utils/preprocessor.js
@@ -1,7 +1,9 @@
 module.exports = {
   process(src, path) {
     return {
-      code: src.replace(/module\.hot/g, 'global.mockModule.hot'),
+      code: src
+        .replace(/module\.hot/g, 'global.mockModule.hot')
+        .replace(/import\.meta\.hot/g, 'global.mockImport.meta.hot'),
     };
   },
 };
diff --git a/__tests__/client-hmr.spec.js → __tests__/webpack/client-hmr.spec.js b/__tests__/client-hmr.spec.js → __tests__/webpack/client-hmr.spec.js
@@ -1,5 +1,5 @@
 let changedData = {};
-jest.mock('../lib/trigger.js', () => {
+jest.mock('../../lib/webpack/trigger.js', () => {
   return changedData;
 });
 
@@ -9,7 +9,7 @@ global.mockModule = {
   },
 };
 
-const applyClientHMR = require('../lib/client-hmr');
+const applyClientHMR = require('../../lib/webpack/client-hmr');
 
 function whenHotTriggeredWith(changedFiles) {
   changedData.changedFiles = changedFiles;

diff --git a/__tests__/loader.spec.js → __tests__/webpack/loader.spec.js b/__tests__/loader.spec.js → __tests__/webpack/loader.spec.js
@@ -1,4 +1,4 @@
-const loader = require('../lib/webpack/loader');
+const loader = require('../../lib/webpack/loader');
 
 describe('loader', () => {
   let context;

diff --git a/__tests__/server-hmr.spec.js → __tests__/webpack/server-hmr.spec.js b/__tests__/server-hmr.spec.js → __tests__/webpack/server-hmr.spec.js
@@ -1,11 +1,10 @@
 const changedData = {};
 
-jest.mock('../lib/trigger.js', () => {
+jest.mock('../../lib/webpack/trigger.js', () => {
   return changedData;
 });
-const applyServerHMR = require('../lib/server-hmr');
-const plugin = require('../lib/webpack/plugin');
-const applyClientHMR = require('../lib/client-hmr');
+const applyServerHMR = require('../../lib/webpack/server-hmr');
+const plugin = require('../../lib/webpack/plugin');
 
 function whenNativeHMRTriggeredWith(changedFiles) {
   changedData.changedFiles = changedFiles;

diff --git a/lib/utils.js b/lib/utils.js
@@ -112,5 +112,7 @@ module.exports = {
   printList: printList,
   extractList: extractList,
   log: log,
+  createLoggerOnce: createLoggerOnce,
+  uniqueList: uniqueList,
   reloadTranslations: reloadTranslations,
 };
diff --git a/lib/webpack/client-hmr.js b/lib/webpack/client-hmr.js
@@ -1,5 +1,4 @@
-const { extractList, printList, reloadTranslations, log } = require('./utils');
-
+const { extractList, printList, reloadTranslations, log } = require('../utils');
 
 module.exports = function applyClientHMR(i18nOrGetter) {
   if (module.hot) {

diff --git a/lib/webpack/server-hmr.js b/lib/webpack/server-hmr.js
@@ -1,4 +1,4 @@
-const { extractList, printList, uniqueList, createLoggerOnce } = require('./utils');
+const { extractList, printList, uniqueList, createLoggerOnce } = require('../utils');
 
 module.exports = function applyServerHMR(i18nOrGetter) {
   const pluginName = `\x1b[35m\x1b[1m${'I18NextHMR'}\x1b[0m\x1b[39m`;
@@ -51,7 +51,7 @@ module.exports = function applyServerHMR(i18nOrGetter) {
   } else {
     logOnce(`Server HMR has started - callback mode`);
 
-    const HMRPlugin = require('./webpack/plugin');
+    const HMRPlugin = require('./plugin');
     HMRPlugin.addListener(reloadServerTranslation);
   }
 };
diff --git a/lib/trigger.js → lib/webpack/trigger.js b/lib/trigger.js → lib/webpack/trigger.js