Unverified Commit 80f959f6 authored by Tim Neutkens's avatar Tim Neutkens Committed by GitHub

Move browserslist loading webpack-config.ts (#30889)

parent 3c5d5b55
...@@ -55,6 +55,21 @@ import { TelemetryPlugin } from './webpack/plugins/telemetry-plugin' ...@@ -55,6 +55,21 @@ import { TelemetryPlugin } from './webpack/plugins/telemetry-plugin'
import type { Span } from '../trace' import type { Span } from '../trace'
import isError from '../lib/is-error' import isError from '../lib/is-error'
import { getRawPageExtensions } from './utils' import { getRawPageExtensions } from './utils'
import browserslist from 'browserslist'
function getSupportedBrowsers(
dir: string,
isDevelopment: boolean
): string[] | undefined {
let browsers: any
try {
browsers = browserslist.loadConfig({
path: dir,
env: isDevelopment ? 'development' : 'production',
})
} catch {}
return browsers
}
type ExcludesFalse = <T>(x: T | false) => x is T type ExcludesFalse = <T>(x: T | false) => x is T
...@@ -338,6 +353,7 @@ export default async function getBaseWebpackConfig( ...@@ -338,6 +353,7 @@ export default async function getBaseWebpackConfig(
runWebpackSpan: Span runWebpackSpan: Span
} }
): Promise<webpack.Configuration> { ): Promise<webpack.Configuration> {
const supportedBrowsers = await getSupportedBrowsers(dir, dev)
const hasRewrites = const hasRewrites =
rewrites.beforeFiles.length > 0 || rewrites.beforeFiles.length > 0 ||
rewrites.afterFiles.length > 0 || rewrites.afterFiles.length > 0 ||
...@@ -1671,6 +1687,7 @@ export default async function getBaseWebpackConfig( ...@@ -1671,6 +1687,7 @@ export default async function getBaseWebpackConfig(
} }
webpackConfig = await buildConfiguration(webpackConfig, { webpackConfig = await buildConfiguration(webpackConfig, {
supportedBrowsers,
rootDirectory: dir, rootDirectory: dir,
customAppFile: new RegExp(escapeRegExp(path.join(pagesDir, `_app`))), customAppFile: new RegExp(escapeRegExp(path.join(pagesDir, `_app`))),
isDevelopment: dev, isDevelopment: dev,
...@@ -1879,7 +1896,7 @@ export default async function getBaseWebpackConfig( ...@@ -1879,7 +1896,7 @@ export default async function getBaseWebpackConfig(
) )
} }
} else if (!config.future.strictPostcssConfiguration) { } else if (!config.future.strictPostcssConfiguration) {
await __overrideCssConfiguration(dir, !dev, webpackConfig) await __overrideCssConfiguration(dir, supportedBrowsers, webpackConfig)
} }
// Inject missing React Refresh loaders so that development mode is fast: // Inject missing React Refresh loaders so that development mode is fast:
......
...@@ -139,7 +139,7 @@ export const css = curry(async function css( ...@@ -139,7 +139,7 @@ export const css = curry(async function css(
const postCssPlugins = await getPostCssPlugins( const postCssPlugins = await getPostCssPlugins(
ctx.rootDirectory, ctx.rootDirectory,
ctx.isProduction, ctx.supportedBrowsers,
!ctx.future.strictPostcssConfiguration !ctx.future.strictPostcssConfiguration
) )
......
...@@ -4,10 +4,13 @@ import postcss from 'postcss' ...@@ -4,10 +4,13 @@ import postcss from 'postcss'
export async function __overrideCssConfiguration( export async function __overrideCssConfiguration(
rootDirectory: string, rootDirectory: string,
isProduction: boolean, supportedBrowsers: string[] | undefined,
config: webpack.Configuration config: webpack.Configuration
) { ) {
const postCssPlugins = await getPostCssPlugins(rootDirectory, isProduction) const postCssPlugins = await getPostCssPlugins(
rootDirectory,
supportedBrowsers
)
function patch(rule: webpack.RuleSetRule) { function patch(rule: webpack.RuleSetRule) {
if ( if (
......
import chalk from 'chalk' import chalk from 'chalk'
import { findConfig } from '../../../../../lib/find-config' import { findConfig } from '../../../../../lib/find-config'
import browserslist from 'browserslist'
type CssPluginCollection_Array = (string | [string, boolean | object])[] type CssPluginCollection_Array = (string | [string, boolean | object])[]
...@@ -89,23 +88,14 @@ async function loadPlugin( ...@@ -89,23 +88,14 @@ async function loadPlugin(
} }
function getDefaultPlugins( function getDefaultPlugins(
baseDirectory: string, supportedBrowsers: string[] | undefined
isProduction: boolean
): CssPluginCollection { ): CssPluginCollection {
let browsers: any
try {
browsers = browserslist.loadConfig({
path: baseDirectory,
env: isProduction ? 'production' : 'development',
})
} catch {}
return [ return [
require.resolve('next/dist/compiled/postcss-flexbugs-fixes'), require.resolve('next/dist/compiled/postcss-flexbugs-fixes'),
[ [
require.resolve('next/dist/compiled/postcss-preset-env'), require.resolve('next/dist/compiled/postcss-preset-env'),
{ {
browsers: browsers ?? ['defaults'], browsers: supportedBrowsers ?? ['defaults'],
autoprefixer: { autoprefixer: {
// Disable legacy flexbox support // Disable legacy flexbox support
flexbox: 'no-2009', flexbox: 'no-2009',
...@@ -123,7 +113,7 @@ function getDefaultPlugins( ...@@ -123,7 +113,7 @@ function getDefaultPlugins(
export async function getPostCssPlugins( export async function getPostCssPlugins(
dir: string, dir: string,
isProduction: boolean, supportedBrowsers: string[] | undefined,
defaults: boolean = false defaults: boolean = false
): Promise<import('postcss').AcceptedPlugin[]> { ): Promise<import('postcss').AcceptedPlugin[]> {
let config = defaults let config = defaults
...@@ -131,7 +121,7 @@ export async function getPostCssPlugins( ...@@ -131,7 +121,7 @@ export async function getPostCssPlugins(
: await findConfig<{ plugins: CssPluginCollection }>(dir, 'postcss') : await findConfig<{ plugins: CssPluginCollection }>(dir, 'postcss')
if (config == null) { if (config == null) {
config = { plugins: getDefaultPlugins(dir, isProduction) } config = { plugins: getDefaultPlugins(supportedBrowsers) }
} }
if (typeof config === 'function') { if (typeof config === 'function') {
......
...@@ -8,6 +8,7 @@ import { ConfigurationContext, pipe } from './utils' ...@@ -8,6 +8,7 @@ import { ConfigurationContext, pipe } from './utils'
export async function build( export async function build(
config: webpack.Configuration, config: webpack.Configuration,
{ {
supportedBrowsers,
rootDirectory, rootDirectory,
customAppFile, customAppFile,
isDevelopment, isDevelopment,
...@@ -21,6 +22,7 @@ export async function build( ...@@ -21,6 +22,7 @@ export async function build(
experimental, experimental,
disableStaticImages, disableStaticImages,
}: { }: {
supportedBrowsers: string[] | undefined
rootDirectory: string rootDirectory: string
customAppFile: RegExp customAppFile: RegExp
isDevelopment: boolean isDevelopment: boolean
...@@ -36,6 +38,7 @@ export async function build( ...@@ -36,6 +38,7 @@ export async function build(
} }
): Promise<webpack.Configuration> { ): Promise<webpack.Configuration> {
const ctx: ConfigurationContext = { const ctx: ConfigurationContext = {
supportedBrowsers,
rootDirectory, rootDirectory,
customAppFile, customAppFile,
isDevelopment, isDevelopment,
......
...@@ -2,6 +2,7 @@ import { webpack } from 'next/dist/compiled/webpack/webpack' ...@@ -2,6 +2,7 @@ import { webpack } from 'next/dist/compiled/webpack/webpack'
import { NextConfigComplete } from '../../../server/config-shared' import { NextConfigComplete } from '../../../server/config-shared'
export type ConfigurationContext = { export type ConfigurationContext = {
supportedBrowsers: string[] | undefined
rootDirectory: string rootDirectory: string
customAppFile: RegExp customAppFile: RegExp
......
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