Allow @next plugins to be loaded without experimental flag

vercel · Nov 4, 2020 · 959c1a1 · 959c1a1
1 parent a1ea352
commit 959c1a1
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 40 deletions.
diff --git a/packages/next/build/plugins/collect-plugins.ts b/packages/next/build/plugins/collect-plugins.ts
@@ -21,7 +21,6 @@ export const VALID_MIDDLEWARE = [
   'on-init-server',
   'on-error-client',
   'on-error-server',
-  'babel-preset-build',
 ]
 
 type ENV_OPTIONS = { [name: string]: string }

diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
@@ -210,24 +210,15 @@ export default async function getBaseWebpackConfig(
 ): Promise<webpack.Configuration> {
   const productionBrowserSourceMaps =
     config.experimental.productionBrowserSourceMaps && !isServer
-  let plugins: PluginMetaData[] = []
-  let babelPresetPlugins: { dir: string; config: any }[] = []
+  let plugins: PluginMetaData[] = await collectPlugins(
+    dir,
+    config.env,
+    config.plugins
+  )
 
   const hasRewrites = rewrites.length > 0 || dev
 
-  if (config.experimental.plugins) {
-    plugins = await collectPlugins(dir, config.env, config.plugins)
-    pluginLoaderOptions.plugins = plugins
-
-    for (const plugin of plugins) {
-      if (plugin.middleware.includes('babel-preset-build')) {
-        babelPresetPlugins.push({
-          dir: plugin.directory,
-          config: plugin.config,
-        })
-      }
-    }
-  }
+  pluginLoaderOptions.plugins = plugins
 
   const reactVersion = await getPackageVersion({ cwd: dir, name: 'react' })
   const hasReactRefresh: boolean = dev && !isServer
@@ -248,7 +239,6 @@ export default async function getBaseWebpackConfig(
         cwd: dir,
         // Webpack 5 has a built-in loader cache
         cache: !isWebpack5,
-        babelPresetPlugins,
         hasModern: !!config.experimental.modern,
         development: dev,
         hasReactRefresh,
@@ -266,9 +256,8 @@ export default async function getBaseWebpackConfig(
     /next[\\/]dist[\\/]client/,
     /next[\\/]dist[\\/]pages/,
     /[\\/](strip-ansi|ansi-regex)[\\/]/,
-    ...(config.experimental.plugins
-      ? VALID_MIDDLEWARE.map((name) => new RegExp(`src(\\\\|/)${name}`))
-      : []),
+    // Compile plugins through babel
+    ...VALID_MIDDLEWARE.map((name) => new RegExp(`src(\\\\|/)${name}`)),
   ]
 
   // Support for NODE_PATH
@@ -969,9 +958,7 @@ export default async function getBaseWebpackConfig(
         'process.env.__NEXT_BUILD_INDICATOR': JSON.stringify(
           config.devIndicators.buildActivity
         ),
-        'process.env.__NEXT_PLUGINS': JSON.stringify(
-          config.experimental.plugins
-        ),
+        'process.env.__NEXT_PLUGINS': JSON.stringify(true),
         'process.env.__NEXT_STRICT_MODE': JSON.stringify(
           config.reactStrictMode
         ),
@@ -1193,7 +1180,6 @@ export default async function getBaseWebpackConfig(
       trailingSlash: config.trailingSlash,
       modern: config.experimental.modern,
       buildActivity: config.devIndicators.buildActivity,
-      plugins: config.experimental.plugins,
       reactStrictMode: config.reactStrictMode,
       reactMode: config.experimental.reactMode,
       optimizeFonts: config.experimental.optimizeFonts,

diff --git a/packages/next/build/webpack/loaders/next-babel-loader.js b/packages/next/build/webpack/loaders/next-babel-loader.js
@@ -58,7 +58,6 @@ module.exports = babelLoader.custom((babel) => {
         isModern: opts.isModern,
         pagesDir: opts.pagesDir,
         hasModern: opts.hasModern,
-        babelPresetPlugins: opts.babelPresetPlugins,
         development: opts.development,
         hasReactRefresh: opts.hasReactRefresh,
         hasJsxRuntime: opts.hasJsxRuntime,
@@ -98,7 +97,6 @@ module.exports = babelLoader.custom((babel) => {
       delete loader.isModern
       delete loader.hasModern
       delete loader.pagesDir
-      delete loader.babelPresetPlugins
       delete loader.development
       delete loader.hasReactRefresh
       delete loader.hasJsxRuntime
@@ -113,7 +111,6 @@ module.exports = babelLoader.custom((babel) => {
           isModern,
           hasModern,
           pagesDir,
-          babelPresetPlugins,
           development,
           hasReactRefresh,
           hasJsxRuntime,
@@ -255,13 +252,6 @@ module.exports = babelLoader.custom((babel) => {
         },
       ]
 
-      for (const plugin of babelPresetPlugins) {
-        require(join(plugin.dir, 'src', 'babel-preset-build.js'))(
-          options,
-          plugin.config || {}
-        )
-      }
-
       return options
     },
   }

diff --git a/packages/next/next-server/server/config.ts b/packages/next/next-server/server/config.ts
@@ -52,7 +52,6 @@ const defaultConfig: { [key: string]: any } = {
         (os.cpus() || { length: 1 }).length) - 1
     ),
     modern: false,
-    plugins: false,
     profiling: false,
     sprFlushToDisk: true,
     reactMode: 'legacy',

diff --git a/packages/next/next-server/server/next-server.ts b/packages/next/next-server/server/next-server.ts
@@ -233,7 +233,7 @@ export default class Server {
 
     // call init-server middleware, this is also handled
     // individually in serverless bundles when deployed
-    if (!dev && this.nextConfig.experimental.plugins) {
+    if (!dev) {
       const initServer = require(join(this.serverBuildDir, 'init-server.js'))
         .default
       this.onErrorMiddleware = require(join(

diff --git a/...ion/next-plugins/app/node_modules/@next/plugin-google-analytics/src/babel-preset-build.js b/...ion/next-plugins/app/node_modules/@next/plugin-google-analytics/src/babel-preset-build.js