Unverified Commit cdc4ee36 authored by JJ Kasper's avatar JJ Kasper Committed by GitHub

Ensure browserslist extends works properly (#33890)

* Ensure browserslist extends works properly

* add comment
parent f841307f
...@@ -310,10 +310,26 @@ export async function ncc_chalk(task, opts) { ...@@ -310,10 +310,26 @@ export async function ncc_chalk(task, opts) {
// eslint-disable-next-line camelcase // eslint-disable-next-line camelcase
externals['browserslist'] = 'next/dist/compiled/browserslist' externals['browserslist'] = 'next/dist/compiled/browserslist'
export async function ncc_browserslist(task, opts) { export async function ncc_browserslist(task, opts) {
const browserslistModule = require.resolve('browserslist')
const nodeFile = join(dirname(browserslistModule), 'node.js')
const content = await fs.readFile(nodeFile, 'utf8')
// ensure ncc doesn't attempt to bundle dynamic requires
// so that they work at runtime correctly
await fs.writeFile(
nodeFile,
content.replace(
/require\(require\.resolve\(/g,
`__non_webpack_require__(__non_webpack_require__.resolve(`
)
)
await task await task
.source(opts.src || relative(__dirname, require.resolve('browserslist'))) .source(opts.src || relative(__dirname, require.resolve('browserslist')))
.ncc({ packageName: 'browserslist', externals }) .ncc({ packageName: 'browserslist', externals })
.target('compiled/browserslist') .target('compiled/browserslist')
await fs.writeFile(nodeFile, content)
} }
// eslint-disable-next-line camelcase // eslint-disable-next-line camelcase
...@@ -1577,7 +1593,6 @@ export async function ncc(task, opts) { ...@@ -1577,7 +1593,6 @@ export async function ncc(task, opts) {
'ncc_node_html_parser', 'ncc_node_html_parser',
'ncc_watchpack', 'ncc_watchpack',
'ncc_chalk', 'ncc_chalk',
'ncc_browserslist',
'ncc_napirs_triples', 'ncc_napirs_triples',
'ncc_etag', 'ncc_etag',
'ncc_p_limit', 'ncc_p_limit',
...@@ -1686,6 +1701,7 @@ export async function ncc(task, opts) { ...@@ -1686,6 +1701,7 @@ export async function ncc(task, opts) {
await task.parallel(['ncc_babel_bundle_packages'], opts) await task.parallel(['ncc_babel_bundle_packages'], opts)
await task.serial( await task.serial(
[ [
'ncc_browserslist',
'ncc_next__react_dev_overlay', 'ncc_next__react_dev_overlay',
'copy_regenerator_runtime', 'copy_regenerator_runtime',
'copy_babel_runtime', 'copy_babel_runtime',
......
import { createNext } from 'e2e-utils'
import { NextInstance } from 'test/lib/next-modes/base'
import { renderViaHTTP } from 'next-test-utils'
describe('browserslist-extends', () => {
let next: NextInstance
beforeAll(async () => {
next = await createNext({
files: {
'pages/index.js': `
import styles from './index.module.css'
export default function Page() {
return <p className={styles.hello}>hello world</p>
}
`,
'pages/index.module.css': `
.hello {
color: pink;
}
`,
},
dependencies: {
'browserslist-config-google': '^3.0.1',
},
packageJson: {
browserslist: ['extends browserslist-config-google'],
},
})
})
afterAll(() => next.destroy())
it('should work', async () => {
const html = await renderViaHTTP(next.url, '/')
expect(html).toContain('hello world')
})
})
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