Skip to content

Commit 9a25995

Browse files
authored
Merge branch 'canary' into fix-duplicate-type-StaticImageData
2 parents bbe16de + 83b3ceb commit 9a25995

File tree

5 files changed

+330
-282
lines changed

5 files changed

+330
-282
lines changed

.github/workflows/build_test_deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ jobs:
253253

254254
- run: ./scripts/publish-release.sh
255255

256-
prStats:
256+
releaseStats:
257257
name: Release Stats
258258
runs-on: ubuntu-latest
259259
needs: [publishRelease]

packages/next/build/webpack-config.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1446,8 +1446,6 @@ export default async function getBaseWebpackConfig(
14461446
// - next.config.js keys that affect compilation
14471447
version: `${process.env.__NEXT_VERSION}|${configVars}`,
14481448
cacheDirectory: path.join(distDir, 'cache', 'webpack'),
1449-
// we assume that the CI already uses cache compression
1450-
compression: false,
14511449
}
14521450

14531451
// Adds `next.config.js` as a buildDependency when custom webpack config is provided

packages/next/bundles/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"dependencies": {
33
"schema-utils3": "npm:schema-utils@3.0.0",
44
"webpack-sources3": "npm:webpack-sources@3.2.0",
5-
"webpack5": "npm:webpack@5.49.0"
5+
"webpack5": "npm:webpack@5.50.0"
66
},
77
"resolutions": {
88
"browserslist": "4.16.6",

packages/next/bundles/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -475,10 +475,10 @@ watchpack@^2.2.0:
475475
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.0.tgz#b16973bcf844ebcdb3afde32eda1c04d0b90f89d"
476476
integrity sha512-fahN08Et7P9trej8xz/Z7eRu8ltyiygEo/hnRi9KqBUs80KeDcnf96ZJo++ewWd84fEf3xSX9bp4ZS9hbw0OBw==
477477

478-
"webpack5@npm:webpack@5.49.0":
479-
version "5.49.0"
480-
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.49.0.tgz#e250362b781a9fb614ba0a97ed67c66b9c5310cd"
481-
integrity sha512-XarsANVf28A7Q3KPxSnX80EkCcuOer5hTOEJWJNvbskOZ+EK3pobHarGHceyUZMxpsTHBHhlV7hiQyLZzGosYw==
478+
"webpack5@npm:webpack@5.50.0":
479+
version "5.50.0"
480+
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.50.0.tgz#5562d75902a749eb4d75131f5627eac3a3192527"
481+
integrity sha512-hqxI7t/KVygs0WRv/kTgUW8Kl3YC81uyWQSo/7WUs5LsuRw0htH/fCwbVBGCuiX/t4s7qzjXFcf41O8Reiypag==
482482
dependencies:
483483
"@types/eslint-scope" "^3.7.0"
484484
"@types/estree" "^0.0.50"

packages/next/compiled/webpack/bundle5.js

Lines changed: 324 additions & 274 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)