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

Jump to bottom

fix: upgrade pinned deps for tests #21515

Merged
merged 7 commits into from Jan 25, 2021
Merged

fix: upgrade pinned deps for tests #21515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e3d1aa2
fix: upgrade pinned deps for tests
Timer Jan 25, 2021
0539470
chore: compile deps
Timer Jan 25, 2021
7e6df88
upgrade nested deps
Timer Jan 25, 2021
a595d57
Merge branch 'canary' into hotfix/tests
Timer Jan 25, 2021
038ac70
debundle more caniuse-lite
Timer Jan 25, 2021
713914f
update snapshots
Timer Jan 25, 2021
97af81f
account for new deduping
Timer Jan 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Expand Up @@ -137,8 +137,8 @@
"worker-loader": "3.0.7"
},
"resolutions": {
"browserslist": "^4.14.7",
"caniuse-lite": "^1.0.30001157"
"browserslist": "4.16.1",
"caniuse-lite": "1.0.30001179"
},
"engines": {
"node": ">= 10.13.0"
Expand Down
4 changes: 4 additions & 0 deletions packages/next/bundles/package.json
View file
Open in desktop
Expand Up @@ -3,5 +3,9 @@
"webpack5": "npm:webpack@5",
"schema-utils3": "npm:schema-utils@3.0.0",
"webpack-sources2": "npm:webpack-sources@2.2.0"
},
"resolutions": {
"browserslist": "4.16.1",
"caniuse-lite": "1.0.30001179"
}
}
10 changes: 5 additions & 5 deletions packages/next/bundles/yarn.lock
View file
Open in desktop
Expand Up @@ -189,7 +189,7 @@ ajv@^6.12.5:
json-schema-traverse "^0.4.1"
uri-js "^4.2.2"

browserslist@^4.14.5:
browserslist@4.16.1, browserslist@^4.14.5:
version "4.16.1"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.1.tgz#bf757a2da376b3447b800a16f0f1c96358138766"
integrity sha512-UXhDrwqsNcpTYJBTZsbGATDxZbiVDsx6UjpmRUmtnP10pr8wAYr5LgFoEFw9ixriQH2mv/NX2SfGzE/o8GndLA==
Expand All @@ -205,10 +205,10 @@ buffer-from@^1.0.0:
resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==

caniuse-lite@^1.0.30001173:
version "1.0.30001178"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001178.tgz#3ad813b2b2c7d585b0be0a2440e1e233c6eabdbc"
integrity sha512-VtdZLC0vsXykKni8Uztx45xynytOi71Ufx9T8kHptSw9AL4dpqailUJJHavttuzUe1KYuBYtChiWv+BAb7mPmQ==
caniuse-lite@1.0.30001179, caniuse-lite@^1.0.30001173:
version "1.0.30001179"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001179.tgz#b0803883b4471a6c62066fb1752756f8afc699c8"
integrity sha512-blMmO0QQujuUWZKyVrD1msR4WNDAqb/UPO1Sw2WWsQ7deoM5bJiicKnWJ1Y0NS/aGINSnKPIWBMw5luX+NDUCA==

chrome-trace-event@^1.0.2:
version "1.0.2"
Expand Down
2 changes: 1 addition & 1 deletion packages/next/compiled/postcss-preset-env/index.js
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions packages/next/package.json
View file
Open in desktop
Expand Up @@ -69,13 +69,13 @@
"@next/react-refresh-utils": "10.0.6-canary.7",
"@opentelemetry/api": "0.14.0",
"ast-types": "0.13.2",
"browserslist": "4.14.6",
"browserslist": "4.16.1",
"buffer": "5.6.0",
"caniuse-lite": "^1.0.30001113",
"caniuse-lite": "^1.0.30001179",
"chalk": "2.4.2",
"chokidar": "3.5.1",
"crypto-browserify": "3.12.0",
"cssnano-simple": "1.2.1",
"cssnano-simple": "1.2.2",
"etag": "1.8.1",
"find-cache-dir": "3.3.1",
"jest-worker": "24.9.0",
Expand Down
4 changes: 4 additions & 0 deletions packages/next/taskfile.js
View file
Open in desktop
Expand Up @@ -36,6 +36,10 @@ const externals = {
// Browserslist (post-css plugins)
browserslist: 'browserslist',
'caniuse-lite': 'caniuse-lite', // FIXME: `autoprefixer` will still bundle this because it uses direct imports
'caniuse-lite/data/features/border-radius':
'caniuse-lite/data/features/border-radius',
'caniuse-lite/data/features/css-featurequeries.js':
'caniuse-lite/data/features/css-featurequeries',

chalk: 'chalk',
'node-fetch': 'node-fetch',
Expand Down
2 changes: 1 addition & 1 deletion test/integration/css-modules/test/index.test.js
View file
Open in desktop
Expand Up @@ -110,7 +110,7 @@ describe('3rd Party CSS Module Support', () => {
const cssContent = await readFile(join(cssFolder, cssFiles[0]), 'utf8')

expect(cssContent.replace(/\/\*.*?\*\//g, '').trim()).toMatchInlineSnapshot(
`".index_foo__29BAH{position:relative}.index_foo__29BAH .bar,.index_foo__29BAH .baz{height:100%;overflow:hidden}.index_foo__29BAH .lol{width:80%}.index_foo__29BAH>.lel{width:80%}"`
`".index_foo__29BAH{position:relative}.index_foo__29BAH .bar,.index_foo__29BAH .baz{height:100%;overflow:hidden}.index_foo__29BAH .lol,.index_foo__29BAH>.lel{width:80%}"`
)
})

Expand Down
4 changes: 2 additions & 2 deletions test/integration/css/test/index.test.js
View file
Open in desktop
Expand Up @@ -1817,11 +1817,11 @@ describe('CSS Support', () => {

// if it is the combined global CSS file there are double the expected
// results
const howMany = content.includes('p{') ? 4 : 2
const howMany = content.includes('p{') || content.includes('p,') ? 2 : 1

expect(content.match(/\(\/vercel\.svg/g).length).toBe(howMany)
// expect(content.match(/\(vercel\.svg/g).length).toBe(howMany)
expect(content.match(/\(\/_next\/static\/media/g).length).toBe(2)
expect(content.match(/\(\/_next\/static\/media/g).length).toBe(1)
expect(content.match(/\(https:\/\//g).length).toBe(howMany)
}
})
Expand Down
2 changes: 1 addition & 1 deletion test/integration/scss-modules/test/index.test.js
View file
Open in desktop
Expand Up @@ -109,7 +109,7 @@ describe('3rd Party CSS Module Support', () => {
const cssContent = await readFile(join(cssFolder, cssFiles[0]), 'utf8')

expect(cssContent.replace(/\/\*.*?\*\//g, '').trim()).toMatchInlineSnapshot(
`".index_foo__9_fxH{position:relative}.index_foo__9_fxH .bar,.index_foo__9_fxH .baz{height:100%;overflow:hidden}.index_foo__9_fxH .lol{width:80%}.index_foo__9_fxH>.lel{width:80%}"`
`".index_foo__9_fxH{position:relative}.index_foo__9_fxH .bar,.index_foo__9_fxH .baz{height:100%;overflow:hidden}.index_foo__9_fxH .lol,.index_foo__9_fxH>.lel{width:80%}"`
)
})

Expand Down
54 changes: 35 additions & 19 deletions yarn.lock
View file
Open in desktop
Expand Up @@ -4196,16 +4196,16 @@ browserify-zlib@^0.2.0:
dependencies:
pako "~1.0.5"

browserslist@4.14.6, browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.14.7, browserslist@^4.15.0, browserslist@^4.3.6, browserslist@^4.6.4, browserslist@^4.8.3:
version "4.14.7"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.7.tgz#c071c1b3622c1c2e790799a37bb09473a4351cb6"
integrity sha512-BSVRLCeG3Xt/j/1cCGj1019Wbty0H+Yvu2AOuZSuoaUWn3RatbL33Cxk+Q4jRMRAbOm0p7SLravLjpnT6s0vzQ==
browserslist@4.16.1, browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.14.7, browserslist@^4.15.0, browserslist@^4.3.6, browserslist@^4.6.4, browserslist@^4.8.3:
version "4.16.1"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.1.tgz#bf757a2da376b3447b800a16f0f1c96358138766"
integrity sha512-UXhDrwqsNcpTYJBTZsbGATDxZbiVDsx6UjpmRUmtnP10pr8wAYr5LgFoEFw9ixriQH2mv/NX2SfGzE/o8GndLA==
dependencies:
caniuse-lite "^1.0.30001157"
caniuse-lite "^1.0.30001173"
colorette "^1.2.1"
electron-to-chromium "^1.3.591"
electron-to-chromium "^1.3.634"
escalade "^3.1.1"
node-releases "^1.1.66"
node-releases "^1.1.69"

browserstack-local@1.4.0:
version "1.4.0"
Expand Down Expand Up @@ -4501,10 +4501,10 @@ caniuse-api@^3.0.0:
lodash.memoize "^4.1.2"
lodash.uniq "^4.5.0"

caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001020, caniuse-lite@^1.0.30001093, caniuse-lite@^1.0.30001113, caniuse-lite@^1.0.30001157, caniuse-lite@^1.0.30001165:
version "1.0.30001157"
resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001157.tgz"
integrity sha512-gOerH9Wz2IRZ2ZPdMfBvyOi3cjaz4O4dgNwPGzx8EhqAs4+2IL/O+fJsbt+znSigujoZG8bVcIAUM/I/E5K3MA==
caniuse-lite@1.0.30001179, caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001020, caniuse-lite@^1.0.30001093, caniuse-lite@^1.0.30001165, caniuse-lite@^1.0.30001173, caniuse-lite@^1.0.30001179:
version "1.0.30001179"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001179.tgz#b0803883b4471a6c62066fb1752756f8afc699c8"
integrity sha512-blMmO0QQujuUWZKyVrD1msR4WNDAqb/UPO1Sw2WWsQ7deoM5bJiicKnWJ1Y0NS/aGINSnKPIWBMw5luX+NDUCA==

capitalize@1.0.0:
version "1.0.0"
Expand Down Expand Up @@ -5663,6 +5663,14 @@ cssnano-preset-simple@1.2.1:
caniuse-lite "^1.0.30001093"
postcss "^7.0.32"

cssnano-preset-simple@1.2.2:
version "1.2.2"
resolved "https://registry.yarnpkg.com/cssnano-preset-simple/-/cssnano-preset-simple-1.2.2.tgz#c631bf79ffec7fdfc4069e2f2da3ca67d99d8413"
integrity sha512-gtvrcRSGtP3hA/wS8mFVinFnQdEsEpm3v4I/s/KmNjpdWaThV/4E5EojAzFXxyT5OCSRPLlHR9iQexAqKHlhGQ==
dependencies:
caniuse-lite "^1.0.30001179"
postcss "^7.0.32"

cssnano-simple@1.2.1:
version "1.2.1"
resolved "https://registry.yarnpkg.com/cssnano-simple/-/cssnano-simple-1.2.1.tgz#6de5d9dd75774bc8f31767573410a952c7dd8a12"
Expand All @@ -5671,6 +5679,14 @@ cssnano-simple@1.2.1:
cssnano-preset-simple "1.2.1"
postcss "^7.0.32"

cssnano-simple@1.2.2:
version "1.2.2"
resolved "https://registry.yarnpkg.com/cssnano-simple/-/cssnano-simple-1.2.2.tgz#72c2c3970e67123c3b4130894a30dc1050267007"
integrity sha512-4slyYc1w4JhSbhVX5xi9G0aQ42JnRyPg+7l7cqoNyoIDzfWx40Rq3JQZnoAWDu60A4AvKVp9ln/YSUOdhDX68g==
dependencies:
cssnano-preset-simple "1.2.2"
postcss "^7.0.32"

cssnano-util-get-arguments@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz#ed3a08299f21d75741b20f3b81f194ed49cc150f"
Expand Down Expand Up @@ -6201,10 +6217,10 @@ ee-first@1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"

electron-to-chromium@^1.3.591:
version "1.3.596"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.596.tgz#c7ed98512c7ff36ddcbfed9e54e6355335c35257"
integrity sha512-nLO2Wd2yU42eSoNJVQKNf89CcEGqeFZd++QsnN2XIgje1s/19AgctfjLIbPORlvcCO8sYjLwX4iUgDdusOY8Sg==
electron-to-chromium@^1.3.634:
version "1.3.644"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.644.tgz#c89721733ec26b8d117275fb6b2acbeb3d45a6b6"
integrity sha512-N7FLvjDPADxad+OXXBuYfcvDvCBG0aW8ZZGr7G91sZMviYbnQJFxdSvUus4SJ0K7Q8dzMxE+Wx1d/CrJIIJ0sw==

elegant-spinner@^1.0.1:
version "1.0.1"
Expand Down Expand Up @@ -11040,10 +11056,10 @@ node-notifier@^5.4.2:
shellwords "^0.1.1"
which "^1.3.0"

node-releases@^1.1.66:
version "1.1.66"
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.66.tgz#609bd0dc069381015cd982300bae51ab4f1b1814"
integrity sha512-JHEQ1iWPGK+38VLB2H9ef2otU4l8s3yAMt9Xf934r6+ojCYDMHPMqvCc9TnzfeFSP1QEOeU6YZEd3+De0LTCgg==
node-releases@^1.1.69:
version "1.1.70"
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.70.tgz#66e0ed0273aa65666d7fe78febe7634875426a08"
integrity sha512-Slf2s69+2/uAD79pVVQo8uSiC34+g8GWY8UH2Qtqv34ZfhYrxpYpfzs9Js9d6O0mbDmALuxaTlplnBTnSELcrw==

node-sass@5.0.0:
version "5.0.0"
Expand Down