terribleplan/next.js
1
0
Fork 0
mirror of https://github.com/terribleplan/next.js.git synced 2024-01-19 02:48:18 +00:00
Code Issues Releases Wiki Activity

Revert "Move phases back to next/constants (#6104)"

Browse source 
This reverts commit 9112f63eba.
This commit is contained in:
Tim Neutkens 2019-01-26 02:01:16 +01:00
parent 7adb6c57f4
commit b4ade0a3cd
7 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/next-server/lib/constants.js
View file

@ -1,3 +1,7 @@
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 PAGES_MANIFEST = 'pages-manifest.json'
export const BUILD_MANIFEST = 'build-manifest.json' export const BUILD_MANIFEST = 'build-manifest.json'
export const REACT_LOADABLE_MANIFEST = 'react-loadable-manifest.json' export const REACT_LOADABLE_MANIFEST = 'react-loadable-manifest.json'

4
packages/next-server/server/next-server.ts
View file

@ -10,7 +10,7 @@ import {serveStatic} from './serve-static'
import Router, {route, Route} from './router' import Router, {route, Route} from './router'
import { isInternalUrl, isBlockedPage } from './utils' import { isInternalUrl, isBlockedPage } from './utils'
import loadConfig from 'next-server/next-config' import loadConfig from 'next-server/next-config'
import {BUILD_ID_FILE, CLIENT_STATIC_FILES_PATH, CLIENT_STATIC_FILES_RUNTIME} from 'next-server/constants' import {PHASE_PRODUCTION_SERVER, BUILD_ID_FILE, CLIENT_STATIC_FILES_PATH, CLIENT_STATIC_FILES_RUNTIME} from 'next-server/constants'
import * as envConfig from '../lib/runtime-config' import * as envConfig from '../lib/runtime-config'
import {loadComponents} from './load-components' import {loadComponents} from './load-components'
@ -74,7 +74,7 @@ export default class Server {
} }
private currentPhase(): string { private currentPhase(): string {
return 'phase-production-server' return PHASE_PRODUCTION_SERVER
} }
private logError(...args: any): void { private logError(...args: any): void {

3
packages/next/build/babel/plugins/next-to-next-server.ts
View file

@ -10,6 +10,9 @@ export default function NextToNextServer (): PluginObj {
if (source === 'next/dynamic') { if (source === 'next/dynamic') {
path.node.source.value = 'next-server/dynamic' path.node.source.value = 'next-server/dynamic'
} }
if (source === 'next/constants') {
path.node.source.value = 'next-server/constants'
}
if (source === 'next/config') { if (source === 'next/config') {
path.node.source.value = 'next-server/config' path.node.source.value = 'next-server/config'
} }

2
packages/next/build/index.ts
View file

@ -1,7 +1,7 @@
import { join } from 'path' import { join } from 'path'
import nanoid from 'nanoid' import nanoid from 'nanoid'
import loadConfig from 'next-server/next-config' import loadConfig from 'next-server/next-config'
import { PHASE_PRODUCTION_BUILD } from '../lib/constants' import { PHASE_PRODUCTION_BUILD } from 'next-server/constants'
import getBaseWebpackConfig from './webpack-config' import getBaseWebpackConfig from './webpack-config'
import {generateBuildId} from './generate-build-id' import {generateBuildId} from './generate-build-id'
import {writeBuildId} from './write-build-id' import {writeBuildId} from './write-build-id'

3
packages/next/export/index.js
View file

@ -6,8 +6,7 @@ import mkdirp from 'mkdirp-then'
import { resolve, join } from 'path' import { resolve, join } from 'path'
import { existsSync, readFileSync } from 'fs' import { existsSync, readFileSync } from 'fs'
import loadConfig from 'next-server/next-config' import loadConfig from 'next-server/next-config'
import { PHASE_EXPORT } from '../lib/constants' import { PHASE_EXPORT, SERVER_DIRECTORY, PAGES_MANIFEST, CONFIG_FILE, BUILD_ID_FILE, CLIENT_STATIC_FILES_PATH } from 'next-server/constants'
import { SERVER_DIRECTORY, PAGES_MANIFEST, CONFIG_FILE, BUILD_ID_FILE, CLIENT_STATIC_FILES_PATH } from 'next-server/constants'
import * as envConfig from 'next-server/config' import * as envConfig from 'next-server/config'
import createProgress from 'tty-aware-progress' import createProgress from 'tty-aware-progress'

5
packages/next/lib/constants.js
View file

@ -10,8 +10,3 @@ export const NEXT_PROJECT_ROOT_DIST_SERVER = join(NEXT_PROJECT_ROOT_DIST, 'serve
// we have to use a private alias // we have to use a private alias
export const PAGES_DIR_ALIAS = 'private-next-pages' export const PAGES_DIR_ALIAS = 'private-next-pages'
export const DOT_NEXT_ALIAS = 'private-dot-next' export const DOT_NEXT_ALIAS = 'private-dot-next'
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'

2
packages/next/server/next-dev-server.js
View file

@ -2,7 +2,7 @@ import Server from 'next-server/dist/server/next-server'
import { join } from 'path' import { join } from 'path'
import HotReloader from './hot-reloader' import HotReloader from './hot-reloader'
import {route} from 'next-server/dist/server/router' import {route} from 'next-server/dist/server/router'
import {PHASE_DEVELOPMENT_SERVER} from '../lib/constants' import {PHASE_DEVELOPMENT_SERVER} from 'next-server/constants'
import ErrorDebug from './error-debug' import ErrorDebug from './error-debug'
export default class DevServer extends Server { export default class DevServer extends Server {