Unverified Commit 9a0fc42d authored by JJ Kasper's avatar JJ Kasper Committed by GitHub

Fix ie11 support with webpack 5 (#25014)

This fixes ie11 compatibility that broke in https://github.com/vercel/next.js/pull/24656 from the polyfills not being loaded first, our existing ie11 test caught this but was failing, this ensures the test is passing again. This also updates the `hrefValue` optional chaining in the eslint plugin as these files aren't transpiled and related tests were failing in azure 

## Bug

- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
parent 6ad91722
...@@ -23,9 +23,9 @@ module.exports = { ...@@ -23,9 +23,9 @@ module.exports = {
} }
const hrefValue = attributes.value('href') const hrefValue = attributes.value('href')
const isGoogleFont = hrefValue?.startsWith( const isGoogleFont =
'https://fonts.googleapis.com/css' typeof hrefValue === 'string' &&
) hrefValue.startsWith('https://fonts.googleapis.com/css')
if (isGoogleFont) { if (isGoogleFont) {
const params = new URLSearchParams(hrefValue.split('?')[1]) const params = new URLSearchParams(hrefValue.split('?')[1])
......
...@@ -26,7 +26,8 @@ module.exports = { ...@@ -26,7 +26,8 @@ module.exports = {
attributes.value('rel') !== 'preconnect' attributes.value('rel') !== 'preconnect'
if ( if (
hrefValue?.startsWith('https://fonts.gstatic.com') && typeof hrefValue === 'string' &&
hrefValue.startsWith('https://fonts.gstatic.com') &&
preconnectMissing preconnectMissing
) { ) {
context.report({ context.report({
......
...@@ -38,9 +38,9 @@ module.exports = { ...@@ -38,9 +38,9 @@ module.exports = {
} }
const hrefValue = attributes.value('href') const hrefValue = attributes.value('href')
const isGoogleFont = hrefValue?.startsWith( const isGoogleFont =
'https://fonts.googleapis.com/css' typeof hrefValue === 'string' &&
) hrefValue.startsWith('https://fonts.googleapis.com/css')
if (isGoogleFont) { if (isGoogleFont) {
context.report({ context.report({
......
...@@ -503,7 +503,7 @@ export default async function getBaseWebpackConfig( ...@@ -503,7 +503,7 @@ export default async function getBaseWebpackConfig(
// and all other chunk depend on them so there is no // and all other chunk depend on them so there is no
// duplication that need to be pulled out. // duplication that need to be pulled out.
chunks: isWebpack5 chunks: isWebpack5
? (chunk) => !/^(main|pages\/_app)$/.test(chunk.name) ? (chunk) => !/^(polyfills|main|pages\/_app)$/.test(chunk.name)
: 'all', : 'all',
cacheGroups: { cacheGroups: {
framework: { framework: {
...@@ -1624,7 +1624,12 @@ export default async function getBaseWebpackConfig( ...@@ -1624,7 +1624,12 @@ export default async function getBaseWebpackConfig(
if (isWebpack5 && !isServer) { if (isWebpack5 && !isServer) {
for (const name of Object.keys(entry)) { for (const name of Object.keys(entry)) {
if (name === 'main' || name === 'amp' || name === 'react-refresh') if (
name === 'polyfills' ||
name === 'main' ||
name === 'amp' ||
name === 'react-refresh'
)
continue continue
const dependOn = const dependOn =
name.startsWith('pages/') && name !== 'pages/_app' name.startsWith('pages/') && name !== 'pages/_app'
......
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