Merge pull request #4 from FormidableLabs/fix/next-8

Improve support for both Next 7 and 8

Author: exogen

.babelrc.js

@@ -1,4 +1,4 @@
 module.exports = {
-  presets: ["@babel/preset-env", "@babel/preset-react"],
+  presets: ["next/babel"],
   plugins: ["babel-plugin-dynamic-import-node"]
 };

index.js

@@ -15,23 +15,37 @@ module.exports = function preloadAll() {
   }
 };
 
-jest.doMock(
-  "next/dynamic",
-  () => {
-    const { default: dynamic } = jest.requireActual("next/dynamic");
+function createFactory(moduleName) {
+  return () => {
+    const dynamicModule = jest.requireActual(moduleName);
+    const dynamic = dynamicModule.default;
 
-    const mockDynamic = (...args) => {
-      const LoadableComponent = dynamic(...args);
+    const mockDynamic = (loader, options) => {
+      // Remove webpack-specific functionality added by the next/babel preset.
+      if (loader && typeof loader === "object" && loader.loadableGenerated) {
+        const { loadableGenerated, ...mockLoader } = loader;
+        loader = mockLoader;
+      }
+      if (options && typeof options === "object" && options.loadableGenerated) {
+        const { loadableGenerated, ...mockOptions } = options;
+        options = mockOptions;
+      }
+      const LoadableComponent = dynamic(loader, options);
       mockInitializers.push(() => LoadableComponent.preload());
       return LoadableComponent;
     };
 
-    return mockDynamic;
-  },
-  // In order to more easily include this feature in shared Jest setups (like
-  // presets), use `virtual: true` to avoid throwing an error when `next` isn't
-  // actually installed.
-  {
-    virtual: true
-  }
-);
+    // Replace the `default` export on the existing module so that other exports
+    // and non-enumerable properties remain.
+    dynamicModule.default = mockDynamic;
+    return dynamicModule;
+  };
+}
+
+// In order to more easily include this feature in shared Jest setups (like
+// presets), use `virtual: true` to avoid throwing an error when `next` isn't
+// actually installed or it's a version without `next-server` (introduced in
+// Next.js 8).
+for (const moduleName of ["next/dynamic", "next-server/dynamic"]) {
+  jest.doMock(moduleName, createFactory(moduleName), { virtual: true });
+}

package.json

@@ -10,16 +10,14 @@
     "test": "jest"
   },
   "devDependencies": {
-    "@babel/core": "^7.2.0",
-    "@babel/preset-env": "^7.2.0",
-    "@babel/preset-react": "^7.0.0",
+    "@babel/core": "^7.3.3",
     "babel-core": "^7.0.0-bridge",
-    "babel-jest": "^23.6.0",
+    "babel-jest": "^24.1.0",
     "babel-plugin-dynamic-import-node": "^2.2.0",
-    "jest": "^23.6.0",
-    "next": "^7.0.2",
-    "react": "^16.6.3",
-    "react-dom": "^16.6.3",
-    "react-test-renderer": "^16.6.3"
+    "jest": "^24.1.0",
+    "next": "^8.0.2",
+    "react": "^16.8.3",
+    "react-dom": "^16.8.3",
+    "react-test-renderer": "^16.8.3"
   }
 }