Skip to content

Commit 4e1f75e

Browse files
ijjkijjk
authored
Merge branch 'canary' into script
2 parents 9218a66 + 8737ac0 commit 4e1f75e

File tree

9 files changed

+87
-85
lines changed

9 files changed

+87
-85
lines changed

‎docs/basic-features/supported-browsers-features.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ In addition, to reduce bundle size, Next.js will only load these polyfills for b
2020

2121
### Server-Side Polyfills
2222

23-
In addition to `fetch()` on the client side, Next.js polyfills `fetch()` in the Node.js environment. You can use `fetch()` on your server code (such as `getStaticProps`) without using polyfills such as `isomorphic-unfetch` or `node-fetch`.
23+
In addition to `fetch()` on the client-side, Next.js polyfills `fetch()` in the Node.js environment. You can use `fetch()` in your server code (such as `getStaticProps`/`getServerSideProps`) without using polyfills such as `isomorphic-unfetch` or `node-fetch`.
2424

2525
### Custom Polyfills
2626

‎docs/migrating/from-create-react-app.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ For more information, see [Migrating from React Router](/docs/migrating/from-rea
5959

6060
Next.js has built-in support for [CSS](/docs/basic-features/built-in-css-support.md), [Sass](/docs/basic-features/built-in-css-support.md#sass-support) and [CSS-in-JS](/docs/basic-features/built-in-css-support.md#css-in-js).
6161

62-
With Create React App, you can import `.css` files directly inside React components. Next.js allows you to do the same, but requires these files to be [CSS Modules](/docs/basic-features/built-in-css-support.md). For global styles, you'll need a [custom `_app.js`](/docs/advanced-features/custom-app.md) to add a [global stylesheet](docs/basic-features/built-in-css-support.md#adding-a-global-stylesheet).
62+
With Create React App, you can import `.css` files directly inside React components. Next.js allows you to do the same, but requires these files to be [CSS Modules](/docs/basic-features/built-in-css-support.md). For global styles, you'll need a [custom `_app.js`](/docs/advanced-features/custom-app.md) to add a [global stylesheet](/docs/basic-features/built-in-css-support.md#adding-a-global-stylesheet).
6363

6464
## Safely Accessing Web APIs
6565

‎examples/with-docker/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ You can view your images created with `docker images`.
2222

2323
## Deploying to Google Cloud Run
2424

25-
The `start` script in `package.json` has been modified to accept a `PORT` environment variable (for compatability with Google Cloud Run).
25+
The `start` script in `package.json` has been modified to accept a `PORT` environment variable (for compatibility with Google Cloud Run).
2626

2727
1. Install the [Google Cloud SDK](https://cloud.google.com/sdk/docs/install) so you can use `gcloud` on the command line.
2828
1. Run `gcloud auth login` to log in to your account.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"@fullhuman/postcss-purgecss": "1.3.0",
5151
"@mdx-js/loader": "0.18.0",
5252
"@svgr/webpack": "5.5.0",
53-
"@swc/core": "1.2.74",
53+
"@swc/core": "1.2.80",
5454
"@testing-library/react": "11.2.5",
5555
"@types/cheerio": "0.22.16",
5656
"@types/fs-extra": "8.1.0",

‎packages/next/build/webpack-config.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -742,7 +742,7 @@ export default async function getBaseWebpackConfig(
742742
}
743743

744744
const notExternalModules =
745-
/^(?:private-next-pages\/|next\/(?:dist\/pages\/|(?:app|document|link|image|constants)$)|string-hash$)/
745+
/^(?:private-next-pages\/|next\/(?:dist\/pages\/|(?:app|document|link|image|constants|dynamic)$)|string-hash$)/
746746
if (notExternalModules.test(request)) {
747747
return
748748
}
@@ -1490,6 +1490,8 @@ export default async function getBaseWebpackConfig(
14901490
reactProductionProfiling,
14911491
webpack: !!config.webpack,
14921492
hasRewrites,
1493+
reactRoot: config.experimental.reactRoot,
1494+
concurrentFeatures: config.experimental.concurrentFeatures,
14931495
})
14941496

14951497
const cache: any = {

‎packages/next/client/image.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,7 @@ export default function Image({
601601
{...rest}
602602
{...imgAttributes}
603603
decoding="async"
604-
data-nimg
604+
data-nimg={layout}
605605
className={className}
606606
ref={(img) => {
607607
setRef(img)
@@ -622,7 +622,7 @@ export default function Image({
622622
loader,
623623
})}
624624
decoding="async"
625-
data-nimg
625+
data-nimg={layout}
626626
style={imgStyle}
627627
className={className}
628628
loading={loading || 'lazy'}

‎test/integration/export-serverless/test/browser.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ export default function (context) {
9999
await browser.close()
100100
})
101101

102-
it('should support client side naviagtion', async () => {
102+
it('should support client side navigation', async () => {
103103
const browser = await webdriver(context.port, '/')
104104
const text = await browser
105105
.elementByCss('#counter')

‎test/integration/export/test/browser.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ export default function (context) {
124124
await browser.close()
125125
})
126126

127-
it('should support client side naviagtion', async () => {
127+
it('should support client side navigation', async () => {
128128
const browser = await webdriver(context.port, '/')
129129
const text = await browser
130130
.elementByCss('#counter')

‎yarn.lock‎

Lines changed: 76 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -4187,85 +4187,85 @@
41874187
"@svgr/plugin-svgo" "^5.5.0"
41884188
loader-utils "^2.0.0"
41894189

4190-
"@swc/core-android-arm64@^1.2.74":
4191-
version "1.2.74"
4192-
resolved "https://registry.yarnpkg.com/@swc/core-android-arm64/-/core-android-arm64-1.2.74.tgz#7e12fde1ba557dad803bc27b5b6cef04957e7ba3"
4193-
integrity sha512-mKqs5QmY4uEUopk98rM4dH0g7iWRH172Z8Bd752/eR9R5Yzut/dEGZCN5lnDfCLc1hecJz3DFsU/71jG4T+1WQ==
4194-
4195-
"@swc/core-darwin-arm64@^1.2.74":
4196-
version "1.2.74"
4197-
resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.2.74.tgz#6b6c6f1a9c12f5c4647f324985aa8f52a6967113"
4198-
integrity sha512-i8bRE/oQAyPmB3Vwk1GfydFbCnsidfXQgyFK0qDsQN7tNPZg5esqQVeAzDWhGWdMK6VAGcMDY3/RinR8KkKCmg==
4199-
4200-
"@swc/core-darwin-x64@^1.2.74":
4201-
version "1.2.74"
4202-
resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.2.74.tgz#588393d8d5d7b52985cbdeaa93ccdf2f8233a9d4"
4203-
integrity sha512-3vcKNlkCa40FosdltLytRHHT4KFnzg5Ws2k40nYT2g55UBk4SHou6eeq9gP0FYkerTNPWhS5c8KyAHCnBXOhoA==
4204-
4205-
"@swc/core-freebsd-x64@^1.2.74":
4206-
version "1.2.74"
4207-
resolved "https://registry.yarnpkg.com/@swc/core-freebsd-x64/-/core-freebsd-x64-1.2.74.tgz#353ec8a9d60031fe39f3ba1ecc0488842226e79b"
4208-
integrity sha512-YFIuIYbs3TUWQFBjs8KCff/nj4yBm1WIrq2w1ZfHOSbTMRnz3slksEviz6QzUhDK6fO8HUwudhxO5INRuWWxfQ==
4209-
4210-
"@swc/core-linux-arm-gnueabihf@^1.2.74":
4211-
version "1.2.74"
4212-
resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.2.74.tgz#16486b80a30401604bf1524918447ff1bb7baf8a"
4213-
integrity sha512-iwLMOGwfH6r1U5Kyu76I2E+6BVKYWFA+l1z6Ja+9rk9qHBeQws6p5vP3HcezQQeKBbmNx6kcF9+RRT6v8yUz7w==
4214-
4215-
"@swc/core-linux-arm64-gnu@^1.2.74":
4216-
version "1.2.74"
4217-
resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.2.74.tgz#192b805894ca6c09aa6e5dbd1c8caabbaf9fff7b"
4218-
integrity sha512-2ndc5Ei88Ifxc9joDtANIhlUSpq5C3Qbc+g/gUUGF2lPCiMk6kPxnpwvDKpAowi7dSeIW94+/9O8l58D8cHRVg==
4219-
4220-
"@swc/core-linux-arm64-musl@^1.2.74":
4221-
version "1.2.74"
4222-
resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.2.74.tgz#c9ec655f6c8f77fc600f078ce1b169baacb76c05"
4223-
integrity sha512-xKNg87bdmmXwyjspiDOdFvGNcuHJ/lL5ouWTriICJ0W8lzuTNs8E9rpk/aPXdPvOhdxT4ACf8x+c1+eHZPsJPA==
4224-
4225-
"@swc/core-linux-x64-gnu@^1.2.74":
4226-
version "1.2.74"
4227-
resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.2.74.tgz#f1dd963c7017f4fc4d95413b6b3f656a981b7621"
4228-
integrity sha512-1q+9WWykTj4Mg5p22O7klr2kx67LL1TSmVJKtCVUNBHNeqlSGTCHA9lGh8ETGIW/iWuvXHTnYMlV9RhPWMZVHQ==
4229-
4230-
"@swc/core-linux-x64-musl@^1.2.74":
4231-
version "1.2.74"
4232-
resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.2.74.tgz#abe7e5280879f9ea290a6eecced4da8cf65ee0de"
4233-
integrity sha512-r/ZnFGn/VwOpboW6dKolStxArBFM0fb1xk+og6KZJtKZE9sE+Y5CAOvcvAxNzic+K2FX47ZSWHIFoHg5yoTkuQ==
4234-
4235-
"@swc/core-win32-arm64-msvc@^1.2.74":
4236-
version "1.2.74"
4237-
resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.2.74.tgz#8354673065c951955dc3af958cc938f297c57c96"
4238-
integrity sha512-u1ww9SaY4sMqogXZorlHpaursJnvgTi86lwJN1E+kKo4MFANcB354FvBUNg+QIRwN7itNvoP+lxHHP9NF87gdg==
4239-
4240-
"@swc/core-win32-ia32-msvc@^1.2.74":
4241-
version "1.2.74"
4242-
resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.2.74.tgz#3f5aadc10381409c79106b24030da5d2066ad061"
4243-
integrity sha512-yftd+MMxJUCmH8DRZ7ZeRE4bTD7+jYFgf2epswF4gdyotB4clvCcL2BDxEN56sMJzrO0+SkTKYEkfFmPQtVUBQ==
4244-
4245-
"@swc/core-win32-x64-msvc@^1.2.74":
4246-
version "1.2.74"
4247-
resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.2.74.tgz#def33e667ed707f9071f03b10a255f15871262bd"
4248-
integrity sha512-zRBBPNLj+hJHNzQ3JZ3YJjSHmVgcVg4wKV5pChr8PO6dMPrYX5RpuOCLwVIUHvCdQ6TmTc/AdGJDP/VpMQfkdA==
4249-
4250-
"@swc/core@1.2.74":
4251-
version "1.2.74"
4252-
resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.2.74.tgz#66348ddfae8c15ba5eaeb0a509fb30a0e354c0b1"
4253-
integrity sha512-ICIXnLUYutYiK6wWb2DXNPZyKgTLHY+BxGbCZs45WwOBjsxden/bznIilPN4lEkNgjzYCZbwi9asuVzH+Ar9BA==
4190+
"@swc/core-android-arm64@^1.2.80":
4191+
version "1.2.80"
4192+
resolved "https://registry.yarnpkg.com/@swc/core-android-arm64/-/core-android-arm64-1.2.80.tgz#712158918c935ddfa0c5e3dac427731aa8396b50"
4193+
integrity sha512-hnjv2cByEgzaOWEV/Y59iAqmaiRbAIcfZzgHPVCqcFx9RRDUgGUbZt/D0kmYF3TWoXADILOe5pNs/38xR/HspQ==
4194+
4195+
"@swc/core-darwin-arm64@^1.2.80":
4196+
version "1.2.80"
4197+
resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.2.80.tgz#36ec0f75debb66074d891424208e5f743789ef8a"
4198+
integrity sha512-oLF+Ri/ctrhT5YAWJoE5Sod92Ih9wEP2pKVRWhJct6CmxGs3ZQd3n2iJEoB0JoIKGiDpHZ89GpD7NXhxv/JtxA==
4199+
4200+
"@swc/core-darwin-x64@^1.2.80":
4201+
version "1.2.80"
4202+
resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.2.80.tgz#795a9909f00b760d5b9c05eb9907cd7dfbdcb75f"
4203+
integrity sha512-0mwJjbfyW7LzIVqKpl6ALAgNa4o0ECbVqoMPWIz2GqnTwwd3Eg2y2uraQfR5Y5J1GGdcTkm+ndPjS0OmZMMzJg==
4204+
4205+
"@swc/core-freebsd-x64@^1.2.80":
4206+
version "1.2.80"
4207+
resolved "https://registry.yarnpkg.com/@swc/core-freebsd-x64/-/core-freebsd-x64-1.2.80.tgz#4e8afd62d2916efe46f5b20c64f3a5b7075c2aa5"
4208+
integrity sha512-31JM6FNjyWBmTs2RoQ6Ec+Hv1viarrea7hJl7WQ2/RqMGQ4/z5rRwkqPnDb/JyUV62UKY+Q30Y9ykeQLhVF3fA==
4209+
4210+
"@swc/core-linux-arm-gnueabihf@^1.2.80":
4211+
version "1.2.80"
4212+
resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.2.80.tgz#21679cb710c4cd5f33e309d1ad846901696e0fdf"
4213+
integrity sha512-wTrM1tMZTBLg8BuGqqxjsJ3bxasX8UU+brHlgiOebq/3051MZebXU7pvpXEVMmnk1VY129khvEV7MUCU1+YtfA==
4214+
4215+
"@swc/core-linux-arm64-gnu@^1.2.80":
4216+
version "1.2.80"
4217+
resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.2.80.tgz#866c0e744b1e0dc6f87264deac56ee4359fb02ef"
4218+
integrity sha512-FQQ5vDeF8DZWWHkcUPj3EohYq8IIFE/THuaQt6yVD83IQZduLrR0hW0qf96Ja0U160IdWO1uQYHHzxmxAl2urQ==
4219+
4220+
"@swc/core-linux-arm64-musl@^1.2.80":
4221+
version "1.2.80"
4222+
resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.2.80.tgz#e392a6afdf81ceba72c9fa491e311856e4e9588e"
4223+
integrity sha512-WXTxU7XgqlJjWUhrtJ0k6b3BnS5EzHs/gQ/Ry5poMmdbA6vXbVlQmo+KhEJou3ejPkC6ss+evLkznW/0os9bGQ==
4224+
4225+
"@swc/core-linux-x64-gnu@^1.2.80":
4226+
version "1.2.80"
4227+
resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.2.80.tgz#c714be0c6c151fcb817e525f043a6541e7174403"
4228+
integrity sha512-ubGScZ+oQ5TuRv5mCYDhRiHdsSKRu6OKhOwBKxzfZaMamFBYav9F4GyerVTlC1fnqd1gu/N+IJUjSIdXR3lEDQ==
4229+
4230+
"@swc/core-linux-x64-musl@^1.2.80":
4231+
version "1.2.80"
4232+
resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.2.80.tgz#84070aeb59bac104aaf59f94cff2ab8be28f430b"
4233+
integrity sha512-gX6TH+mx0tjqNSz4Q8aQVkOIDFpAcJdzoRGlBBFcmrMP1pIGrBfPSLivK1ijU84Wg3I5VbMkkNV8mrw/tEjI+w==
4234+
4235+
"@swc/core-win32-arm64-msvc@^1.2.80":
4236+
version "1.2.80"
4237+
resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.2.80.tgz#f4eaca0d7093a876b767574aa462c63d1a525493"
4238+
integrity sha512-ncw2t6QwXPEfVNG4w+IjIQ4PXwTd3C3XxwI/+AZ7f05SLVhfL2WHEM0ICV81Hq1/o65MCwM4VlU+4QgR0EpWyQ==
4239+
4240+
"@swc/core-win32-ia32-msvc@^1.2.80":
4241+
version "1.2.80"
4242+
resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.2.80.tgz#e868057b4fede433964b4cd8e404bfda131621a7"
4243+
integrity sha512-+fztR/JGZ49r/zodGbmlJn/T+Okoerh+qfzKSyQ/ic3kd0NO5nQ6HExNH1kzjCcuPvOcuAe1YIfREw9FiwvaUA==
4244+
4245+
"@swc/core-win32-x64-msvc@^1.2.80":
4246+
version "1.2.80"
4247+
resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.2.80.tgz#961d4c07da33da70f102aa5926f1018532a02349"
4248+
integrity sha512-xtisiMbVBoP6tOb1euTnvRwlBHr81iRnVOo+h1tWBdHAuZddAR/9gKo6TMcZ94jqFLQimbDcaghJ48Tp4R31dw==
4249+
4250+
"@swc/core@1.2.80":
4251+
version "1.2.80"
4252+
resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.2.80.tgz#d6754200e4f1b4815e7cbbe7da26583354ec6a30"
4253+
integrity sha512-Giu6t8UrQG/1vwKZkYXLFiOmKB9+OC65AoR8g8O0m47oNtPIOWa3zBTcnP236/+edFS6VYPLBTzYj2yjLpUgwg==
42544254
dependencies:
42554255
"@node-rs/helper" "^1.0.0"
42564256
optionalDependencies:
4257-
"@swc/core-android-arm64" "^1.2.74"
4258-
"@swc/core-darwin-arm64" "^1.2.74"
4259-
"@swc/core-darwin-x64" "^1.2.74"
4260-
"@swc/core-freebsd-x64" "^1.2.74"
4261-
"@swc/core-linux-arm-gnueabihf" "^1.2.74"
4262-
"@swc/core-linux-arm64-gnu" "^1.2.74"
4263-
"@swc/core-linux-arm64-musl" "^1.2.74"
4264-
"@swc/core-linux-x64-gnu" "^1.2.74"
4265-
"@swc/core-linux-x64-musl" "^1.2.74"
4266-
"@swc/core-win32-arm64-msvc" "^1.2.74"
4267-
"@swc/core-win32-ia32-msvc" "^1.2.74"
4268-
"@swc/core-win32-x64-msvc" "^1.2.74"
4257+
"@swc/core-android-arm64" "^1.2.80"
4258+
"@swc/core-darwin-arm64" "^1.2.80"
4259+
"@swc/core-darwin-x64" "^1.2.80"
4260+
"@swc/core-freebsd-x64" "^1.2.80"
4261+
"@swc/core-linux-arm-gnueabihf" "^1.2.80"
4262+
"@swc/core-linux-arm64-gnu" "^1.2.80"
4263+
"@swc/core-linux-arm64-musl" "^1.2.80"
4264+
"@swc/core-linux-x64-gnu" "^1.2.80"
4265+
"@swc/core-linux-x64-musl" "^1.2.80"
4266+
"@swc/core-win32-arm64-msvc" "^1.2.80"
4267+
"@swc/core-win32-ia32-msvc" "^1.2.80"
4268+
"@swc/core-win32-x64-msvc" "^1.2.80"
42694269

42704270
"@szmarczak/http-timer@^1.1.2":
42714271
version "1.1.2"

0 commit comments

Comments
 (0)