Commit 263e6319 authored by devjiwonchoi's avatar devjiwonchoi

Set `__NEXT_PREVIEW` env var from define-env

parent 89da8ff6
...@@ -1156,9 +1156,6 @@ impl Project { ...@@ -1156,9 +1156,6 @@ impl Project {
let edge_env = fxindexmap! { let edge_env = fxindexmap! {
rcstr!("__NEXT_BUILD_ID") => self.build_id.clone(), rcstr!("__NEXT_BUILD_ID") => self.build_id.clone(),
rcstr!("NEXT_SERVER_ACTIONS_ENCRYPTION_KEY") => self.encryption_key.clone(), rcstr!("NEXT_SERVER_ACTIONS_ENCRYPTION_KEY") => self.encryption_key.clone(),
rcstr!("__NEXT_PREVIEW_MODE_ID") => self.preview_props.preview_mode_id.clone(),
rcstr!("__NEXT_PREVIEW_MODE_ENCRYPTION_KEY") => self.preview_props.preview_mode_encryption_key.clone(),
rcstr!("__NEXT_PREVIEW_MODE_SIGNING_KEY") => self.preview_props.preview_mode_signing_key.clone(),
}; };
Vc::cell(edge_env) Vc::cell(edge_env)
} }
......
...@@ -973,5 +973,8 @@ ...@@ -973,5 +973,8 @@
"972": "Failed to resolve pattern \"%s\": %s", "972": "Failed to resolve pattern \"%s\": %s",
"973": "Server Actions are not enabled for this application. This request might be from an older or newer deployment.\nRead more: https://nextjs.org/docs/messages/failed-to-find-server-action", "973": "Server Actions are not enabled for this application. This request might be from an older or newer deployment.\nRead more: https://nextjs.org/docs/messages/failed-to-find-server-action",
"974": "Failed to find Server Action%s. This request might be from an older or newer deployment.\\nRead more: https://nextjs.org/docs/messages/failed-to-find-server-action", "974": "Failed to find Server Action%s. This request might be from an older or newer deployment.\\nRead more: https://nextjs.org/docs/messages/failed-to-find-server-action",
"975": "Failed to find Server Action. This request might be from an older or newer deployment.\\nRead more: https://nextjs.org/docs/messages/failed-to-find-server-action" "975": "Failed to find Server Action. This request might be from an older or newer deployment.\\nRead more: https://nextjs.org/docs/messages/failed-to-find-server-action",
"976": "__NEXT_PREVIEW_MODE_ENCRYPTION_KEY is not set. This is a bug in Next.js",
"977": "__NEXT_PREVIEW_MODE_ID is not set. This is a bug in Next.js",
"978": "__NEXT_PREVIEW_MODE_SIGNING_KEY is not set. This is a bug in Next.js"
} }
...@@ -12,6 +12,7 @@ import { ...@@ -12,6 +12,7 @@ import {
getNextConfigEnv, getNextConfigEnv,
getNextPublicEnvironmentVariables, getNextPublicEnvironmentVariables,
} from '../lib/static-env' } from '../lib/static-env'
import type { __ApiPreviewProps } from '../server/api-utils'
type BloomFilter = ReturnType< type BloomFilter = ReturnType<
import('../shared/lib/bloom-filter').BloomFilter['export'] import('../shared/lib/bloom-filter').BloomFilter['export']
...@@ -39,6 +40,7 @@ export interface DefineEnvOptions { ...@@ -39,6 +40,7 @@ export interface DefineEnvOptions {
afterFiles: Rewrite[] afterFiles: Rewrite[]
fallback: Rewrite[] fallback: Rewrite[]
} }
previewProps: __ApiPreviewProps
} }
interface DefineEnv { interface DefineEnv {
...@@ -111,6 +113,7 @@ export function getDefineEnv({ ...@@ -111,6 +113,7 @@ export function getDefineEnv({
middlewareMatchers, middlewareMatchers,
omitNonDeterministic, omitNonDeterministic,
rewrites, rewrites,
previewProps,
}: DefineEnvOptions): SerializedDefineEnv { }: DefineEnvOptions): SerializedDefineEnv {
const nextPublicEnv = getNextPublicEnvironmentVariables() const nextPublicEnv = getNextPublicEnvironmentVariables()
const nextConfigEnv = getNextConfigEnv(config) const nextConfigEnv = getNextConfigEnv(config)
...@@ -345,6 +348,12 @@ export function getDefineEnv({ ...@@ -345,6 +348,12 @@ export function getDefineEnv({
config.experimental.reactDebugChannel ?? false, config.experimental.reactDebugChannel ?? false,
'process.env.__NEXT_TRANSITION_INDICATOR': 'process.env.__NEXT_TRANSITION_INDICATOR':
config.experimental.transitionIndicator ?? false, config.experimental.transitionIndicator ?? false,
'process.env.__NEXT_PREVIEW_MODE_ID': previewProps.previewModeId,
'process.env.__NEXT_PREVIEW_MODE_SIGNING_KEY':
previewProps.previewModeSigningKey,
'process.env.__NEXT_PREVIEW_MODE_ENCRYPTION_KEY':
previewProps.previewModeEncryptionKey,
} }
const userDefines = config.compiler?.define ?? {} const userDefines = config.compiler?.define ?? {}
......
...@@ -437,6 +437,7 @@ export function createDefineEnv({ ...@@ -437,6 +437,7 @@ export function createDefineEnv({
hasRewrites, hasRewrites,
middlewareMatchers, middlewareMatchers,
rewrites, rewrites,
previewProps,
}: Omit< }: Omit<
DefineEnvOptions, DefineEnvOptions,
'isClient' | 'isNodeOrEdgeCompilation' | 'isEdgeServer' | 'isNodeServer' 'isClient' | 'isNodeOrEdgeCompilation' | 'isEdgeServer' | 'isNodeServer'
...@@ -463,6 +464,7 @@ export function createDefineEnv({ ...@@ -463,6 +464,7 @@ export function createDefineEnv({
isNodeServer: variant === 'nodejs', isNodeServer: variant === 'nodejs',
middlewareMatchers, middlewareMatchers,
rewrites, rewrites,
previewProps,
}) })
) )
} }
......
...@@ -67,6 +67,11 @@ export async function turbopackAnalyze( ...@@ -67,6 +67,11 @@ export async function turbopackAnalyze(
afterFiles: [], afterFiles: [],
fallback: [], fallback: [],
}, },
previewProps: {
previewModeId: '',
previewModeEncryptionKey: '',
previewModeSigningKey: '',
},
}), }),
buildId: 'analyze-build', buildId: 'analyze-build',
encryptionKey: '', encryptionKey: '',
......
...@@ -73,6 +73,7 @@ export async function turbopackBuild(): Promise<{ ...@@ -73,6 +73,7 @@ export async function turbopackBuild(): Promise<{
// Implemented separately in Turbopack, doesn't have to be passed here. // Implemented separately in Turbopack, doesn't have to be passed here.
middlewareMatchers: undefined, middlewareMatchers: undefined,
rewrites, rewrites,
previewProps,
}), }),
buildId, buildId,
encryptionKey, encryptionKey,
......
...@@ -2029,6 +2029,7 @@ export default async function getBaseWebpackConfig( ...@@ -2029,6 +2029,7 @@ export default async function getBaseWebpackConfig(
middlewareMatchers, middlewareMatchers,
omitNonDeterministic: isCompileMode, omitNonDeterministic: isCompileMode,
rewrites, rewrites,
previewProps,
}) })
), ),
isClient && isClient &&
...@@ -2106,10 +2107,6 @@ export default async function getBaseWebpackConfig( ...@@ -2106,10 +2107,6 @@ export default async function getBaseWebpackConfig(
edgeEnvironments: { edgeEnvironments: {
__NEXT_BUILD_ID: buildId, __NEXT_BUILD_ID: buildId,
NEXT_SERVER_ACTIONS_ENCRYPTION_KEY: encryptionKey, NEXT_SERVER_ACTIONS_ENCRYPTION_KEY: encryptionKey,
__NEXT_PREVIEW_MODE_ID: previewProps.previewModeId,
__NEXT_PREVIEW_MODE_SIGNING_KEY: previewProps.previewModeSigningKey,
__NEXT_PREVIEW_MODE_ENCRYPTION_KEY:
previewProps.previewModeEncryptionKey,
}, },
}), }),
isClient && isClient &&
......
...@@ -273,6 +273,7 @@ export async function createHotReloaderTurbopack( ...@@ -273,6 +273,7 @@ export async function createHotReloaderTurbopack(
// TODO: Implement // TODO: Implement
middlewareMatchers: undefined, middlewareMatchers: undefined,
rewrites: opts.fsChecker.rewrites, rewrites: opts.fsChecker.rewrites,
previewProps: opts.fsChecker.prerenderManifest.preview,
}), }),
buildId, buildId,
encryptionKey, encryptionKey,
......
...@@ -829,6 +829,7 @@ async function startWatcher( ...@@ -829,6 +829,7 @@ async function startWatcher(
middlewareMatchers: undefined, middlewareMatchers: undefined,
projectPath: opts.dir, projectPath: opts.dir,
rewrites: opts.fsChecker.rewrites, rewrites: opts.fsChecker.rewrites,
previewProps: opts.fsChecker.prerenderManifest.preview,
}), }),
rootPath, rootPath,
projectPath: normalizePath(path.relative(rootPath, dir)), projectPath: normalizePath(path.relative(rootPath, dir)),
...@@ -926,6 +927,7 @@ async function startWatcher( ...@@ -926,6 +927,7 @@ async function startWatcher(
middlewareMatchers: undefined, middlewareMatchers: undefined,
projectPath: opts.dir, projectPath: opts.dir,
rewrites: opts.fsChecker.rewrites, rewrites: opts.fsChecker.rewrites,
previewProps: opts.fsChecker.prerenderManifest.preview,
}) })
Object.keys(plugin.definitions).forEach((key) => { Object.keys(plugin.definitions).forEach((key) => {
......
...@@ -192,8 +192,8 @@ export abstract class RouteModule< ...@@ -192,8 +192,8 @@ export abstract class RouteModule<
} { } {
let result let result
if (process.env.NEXT_RUNTIME === 'edge') { if (process.env.NEXT_RUNTIME === 'edge') {
const { getEdgePreviewProps } = const { getPreviewProps } =
require('../web/get-edge-preview-props') as typeof import('../web/get-edge-preview-props') require('../web/get-preview-props') as typeof import('../web/get-preview-props')
const maybeJSONParse = (str?: string) => const maybeJSONParse = (str?: string) =>
str ? JSON.parse(str) : undefined str ? JSON.parse(str) : undefined
...@@ -209,7 +209,7 @@ export abstract class RouteModule< ...@@ -209,7 +209,7 @@ export abstract class RouteModule<
dynamicRoutes: {}, dynamicRoutes: {},
notFoundRoutes: [], notFoundRoutes: [],
version: 4, version: 4,
preview: getEdgePreviewProps(), preview: getPreviewProps(),
} as const, } as const,
routesManifest: { routesManifest: {
version: 4, version: 4,
......
...@@ -32,7 +32,7 @@ import { getTracer } from '../lib/trace/tracer' ...@@ -32,7 +32,7 @@ import { getTracer } from '../lib/trace/tracer'
import type { TextMapGetter } from 'next/dist/compiled/@opentelemetry/api' import type { TextMapGetter } from 'next/dist/compiled/@opentelemetry/api'
import { MiddlewareSpan } from '../lib/trace/constants' import { MiddlewareSpan } from '../lib/trace/constants'
import { CloseController } from './web-on-close' import { CloseController } from './web-on-close'
import { getEdgePreviewProps } from './get-edge-preview-props' import { getPreviewProps } from './get-preview-props'
import { getBuiltinRequestContext } from '../after/builtin-request-context' import { getBuiltinRequestContext } from '../after/builtin-request-context'
import { getImplicitTags } from '../lib/implicit-tags' import { getImplicitTags } from '../lib/implicit-tags'
...@@ -223,7 +223,7 @@ export async function adapter( ...@@ -223,7 +223,7 @@ export async function adapter(
routes: {}, routes: {},
dynamicRoutes: {}, dynamicRoutes: {},
notFoundRoutes: [], notFoundRoutes: [],
preview: getEdgePreviewProps(), preview: getPreviewProps(),
} }
}, },
}) })
...@@ -272,7 +272,7 @@ export async function adapter( ...@@ -272,7 +272,7 @@ export async function adapter(
const onUpdateCookies = (cookies: Array<string>) => { const onUpdateCookies = (cookies: Array<string>) => {
cookiesFromResponse = cookies cookiesFromResponse = cookies
} }
const previewProps = getEdgePreviewProps() const previewProps = getPreviewProps()
const page = '/' // Fake Work const page = '/' // Fake Work
const fallbackRouteParams = null const fallbackRouteParams = null
......
...@@ -13,7 +13,7 @@ import { internal_getCurrentFunctionWaitUntil } from './internal-edge-wait-until ...@@ -13,7 +13,7 @@ import { internal_getCurrentFunctionWaitUntil } from './internal-edge-wait-until
import { getServerUtils } from '../server-utils' import { getServerUtils } from '../server-utils'
import { searchParamsToUrlQuery } from '../../shared/lib/router/utils/querystring' import { searchParamsToUrlQuery } from '../../shared/lib/router/utils/querystring'
import { CloseController, trackStreamConsumed } from './web-on-close' import { CloseController, trackStreamConsumed } from './web-on-close'
import { getEdgePreviewProps } from './get-edge-preview-props' import { getPreviewProps } from './get-preview-props'
import { WebNextRequest } from '../../server/base-http/web' import { WebNextRequest } from '../../server/base-http/web'
export interface WrapOptions { export interface WrapOptions {
...@@ -93,7 +93,7 @@ export class EdgeRouteModuleWrapper { ...@@ -93,7 +93,7 @@ export class EdgeRouteModuleWrapper {
const waitUntil = evt.waitUntil.bind(evt) const waitUntil = evt.waitUntil.bind(evt)
const closeController = new CloseController() const closeController = new CloseController()
const previewProps = getEdgePreviewProps() const previewProps = getPreviewProps()
// Create the context for the handler. This contains the params from the // Create the context for the handler. This contains the params from the
// match (if any). // match (if any).
......
/**
* In edge runtime, these props directly accessed from environment variables.
* - local: env vars will be injected through edge-runtime as runtime env vars
* - deployment: env vars will be replaced by edge build pipeline
*/
export function getEdgePreviewProps() {
return {
previewModeId: process.env.__NEXT_PREVIEW_MODE_ID || '',
previewModeSigningKey: process.env.__NEXT_PREVIEW_MODE_SIGNING_KEY || '',
previewModeEncryptionKey:
process.env.__NEXT_PREVIEW_MODE_ENCRYPTION_KEY || '',
}
}
import type { __ApiPreviewProps } from '../api-utils'
/**
* The previewProps value is set to env variables during build in define-env.
*/
export function getPreviewProps(): __ApiPreviewProps {
if (!process.env.__NEXT_PREVIEW_MODE_ID) {
throw new Error(
'__NEXT_PREVIEW_MODE_ID is not set. This is a bug in Next.js'
)
}
if (!process.env.__NEXT_PREVIEW_MODE_SIGNING_KEY) {
throw new Error(
'__NEXT_PREVIEW_MODE_SIGNING_KEY is not set. This is a bug in Next.js'
)
}
if (!process.env.__NEXT_PREVIEW_MODE_ENCRYPTION_KEY) {
throw new Error(
'__NEXT_PREVIEW_MODE_ENCRYPTION_KEY is not set. This is a bug in Next.js'
)
}
return {
previewModeId: process.env.__NEXT_PREVIEW_MODE_ID,
previewModeSigningKey: process.env.__NEXT_PREVIEW_MODE_SIGNING_KEY,
previewModeEncryptionKey: process.env.__NEXT_PREVIEW_MODE_ENCRYPTION_KEY,
}
}
...@@ -219,6 +219,11 @@ async function main() { ...@@ -219,6 +219,11 @@ async function main() {
afterFiles: [], afterFiles: [],
fallback: [], fallback: [],
}, },
previewProps: {
previewModeId: 'development',
previewModeEncryptionKey: '12345',
previewModeSigningKey: '12345',
},
}), }),
buildId: 'development', buildId: 'development',
encryptionKey: '12345', encryptionKey: '12345',
...@@ -377,6 +382,11 @@ describe('next.rs api', () => { ...@@ -377,6 +382,11 @@ describe('next.rs api', () => {
afterFiles: [], afterFiles: [],
fallback: [], fallback: [],
}, },
previewProps: {
previewModeId: 'development',
previewModeEncryptionKey: '12345',
previewModeSigningKey: '12345',
},
}), }),
buildId: 'development', buildId: 'development',
encryptionKey: '12345', encryptionKey: '12345',
......
...@@ -236,9 +236,6 @@ describe('Middleware Runtime', () => { ...@@ -236,9 +236,6 @@ describe('Middleware Runtime', () => {
expect(envs).toContainAllKeys([ expect(envs).toContainAllKeys([
'NEXT_SERVER_ACTIONS_ENCRYPTION_KEY', 'NEXT_SERVER_ACTIONS_ENCRYPTION_KEY',
'__NEXT_BUILD_ID', '__NEXT_BUILD_ID',
'__NEXT_PREVIEW_MODE_ENCRYPTION_KEY',
'__NEXT_PREVIEW_MODE_ID',
'__NEXT_PREVIEW_MODE_SIGNING_KEY',
]) ])
}) })
......
...@@ -180,9 +180,6 @@ describe('adapter-config', () => { ...@@ -180,9 +180,6 @@ describe('adapter-config', () => {
expect.objectContaining({ expect.objectContaining({
NEXT_SERVER_ACTIONS_ENCRYPTION_KEY: expect.toBeString(), NEXT_SERVER_ACTIONS_ENCRYPTION_KEY: expect.toBeString(),
__NEXT_BUILD_ID: expect.toBeString(), __NEXT_BUILD_ID: expect.toBeString(),
__NEXT_PREVIEW_MODE_ENCRYPTION_KEY: expect.toBeString(),
__NEXT_PREVIEW_MODE_ID: expect.toBeString(),
__NEXT_PREVIEW_MODE_SIGNING_KEY: expect.toBeString(),
}) })
) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment