Unverified Commit c1528e4f authored by Tim Neutkens's avatar Tim Neutkens Committed by GitHub

Remove experimental-modern-preset option (#25100)

parent 5bff9eac
...@@ -41,7 +41,6 @@ type NextBabelPresetOptions = { ...@@ -41,7 +41,6 @@ type NextBabelPresetOptions = {
'preset-react'?: any 'preset-react'?: any
'class-properties'?: any 'class-properties'?: any
'transform-runtime'?: any 'transform-runtime'?: any
'experimental-modern-preset'?: PluginItem
'styled-jsx'?: StyledJsxBabelOptions 'styled-jsx'?: StyledJsxBabelOptions
'preset-typescript'?: any 'preset-typescript'?: any
} }
...@@ -89,10 +88,6 @@ export default ( ...@@ -89,10 +88,6 @@ export default (
(Boolean(api.caller((caller: any) => !!caller && caller.hasJsxRuntime)) && (Boolean(api.caller((caller: any) => !!caller && caller.hasJsxRuntime)) &&
options['preset-react']?.runtime !== 'classic') options['preset-react']?.runtime !== 'classic')
const isLaxModern =
options['preset-env']?.targets &&
options['preset-env'].targets.esmodules === true
const presetEnvConfig = { const presetEnvConfig = {
// In the test environment `modules` is often needed to be set to true, babel figures that out by itself using the `'auto'` option // In the test environment `modules` is often needed to be set to true, babel figures that out by itself using the `'auto'` option
// In production/development this option is set to `false` so that webpack can handle import/export with tree-shaking // In production/development this option is set to `false` so that webpack can handle import/export with tree-shaking
...@@ -122,17 +117,10 @@ export default ( ...@@ -122,17 +117,10 @@ export default (
} }
} }
// specify a preset to use instead of @babel/preset-env
const customModernPreset =
isLaxModern && options['experimental-modern-preset']
return { return {
sourceType: 'unambiguous', sourceType: 'unambiguous',
presets: [ presets: [
customModernPreset || [ [require('next/dist/compiled/babel/preset-env'), presetEnvConfig],
require('next/dist/compiled/babel/preset-env'),
presetEnvConfig,
],
[ [
require('next/dist/compiled/babel/preset-react'), require('next/dist/compiled/babel/preset-react'),
{ {
......
...@@ -165,28 +165,6 @@ describe('next/babel', () => { ...@@ -165,28 +165,6 @@ describe('next/babel', () => {
}) })
}) })
describe('experimental-modern-preset', () => {
it('should allow passing a custom Babel preset', () => {
const code = trim`
const [, b, c] = [...[1,2,3]];
({a}) => a;
`
const output = babel(code, true, {
'preset-env': {
targets: {
esmodules: true,
},
},
// our modern preset is no preset at all
'experimental-modern-preset': () => ({}),
})
expect(output).toMatch(trim`
const[,b,c]=[...[1,2,3]];({a})=>a;
`)
})
})
describe('respect preset-react runtime', () => { describe('respect preset-react runtime', () => {
it('should allow forcing on automatic mode', () => { it('should allow forcing on automatic mode', () => {
const code = trim`const a = ()=><a href="/">home</a>` const code = trim`const a = ()=><a href="/">home</a>`
......
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