(next) - fix next 10.2 compat (#345)

* fix next 10.2 compat * add changeset
preactjs · May 21, 2021 · c9b3bdf · c9b3bdf
1 parent 34ff2b4
commit c9b3bdf
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/.changeset/ten-items-invite.md b/.changeset/ten-items-invite.md
@@ -0,0 +1,5 @@
+---
+'@prefresh/webpack': minor
+---
+
+Use newly introduced dependency injection for webpack 5
diff --git a/packages/webpack/src/index.js b/packages/webpack/src/index.js
@@ -135,8 +135,6 @@ class ReloadPlugin {
       `);
     }
 
-    compiler.options.entry = injectEntry(compiler.options.entry);
-
     let provide = {
       [prefreshUtils]: require.resolve('./utils/prefresh'),
     };
@@ -152,10 +150,23 @@ class ReloadPlugin {
 
     switch (Number(webpack.version[0])) {
       case 4: {
+        compiler.options.entry = injectEntry(compiler.options.entry);
         this.webpack4(compiler);
         break;
       }
       case 5: {
+        const dependency = webpack.EntryPlugin.createDependency(
+          '@prefresh/core',
+          { name: '@prefresh/core' }
+        );
+        compiler.hooks.make.tapAsync(NAME, (compilation, callback) => {
+          compilation.addEntry(
+            compiler.context,
+            dependency,
+            undefined,
+            callback
+          );
+        });
         this.webpack5(compiler);
         break;
       }

diff --git a/test/fixture/next-webpack5/next.config.js b/test/fixture/next-webpack5/next.config.js
@@ -11,9 +11,10 @@ const config = {
   },
 	webpack(config, { dev, isServer }) {
 		const splitChunks = config.optimization && config.optimization.splitChunks;
-		if (splitChunks) {
+		if (splitChunks && isServer && splitChunks.cacheGroups) {
 			const cacheGroups = splitChunks.cacheGroups;
 			const preactModules = /[\\/]node_modules[\\/](preact|preact-render-to-string|preact-context-provider)[\\/]/;
+
 			if (cacheGroups.framework) {
 				cacheGroups.preact = Object.assign({}, cacheGroups.framework, {
 					test: preactModules

diff --git a/test/fixture/next-webpack5/package.json b/test/fixture/next-webpack5/package.json
@@ -13,7 +13,7 @@
 	},
 	"dependencies": {
     "goober": "latest",
-		"next": "^10.0.7",
+		"next": "^10.2.2",
 		"preact": "^10.5.7",
 		"preact-render-to-string": "^5.1.12",
 		"react": "github:preact-compat/react#1.0.0",