Unverified Commit 5b4ad4a1 authored by Jiachi Liu's avatar Jiachi Liu Committed by GitHub

Simplify rsc related configs and fix test (#30546)

Co-authored-by: 's avatarkodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: 's avatarJJ Kasper <jj@jjsweb.site>
parent 72324150
...@@ -147,9 +147,9 @@ export default async function build( ...@@ -147,9 +147,9 @@ export default async function build(
setGlobal('phase', PHASE_PRODUCTION_BUILD) setGlobal('phase', PHASE_PRODUCTION_BUILD)
setGlobal('distDir', distDir) setGlobal('distDir', distDir)
const webServerRuntime = !!config.experimental.concurrentFeatures const hasConcurrentFeatures = !!config.experimental.concurrentFeatures
const hasServerComponents = const hasServerComponents =
webServerRuntime && !!config.experimental.serverComponents hasConcurrentFeatures && !!config.experimental.serverComponents
const { target } = config const { target } = config
const buildId: string = await nextBuildSpan const buildId: string = await nextBuildSpan
...@@ -593,7 +593,7 @@ export default async function build( ...@@ -593,7 +593,7 @@ export default async function build(
rewrites, rewrites,
runWebpackSpan, runWebpackSpan,
}), }),
webServerRuntime hasConcurrentFeatures
? getBaseWebpackConfig(dir, { ? getBaseWebpackConfig(dir, {
buildId, buildId,
reactProductionProfiling, reactProductionProfiling,
...@@ -904,7 +904,7 @@ export default async function build( ...@@ -904,7 +904,7 @@ export default async function build(
if ( if (
!isMiddlewareRoute && !isMiddlewareRoute &&
!page.match(RESERVED_PAGE) && !page.match(RESERVED_PAGE) &&
!webServerRuntime !hasConcurrentFeatures
) { ) {
try { try {
let isPageStaticSpan = let isPageStaticSpan =
...@@ -1014,7 +1014,7 @@ export default async function build( ...@@ -1014,7 +1014,7 @@ export default async function build(
static: isStatic, static: isStatic,
isSsg, isSsg,
isWebSsr: isWebSsr:
webServerRuntime && hasConcurrentFeatures &&
!isMiddlewareRoute && !isMiddlewareRoute &&
!page.match(RESERVED_PAGE), !page.match(RESERVED_PAGE),
isHybridAmp, isHybridAmp,
......
...@@ -1412,7 +1412,7 @@ export default async function getBaseWebpackConfig( ...@@ -1412,7 +1412,7 @@ export default async function getBaseWebpackConfig(
new PagesManifestPlugin({ serverless: isLikeServerless, dev }), new PagesManifestPlugin({ serverless: isLikeServerless, dev }),
// MiddlewarePlugin should be after DefinePlugin so NEXT_PUBLIC_* // MiddlewarePlugin should be after DefinePlugin so NEXT_PUBLIC_*
// replacement is done before its process.env.* handling // replacement is done before its process.env.* handling
!isServer && new MiddlewarePlugin({ dev, hasServerComponents }), !isServer && new MiddlewarePlugin({ dev }),
isServer && new NextJsSsrImportPlugin(), isServer && new NextJsSsrImportPlugin(),
!isServer && !isServer &&
new BuildManifestPlugin({ new BuildManifestPlugin({
......
...@@ -149,7 +149,7 @@ export default async function transformSource( ...@@ -149,7 +149,7 @@ export default async function transformSource(
this.loadModule this.loadModule
) )
// next.js/packages/next/link.js // next.js/packages/next/<component>.js
if (/[\\/]next[\\/](link|image)\.js$/.test(url)) { if (/[\\/]next[\\/](link|image)\.js$/.test(url)) {
names.push('default') names.push('default')
} }
......
...@@ -33,17 +33,9 @@ export interface MiddlewareManifest { ...@@ -33,17 +33,9 @@ export interface MiddlewareManifest {
export default class MiddlewarePlugin { export default class MiddlewarePlugin {
dev: boolean dev: boolean
hasServerComponents?: boolean
constructor({ dev }: { dev: boolean }) {
constructor({
dev,
hasServerComponents,
}: {
dev: boolean
hasServerComponents?: boolean
}) {
this.dev = dev this.dev = dev
this.hasServerComponents = hasServerComponents
} }
createAssets( createAssets(
......
...@@ -299,16 +299,7 @@ export class TerserPlugin { ...@@ -299,16 +299,7 @@ export class TerserPlugin {
const pluginName = this.constructor.name const pluginName = this.constructor.name
const availableNumberOfCores = this.options.parallel const availableNumberOfCores = this.options.parallel
compiler.hooks.compilation.tap(pluginName, (compilation) => { compiler.hooks.thisCompilation.tap(pluginName, (compilation) => {
// Don't run minifier against mini-css-extract-plugin
if (
compilation.name !== 'client' &&
compilation.name !== 'server' &&
compilation.name !== 'server-web'
) {
return
}
const cache = compilation.getCache('TerserWebpackPlugin') const cache = compilation.getCache('TerserWebpackPlugin')
const handleHashForChunk = (hash, chunk) => { const handleHashForChunk = (hash, chunk) => {
......
...@@ -1193,25 +1193,20 @@ export async function renderToHTML( ...@@ -1193,25 +1193,20 @@ export async function renderToHTML(
) )
} }
: null, : null,
renderOpts.optimizeCss !process.browser && renderOpts.optimizeCss
? async (html: string) => { ? async (html: string) => {
if (process.browser) { // eslint-disable-next-line import/no-extraneous-dependencies
// Have to disable critters under the web environment. const Critters = require('critters')
return html const cssOptimizer = new Critters({
} else { ssrMode: true,
// eslint-disable-next-line import/no-extraneous-dependencies reduceInlineStyles: false,
const Critters = require('critters') path: renderOpts.distDir,
const cssOptimizer = new Critters({ publicPath: `${renderOpts.assetPrefix}/_next/`,
ssrMode: true, preload: 'media',
reduceInlineStyles: false, fonts: false,
path: renderOpts.distDir, ...renderOpts.optimizeCss,
publicPath: `${renderOpts.assetPrefix}/_next/`, })
preload: 'media', return await cssOptimizer.process(html)
fonts: false,
...renderOpts.optimizeCss,
})
return await cssOptimizer.process(html)
}
} }
: null, : null,
inAmpMode || hybridAmp inAmpMode || hybridAmp
......
...@@ -4,7 +4,7 @@ import dynamic from 'next/dynamic' ...@@ -4,7 +4,7 @@ import dynamic from 'next/dynamic'
let ssr let ssr
const suspense = false const suspense = false
const Hello = dynamic(() => import('./hello'), { const Hello = dynamic(() => import(/* webpackMode: "eager" */ './hello'), {
ssr, ssr,
suspense, suspense,
}) })
......
...@@ -26,7 +26,7 @@ export default (context, _render) => { ...@@ -26,7 +26,7 @@ export default (context, _render) => {
}) })
}) })
it.skip('should resolve suspense on server side if not suspended on server', async () => { it('should resolve suspense on server side if not suspended on server', async () => {
await withBrowser('/suspense/no-thrown', async (browser) => { await withBrowser('/suspense/no-thrown', async (browser) => {
await check( await check(
() => browser.waitForElementByCss('#server-rendered').text(), () => browser.waitForElementByCss('#server-rendered').text(),
...@@ -39,7 +39,7 @@ export default (context, _render) => { ...@@ -39,7 +39,7 @@ export default (context, _render) => {
}) })
}) })
it.skip('should resolve suspense on server side if suspended on server', async () => { it('should resolve suspense on server side if suspended on server', async () => {
await withBrowser('/suspense/thrown', async (browser) => { await withBrowser('/suspense/thrown', async (browser) => {
await check( await check(
() => browser.waitForElementByCss('#server-rendered').text(), () => browser.waitForElementByCss('#server-rendered').text(),
......
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