next-server (#5357)

packages/next-server/asset.js

@@ -0,0 +1 @@
+module.exports = require('./dist/lib/asset')

packages/next-server/babel.config.js

@@ -0,0 +1,17 @@
+module.exports = {
+  'presets': [
+    '@babel/preset-env',
+    '@babel/preset-react',
+    '@babel/preset-flow'
+  ],
+  'plugins': [
+    '@babel/plugin-proposal-object-rest-spread',
+    '@babel/plugin-proposal-class-properties',
+    ['@babel/plugin-transform-runtime', {
+      'corejs': 2
+    }],
+    ['babel-plugin-transform-define', {
+      'process.env.NEXT_VERSION': require('./package.json').version
+    }]
+  ]
+}

packages/next-server/config.js

@@ -0,0 +1 @@
+module.exports = require('./dist/lib/runtime-config')

packages/next-server/constants.js

@@ -0,0 +1 @@
+module.exports = require('./dist/lib/constants')

packages/next-server/dynamic.js

@@ -0,0 +1 @@
+module.exports = require('./dist/lib/dynamic')

packages/next-server/head.js

@@ -0,0 +1 @@
+module.exports = require('./dist/lib/head')

packages/next-server/lib/constants.js

@@ -0,0 +1,27 @@
+import {join} from 'path'
+export const PHASE_EXPORT = 'phase-export'
+export const PHASE_PRODUCTION_BUILD = 'phase-production-build'
+export const PHASE_PRODUCTION_SERVER = 'phase-production-server'
+export const PHASE_DEVELOPMENT_SERVER = 'phase-development-server'
+export const PAGES_MANIFEST = 'pages-manifest.json'
+export const BUILD_MANIFEST = 'build-manifest.json'
+export const REACT_LOADABLE_MANIFEST = 'react-loadable-manifest.json'
+export const SERVER_DIRECTORY = 'server'
+export const CONFIG_FILE = 'next.config.js'
+export const BUILD_ID_FILE = 'BUILD_ID'
+export const BLOCKED_PAGES = [
+  '/_document',
+  '/_app',
+  '/_error'
+]
+export const CLIENT_STATIC_FILES_PATH = 'static'
+export const CLIENT_STATIC_FILES_RUNTIME = 'runtime'
+export const CLIENT_STATIC_FILES_RUNTIME_PATH = `${CLIENT_STATIC_FILES_PATH}/${CLIENT_STATIC_FILES_RUNTIME}`
+// static/runtime/main.js
+export const CLIENT_STATIC_FILES_RUNTIME_MAIN = `${CLIENT_STATIC_FILES_RUNTIME_PATH}/main.js`
+// static/runtime/webpack.js
+export const CLIENT_STATIC_FILES_RUNTIME_WEBPACK = `${CLIENT_STATIC_FILES_RUNTIME_PATH}/webpack.js`
+// matches static/<buildid>/pages/<page>.js
+export const IS_BUNDLED_PAGE_REGEX = /^static[/\\][^/\\]+[/\\]pages.*\.js$/
+// matches static/<buildid>/pages/:page*.js
+export const ROUTE_NAME_REGEX = /^static[/\\][^/\\]+[/\\]pages[/\\](.*)\.js$/

packages/next-server/lib/error-debug.js

@@ -1,7 +1,7 @@
 // @flow
 import React from 'react'
 import ansiHTML from 'ansi-html'
-import Head from './head'
+import Head from 'next-server/head'
 
 // This component is rendered through dev-error-overlay on the client side.
 // On the server side it's rendered directly

packages/next-server/lib/link.js

@@ -4,7 +4,7 @@ import { resolve, format, parse } from 'url'
 import React, { Component, Children } from 'react'
 import PropTypes from 'prop-types'
 import Router, { _rewriteUrlForNextExport } from './router'
-import { execOnce, getLocationOrigin } from './utils'
+import {execOnce, getLocationOrigin} from './utils'
 
 function isLocal (href) {
   const url = parse(href, false, true)

packages/next-server/lib/utils.js

@@ -8,6 +8,17 @@ export function execOnce (fn) {
   }
 }
 
+export function getLocationOrigin () {
+  const { protocol, hostname, port } = window.location
+  return `${protocol}//${hostname}${port ? ':' + port : ''}`
+}
+
+export function getURL () {
+  const { href } = window.location
+  const origin = getLocationOrigin()
+  return href.substring(origin.length)
+}
+
 export function getDisplayName (Component) {
   if (typeof Component === 'string') {
     return Component
@@ -45,14 +56,3 @@ export async function loadGetInitialProps (Component, ctx) {
 
   return props
 }
-
-export function getLocationOrigin () {
-  const { protocol, hostname, port } = window.location
-  return `${protocol}//${hostname}${port ? ':' + port : ''}`
-}
-
-export function getURL () {
-  const { href } = window.location
-  const origin = getLocationOrigin()
-  return href.substring(origin.length)
-}

packages/next-server/link.js

@@ -0,0 +1 @@
+module.exports = require('./dist/lib/link')

packages/next-server/next-config.js

@@ -0,0 +1 @@
+module.exports = require('./dist/server/config')

packages/next-server/package.json

@@ -0,0 +1,45 @@
+{
+  "name": "next-server",
+  "version": "7.0.1",
+  "main": "./dist/server/next-server.js",
+  "scripts": {
+    "build": "taskr",
+    "release": "taskr release",
+    "prepublish": "npm run release"
+  },
+  "taskr": {
+    "requires": [
+      "./taskfile-babel.js"
+    ]
+  },
+  "dependencies": {
+    "find-up": "3.0.0",
+    "http-errors": "1.6.2",
+    "path-to-regexp": "2.1.0",
+    "url": "0.11.0",
+    "ansi-html": "0.0.7",
+    "prop-types": "15.6.2",
+    "send": "0.16.1",
+    "styled-jsx": "3.1.0",
+    "etag": "1.8.1",
+    "fresh": "0.5.2",
+    "htmlescape": "1.1.1"
+  },
+  "peerDependencies": {
+    "react": "^16.0.0",
+    "react-dom": "^16.0.0"
+  },
+  "devDependencies": {
+    "@babel/core": "7.1.2",
+    "@babel/plugin-proposal-class-properties": "7.1.0",
+    "@babel/plugin-proposal-object-rest-spread": "7.0.0",
+    "@babel/plugin-syntax-dynamic-import": "7.0.0",
+    "@babel/plugin-transform-runtime": "7.1.0",
+    "@babel/preset-env": "7.1.0",
+    "@babel/preset-react": "7.0.0",
+    "@babel/runtime": "7.1.2",
+    "@babel/runtime-corejs2": "7.1.2",
+    "@taskr/clear": "1.1.0",
+    "@taskr/watch": "1.1.0"
+  }
+}

packages/next-server/router.js

@@ -0,0 +1 @@
+module.exports = require('./dist/lib/router')

packages/next-server/server/config.js

@@ -1,6 +1,6 @@
 // @flow
 import findUp from 'find-up'
-import {CONFIG_FILE} from '../lib/constants'
+import {CONFIG_FILE} from 'next-server/constants'
 
 type WebpackConfig = *
 

packages/next-server/server/next-server.js

@@ -11,8 +11,8 @@ import {
 } from './render'
 import Router, {route} from './router'
 import { isInternalUrl } from './utils'
-import loadConfig from './config'
+import loadConfig from 'next-server/next-config'
-import {PHASE_PRODUCTION_SERVER, BLOCKED_PAGES, BUILD_ID_FILE, CLIENT_STATIC_FILES_PATH, CLIENT_STATIC_FILES_RUNTIME} from '../lib/constants'
+import {PHASE_PRODUCTION_SERVER, BLOCKED_PAGES, BUILD_ID_FILE, CLIENT_STATIC_FILES_PATH, CLIENT_STATIC_FILES_RUNTIME} from 'next-server/constants'
 import * as asset from '../lib/asset'
 import * as envConfig from '../lib/runtime-config'
 import { isResSent } from '../lib/utils'

packages/next-server/server/render.js

@@ -11,7 +11,7 @@ import Head, { defaultHead } from '../lib/head'
 import ErrorDebug from '../lib/error-debug'
 import Loadable from '../lib/loadable'
 import LoadableCapture from '../lib/loadable-capture'
-import { BUILD_MANIFEST, REACT_LOADABLE_MANIFEST, SERVER_DIRECTORY, CLIENT_STATIC_FILES_PATH } from '../lib/constants'
+import { BUILD_MANIFEST, REACT_LOADABLE_MANIFEST, SERVER_DIRECTORY, CLIENT_STATIC_FILES_PATH } from 'next-server/constants'
 
 // Based on https://github.com/jamiebuilds/react-loadable/pull/132
 function getDynamicImportBundles (manifest, moduleIds) {

packages/next-server/server/require.js

@@ -1,5 +1,5 @@
 import {join, posix} from 'path'
-import {PAGES_MANIFEST, SERVER_DIRECTORY} from '../lib/constants'
+import {PAGES_MANIFEST, SERVER_DIRECTORY} from 'next-server/constants'
 
 export function pageNotFoundError (page) {
   const err = new Error(`Cannot find module for page: ${page}`)

packages/next-server/server/utils.js

@@ -0,0 +1,14 @@
+const internalPrefixes = [
+  /^\/_next\//,
+  /^\/static\//
+]
+
+export function isInternalUrl (url) {
+  for (const prefix of internalPrefixes) {
+    if (prefix.test(url)) {
+      return true
+    }
+  }
+
+  return false
+}

packages/next-server/taskfile-babel.js

@@ -0,0 +1,65 @@
+// taskr babel plugin with Babel 7 support
+// https://github.com/lukeed/taskr/pull/305
+'use strict'
+
+const transform = require('@babel/core').transform
+const flatten = require('flatten')
+
+const BABEL_REGEX = /(^@babel\/)(preset|plugin)-(.*)/i
+
+function getBabels () {
+  const pkg = require('./package.json')
+  return flatten(
+    ['devDependencies', 'dependencies'].map(s => Object.keys(pkg[s] || {}))
+  ).filter(s => BABEL_REGEX.test(s))
+}
+
+module.exports = function (task) {
+  let cache
+
+  task.plugin('babel', {}, function * (file, opts) {
+    if (opts.preload) {
+      delete opts.preload
+      // get dependencies
+      cache = cache || getBabels()
+
+      // attach any deps to babel's `opts`
+      cache.forEach(dep => {
+        const segs = BABEL_REGEX.exec(dep)
+        const type = `${segs[2]}s`
+        const name = `@babel/${segs[2]}-${segs[3]}`
+
+        opts[type] = opts[type] || []
+
+        // flatten all (advanced entries are arrays)
+        if (flatten(opts[type]).indexOf(name) === -1) {
+          opts[type] = opts[type].concat(name)
+        }
+      })
+    }
+
+    // attach file's name
+    opts.filename = file.base
+
+    const output = transform(file.data, opts)
+
+    if (output.map) {
+      const map = `${file.base}.map`
+
+      // append `sourceMappingURL` to original file
+      if (opts.sourceMaps !== 'both') {
+        output.code += Buffer.from(`\n//# sourceMappingURL=${map}`)
+      }
+
+      // add sourcemap to `files` array
+      this._.files.push({
+        base: map,
+        dir: file.dir,
+        data: Buffer.from(JSON.stringify(output.map))
+      })
+    }
+
+    // update file's data
+    file.data = Buffer.from(output.code)
+  })
+}

packages/next-server/taskfile.js

@@ -0,0 +1,40 @@
+const notifier = require('node-notifier')
+
+export async function bin (task, opts) {
+  await task.source(opts.src || 'bin/*').babel().target('dist/bin', {mode: '0755'})
+  notify('Compiled binaries')
+}
+
+export async function lib (task, opts) {
+  await task.source(opts.src || 'lib/**/*.js').babel().target('dist/lib')
+  notify('Compiled lib files')
+}
+
+export async function server (task, opts) {
+  await task.source(opts.src || 'server/**/*.js').babel().target('dist/server')
+  notify('Compiled server files')
+}
+
+export async function build (task) {
+  await task.parallel(['bin', 'server', 'lib'])
+}
+
+export default async function (task) {
+  await task.start('build')
+  await task.watch('bin/*', 'bin')
+  await task.watch('server/**/*.js', 'server')
+  await task.watch('lib/**/*.js', 'lib')
+}
+
+export async function release (task) {
+  await task.clear('dist').start('build')
+}
+
+// notification helper
+function notify (msg) {
+  return notifier.notify({
+    title: '▲ Next',
+    message: msg,
+    icon: false
+  })
+}

packages/next/asset.js

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

packages/next/bin/next

@@ -2,7 +2,7 @@
 import { join } from 'path'
 import { spawn } from 'cross-spawn'
 import pkg from '../../package.json'
-import {CONFIG_FILE} from '../lib/constants'
+import {CONFIG_FILE} from 'next-server/constants'
 
 if (pkg.peerDependencies) {
   Object.keys(pkg.peerDependencies).forEach(dependency => {

packages/next/build/index.js

@@ -2,8 +2,8 @@ import { join } from 'path'
 import promisify from '../lib/promisify'
 import fs from 'fs'
 import webpack from 'webpack'
-import loadConfig from '../server/config'
+import loadConfig from 'next-server/next-config'
-import { PHASE_PRODUCTION_BUILD, BUILD_ID_FILE } from '../lib/constants'
+import { PHASE_PRODUCTION_BUILD, BUILD_ID_FILE } from 'next-server/constants'
 import getBaseWebpackConfig from './webpack'
 
 const access = promisify(fs.access)

packages/next/build/webpack.js

@@ -17,7 +17,8 @@ import PagesManifestPlugin from './webpack/plugins/pages-manifest-plugin'
 import BuildManifestPlugin from './webpack/plugins/build-manifest-plugin'
 import ChunkNamesPlugin from './webpack/plugins/chunk-names-plugin'
 import { ReactLoadablePlugin } from './webpack/plugins/react-loadable-plugin'
-import {SERVER_DIRECTORY, NEXT_PROJECT_ROOT, NEXT_PROJECT_ROOT_NODE_MODULES, NEXT_PROJECT_ROOT_DIST, DEFAULT_PAGES_DIR, REACT_LOADABLE_MANIFEST, CLIENT_STATIC_FILES_RUNTIME_WEBPACK, CLIENT_STATIC_FILES_RUNTIME_MAIN} from '../lib/constants'
+import {SERVER_DIRECTORY, REACT_LOADABLE_MANIFEST, CLIENT_STATIC_FILES_RUNTIME_WEBPACK, CLIENT_STATIC_FILES_RUNTIME_MAIN} from 'next-server/constants'
+import {NEXT_PROJECT_ROOT, NEXT_PROJECT_ROOT_NODE_MODULES, NEXT_PROJECT_ROOT_DIST, DEFAULT_PAGES_DIR} from '../lib/constants'
 import AutoDllPlugin from 'autodll-webpack-plugin'
 import TerserPlugin from 'terser-webpack-plugin'
 

packages/next/build/webpack/plugins/build-manifest-plugin.js

@@ -1,6 +1,6 @@
 // @flow
 import { RawSource } from 'webpack-sources'
-import {BUILD_MANIFEST, ROUTE_NAME_REGEX, IS_BUNDLED_PAGE_REGEX, CLIENT_STATIC_FILES_RUNTIME_MAIN} from '../../../lib/constants'
+import {BUILD_MANIFEST, ROUTE_NAME_REGEX, IS_BUNDLED_PAGE_REGEX, CLIENT_STATIC_FILES_RUNTIME_MAIN} from 'next-server/constants'
 
 // This plugin creates a build-manifest.json for all assets that are being output
 // It has a mapping of "entry" filename to real filename. Because the real filename can be hashed in production

packages/next/build/webpack/plugins/nextjs-ssr-module-cache.js

@@ -1,7 +1,7 @@
 import webpack from 'webpack'
 import { RawSource } from 'webpack-sources'
 import { join, relative, dirname } from 'path'
-import {IS_BUNDLED_PAGE_REGEX} from '../../../lib/constants'
+import {IS_BUNDLED_PAGE_REGEX} from 'next-server/constants'
 
 const SSR_MODULE_CACHE_FILENAME = 'ssr-module-cache.js'
 

packages/next/build/webpack/plugins/pages-manifest-plugin.js

@@ -1,6 +1,6 @@
 // @flow
 import { RawSource } from 'webpack-sources'
-import {PAGES_MANIFEST, ROUTE_NAME_REGEX} from '../../../lib/constants'
+import {PAGES_MANIFEST, ROUTE_NAME_REGEX} from 'next-server/constants'
 
 // This plugin creates a pages-manifest.json from page entrypoints.
 // This is used for mapping paths like `/` to `.next/server/static/<buildid>/pages/index.js` when doing SSR

packages/next/build/webpack/plugins/pages-plugin.js

@@ -3,7 +3,7 @@ import { ConcatSource } from 'webpack-sources'
 import {
   IS_BUNDLED_PAGE_REGEX,
   ROUTE_NAME_REGEX
-} from '../../../lib/constants'
+} from 'next-server/constants'
 
 export default class PagesPlugin {
   apply (compiler: any) {

packages/next/build/webpack/plugins/unlink-file-plugin.js

@@ -2,7 +2,7 @@
 import { join } from 'path'
 import promisify from '../../../lib/promisify'
 import fs from 'fs'
-import { IS_BUNDLED_PAGE_REGEX } from '../../../lib/constants'
+import { IS_BUNDLED_PAGE_REGEX } from 'next-server/constants'
 
 const unlink = promisify(fs.unlink)
 

packages/next/build/webpack/utils.js

@@ -1,7 +1,7 @@
 import path from 'path'
 import promisify from '../../lib/promisify'
 import globModule from 'glob'
-import {CLIENT_STATIC_FILES_PATH} from '../../lib/constants'
+import {CLIENT_STATIC_FILES_PATH} from 'next-server/constants'
 
 const glob = promisify(globModule)
 

packages/next/client/index.js

@@ -1,14 +1,14 @@
 import React from 'react'
 import ReactDOM from 'react-dom'
 import HeadManager from './head-manager'
-import { createRouter } from '../lib/router'
+import { createRouter } from 'next-server/dist/lib/router'
-import EventEmitter from '../lib/EventEmitter'
+import EventEmitter from 'next-server/dist/lib/EventEmitter'
-import { loadGetInitialProps, getURL } from '../lib/utils'
+import {loadGetInitialProps, getURL} from 'next-server/dist/lib/utils'
 import PageLoader from '../lib/page-loader'
-import * as asset from '../lib/asset'
+import * as asset from 'next-server/asset'
-import * as envConfig from '../lib/runtime-config'
+import * as envConfig from 'next-server/config'
 import ErrorBoundary from './error-boundary'
-import Loadable from '../lib/loadable'
+import Loadable from 'next-server/dist/lib/loadable'
 
 // Polyfill Promise globally
 // This is needed because Webpack's dynamic loading(common chunks) code

packages/next/client/on-demand-entries-client.js

@@ -1,6 +1,6 @@
 /* global location */
 
-import Router from '../lib/router'
+import Router from 'next-server/router'
 import fetch from 'unfetch'
 
 export default ({assetPrefix}) => {

packages/next/client/webpack-hot-middleware-client.js

@@ -1,6 +1,6 @@
 import 'event-source-polyfill'
 import connect from './dev-error-overlay/hot-dev-client'
-import Router from '../lib/router'
+import Router from 'next-server/router'
 
 const handlers = {
   reload (route) {

packages/next/config.js

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

packages/next/constants.js

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

packages/next/dynamic.js

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

packages/next/export/index.js

@@ -3,11 +3,11 @@ import cp from 'recursive-copy'
 import mkdirp from 'mkdirp-then'
 import { extname, resolve, join, dirname, sep } from 'path'
 import { existsSync, readFileSync, writeFileSync } from 'fs'
-import loadConfig from '../server/config'
+import loadConfig from 'next-server/next-config'
-import {PHASE_EXPORT, SERVER_DIRECTORY, PAGES_MANIFEST, CONFIG_FILE, BUILD_ID_FILE, CLIENT_STATIC_FILES_PATH} from '../lib/constants'
+import {PHASE_EXPORT, SERVER_DIRECTORY, PAGES_MANIFEST, CONFIG_FILE, BUILD_ID_FILE, CLIENT_STATIC_FILES_PATH} from 'next-server/constants'
-import { renderToHTML } from '../server/render'
+import { renderToHTML } from 'next-server/dist/server/render'
-import { setAssetPrefix } from '../lib/asset'
+import { setAssetPrefix } from 'next-server/asset'
-import * as envConfig from '../lib/runtime-config'
+import * as envConfig from 'next-server/config'
 
 export default async function (dir, options, configuration) {
   function log (message) {

packages/next/head.js

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

packages/next/lib/app.js

@@ -1,7 +1,7 @@
 import React, { Component } from 'react'
 import PropTypes from 'prop-types'
-import { execOnce, loadGetInitialProps } from './utils'
+import { execOnce, loadGetInitialProps } from 'next-server/dist/lib/utils'
-import { makePublicRouterInstance } from './router'
+import { makePublicRouterInstance } from 'next-server/router'
 
 export default class App extends Component {
   static childContextTypes = {

packages/next/lib/constants.js

@@ -1,31 +1,5 @@
 import {join} from 'path'
-export const PHASE_EXPORT = 'phase-export'
-export const PHASE_PRODUCTION_BUILD = 'phase-production-build'
-export const PHASE_PRODUCTION_SERVER = 'phase-production-server'
-export const PHASE_DEVELOPMENT_SERVER = 'phase-development-server'
-export const PAGES_MANIFEST = 'pages-manifest.json'
-export const BUILD_MANIFEST = 'build-manifest.json'
-export const REACT_LOADABLE_MANIFEST = 'react-loadable-manifest.json'
-export const SERVER_DIRECTORY = 'server'
-export const CONFIG_FILE = 'next.config.js'
-export const BUILD_ID_FILE = 'BUILD_ID'
-export const BLOCKED_PAGES = [
-  '/_document',
-  '/_app',
-  '/_error'
-]
-// matches static/<buildid>/pages/<page>.js
-export const IS_BUNDLED_PAGE_REGEX = /^static[/\\][^/\\]+[/\\]pages.*\.js$/
-// matches static/<buildid>/pages/:page*.js
-export const ROUTE_NAME_REGEX = /^static[/\\][^/\\]+[/\\]pages[/\\](.*)\.js$/
 export const NEXT_PROJECT_ROOT = join(__dirname, '..', '..')
 export const NEXT_PROJECT_ROOT_DIST = join(NEXT_PROJECT_ROOT, 'dist')
 export const NEXT_PROJECT_ROOT_NODE_MODULES = join(NEXT_PROJECT_ROOT, 'node_modules')
 export const DEFAULT_PAGES_DIR = join(NEXT_PROJECT_ROOT_DIST, 'pages')
-export const CLIENT_STATIC_FILES_PATH = 'static'
-export const CLIENT_STATIC_FILES_RUNTIME = 'runtime'
-export const CLIENT_STATIC_FILES_RUNTIME_PATH = `${CLIENT_STATIC_FILES_PATH}/${CLIENT_STATIC_FILES_RUNTIME}`
-// static/runtime/main.js
-export const CLIENT_STATIC_FILES_RUNTIME_MAIN = `${CLIENT_STATIC_FILES_RUNTIME_PATH}/main.js`
-// static/runtime/webpack.js
-export const CLIENT_STATIC_FILES_RUNTIME_WEBPACK = `${CLIENT_STATIC_FILES_RUNTIME_PATH}/webpack.js`

packages/next/lib/error.js

@@ -1,7 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 import HTTPStatus from 'http-status'
-import Head from './head'
+import Head from 'next-server/head'
 
 export default class Error extends React.Component {
   static getInitialProps ({ res, err }) {

packages/next/lib/page-loader.js

@@ -1,5 +1,5 @@
 /* global window, document */
-import EventEmitter from './EventEmitter'
+import EventEmitter from 'next-server/dist/lib/EventEmitter'
 
 const webpackModule = module
 

packages/next/link.js

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

packages/next/package.json

@@ -47,6 +47,7 @@
     ]
   },
   "dependencies": {
+    "next-server": "7.0.1",
     "@babel/core": "7.1.2",
     "@babel/plugin-proposal-class-properties": "7.1.0",
     "@babel/plugin-proposal-object-rest-spread": "7.0.0",

packages/next/router.js

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

packages/next/server/hot-reloader.js

@@ -6,14 +6,31 @@ import del from 'del'
 import onDemandEntryHandler, {normalizePage} from './on-demand-entry-handler'
 import webpack from 'webpack'
 import getBaseWebpackConfig from '../build/webpack'
-import {
+import {IS_BUNDLED_PAGE_REGEX, ROUTE_NAME_REGEX, BLOCKED_PAGES, CLIENT_STATIC_FILES_PATH} from 'next-server/constants'
-  addCorsSupport
+import {route} from 'next-server/dist/server/router'
-} from './utils'
+import {renderScriptError} from 'next-server/dist/server/render'
-import {IS_BUNDLED_PAGE_REGEX, ROUTE_NAME_REGEX, BLOCKED_PAGES, CLIENT_STATIC_FILES_PATH} from '../lib/constants'
+
-import pathMatch from './lib/path-match'
+function addCorsSupport (req, res) {
-import {renderScriptError} from './render'
+  if (!req.headers.origin) {
+    return { preflight: false }
+  }
+
+  res.setHeader('Access-Control-Allow-Origin', req.headers.origin)
+  res.setHeader('Access-Control-Allow-Methods', 'OPTIONS, GET')
+  // Based on https://github.com/primus/access-control/blob/4cf1bc0e54b086c91e6aa44fb14966fa5ef7549c/index.js#L158
+  if (req.headers['access-control-request-headers']) {
+    res.setHeader('Access-Control-Allow-Headers', req.headers['access-control-request-headers'])
+  }
+
+  if (req.method === 'OPTIONS') {
+    res.writeHead(200)
+    res.end()
+    return { preflight: true }
+  }
+
+  return { preflight: false }
+}
 
-const route = pathMatch()
 const matchNextPageBundleRequest = route('/_next/static/:buildId/pages/:path*.js(.map)?')
 
 // Recursively look up the issuer till it ends up at the root

packages/next/server/next-dev-server.js

@@ -1,8 +1,8 @@
-import Server from './next-server'
+import Server from 'next-server'
 import { join } from 'path'
 import HotReloader from './hot-reloader'
-import {route} from './router'
+import {route} from 'next-server/dist/server/router'
-import {PHASE_DEVELOPMENT_SERVER} from '../lib/constants'
+import {PHASE_DEVELOPMENT_SERVER} from 'next-server/constants'
 
 export default class DevServer extends Server {
   constructor (options) {

packages/next/server/next.js

@@ -1,5 +1,5 @@
 // This file is used for when users run `require('next')`
 module.exports = (opts) => {
-  const Server = opts.dev ? require('./next-dev-server').default : require('./next-server').default
+  const Server = opts.dev ? require('./next-dev-server').default : require('next-server').default
   return new Server(opts)
 }

packages/next/server/on-demand-entry-handler.js

@@ -5,9 +5,9 @@ import { parse } from 'url'
 import fs from 'fs'
 import promisify from '../lib/promisify'
 import globModule from 'glob'
-import {normalizePagePath, pageNotFoundError} from './require'
+import {normalizePagePath, pageNotFoundError} from 'next-server/dist/server/require'
 import {createEntry} from '../build/webpack/utils'
-import { ROUTE_NAME_REGEX, IS_BUNDLED_PAGE_REGEX } from '../lib/constants'
+import { ROUTE_NAME_REGEX, IS_BUNDLED_PAGE_REGEX } from 'next-server/constants'
 
 const ADDED = Symbol('added')
 const BUILDING = Symbol('building')

packages/next/server/utils.js

@@ -1,35 +0,0 @@
-const internalPrefixes = [
-  /^\/_next\//,
-  /^\/static\//
-]
-
-export function isInternalUrl (url) {
-  for (const prefix of internalPrefixes) {
-    if (prefix.test(url)) {
-      return true
-    }
-  }
-
-  return false
-}
-
-export function addCorsSupport (req, res) {
-  if (!req.headers.origin) {
-    return { preflight: false }
-  }
-
-  res.setHeader('Access-Control-Allow-Origin', req.headers.origin)
-  res.setHeader('Access-Control-Allow-Methods', 'OPTIONS, GET')
-  // Based on https://github.com/primus/access-control/blob/4cf1bc0e54b086c91e6aa44fb14966fa5ef7549c/index.js#L158
-  if (req.headers['access-control-request-headers']) {
-    res.setHeader('Access-Control-Allow-Headers', req.headers['access-control-request-headers'])
-  }
-
-  if (req.method === 'OPTIONS') {
-    res.writeHead(200)
-    res.end()
-    return { preflight: true }
-  }
-
-  return { preflight: false }
-}

test/integration/basic/test/rendering.js

@@ -1,7 +1,7 @@
 /* global describe, test, it, expect */
 
 import cheerio from 'cheerio'
-import {BUILD_MANIFEST, REACT_LOADABLE_MANIFEST} from 'next/constants'
+import {BUILD_MANIFEST, REACT_LOADABLE_MANIFEST} from 'next-server/constants'
 import { join } from 'path'
 
 export default function ({ app }, suiteName, render, fetch, appPort) {

test/integration/dist-dir/test/index.test.js

@@ -2,7 +2,7 @@
 
 import { join } from 'path'
 import { existsSync } from 'fs'
-import {BUILD_ID_FILE} from 'next/constants'
+import {BUILD_ID_FILE} from 'next-server/constants'
 import {
   nextServer,
   nextBuild,

test/integration/export/next.config.js

@@ -1,4 +1,4 @@
-const {PHASE_DEVELOPMENT_SERVER} = require('next/constants')
+const {PHASE_DEVELOPMENT_SERVER} = require('next-server/constants')
 
 module.exports = (phase) => {
   return {

test/integration/production/test/index.test.js

@@ -16,7 +16,7 @@ import fetch from 'node-fetch'
 import dynamicImportTests from './dynamic'
 import processEnv from './process-env'
 import security from './security'
-import {BUILD_MANIFEST, REACT_LOADABLE_MANIFEST} from 'next/constants'
+import {BUILD_MANIFEST, REACT_LOADABLE_MANIFEST} from 'next-server/constants'
 
 const appDir = join(__dirname, '../')
 let appPort

test/isolated/config.test.js

@@ -1,8 +1,8 @@
 /* global describe, it, expect */
 
 import {join} from 'path'
-import loadConfig from 'next/dist/server/config'
+import loadConfig from 'next-server/next-config'
-import {PHASE_DEVELOPMENT_SERVER} from 'next/constants'
+import {PHASE_DEVELOPMENT_SERVER} from 'next-server/constants'
 
 const pathToConfig = join(__dirname, '_resolvedata', 'without-function')
 const pathToConfigFn = join(__dirname, '_resolvedata', 'with-function')

test/isolated/require-page.test.js

@@ -1,8 +1,8 @@
 /* global describe, it, expect */
 
 import { join } from 'path'
-import {SERVER_DIRECTORY, CLIENT_STATIC_FILES_PATH} from 'next/constants'
+import {SERVER_DIRECTORY, CLIENT_STATIC_FILES_PATH} from 'next-server/constants'
-import requirePage, {getPagePath, normalizePagePath, pageNotFoundError} from 'next/dist/server/require'
+import requirePage, {getPagePath, normalizePagePath, pageNotFoundError} from 'next-server/dist/server/require'
 
 const sep = '/'
 const distDir = join(__dirname, '_resolvedata')

test/node_modules/next

@@ -1 +0,0 @@
-../../packages/next

test/unit/EventEmitter.test.js

@@ -1,5 +1,5 @@
 /* global describe, it, expect */
-import EventEmitter from 'next/dist/lib/EventEmitter'
+import EventEmitter from 'next-server/dist/lib/EventEmitter'
 
 describe('EventEmitter', () => {
   describe('With listeners', () => {

test/unit/getDisplayName.test.js

@@ -1,6 +1,6 @@
 /* global describe, it, expect */
 import { Component } from 'react'
-import { getDisplayName } from 'next/dist/lib/utils'
+import { getDisplayName } from 'next-server/dist/lib/utils'
 
 describe('getDisplayName', () => {
   it('gets the proper display name of a component', () => {

test/unit/loadGetInitialProps.test.js

@@ -1,5 +1,5 @@
 /* global describe, it, expect */
-import { loadGetInitialProps } from 'next/dist/lib/utils'
+import { loadGetInitialProps } from 'next-server/dist/lib/utils'
 
 describe('loadGetInitialProps', () => {
   it('should throw if getInitialProps is defined as an instance method', () => {

test/unit/router.test.js

@@ -1,5 +1,5 @@
 /* global describe, it, expect */
-import Router from 'next/dist/lib/router/router'
+import Router from 'next-server/dist/lib/router/router'
 
 class PageLoader {
   constructor (options = {}) {

test/unit/shallow-equal.test.js

@@ -1,6 +1,6 @@
 /* global describe, it, expect */
 
-import shallowEquals from 'next/dist/lib/shallow-equals'
+import shallowEquals from 'next-server/dist/lib/shallow-equals'
 
 describe('Shallow Equals', () => {
   it('should be true if both objects are the same', () => {