Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update tracing to collect from reasons #29975

Merged
merged 9 commits into from
Oct 18, 2021
Merged

Update tracing to collect from reasons #29975

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6e96603
Update tracing to collect from reasons
ijjk Oct 16, 2021
4dc3a35
Ensure all package.jsons are collected
ijjk Oct 16, 2021
8e017f4
Update server trace
ijjk Oct 16, 2021
10cb29a
Merge branch 'canary' into update/patch-tracing-cases
ijjk Oct 17, 2021
34a5f4e
Merge remote-tracking branch 'upstream/canary' into update/patch-trac…
ijjk Oct 18, 2021
1175bae
update test for ie11
ijjk Oct 18, 2021
7336f2b
Merge remote-tracking branch 'upstream/canary' into update/patch-trac…
ijjk Oct 18, 2021
23038b4
share image regex more
ijjk Oct 18, 2021
a99ea26
Merge branch 'canary' into update/patch-tracing-cases
ijjk Oct 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion packages/next/build/webpack-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,9 @@ export const NODE_BASE_ESM_RESOLVE_OPTIONS = {

let TSCONFIG_WARNED = false

export const nextImageLoaderRegex =
ijjk marked this conversation as resolved.
Show resolved Hide resolved
/\.(png|jpg|jpeg|gif|webp|avif|ico|bmp|svg)$/i

export default async function getBaseWebpackConfig(
dir: string,
{
Expand Down Expand Up @@ -1057,7 +1060,7 @@ export default async function getBaseWebpackConfig(
...(!config.images.disableStaticImages
? [
{
test: /\.(png|jpg|jpeg|gif|webp|avif|ico|bmp|svg)$/i,
test: nextImageLoaderRegex,
loader: 'next-image-loader',
issuer: { not: regexLikeCss },
dependency: { not: ['url'] },
Expand Down Expand Up @@ -1199,6 +1202,8 @@ export default async function getBaseWebpackConfig(
!dev &&
new TraceEntryPointsPlugin({
appDir: dir,
esmExternals: config.experimental.esmExternals,
staticImageImports: !config.images.disableStaticImages,
}),
// Moment.js is an extremely popular library that bundles large locale files
// by default due to how Webpack interprets its code. This is a practical
Expand Down
3 changes: 2 additions & 1 deletion packages/next/build/webpack/config/blocks/images/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import curry from 'next/dist/compiled/lodash.curry'
import { webpack } from 'next/dist/compiled/webpack/webpack'
import { nextImageLoaderRegex } from '../../../../webpack-config'
import { loader } from '../../helpers'
import { ConfigurationContext, ConfigurationFn, pipe } from '../../utils'
import { getCustomDocumentImageError } from './messages'
Expand All @@ -12,7 +13,7 @@ export const images = curry(async function images(
loader({
oneOf: [
{
test: /\.(png|jpg|jpeg|gif|webp|avif|ico|bmp|svg)$/i,
test: nextImageLoaderRegex,
use: {
loader: 'error-loader',
options: {
Expand Down
Loading