Only load plugins with @next prefix (#17945)

vercel · Oct 16, 2020 · dfcf267 · bitfrost · Nov 5, 2020 · timneutkens
1 parent cbbf9a7
commit dfcf267
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 40 deletions.
diff --git a/packages/next/build/plugins/collect-plugins.ts b/packages/next/build/plugins/collect-plugins.ts
@@ -182,11 +182,9 @@ async function _collectPlugins(
     }
 
     // find packages with the naming convention
-    // @scope/next-plugin-[name]
     // @next/plugin-[name]
-    // next-plugin-[name]
     const filteredDeps = dependencies.filter((name) => {
-      return name.match(/(^@next\/plugin|next-plugin-)/)
+      return name.match(/^@next\/plugin/)
     })
 
     if (nextPluginConfigNames) {

diff --git a/test/integration/next-plugins/app/node_modules/@zeit/next-plugin-scope/package.json b/test/integration/next-plugins/app/node_modules/@zeit/next-plugin-scope/package.json
diff --git a/test/integration/next-plugins/app/node_modules/@zeit/next-plugin-scope/src/on-init-client.js b/test/integration/next-plugins/app/node_modules/@zeit/next-plugin-scope/src/on-init-client.js
diff --git a/test/integration/next-plugins/app/node_modules/next-plugin-normal/package.json b/test/integration/next-plugins/app/node_modules/next-plugin-normal/package.json
diff --git a/...integration/next-plugins/app/node_modules/next-plugin-normal/src/dir-with-ext.js/index.js b/...integration/next-plugins/app/node_modules/next-plugin-normal/src/dir-with-ext.js/index.js
diff --git a/...integration/next-plugins/app/node_modules/next-plugin-normal/src/dir-without-ext/index.js b/...integration/next-plugins/app/node_modules/next-plugin-normal/src/dir-without-ext/index.js
diff --git a/test/integration/next-plugins/app/node_modules/next-plugin-normal/src/on-init-client.js b/test/integration/next-plugins/app/node_modules/next-plugin-normal/src/on-init-client.js
diff --git a/test/integration/next-plugins/app/package.json b/test/integration/next-plugins/app/package.json
@@ -1,7 +1,5 @@
 {
   "dependencies": {
-    "@next/plugin-google-analytics": "latest",
-    "@zeit/next-plugin-scope": "latest",
-    "next-plugin-normal": "latest"
+    "@next/plugin-google-analytics": "latest"
   }
 }
diff --git a/test/integration/next-plugins/test/index.test.js b/test/integration/next-plugins/test/index.test.js
@@ -44,8 +44,6 @@ function runTests() {
 
   it('should list loaded plugins', async () => {
     expect(stdout).toMatch(/loaded plugin: @next\/plugin-google-analytics/i)
-    expect(stdout).toMatch(/loaded plugin: @zeit\/next-plugin-scope/i)
-    expect(stdout).toMatch(/loaded plugin: next-plugin-normal/i)
   })
 
   it('should ignore directories in plugins', async () => {
@@ -111,8 +109,6 @@ describe('Next.js plugins', () => {
 
       it('should disable auto detecting plugins when plugin config is used', async () => {
         expect(stdout).toMatch(/loaded plugin: @next\/plugin-google-analytics/i)
-        expect(stdout).not.toMatch(/loaded plugin: @zeit\/next-plugin-scope/i)
-        expect(stdout).not.toMatch(/loaded plugin: next-plugin-normal/i)
       })
 
       it('should expose a plugins config', async () => {