Move next-server back into next package

packages/next/amp.d.ts

@@ -1,2 +1,2 @@
-export * from 'next-server/amp'
-export { default } from 'next-server/amp'
+export * from './dist/next-server/lib/amp'
+export { default } from './dist/next-server/lib/amp'

packages/next/amp.js

@@ -1 +1 @@
-module.exports = require('next-server/amp')
+module.exports = require('./dist/next-server/lib/amp')

packages/next/bin/next.ts

@@ -101,7 +101,7 @@ if (typeof React.Suspense === 'undefined') {
 commands[command]().then(exec => exec(forwardedArgs))
 
 if (command === 'dev') {
-  const { CONFIG_FILE } = require('next-server/constants')
+  const { CONFIG_FILE } = require('../next-server/lib/constants')
   const { watchFile } = require('fs')
   watchFile(`${process.cwd()}/${CONFIG_FILE}`, (cur: any, prev: any) => {
     if (cur.size > 0 || prev.size > 0) {

packages/next/build/babel/plugins/next-page-config.ts

@@ -1,7 +1,7 @@
 import { PluginObj } from '@babel/core'
 import { NodePath } from '@babel/traverse'
 import * as BabelTypes from '@babel/types'
-import { PageConfig } from 'next-server/types'
+import { PageConfig } from '../../../types'
 
 export const dropBundleIdentifier = '__NEXT_DROP_CLIENT_FILE__'
 export const sprStatus = { used: false }

packages/next/build/entries.ts

@@ -1,4 +1,4 @@
-import { isTargetLikeServerless } from 'next-server/dist/server/config'
+import { isTargetLikeServerless } from '../next-server/server/config'
 import { join } from 'path'
 import { stringify } from 'querystring'
 

packages/next/build/index.ts

@@ -7,10 +7,10 @@ import {
   PRERENDER_MANIFEST,
   SERVER_DIRECTORY,
   SERVERLESS_DIRECTORY,
-} from 'next-server/constants'
+} from '../next-server/lib/constants'
 import loadConfig, {
   isTargetLikeServerless,
-} from 'next-server/dist/server/config'
+} from '../next-server/server/config'
 import nanoid from 'next/dist/compiled/nanoid/index.js'
 import path from 'path'
 import { promisify } from 'util'

packages/next/build/utils.ts

@@ -150,7 +150,7 @@ export function isPageStatic(
   runtimeEnvConfig: any
 ): { static?: boolean; prerender?: boolean; isHybridAmp?: boolean } {
   try {
-    require('next-server/config').setConfig(runtimeEnvConfig)
+    require('../next-server/lib/runtime-config').setConfig(runtimeEnvConfig)
     const mod = require(serverBundle)
     const Comp = mod.default || mod
 
@@ -174,7 +174,7 @@ export function hasCustomAppGetInitialProps(
   _appBundle: string,
   runtimeEnvConfig: any
 ): boolean {
-  require('next-server/config').setConfig(runtimeEnvConfig)
+  require('../next-server/lib/runtime-config').setConfig(runtimeEnvConfig)
   let mod = require(_appBundle)
 
   if (_appBundle.endsWith('_app.js')) {

packages/next/build/webpack-config.ts

@@ -5,7 +5,7 @@ import {
   REACT_LOADABLE_MANIFEST,
   SERVER_DIRECTORY,
   SERVERLESS_DIRECTORY,
-} from 'next-server/constants'
+} from '../next-server/lib/constants'
 import resolve from 'next/dist/compiled/resolve/index.js'
 import path from 'path'
 import crypto from 'crypto'
@@ -144,10 +144,10 @@ export default async function getBaseWebpackConfig(
     alias: {
       // These aliases make sure the wrapper module is not included in the bundles
       // Which makes bundles slightly smaller, but also skips parsing a module that we know will result in this alias
-      'next/head': 'next-server/dist/lib/head.js',
+      'next/head': 'next/dist/next-server/lib/head.js',
       'next/router': 'next/dist/client/router.js',
-      'next/config': 'next-server/dist/lib/runtime-config.js',
-      'next/dynamic': 'next-server/dist/lib/dynamic.js',
+      'next/config': 'next/dist/next-server/lib/runtime-config.js',
+      'next/dynamic': 'next/dist/next-server/lib/dynamic.js',
       next: NEXT_PROJECT_ROOT,
       [PAGES_DIR_ALIAS]: path.join(dir, 'pages'),
       [DOT_NEXT_ALIAS]: distDir,
@@ -325,9 +325,12 @@ export default async function getBaseWebpackConfig(
 
                 // Default pages have to be transpiled
                 if (
-                  res.match(/next[/\\]dist[/\\]/) ||
-                  res.match(/node_modules[/\\]@babel[/\\]runtime[/\\]/) ||
-                  res.match(/node_modules[/\\]@babel[/\\]runtime-corejs2[/\\]/)
+                  !res.match(/next[/\\]dist[/\\]next-server[/\\]/) &&
+                  (res.match(/next[/\\]dist[/\\]/) ||
+                    res.match(/node_modules[/\\]@babel[/\\]runtime[/\\]/) ||
+                    res.match(
+                      /node_modules[/\\]@babel[/\\]runtime-corejs2[/\\]/
+                    ))
                 ) {
                   return callback()
                 }
@@ -360,9 +363,7 @@ export default async function getBaseWebpackConfig(
             ) {
               // if it's the Next.js' require mark it as external
               // since it's not used
-              if (
-                context.replace(/\\/g, '/').includes('next-server/dist/server')
-              ) {
+              if (context.replace(/\\/g, '/').includes('next-server/server')) {
                 return callback(undefined, `commonjs ${request}`)
               }
             }
@@ -457,14 +458,14 @@ export default async function getBaseWebpackConfig(
           test: /\.(tsx|ts|js|mjs|jsx)$/,
           include: [
             dir,
-            /next-server[\\/]dist[\\/]lib/,
+            /next[\\/]dist[\\/]next-server[\\/]lib/,
             /next[\\/]dist[\\/]client/,
             /next[\\/]dist[\\/]pages/,
             /[\\/](strip-ansi|ansi-regex)[\\/]/,
           ],
           exclude: (path: string) => {
             if (
-              /next-server[\\/]dist[\\/]lib/.test(path) ||
+              /next[\\/]dist[\\/]next-server[\\/]lib/.test(path) ||
               /next[\\/]dist[\\/]client/.test(path) ||
               /next[\\/]dist[\\/]pages/.test(path) ||
               /[\\/](strip-ansi|ansi-regex)[\\/]/.test(path)
@@ -698,6 +699,7 @@ export default async function getBaseWebpackConfig(
       // Server compilation doesn't have main.js
       if (clientEntries && entry['main.js'] && entry['main.js'].length > 0) {
         const originalFile = clientEntries[CLIENT_STATIC_FILES_RUNTIME_MAIN]
+        // @ts-ignore TODO: investigate type error
         entry[CLIENT_STATIC_FILES_RUNTIME_MAIN] = [
           ...entry['main.js'],
           originalFile,

packages/next/build/webpack/loaders/next-babel-loader.js

@@ -174,7 +174,7 @@ module.exports = babelLoader.custom(babel => {
         ...(options.overrides || []),
         {
           test: [
-            /next-server[\\/]dist[\\/]lib/,
+            /next[\\/]dist[\\/]next-server[\\/]lib/,
             /next[\\/]dist[\\/]client/,
             /next[\\/]dist[\\/]pages/
           ],

packages/next/build/webpack/loaders/next-serverless-loader.ts

@@ -1,8 +1,11 @@
 import { loader } from 'webpack'
 import { join } from 'path'
 import { parse } from 'querystring'
-import { BUILD_MANIFEST, REACT_LOADABLE_MANIFEST } from 'next-server/constants'
-import { isDynamicRoute } from 'next-server/dist/lib/router/utils'
+import {
+  BUILD_MANIFEST,
+  REACT_LOADABLE_MANIFEST,
+} from '../../../next-server/lib/constants'
+import { isDynamicRoute } from '../../../next-server/lib/router/utils'
 import { API_ROUTE } from '../../../lib/constants'
 
 export type ServerlessLoaderQuery = {
@@ -45,13 +48,13 @@ const nextServerlessLoader: loader.Loader = function() {
     ${
       isDynamicRoute(page)
         ? `
-      import { getRouteMatcher } from 'next-server/dist/lib/router/utils/route-matcher';
-      import { getRouteRegex } from 'next-server/dist/lib/router/utils/route-regex';
+      import { getRouteMatcher } from 'next/dist/next-server/lib/router/utils/route-matcher';
+      import { getRouteRegex } from 'next/dist/next-server/lib/router/utils/route-regex';
       `
         : ``
     }
       import { parse } from 'url'
-      import { apiResolver } from 'next-server/dist/server/api-utils'
+      import { apiResolver } from 'next/dist/next-server/server/api-utils'
 
       export default (req, res) => {
         const params = ${
@@ -66,11 +69,11 @@ const nextServerlessLoader: loader.Loader = function() {
   } else {
     return `
     import {parse} from 'url'
-    import {renderToHTML} from 'next-server/dist/server/render';
-    import {sendHTML} from 'next-server/dist/server/send-html';
+    import {renderToHTML} from 'next/dist/next-server/server/render';
+    import {sendHTML} from 'next/dist/next-server/server/send-html';
     ${
       isDynamicRoute(page)
-        ? `import {getRouteMatcher, getRouteRegex} from 'next-server/dist/lib/router/utils';`
+        ? `import {getRouteMatcher, getRouteRegex} from 'next/dist/next-server/lib/router/utils';`
         : ''
     }
     import buildManifest from '${buildManifest}';