Move webpack implementation into package folder

.config/eslintignore.mjs

@@ -20,6 +20,9 @@ export default globalIgnores([
   'packages/next/src/bundles/webpack/packages/*.runtime.js',
   'packages/next/src/bundles/webpack/packages/lazy-compilation-*.js',
   'packages/next/src/compiled/**/*',
+  'packages/next/src/webpack/bundles/webpack/packages/*.runtime.js',
+  'packages/next/src/webpack/bundles/webpack/packages/lazy-compilation-*.js',
+  'packages/next/src/webpack/compiled/**/*',
   'packages/next/wasm/@next',
   'packages/react-refresh-utils/**/*.js',
   'packages/react-dev-overlay/lib/**/*',

.prettierignore

@@ -16,6 +16,9 @@ pnpm-lock.yaml
 
 packages/next/src/bundles/webpack/packages/*.runtime.js
 packages/next/src/bundles/webpack/packages/lazy-compilation-*.js
+packages/next/src/webpack/bundles/webpack/packages/*.runtime.js
+packages/next/src/webpack/bundles/webpack/packages/lazy-compilation-*.js
+packages/next/src/webpack/compiled/**/*
 packages/next/wasm/@next
 packages/next/errors.json
 

crates/next-api/src/next_server_nft.rs

@@ -317,6 +317,7 @@ impl ServerNftJsonAsset {
             "**/*.map",
             "**/next/dist/pages/**/*",
             "**/next/dist/compiled/next-server/**/*.dev.js",
+            "**/next/dist/webpack/load-webpack-hook.js",
             "**/next/dist/compiled/webpack/*",
             "**/node_modules/webpack5/**/*",
             "**/next/dist/server/lib/route-resolver*",

crates/next-core/src/next_app/metadata/route.rs

@@ -219,14 +219,14 @@ async fn dynamic_text_route_source(path: FileSystemPath) -> Result<Vc<Box<dyn So
 
     let content_type = get_content_type(path.clone()).await?;
 
-    // refer https://github.com/vercel/next.js/blob/7b2b9823432fb1fa28ae0ac3878801d638d93311/packages/next/src/build/webpack/loaders/next-metadata-route-loader.ts#L84
+    // refer https://github.com/vercel/next.js/blob/7b2b9823432fb1fa28ae0ac3878801d638d93311/packages/next/src/webpack/build/webpack/loaders/next-metadata-route-loader.ts#L84
     // for the original template.
     let code = formatdoc! {
         r#"
             import {{ NextResponse }} from 'next/server'
             import handler from {resource_path}
             import {{ resolveRouteData }} from
-'next/dist/build/webpack/loaders/metadata/resolve-route-data'
+'next/dist/webpack/build/webpack/loaders/metadata/resolve-route-data'
 
             const contentType = {content_type}
             const cacheControl = {cache_control}
@@ -276,7 +276,7 @@ async fn dynamic_sitemap_route_with_generate_source(
         r#"
             import {{ NextResponse }} from 'next/server'
             import {{ default as handler, generateSitemaps }} from {resource_path}
-            import {{ resolveRouteData }} from 'next/dist/build/webpack/loaders/metadata/resolve-route-data'
+            import {{ resolveRouteData }} from 'next/dist/webpack/build/webpack/loaders/metadata/resolve-route-data'
 
             const contentType = {content_type}
             const cache_control = {cache_control}
@@ -365,7 +365,7 @@ async fn dynamic_sitemap_route_without_generate_source(
         r#"
             import {{ NextResponse }} from 'next/server'
             import {{ default as handler }} from {resource_path}
-            import {{ resolveRouteData }} from 'next/dist/build/webpack/loaders/metadata/resolve-route-data'
+            import {{ resolveRouteData }} from 'next/dist/webpack/build/webpack/loaders/metadata/resolve-route-data'
 
             const contentType = {content_type}
             const cacheControl = {cache_control}

crates/next-core/src/next_import_map.rs

@@ -1111,21 +1111,23 @@ async fn insert_next_shared_aliases(
         rcstr!("private-next-rsc-server-reference"),
         request_to_import_mapping(
             project_path.clone(),
-            rcstr!("next/dist/build/webpack/loaders/next-flight-loader/server-reference"),
+            rcstr!("next/dist/webpack/build/webpack/loaders/next-flight-loader/server-reference"),
         ),
     );
     import_map.insert_exact_alias(
         rcstr!("private-next-rsc-action-client-wrapper"),
         request_to_import_mapping(
             project_path.clone(),
-            rcstr!("next/dist/build/webpack/loaders/next-flight-loader/action-client-wrapper"),
+            rcstr!(
+                "next/dist/webpack/build/webpack/loaders/next-flight-loader/action-client-wrapper"
+            ),
         ),
     );
     import_map.insert_exact_alias(
         rcstr!("private-next-rsc-action-validate"),
         request_to_import_mapping(
             project_path.clone(),
-            rcstr!("next/dist/build/webpack/loaders/next-flight-loader/action-validate"),
+            rcstr!("next/dist/webpack/build/webpack/loaders/next-flight-loader/action-validate"),
         ),
     );
     import_map.insert_exact_alias(
@@ -1139,14 +1141,16 @@ async fn insert_next_shared_aliases(
         rcstr!("private-next-rsc-cache-wrapper"),
         request_to_import_mapping(
             project_path.clone(),
-            rcstr!("next/dist/build/webpack/loaders/next-flight-loader/cache-wrapper"),
+            rcstr!("next/dist/webpack/build/webpack/loaders/next-flight-loader/cache-wrapper"),
         ),
     );
     import_map.insert_exact_alias(
         rcstr!("private-next-rsc-track-dynamic-import"),
         request_to_import_mapping(
             project_path.clone(),
-            rcstr!("next/dist/build/webpack/loaders/next-flight-loader/track-dynamic-import"),
+            rcstr!(
+                "next/dist/webpack/build/webpack/loaders/next-flight-loader/track-dynamic-import"
+            ),
         ),
     );
 

crates/next-core/src/next_shared/webpack_rules/sass.rs

@@ -94,7 +94,7 @@ pub async fn get_sass_loader_rules(
         ),
     };
     let resolve_url_loader = WebpackLoaderItem {
-        loader: rcstr!("next/dist/build/webpack/loaders/resolve-url-loader/index"),
+        loader: rcstr!("next/dist/build/resolve-url-loader/index"),
         options: take(
             serde_json::json!({
                 // https://github.com/vercel/turbo/blob/d527eb54be384a4658243304cecd547d09c05c6b/crates/turbopack-node/src/transforms/webpack.rs#L191

eslint.cli.config.mjs

@@ -15,6 +15,7 @@ export default defineConfig([
       'examples/**/*',
       'test/**/*',
       '**/*.d.ts',
+      'packages/next/src/webpack/**/*',
       'turbopack/**/*',
     ],
     languageOptions: {

packages/next-plugin-storybook/preset.js

@@ -1,11 +1,15 @@
 const { PHASE_PRODUCTION_BUILD } = require('next/constants')
 const { findPagesDir } = require('next/dist/lib/find-pages-dir')
 const loadConfig = require('next/dist/server/config').default
-const getWebpackConfig = require('next/dist/build/webpack-config').default
+const {
+  getBaseWebpackConfig: getWebpackConfig,
+  loadWebpackHook,
+} = require('next/dist/webpack/next-integration')
 
 const CWD = process.cwd()
 
 async function webpackFinal(config) {
+  loadWebpackHook()
   const nextConfig = await loadConfig(PHASE_PRODUCTION_BUILD, CWD)
   const { pagesDir } = findPagesDir(CWD, !!nextConfig.experimental.appDir)
   const nextWebpackConfig = await getWebpackConfig(CWD, {
@@ -31,9 +35,7 @@ async function webpackFinal(config) {
       // we need to resolve next-babel-loader since it's not available
       // relative with storybook's config
       if (rule.use && rule.use.loader === 'next-babel-loader') {
-        rule.use.loader = require.resolve(
-          'next/dist/build/webpack/loaders/next-babel-loader'
-        )
+        rule.use.loader = require.resolve('next/dist/build/babel/loader')
       }
       return rule
     }),

packages/next/next-devtools.webpack-config.js

@@ -129,7 +129,7 @@ module.exports = ({ dev, ...rest }) => {
                 // Keep using `styleTag` to ensure when new styles injected the style can also be updated.
                 injectType: 'styleTag',
                 insert: require.resolve(
-                  './src/build/webpack/loaders/devtool/devtool-style-inject.js'
+                  'next/dist/webpack/build/webpack/loaders/devtool/devtool-style-inject.js'
                 ),
               },
             },

packages/next/next-runtime.webpack-config.js

@@ -42,7 +42,7 @@ function makeAppAliases({ experimental, bundler }) {
     'react/compiler-runtime$': `next/dist/compiled/react${reactChannel}/compiler-runtime`,
     'react-dom/client$': `next/dist/compiled/react-dom${reactChannel}/client`,
     // optimizations to ignore the legacy APIs in react-dom/server
-    'react-dom/server$': `next/dist/build/webpack/alias/react-dom-server${reactChannel}.js`,
+    'react-dom/server$': `next/dist/webpack/build/webpack/alias/react-dom-server${reactChannel}.js`,
     'react-dom/static$': `next/dist/compiled/react-dom${reactChannel}/static.node`,
     // react-server-dom-webpack alias
     'react-server-dom-turbopack/client$': `next/dist/compiled/react-server-dom-turbopack${reactChannel}/client.node`,

packages/next/src/build/adapter/build-complete.ts

@@ -20,10 +20,7 @@ import {
   convertHeaders,
 } from 'next/dist/compiled/@vercel/routing-utils'
 
-import type {
-  MiddlewareManifest,
-  EdgeFunctionDefinition,
-} from '../webpack/plugins/middleware-plugin'
+import type { MiddlewareManifest, EdgeFunctionDefinition } from '../manifests'
 
 import type {
   RoutesManifest,
@@ -2203,7 +2200,8 @@ async function getSharedNodeAssets({
 
     const sharedTraceIgnores = [
       '**/next/dist/compiled/next-server/**/*.dev.js',
-      '**/next/dist/compiled/webpack/*',
+      '**/next/dist/webpack/load-webpack-hook.js',
+      '**/next/dist/webpack/compiled/webpack/*',
       '**/node_modules/webpack5/**/*',
       '**/next/dist/server/lib/route-resolver*',
       'next/dist/compiled/semver/semver/**/*.js',

packages/next/src/build/analysis/get-page-static-info.ts

@@ -24,7 +24,7 @@ import {
 } from '../warn-about-edge-runtime'
 import { RSC_MODULE_TYPES } from '../../shared/lib/constants'
 import { escapeStringRegexp } from '../../shared/lib/escape-regexp'
-import type { RSCMeta } from '../webpack/loaders/get-module-build-info'
+import type { RSCMeta } from '../manifests'
 import { PAGE_TYPES } from '../../lib/page-types'
 import {
   AppSegmentConfigSchemaKeys,

packages/next/src/build/babel/loader/get-config.ts

@@ -15,9 +15,9 @@ import {
   type SourceMap,
   type BabelLoaderTransformOptions,
 } from './util'
-import * as Log from '../../output/log'
-import { isReactCompilerRequired } from '../../swc'
-import { installBindings } from '../../swc/install-bindings'
+import * as Log from 'next/dist/build/output/log'
+import { isReactCompilerRequired } from 'next/dist/build/swc'
+import { installBindings } from 'next/dist/build/swc/install-bindings'
 
 /**
  * An internal (non-exported) type used by babel.
@@ -165,7 +165,7 @@ function getPlugins(
 
   const applyCommonJsItem = hasModuleExports
     ? createConfigItem(
-        require('../plugins/commonjs') as typeof import('../plugins/commonjs'),
+        require('next/dist/build/babel/plugins/commonjs') as typeof import('next/dist/build/babel/plugins/commonjs'),
         { type: 'plugin' }
       )
     : null
@@ -182,7 +182,7 @@ function getPlugins(
     !isServer && isPageFile
       ? createConfigItem(
           [
-            require('../plugins/next-page-config') as typeof import('../plugins/next-page-config'),
+            require('next/dist/build/babel/plugins/next-page-config') as typeof import('next/dist/build/babel/plugins/next-page-config'),
           ],
           {
             type: 'plugin',
@@ -193,7 +193,7 @@ function getPlugins(
     !isServer && isPageFile
       ? createConfigItem(
           [
-            require('../plugins/next-page-disallow-re-export-all-exports') as typeof import('../plugins/next-page-disallow-re-export-all-exports'),
+            require('next/dist/build/babel/plugins/next-page-disallow-re-export-all-exports') as typeof import('next/dist/build/babel/plugins/next-page-disallow-re-export-all-exports'),
           ],
           { type: 'plugin' }
         )
@@ -212,9 +212,12 @@ function getPlugins(
   )
   const nextSsgItem =
     !isServer && isPageFile
-      ? createConfigItem([require.resolve('../plugins/next-ssg-transform')], {
-          type: 'plugin',
-        })
+      ? createConfigItem(
+          [require.resolve('next/dist/build/babel/plugins/next-ssg-transform')],
+          {
+            type: 'plugin',
+          }
+        )
       : null
   const commonJsItem = isNextDist
     ? createConfigItem(
@@ -224,7 +227,7 @@ function getPlugins(
     : null
   const nextFontUnsupported = createConfigItem(
     [
-      require('../plugins/next-font-unsupported') as typeof import('../plugins/next-font-unsupported'),
+      require('next/dist/build/babel/plugins/next-font-unsupported') as typeof import('next/dist/build/babel/plugins/next-font-unsupported'),
     ],
     { type: 'plugin' }
   )

packages/next/src/build/babel/loader/index.ts

@@ -1,8 +1,8 @@
-import type { Span } from '../../../trace'
+import type { Span } from 'next/dist/trace'
 import transform from './transform'
 import type { NextJsLoaderContext } from './types'
 import type { SourceMap } from './util'
-import type { webpack } from 'next/dist/compiled/webpack/webpack'
+import type { webpack } from 'next/dist/webpack/compiled/webpack/webpack'
 
 async function nextBabelLoader(
   ctx: NextJsLoaderContext,

packages/next/src/build/babel/loader/transform.ts

@@ -13,7 +13,7 @@ import PluginPass from 'next/dist/compiled/babel/core-lib-plugin-pass'
 
 import getConfig from './get-config'
 import { consumeIterator } from './util'
-import type { Span } from '../../../trace'
+import type { Span } from 'next/dist/trace'
 import type { NextJsLoaderContext } from './types'
 import type { SourceMap } from './util'
 

packages/next/src/build/babel/loader/types.d.ts

@@ -1,6 +1,6 @@
-import type { webpack } from 'next/dist/compiled/webpack/webpack'
-import type { JSONValue } from '../../../server/config-shared'
-import type { Span } from '../../../trace'
+import type { webpack } from 'next/dist/webpack/compiled/webpack/webpack'
+import type { JSONValue } from 'next/dist/server/config-shared'
+import type { Span } from 'next/dist/trace'
 
 export interface NextJsLoaderContext extends webpack.LoaderContext<{}> {
   currentTraceSpan: Span

packages/next/src/build/build-context.ts

@@ -3,8 +3,7 @@ import type { Rewrite, Redirect } from '../lib/load-custom-routes'
 import type { __ApiPreviewProps } from '../server/api-utils'
 import type { NextConfigComplete } from '../server/config-shared'
 import type { Span } from '../trace'
-import type getBaseWebpackConfig from './webpack-config'
-import type { TelemetryPluginState } from './webpack/plugins/telemetry-plugin/telemetry-plugin'
+import type { TelemetryPluginState } from './manifests'
 import type { Telemetry } from '../telemetry/storage'
 
 // A layer for storing data that is used by plugins to communicate with each
@@ -87,9 +86,7 @@ export const NextBuildContext: Partial<{
   reactProductionProfiling: boolean
   noMangling: boolean
   appDirOnly: boolean
-  clientRouterFilters: Parameters<
-    typeof getBaseWebpackConfig
-  >[1]['clientRouterFilters']
+  clientRouterFilters: any
   previewModeId: string
   fetchCacheKeyPrefix?: string
   allowedRevalidateHeaderKeys?: string[]

packages/next/src/build/collect-build-traces.ts

@@ -3,11 +3,8 @@ import '../server/lib/cpu-profile'
 import { Span } from '../trace'
 import type { NextConfigComplete } from '../server/config-shared'
 
-import {
-  TRACE_IGNORES,
-  type BuildTraceContext,
-  getFilesMapFromReasons,
-} from './webpack/plugins/next-trace-entrypoints-plugin'
+import type { BuildTraceContext } from './manifests'
+import { TRACE_IGNORES, getFilesMapFromReasons } from './trace-utils'
 
 import path from 'path'
 import { resolveCacheHandlerPathToFilesystem } from '../lib/format-dynamic-import-path'
@@ -223,7 +220,8 @@ export async function collectBuildTraces({
       const sharedIgnores = [
         '**/next/dist/compiled/next-server/**/*.dev.js',
         ...(isStandalone ? [] : ['**/next/dist/compiled/jest-worker/**/*']),
-        '**/next/dist/compiled/webpack/*',
+        '**/next/dist/webpack/load-webpack-hook.js',
+        '**/next/dist/webpack/compiled/webpack/*',
         '**/node_modules/webpack5/**/*',
         '**/next/dist/server/lib/route-resolver*',
         'next/dist/compiled/semver/semver/**/*.js',