hello world
} Page.getLayout = function getLayout(page: ReactElement) { @@ -116,6 +115,8 @@ Page.getLayout = function getLayout(page: ReactElement) { ) } + +export default Page ``` ```tsx @@ -125,7 +126,7 @@ import type { ReactElement, ReactNode } from 'react' import type { NextPage } from 'next' import type { AppProps } from 'next/app' -type NextPageWithLayout = NextPage & { +export type NextPageWithLayout = NextPage & { getLayout?: (page: ReactElement) => ReactNode } diff --git a/docs/basic-features/script.md b/docs/basic-features/script.md index cb3905ce4800..4491d251f3a4 100644 --- a/docs/basic-features/script.md +++ b/docs/basic-features/script.md @@ -247,7 +247,7 @@ The `id` property is required for **inline scripts** in order for Next.js to tra ### Executing Code After Loading (`onLoad`) -> **Note: Both `onLoad` and `onError` can't be used with the `beforeInteractive` loading strategy.** +> **Note: `onLoad` and `onError` cannot be used with the `beforeInteractive` loading strategy.** Some third-party scripts require users to run JavaScript code after the script has finished loading in order to instantiate content or call a function. If you are loading a script with either `afterInteractive` or `lazyOnload` as a loading strategy, you can execute code after it has loaded using the `onLoad` property: diff --git a/docs/testing.md b/docs/testing.md index 551933ad4d7d..11163588bbc5 100644 --- a/docs/testing.md +++ b/docs/testing.md @@ -263,10 +263,10 @@ npx create-next-app@latest --example with-jest with-jest-app Since the release of [Next.js 12](https://nextjs.org/blog/next-12), Next.js now has built-in configuration for Jest. -To set up Jest, install `jest` , `@testing-library/react`, `@testing-library/jest-dom`: +To set up Jest, install `jest`, `jest-environment-jsdom`, `@testing-library/react`, `@testing-library/jest-dom`: ```bash -npm install --save-dev jest @testing-library/react @testing-library/jest-dom +npm install --save-dev jest jest-environment-jsdom @testing-library/react @testing-library/jest-dom ``` Create a `jest.config.js` file in your project's root directory and add the following: diff --git a/errors/invalid-images-config.md b/errors/invalid-images-config.md index b409f6056830..8a03674a31df 100644 --- a/errors/invalid-images-config.md +++ b/errors/invalid-images-config.md @@ -17,6 +17,8 @@ module.exports = { imageSizes: [16, 32, 48, 64, 96, 128, 256, 384], // limit of 50 domains values domains: [], + // limit of 50 objects + remotePatterns: [], // path prefix for Image Optimization API, useful with `loader` path: '/_next/image', // loader can be 'default', 'imgix', 'cloudinary', 'akamai', or 'custom' diff --git a/errors/no-cache.md b/errors/no-cache.md index b3b0214ca31f..3ef035538512 100644 --- a/errors/no-cache.md +++ b/errors/no-cache.md @@ -78,7 +78,7 @@ cache: Using GitHub's [actions/cache](https://github.com/actions/cache), add the following step in your workflow file: ```yaml -uses: actions/cache@v2 +uses: actions/cache@v3 with: # See here for caching with `yarn` https://github.com/actions/cache/blob/main/examples.md#node---yarn or you can leverage caching with actions/setup-node https://github.com/actions/setup-node path: | diff --git a/examples/cms-buttercms/.env.local.example b/examples/cms-buttercms/.env.local.example index ea6dea901406..07198f69da10 100644 --- a/examples/cms-buttercms/.env.local.example +++ b/examples/cms-buttercms/.env.local.example @@ -1,3 +1 @@ -# Copy this file as .env.local -BUTTERCMS_API_KEY= -BUTTERCMS_PREVIEW_SECRET= \ No newline at end of file +NEXT_PUBLIC_BUTTER_CMS_API_KEY=your_auth_token \ No newline at end of file diff --git a/examples/cms-buttercms/README.md b/examples/cms-buttercms/README.md index bf57965882e9..8e1ed65bdd2d 100644 --- a/examples/cms-buttercms/README.md +++ b/examples/cms-buttercms/README.md @@ -1,16 +1,20 @@ -# A statically generated blog example using Next.js and ButterCMS +# A fully-functional, drop-in proof-of-concept Next.js app using ButterCMS + +This Next.js starter project fully integrates with dynamic sample content from your ButterCMS account, including main menu, pages, blog posts, categories, and tags, all with a beautiful, custom theme with already-implemented search functionality. All of the included sample content is automatically created in your account dashboard when you sign up for a free trial of ButterCMS. + +A copy of this starter project can be easily and quickly deployed to Vercel with the click of a button. This example showcases Next.js's [Static Generation](https://nextjs.org/docs/basic-features/pages) feature using [ButterCMS](https://buttercms.com/) as the data source. ## Demo -[https://next-blog-buttercms.vercel.app/](https://next-blog-buttercms.vercel.app/) +Check out our live demo: [https://nextjs-starter-buttercms.vercel.app/](https://nextjs-starter-buttercms.vercel.app/) ## Deploy your own -Once you have access to [the environment variables you'll need](#step-2-set-up-environment-variables), deploy the example using [Vercel](https://vercel.com?utm_source=github&utm_medium=readme&utm_campaign=next-example): +Once you have access to your Butter API token, you can deploy your Butterized proof-of-concept app to Vercel, the creators of Next.js, and spread your love of Butter. By clicking the button below, you'll create a copy of our starter project in your Git provider account, instantly deploy it, and institute a full content workflow connected to your ButterCMS account. Smooth. -[](https://vercel.com/new/git/external?repository-url=https://github.com/vercel/next.js/tree/canary/examples/cms-buttercms&project-name=cms-buttercms&repository-name=cms-buttercms&env=BUTTERCMS_API_KEY,BUTTERCMS_PREVIEW_SECRET&envDescription=Required%20to%20connect%20the%20app%20with%20ButterCMS&envLink=https://vercel.link/buttercms-env) +[](https://vercel.com/new/clone?repository-url=https%3A%2F%2Fgithub.com%2FButterCMS%2Fnextjs-starter-buttercms&env=NEXT_PUBLIC_BUTTER_CMS_API_KEY&envDescription=Your%20ButterCMS%20API%20Token&envLink=https%3A%2F%2Fbuttercms.com%2Fsettings%2F&project-name=nextjs-starter-buttercms&repo-name=nextjs-starter-buttercms&redirect-url=https%3A%2F%2Fbuttercms.com%2Fonboarding%2Fvercel-starter-deploy-callback%2F&production-deploy-hook=Deploy%20Triggered%20from%20ButterCMS&demo-title=ButterCMS%20Next.js%20Starter&demo-description=Fully%20integrated%20with%20your%20ButterCMS%20account&demo-url=https%3A%2F%2Fnextjs-starter-buttercms.vercel.app%2F&demo-image=https://cdn.buttercms.com/r0tGK8xFRti2iRKBJ0eY&repository-name=nextjs-starter-buttercms) ### Related examples @@ -33,6 +37,18 @@ Once you have access to [the environment variables you'll need](#step-2-set-up-e ## How to use +### Option 1. Install via Github and NPM or Yarn + +First, install the dependencies by cloning the repo and running one of the following commands, depending on your current setup: + +```bash +git clone https://github.com/ButterCMS/nextjs-starter-buttercms.git +cd nextjs-starter-buttercms +npm install # or yarn install +``` + +### Option 2. Install via Create-Next-App + Execute [`create-next-app`](https://github.com/vercel/next.js/tree/canary/packages/create-next-app) with [npm](https://docs.npmjs.com/cli/init) or [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) to bootstrap the example: ```bash @@ -49,7 +65,7 @@ pnpm create next-app -- --example cms-buttercms cms-buttercms-app First, [create an account on ButterCMS](https://buttercms.com/). -After signing up, you’ll be presented with the API key. We’ll use this in the next step. +After signing up, you’ll be presented with your free API token. We’ll use this in the next step. ### Step 2. Set up environment variables @@ -61,12 +77,12 @@ cp .env.local.example .env.local Then set each variable on `.env.local`: -- `BUTTERCMS_API_KEY` should be set as the API key. -- `BUTTERCMS_PREVIEW_SECRET` can be any random string (but avoid spaces), like `MY_SECRET` - this is used for [Preview Mode](https://nextjs.org/docs/advanced-features/preview-mode). +- `NEXT_PUBLIC_BUTTER_CMS_API_KEY` should be set as the API key. ### Step 3. Run Next.js in development mode -When you sign up to ButterCMS, it creates an example blog post automatically. You can run Next.js in development mode to view a blog containing this example post. +When you sign up for ButterCMS, it creates all of the example content used by this starter project. You can run Next.js in development mode to view your fully-functional starter project, including landing page with +API-based components, API-based menu, and a blog. ```bash npm install @@ -78,44 +94,39 @@ yarn install yarn dev ``` -Your blog should be up and running on [http://localhost:3000](http://localhost:3000)! If it doesn't work, post on [GitHub discussions](https://github.com/vercel/next.js/discussions). +Your starter project should be up and running on [http://localhost:3000](http://localhost:3000)! If it doesn't work, post on [GitHub discussions](https://github.com/vercel/next.js/discussions). ### Step 4. Try preview mode +Your starter project is automatically configured to show draft changes saved in your Butter account when run locally or deploy to a hosting provider. To disable this behavior, set the following value in your `.env.local` file: `PREVIEW=false`. + To try preview mode, [create a blog post](https://buttercms.com/post/): - Set the **Title** as `Draft Post Test`. - Fill the content and summary with dummy text. -- Set the **Featured Image** by downloading some image from [Unsplash](https://unsplash.com/). Most importantly, **do not publish** the blog post. Instead, click **Save Draft**. -Now, if you go to the post page on localhost, you won't see this post because it’s not published. However, if you use the **Preview Mode**, you'll be able to see the change ([Documentation](https://nextjs.org/docs/advanced-features/preview-mode)). - -To enable the Preview Mode, go to this URL: - -``` -http://localhost:3000/api/preview?secret=+ Butter also has a built in blog engine which makes it dead + simple to launch a new company blog. +
++ + View All Blog Posts + +
+{excerpt}
-{description}
+{subheadline}
+Check console for component details
+{quote}
+{title}
+
+ Please add your API token to .env file as{' '}
+ NEXT_PUBLIC_BUTTER_CMS_API_KEY.
+
hello from team homepage
- - ) -} diff --git a/test/e2e/root-dir/app/root/conditional/[slug]@team/members.js b/test/e2e/root-dir/app/root/conditional/[slug]@team/members.js deleted file mode 100644 index 2c3ba112bead..000000000000 --- a/test/e2e/root-dir/app/root/conditional/[slug]@team/members.js +++ /dev/null @@ -1,7 +0,0 @@ -export default function TeamMembersPage(props) { - return ( - <> -hello from team/members
- - ) -} diff --git a/test/e2e/root-dir/app/root/conditional/[slug]@user/index.js b/test/e2e/root-dir/app/root/conditional/[slug]@user/index.js deleted file mode 100644 index 81100777dae2..000000000000 --- a/test/e2e/root-dir/app/root/conditional/[slug]@user/index.js +++ /dev/null @@ -1,7 +0,0 @@ -export default function UserHomePage(props) { - return ( - <> -hello from user homepage
- - ) -} diff --git a/test/e2e/root-dir/app/root/conditional/[slug]@user/teams.js b/test/e2e/root-dir/app/root/conditional/[slug]@user/teams.js deleted file mode 100644 index 294c3bf316da..000000000000 --- a/test/e2e/root-dir/app/root/conditional/[slug]@user/teams.js +++ /dev/null @@ -1,7 +0,0 @@ -export default function UserTeamsPage(props) { - return ( - <> -hello from user/teams
- - ) -} diff --git a/test/e2e/root-dir/app/next.config.js b/test/e2e/views-dir/app/next.config.js similarity index 85% rename from test/e2e/root-dir/app/next.config.js rename to test/e2e/views-dir/app/next.config.js index 9abd7b65b73a..4131d5b60875 100644 --- a/test/e2e/root-dir/app/next.config.js +++ b/test/e2e/views-dir/app/next.config.js @@ -1,6 +1,6 @@ module.exports = { experimental: { - rootDir: true, + viewsDir: true, runtime: 'nodejs', reactRoot: true, serverComponents: true, diff --git a/test/e2e/root-dir/app/pages/blog/[slug].js b/test/e2e/views-dir/app/pages/blog/[slug].js similarity index 100% rename from test/e2e/root-dir/app/pages/blog/[slug].js rename to test/e2e/views-dir/app/pages/blog/[slug].js diff --git a/test/e2e/root-dir/app/pages/index.js b/test/e2e/views-dir/app/pages/index.js similarity index 100% rename from test/e2e/root-dir/app/pages/index.js rename to test/e2e/views-dir/app/pages/index.js diff --git a/test/e2e/root-dir/app/public/hello.txt b/test/e2e/views-dir/app/public/hello.txt similarity index 100% rename from test/e2e/root-dir/app/public/hello.txt rename to test/e2e/views-dir/app/public/hello.txt diff --git a/test/e2e/root-dir/app/root/dashboard+changelog.server.js b/test/e2e/views-dir/app/views/(rootonly)/dashboard/changelog/page.server.js similarity index 100% rename from test/e2e/root-dir/app/root/dashboard+changelog.server.js rename to test/e2e/views-dir/app/views/(rootonly)/dashboard/changelog/page.server.js diff --git a/test/e2e/root-dir/app/root/dashboard+rootonly/hello.server.js b/test/e2e/views-dir/app/views/(rootonly)/dashboard/hello/page.server.js similarity index 100% rename from test/e2e/root-dir/app/root/dashboard+rootonly/hello.server.js rename to test/e2e/views-dir/app/views/(rootonly)/dashboard/hello/page.server.js diff --git a/test/e2e/root-dir/app/root/client-component-route.client.js b/test/e2e/views-dir/app/views/client-component-route/page.client.js similarity index 100% rename from test/e2e/root-dir/app/root/client-component-route.client.js rename to test/e2e/views-dir/app/views/client-component-route/page.client.js diff --git a/test/e2e/root-dir/app/root/client-nested/index.server.js b/test/e2e/views-dir/app/views/client-nested/index/page.server.js similarity index 100% rename from test/e2e/root-dir/app/root/client-nested/index.server.js rename to test/e2e/views-dir/app/views/client-nested/index/page.server.js diff --git a/test/e2e/root-dir/app/root/client-nested.client.js b/test/e2e/views-dir/app/views/client-nested/layout.client.js similarity index 100% rename from test/e2e/root-dir/app/root/client-nested.client.js rename to test/e2e/views-dir/app/views/client-nested/layout.client.js diff --git a/test/e2e/root-dir/app/root/dashboard/deployments/[id].server.js b/test/e2e/views-dir/app/views/dashboard/deployments/[id]/page.server.js similarity index 100% rename from test/e2e/root-dir/app/root/dashboard/deployments/[id].server.js rename to test/e2e/views-dir/app/views/dashboard/deployments/[id]/page.server.js diff --git a/test/e2e/root-dir/app/root/dashboard/deployments/info.server.js b/test/e2e/views-dir/app/views/dashboard/deployments/info/page.server.js similarity index 100% rename from test/e2e/root-dir/app/root/dashboard/deployments/info.server.js rename to test/e2e/views-dir/app/views/dashboard/deployments/info/page.server.js diff --git a/test/e2e/root-dir/app/root/dashboard/deployments.server.js b/test/e2e/views-dir/app/views/dashboard/deployments/layout.server.js similarity index 100% rename from test/e2e/root-dir/app/root/dashboard/deployments.server.js rename to test/e2e/views-dir/app/views/dashboard/deployments/layout.server.js diff --git a/test/e2e/root-dir/app/root/dashboard/index.server.js b/test/e2e/views-dir/app/views/dashboard/index/page.server.js similarity index 100% rename from test/e2e/root-dir/app/root/dashboard/index.server.js rename to test/e2e/views-dir/app/views/dashboard/index/page.server.js diff --git a/test/e2e/root-dir/app/root/dashboard/integrations/index.server.js b/test/e2e/views-dir/app/views/dashboard/integrations/index/page.server.js similarity index 100% rename from test/e2e/root-dir/app/root/dashboard/integrations/index.server.js rename to test/e2e/views-dir/app/views/dashboard/integrations/index/page.server.js diff --git a/test/e2e/root-dir/app/root/dashboard.server.js b/test/e2e/views-dir/app/views/dashboard/layout.server.js similarity index 100% rename from test/e2e/root-dir/app/root/dashboard.server.js rename to test/e2e/views-dir/app/views/dashboard/layout.server.js diff --git a/test/e2e/root-dir/app/root.server.js b/test/e2e/views-dir/app/views/layout.server.js similarity index 100% rename from test/e2e/root-dir/app/root.server.js rename to test/e2e/views-dir/app/views/layout.server.js diff --git a/test/e2e/root-dir/app/root/partial-match-[id].server.js b/test/e2e/views-dir/app/views/partial-match-[id]/page.server.js similarity index 100% rename from test/e2e/root-dir/app/root/partial-match-[id].server.js rename to test/e2e/views-dir/app/views/partial-match-[id]/page.server.js diff --git a/test/e2e/root-dir/app/root/shared-component-route.js b/test/e2e/views-dir/app/views/shared-component-route/page.js similarity index 100% rename from test/e2e/root-dir/app/root/shared-component-route.js rename to test/e2e/views-dir/app/views/shared-component-route/page.js diff --git a/test/e2e/root-dir/app/root/should-not-serve-client.client.js b/test/e2e/views-dir/app/views/should-not-serve-client/page.client.js similarity index 100% rename from test/e2e/root-dir/app/root/should-not-serve-client.client.js rename to test/e2e/views-dir/app/views/should-not-serve-client/page.client.js diff --git a/test/e2e/root-dir/app/root/should-not-serve-server.server.js b/test/e2e/views-dir/app/views/should-not-serve-server/page.server.js similarity index 100% rename from test/e2e/root-dir/app/root/should-not-serve-server.server.js rename to test/e2e/views-dir/app/views/should-not-serve-server/page.server.js diff --git a/test/e2e/root-dir/index.test.ts b/test/e2e/views-dir/index.test.ts similarity index 77% rename from test/e2e/root-dir/index.test.ts rename to test/e2e/views-dir/index.test.ts index 2f9b1b9dc91d..361613c99dfc 100644 --- a/test/e2e/root-dir/index.test.ts +++ b/test/e2e/views-dir/index.test.ts @@ -5,8 +5,11 @@ import path from 'path' import cheerio from 'cheerio' import webdriver from 'next-webdriver' -// TODO: implementation -describe.skip('root dir', () => { +describe('views dir', () => { + if (process.env.NEXT_TEST_REACT_VERSION === '^17') { + it('should skip for react v17', () => {}) + return + } let next: NextInstance beforeAll(async () => { @@ -14,18 +17,11 @@ describe.skip('root dir', () => { files: { public: new FileRef(path.join(__dirname, 'app/public')), pages: new FileRef(path.join(__dirname, 'app/pages')), - root: new FileRef(path.join(__dirname, 'app/root')), - 'root.server.js': new FileRef( - path.join(__dirname, 'app/root.server.js') - ), + views: new FileRef(path.join(__dirname, 'app/views')), 'next.config.js': new FileRef( path.join(__dirname, 'app/next.config.js') ), }, - dependencies: { - react: '18.0.0-rc.2', - 'react-dom': '18.0.0-rc.2', - }, }) }) afterAll(() => next.destroy()) @@ -61,7 +57,7 @@ describe.skip('root dir', () => { // TODO: why is this routable but /should-not-serve-server.server.js it('should not include parent when not in parent directory with route in directory', async () => { - const html = await renderViaHTTP(next.url, '/dashboard/rootonly/hello') + const html = await renderViaHTTP(next.url, '/dashboard/hello') const $ = cheerio.load(html) // Should be nested in /root.js @@ -127,55 +123,11 @@ describe.skip('root dir', () => { // TODO: do we want to make this only work for /root or is it allowed // to work for /pages as well? - it('should match partial parameters', async () => { + it.skip('should match partial parameters', async () => { const html = await renderViaHTTP(next.url, '/partial-match-123') expect(html).toContain('hello from root/partial-match-[id]. ID is: 123') }) - describe('parallel routes', () => { - describe('conditional routes', () => { - it('should serve user page', async () => { - const html = await renderViaHTTP(next.url, '/conditional/tim') - expect(html).toContain('hello from user homepage') - }) - - it('should serve user teams page', async () => { - const html = await renderViaHTTP(next.url, '/conditional/tim/teams') - expect(html).toContain('hello from user/teams') - }) - - it('should not serve teams page to user', async () => { - const html = await renderViaHTTP(next.url, '/conditional/tim/members') - expect(html).not.toContain('hello from team/members') - }) - - it('should serve team page', async () => { - const html = await renderViaHTTP(next.url, '/conditional/vercel') - expect(html).toContain('hello from team homepage') - }) - - it('should serve team members page', async () => { - const html = await renderViaHTTP( - next.url, - '/conditional/vercel/members' - ) - expect(html).toContain('hello from team/members') - }) - - it('should provide both matches if both paths match', async () => { - const html = await renderViaHTTP(next.url, '/conditional/both') - expect(html).toContain('hello from team homepage') - expect(html).toContain('hello from user homepage') - }) - - it('should 404 based on getServerSideProps', async () => { - const res = await fetchViaHTTP(next.url, '/conditional/nonexistent') - expect(res.status).toBe(404) - expect(await res.text()).toContain('This page could not be found') - }) - }) - }) - describe('server components', () => { // TODO: why is this not servable but /dashboard+rootonly/hello.server.js // should be? Seems like they both either should be servable or not @@ -229,7 +181,8 @@ describe.skip('root dir', () => { expect(html).toContain('hello from root/shared-component-route') }) - it('should serve client component', async () => { + // TODO: implement + it.skip('should serve client component', async () => { const html = await renderViaHTTP(next.url, '/client-component-route') expect(html).toContain('hello from root/client-component-route. count: 0') @@ -240,7 +193,8 @@ describe.skip('root dir', () => { ) }) - it('should include client component layout with server component route', async () => { + // TODO: implement + it.skip('should include client component layout with server component route', async () => { const html = await renderViaHTTP(next.url, '/client-nested') const $ = cheerio.load(html) // Should not be nested in dashboard diff --git a/test/integration/chunking/pages/page3.js b/test/integration/chunking/pages/page3.js index 03d534597ca2..a49f3544a696 100644 --- a/test/integration/chunking/pages/page3.js +++ b/test/integration/chunking/pages/page3.js @@ -1,5 +1,7 @@ import Link from 'next/link' -import('lodash').then((_) => console.log(_.chunk(['a', 'b', 'c', 'd'], 2))) +import('lodash').then(({ default: _ }) => + console.log(_.chunk(['a', 'b', 'c', 'd'], 2)) +) const Page = () => { return ( diff --git a/test/integration/custom-server/test/index.test.js b/test/integration/custom-server/test/index.test.js index 330fe4b1c4ef..8d4e2ee70311 100644 --- a/test/integration/custom-server/test/index.test.js +++ b/test/integration/custom-server/test/index.test.js @@ -132,8 +132,18 @@ describe('Custom Server', () => { try { browser = await webdriver(context.appPort, '/test-index-hmr') const text = await browser.elementByCss('#go-asset').text() + const logs = await browser.log() expect(text).toBe('Asset') + // Hydrates with react 18 is correct as expected + expect( + logs.some((log) => + log.message.includes( + 'ReactDOM.hydrate is no longer supported in React 18' + ) + ) + ).toBe(false) + indexPg.replace('Asset', 'Asset!!') await check(() => browser.elementByCss('#go-asset').text(), /Asset!!/) diff --git a/test/integration/image-component/asset-prefix/next.config.js b/test/integration/image-component/asset-prefix/next.config.js index d6798dc737bc..f277a6b3d133 100644 --- a/test/integration/image-component/asset-prefix/next.config.js +++ b/test/integration/image-component/asset-prefix/next.config.js @@ -1,3 +1,4 @@ module.exports = { assetPrefix: 'https://example.com/pre', + // Intentionally omit `domains` and `remotePatterns` } diff --git a/test/integration/image-component/unicode/next.config.js b/test/integration/image-component/unicode/next.config.js index eb554b46c10c..e4ff44f0fe11 100644 --- a/test/integration/image-component/unicode/next.config.js +++ b/test/integration/image-component/unicode/next.config.js @@ -1,5 +1,7 @@ module.exports = { - images: { - domains: ['image-optimization-test.vercel.app'], + experimental: { + images: { + remotePatterns: [{ hostname: 'image-optimization-test.vercel.app' }], + }, }, } diff --git a/test/integration/image-optimizer/test/index.test.js b/test/integration/image-optimizer/test/index.test.js index bcac0f864552..bd21d869e6cc 100644 --- a/test/integration/image-optimizer/test/index.test.js +++ b/test/integration/image-optimizer/test/index.test.js @@ -48,6 +48,89 @@ describe('Image Optimizer', () => { ) }) + it('should error when remotePatterns length exceeds 50', async () => { + await nextConfig.replace( + '{ /* replaceme */ }', + JSON.stringify({ + experimental: { + images: { + remotePatterns: Array.from({ length: 51 }).map((_) => ({ + hostname: 'example.com', + })), + }, + }, + }) + ) + let stderr = '' + + app = await launchApp(appDir, await findPort(), { + onStderr(msg) { + stderr += msg || '' + }, + }) + await waitFor(1000) + await killApp(app).catch(() => {}) + await nextConfig.restore() + + expect(stderr).toContain( + 'Specified images.remotePatterns exceeds length of 50, received length (51), please reduce the length of the array to continue' + ) + }) + + it('should error when remotePatterns has invalid prop', async () => { + await nextConfig.replace( + '{ /* replaceme */ }', + JSON.stringify({ + experimental: { + images: { + remotePatterns: [{ hostname: 'example.com', foo: 'bar' }], + }, + }, + }) + ) + let stderr = '' + + app = await launchApp(appDir, await findPort(), { + onStderr(msg) { + stderr += msg || '' + }, + }) + await waitFor(1000) + await killApp(app).catch(() => {}) + await nextConfig.restore() + + expect(stderr).toContain( + 'Invalid images.remotePatterns values:\n{"hostname":"example.com","foo":"bar"}' + ) + }) + + it('should error when remotePatterns is missing hostname', async () => { + await nextConfig.replace( + '{ /* replaceme */ }', + JSON.stringify({ + experimental: { + images: { + remotePatterns: [{ protocol: 'https' }], + }, + }, + }) + ) + let stderr = '' + + app = await launchApp(appDir, await findPort(), { + onStderr(msg) { + stderr += msg || '' + }, + }) + await waitFor(1000) + await killApp(app).catch(() => {}) + await nextConfig.restore() + + expect(stderr).toContain( + 'Invalid images.remotePatterns values:\n{"protocol":"https"}' + ) + }) + it('should error when sizes length exceeds 25', async () => { await nextConfig.replace( '{ /* replaceme */ }', diff --git a/test/integration/image-optimizer/test/util.js b/test/integration/image-optimizer/test/util.js index 1d4613dbbd5c..be4e2bdfc528 100644 --- a/test/integration/image-optimizer/test/util.js +++ b/test/integration/image-optimizer/test/util.js @@ -136,7 +136,7 @@ export function runTests(ctx) { slowImageServer.stop() }) - if (ctx.domains.includes('localhost')) { + if (ctx.domains?.length > 0) { it('should normalize invalid status codes', async () => { const url = `http://localhost:${ slowImageServer.port @@ -583,7 +583,7 @@ export function runTests(ctx) { }) } - if (ctx.domains.includes('localhost')) { + if (ctx.domains?.length > 0) { it('should resize absolute url from localhost', async () => { const url = `http://localhost:${ctx.appPort}/test.png` const query = { url, w: ctx.w, q: 80 } @@ -762,7 +762,7 @@ export function runTests(ctx) { ) }) - if (ctx.domains.includes('localhost')) { + if (ctx.domains?.length > 0) { it('should fail when url fails to load an image', async () => { const url = `http://localhost:${ctx.appPort}/not-an-image` const query = { w: ctx.w, url, q: 100 } @@ -1119,7 +1119,7 @@ export function runTests(ctx) { expect(await res.text()).toBe("The requested resource isn't a valid image.") }) - if (ctx.domains.length) { + if (ctx.domains?.length > 0) { it('should handle concurrent requests', async () => { await cleanImagesDir(ctx) const delay = 500 diff --git a/test/integration/telemetry/next.config.i18n-images b/test/integration/telemetry/next.config.i18n-images index 0af3a77e421a..4b7a8d7ce6ef 100644 --- a/test/integration/telemetry/next.config.i18n-images +++ b/test/integration/telemetry/next.config.i18n-images @@ -3,7 +3,12 @@ module.exports = phase => { images: { formats: ['image/avif', 'image/webp'], imageSizes: [64, 128, 256, 512, 1024], - domains: ['example.com'], + domains: ['example.com', 'another.com'], + }, + experimental: { + images: { + remotePatterns: [{ protocol: 'https', hostname: '**.example.com' }], + }, }, i18n: { locales: ['en','nl','fr'], diff --git a/test/integration/telemetry/test/index.test.js b/test/integration/telemetry/test/index.test.js index fbd4fa1a6732..de7e41d6790f 100644 --- a/test/integration/telemetry/test/index.test.js +++ b/test/integration/telemetry/test/index.test.js @@ -502,7 +502,8 @@ describe('Telemetry CLI', () => { expect(event1).toMatch(/"locales": "en,nl,fr"/) expect(event1).toMatch(/"localeDomainsCount": 2/) expect(event1).toMatch(/"localeDetectionEnabled": true/) - expect(event1).toMatch(/"imageDomainsCount": 1/) + expect(event1).toMatch(/"imageDomainsCount": 2/) + expect(event1).toMatch(/"imageRemotePatternsCount": 1/) expect(event1).toMatch(/"imageSizes": "64,128,256,512,1024"/) expect(event1).toMatch(/"imageFormats": "image\/avif,image\/webp"/) expect(event1).toMatch(/"trailingSlashEnabled": false/) @@ -538,7 +539,8 @@ describe('Telemetry CLI', () => { expect(event2).toMatch(/"locales": "en,nl,fr"/) expect(event2).toMatch(/"localeDomainsCount": 2/) expect(event2).toMatch(/"localeDetectionEnabled": true/) - expect(event2).toMatch(/"imageDomainsCount": 1/) + expect(event2).toMatch(/"imageDomainsCount": 2/) + expect(event2).toMatch(/"imageRemotePatternsCount": 1/) expect(event2).toMatch(/"imageSizes": "64,128,256,512,1024"/) expect(event2).toMatch(/"trailingSlashEnabled": false/) expect(event2).toMatch(/"reactStrictMode": false/) diff --git a/test/lib/next-modes/base.ts b/test/lib/next-modes/base.ts index 16338e57a2d5..ebd980507770 100644 --- a/test/lib/next-modes/base.ts +++ b/test/lib/next-modes/base.ts @@ -128,7 +128,8 @@ export class NextInstance { if ( process.env.NEXT_TEST_STARTER && !this.dependencies && - !this.installCommand + !this.installCommand && + !this.packageJson ) { await fs.copy(process.env.NEXT_TEST_STARTER, this.testDir) } else if (!skipIsolatedNext) { diff --git a/test/production/required-server-files-i18n.test.ts b/test/production/required-server-files-i18n.test.ts index b74cd9bd9f0d..a1b5d0d6f8d7 100644 --- a/test/production/required-server-files-i18n.test.ts +++ b/test/production/required-server-files-i18n.test.ts @@ -13,6 +13,7 @@ import { renderViaHTTP, waitFor, } from 'next-test-utils' +import nodeFetch from 'node-fetch' describe('should set-up next', () => { let next: NextInstance @@ -22,6 +23,22 @@ describe('should set-up next', () => { let requiredFilesManifest beforeAll(async () => { + let wasmPkgIsAvailable = false + + const res = await nodeFetch( + `https://registry.npmjs.com/@next/swc-wasm-nodejs/-/swc-wasm-nodejs-${ + require('next/package.json').version + }.tgz`, + { + method: 'HEAD', + } + ) + + if (res.status === 200) { + wasmPkgIsAvailable = true + console.warn(`Testing wasm fallback handling`) + } + next = await createNext({ files: { pages: new FileRef(join(__dirname, 'required-server-files/pages')), @@ -30,6 +47,14 @@ describe('should set-up next', () => { join(__dirname, 'required-server-files/data.txt') ), }, + packageJson: { + scripts: { + build: wasmPkgIsAvailable + ? 'rm -rfv node_modules/@next/swc && yarn next build' + : 'yarn next build', + }, + }, + buildCommand: 'yarn build', nextConfig: { i18n: { locales: ['en', 'fr'], diff --git a/test/production/required-server-files.test.ts b/test/production/required-server-files.test.ts index 1b105c739546..8f5e3dd5084c 100644 --- a/test/production/required-server-files.test.ts +++ b/test/production/required-server-files.test.ts @@ -56,6 +56,10 @@ describe('should set-up next', () => { source: '/an-ssg-path', destination: '/hello.txt', }, + { + source: '/fallback-false/:path', + destination: '/hello.txt', + }, ], afterFiles: [ { @@ -980,6 +984,35 @@ describe('should set-up next', () => { expect(JSON.parse($('#router').text()).asPath).toBe('/an-ssg-path') }) + it('should have correct asPath on dynamic SSG page fallback correctly', async () => { + const toCheck = [ + { + pathname: '/fallback-false/first', + matchedPath: '/fallback-false/first', + }, + { + pathname: '/fallback-false/first', + matchedPath: `/_next/data/${next.buildId}/fallback-false/first.json`, + }, + ] + for (const check of toCheck) { + console.warn('checking', check) + const res = await fetchViaHTTP(appPort, check.pathname, undefined, { + headers: { + 'x-matched-path': check.matchedPath, + }, + redirect: 'manual', + }) + + const html = await res.text() + const $ = cheerio.load(html) + expect($('#page').text()).toBe('blog slug') + expect($('#asPath').text()).toBe('/fallback-false/first') + expect($('#pathname').text()).toBe('/fallback-false/[slug]') + expect(JSON.parse($('#query').text())).toEqual({ slug: 'first' }) + } + }) + it('should copy and read .env file', async () => { const res = await fetchViaHTTP(appPort, '/api/env') diff --git a/test/production/required-server-files/pages/fallback-false/[slug].js b/test/production/required-server-files/pages/fallback-false/[slug].js new file mode 100644 index 000000000000..8296dbc7bd93 --- /dev/null +++ b/test/production/required-server-files/pages/fallback-false/[slug].js @@ -0,0 +1,35 @@ +import { useRouter } from 'next/router' + +export default function Page(props) { + const router = useRouter() + + return ( + <> +blog slug
+{JSON.stringify(props)}
+{JSON.stringify(router.query)}
+{router.pathname}
+{router.asPath}
+ + ) +} + +export function getStaticProps({ params }) { + console.log({ blogSlug: true, params }) + + return { + props: { + random: Math.random() + Date.now(), + blogSlug: true, + params, + }, + revalidate: 1, + } +} + +export function getStaticPaths() { + return { + paths: ['/fallback-false/first', '/fallback-false/second'], + fallback: false, + } +} diff --git a/test/unit/image-optimizer/match-remote-pattern.test.ts b/test/unit/image-optimizer/match-remote-pattern.test.ts new file mode 100644 index 000000000000..cf4505507706 --- /dev/null +++ b/test/unit/image-optimizer/match-remote-pattern.test.ts @@ -0,0 +1,236 @@ +/* eslint-env jest */ +import { + matchRemotePattern as m, + hasMatch, +} from 'next/dist/shared/lib/match-remote-pattern' + +describe('matchRemotePattern', () => { + it('should match literal hostname', () => { + const p = { hostname: 'example.com' } as const + expect(m(p, new URL('https://example.com'))).toBe(true) + expect(m(p, new URL('https://example.com.uk'))).toBe(false) + expect(m(p, new URL('https://example.net'))).toBe(false) + expect(m(p, new URL('https://sub.example.com'))).toBe(false) + expect(m(p, new URL('https://com'))).toBe(false) + expect(m(p, new URL('https://example.com/path'))).toBe(true) + expect(m(p, new URL('https://example.com/path/to'))).toBe(true) + expect(m(p, new URL('https://example.com/path/to/file'))).toBe(true) + expect(m(p, new URL('https://example.com:81/path/to/file'))).toBe(true) + expect(m(p, new URL('https://example.com:81/path/to/file?q=1'))).toBe(true) + expect(m(p, new URL('http://example.com:81/path/to/file'))).toBe(true) + }) + + it('should match literal protocol and hostname', () => { + const p = { protocol: 'https', hostname: 'example.com' } as const + expect(m(p, new URL('https://example.com'))).toBe(true) + expect(m(p, new URL('https://example.com.uk'))).toBe(false) + expect(m(p, new URL('https://sub.example.com'))).toBe(false) + expect(m(p, new URL('https://com'))).toBe(false) + expect(m(p, new URL('https://example.com/path/to'))).toBe(true) + expect(m(p, new URL('https://example.com/path/to/file'))).toBe(true) + expect(m(p, new URL('https://example.com/path/to/file'))).toBe(true) + expect(m(p, new URL('https://example.com:81/path/to/file'))).toBe(true) + expect(m(p, new URL('https://example.com:81/path/to/file?q=1'))).toBe(true) + expect(m(p, new URL('http://example.com:81/path/to/file'))).toBe(false) + expect(m(p, new URL('ftp://example.com:81/path/to/file'))).toBe(false) + }) + + it('should match literal protocol, hostname, no port', () => { + const p = { protocol: 'https', hostname: 'example.com', port: '' } as const + expect(m(p, new URL('https://example.com'))).toBe(true) + expect(m(p, new URL('https://example.com.uk'))).toBe(false) + expect(m(p, new URL('https://sub.example.com'))).toBe(false) + expect(m(p, new URL('https://com'))).toBe(false) + expect(m(p, new URL('https://example.com/path/to/file'))).toBe(true) + expect(m(p, new URL('https://example.com/path/to/file?q=1'))).toBe(true) + expect(m(p, new URL('http://example.com/path/to/file'))).toBe(false) + expect(m(p, new URL('ftp://example.com/path/to/file'))).toBe(false) + expect(m(p, new URL('https://example.com:81/path/to/file'))).toBe(false) + expect(m(p, new URL('https://example.com:81/path/to/file?q=1'))).toBe(false) + expect(m(p, new URL('http://example.com:81/path/to/file'))).toBe(false) + }) + + it('should match literal protocol, hostname, port 42', () => { + const p = { + protocol: 'https', + hostname: 'example.com', + port: '42', + } as const + expect(m(p, new URL('https://example.com:42'))).toBe(true) + expect(m(p, new URL('https://example.com.uk:42'))).toBe(false) + expect(m(p, new URL('https://sub.example.com:42'))).toBe(false) + expect(m(p, new URL('https://com:42'))).toBe(false) + expect(m(p, new URL('https://example.com:42/path/to/file'))).toBe(true) + expect(m(p, new URL('https://example.com:42/path/to/file?q=1'))).toBe(true) + expect(m(p, new URL('http://example.com:42/path/to/file'))).toBe(false) + expect(m(p, new URL('ftp://example.com:42/path/to/file'))).toBe(false) + expect(m(p, new URL('https://example.com'))).toBe(false) + expect(m(p, new URL('https://example.com.uk'))).toBe(false) + expect(m(p, new URL('https://sub.example.com'))).toBe(false) + expect(m(p, new URL('https://com'))).toBe(false) + expect(m(p, new URL('https://example.com/path/to/file'))).toBe(false) + expect(m(p, new URL('https://example.com/path/to/file?q=1'))).toBe(false) + expect(m(p, new URL('http://example.com/path/to/file'))).toBe(false) + expect(m(p, new URL('ftp://example.com/path/to/file'))).toBe(false) + }) + + it('should match literal protocol, hostname, port, pathname', () => { + const p = { + protocol: 'https', + hostname: 'example.com', + port: '42', + pathname: '/path/to/file', + } as const + expect(m(p, new URL('https://example.com:42'))).toBe(false) + expect(m(p, new URL('https://example.com.uk:42'))).toBe(false) + expect(m(p, new URL('https://sub.example.com:42'))).toBe(false) + expect(m(p, new URL('https://example.com:42/path'))).toBe(false) + expect(m(p, new URL('https://example.com:42/path/to'))).toBe(false) + expect(m(p, new URL('https://example.com:42/file'))).toBe(false) + expect(m(p, new URL('https://example.com:42/path/to/file'))).toBe(true) + expect(m(p, new URL('https://example.com:42/path/to/file?q=1'))).toBe(true) + expect(m(p, new URL('http://example.com:42/path/to/file'))).toBe(false) + expect(m(p, new URL('ftp://example.com:42/path/to/file'))).toBe(false) + expect(m(p, new URL('https://example.com'))).toBe(false) + expect(m(p, new URL('https://example.com.uk'))).toBe(false) + expect(m(p, new URL('https://sub.example.com'))).toBe(false) + expect(m(p, new URL('https://example.com/path'))).toBe(false) + expect(m(p, new URL('https://example.com/path/to'))).toBe(false) + expect(m(p, new URL('https://example.com/path/to/file'))).toBe(false) + expect(m(p, new URL('https://example.com/path/to/file?q=1'))).toBe(false) + expect(m(p, new URL('http://example.com/path/to/file'))).toBe(false) + expect(m(p, new URL('ftp://example.com/path/to/file'))).toBe(false) + }) + + it('should match hostname pattern with single asterisk', () => { + const p = { hostname: 'avatars.*.example.com' } as const + expect(m(p, new URL('https://com'))).toBe(false) + expect(m(p, new URL('https://example.com'))).toBe(false) + expect(m(p, new URL('https://sub.example.com'))).toBe(false) + expect(m(p, new URL('https://example.com.uk'))).toBe(false) + expect(m(p, new URL('https://sub.example.com.uk'))).toBe(false) + expect(m(p, new URL('https://avatars.example.com'))).toBe(false) + expect(m(p, new URL('https://avatars.sfo1.example.com'))).toBe(true) + expect(m(p, new URL('https://avatars.iad1.example.com'))).toBe(true) + expect(m(p, new URL('https://more.avatars.iad1.example.com'))).toBe(false) + }) + + it('should match hostname pattern with double asterisk', () => { + const p = { hostname: '**.example.com' } as const + expect(m(p, new URL('https://com'))).toBe(false) + expect(m(p, new URL('https://example.com'))).toBe(false) + expect(m(p, new URL('https://sub.example.com'))).toBe(true) + expect(m(p, new URL('https://deep.sub.example.com'))).toBe(true) + expect(m(p, new URL('https://example.com.uk'))).toBe(false) + expect(m(p, new URL('https://sub.example.com.uk'))).toBe(false) + expect(m(p, new URL('https://avatars.example.com'))).toBe(true) + expect(m(p, new URL('https://avatars.sfo1.example.com'))).toBe(true) + expect(m(p, new URL('https://avatars.iad1.example.com'))).toBe(true) + expect(m(p, new URL('https://more.avatars.iad1.example.com'))).toBe(true) + }) + + it('should match pathname pattern with single asterisk', () => { + const p = { + hostname: 'example.com', + pathname: '/act123/*/pic.jpg', + } as const + expect(m(p, new URL('https://com'))).toBe(false) + expect(m(p, new URL('https://example.com'))).toBe(false) + expect(m(p, new URL('https://sub.example.com'))).toBe(false) + expect(m(p, new URL('https://example.com.uk'))).toBe(false) + expect(m(p, new URL('https://example.com/act123'))).toBe(false) + expect(m(p, new URL('https://example.com/act123/usr4'))).toBe(false) + expect(m(p, new URL('https://example.com/act123/usr4/pic'))).toBe(false) + expect(m(p, new URL('https://example.com/act123/usr4/picsjpg'))).toBe(false) + expect(m(p, new URL('https://example.com/act123/usr4/pic.jpg'))).toBe(true) + expect(m(p, new URL('https://example.com/act123/usr5/pic.jpg'))).toBe(true) + expect(m(p, new URL('https://example.com/act123/usr6/pic.jpg'))).toBe(true) + expect(m(p, new URL('https://example.com/act123/team/pic.jpg'))).toBe(true) + expect(m(p, new URL('https://example.com/act456/team/pic.jpg'))).toBe(false) + expect(m(p, new URL('https://example.com/team/pic.jpg'))).toBe(false) + }) + + it('should match pathname pattern with double asterisk', () => { + const p = { hostname: 'example.com', pathname: '/act123/**' } as const + expect(m(p, new URL('https://com'))).toBe(false) + expect(m(p, new URL('https://example.com'))).toBe(false) + expect(m(p, new URL('https://sub.example.com'))).toBe(false) + expect(m(p, new URL('https://example.com.uk'))).toBe(false) + expect(m(p, new URL('https://example.com/act123'))).toBe(false) + expect(m(p, new URL('https://example.com/act123/usr4'))).toBe(true) + expect(m(p, new URL('https://example.com/act123/usr4/pic'))).toBe(true) + expect(m(p, new URL('https://example.com/act123/usr4/picsjpg'))).toBe(true) + expect(m(p, new URL('https://example.com/act123/usr4/pic.jpg'))).toBe(true) + expect(m(p, new URL('https://example.com/act123/usr5/pic.jpg'))).toBe(true) + expect(m(p, new URL('https://example.com/act123/usr6/pic.jpg'))).toBe(true) + expect(m(p, new URL('https://example.com/act123/team/pic.jpg'))).toBe(true) + expect(m(p, new URL('https://example.com/act456/team/pic.jpg'))).toBe(false) + expect(m(p, new URL('https://example.com/team/pic.jpg'))).toBe(false) + }) + + it('should throw when hostname is missing', () => { + const p = { protocol: 'https' } as const + // @ts-ignore testing invalid input + expect(() => m(p, new URL('https://example.com'))).toThrow( + 'Pattern should define hostname but found\n{"protocol":"https"}' + ) + }) + + it('should throw when hostname has double asterisk in the middle', () => { + const p = { hostname: 'example.**.com' } as const + expect(() => m(p, new URL('https://example.com'))).toThrow( + 'Pattern can only contain ** at start of hostname but found "example.**.com"' + ) + }) + + it('should throw when pathname has double asterisk in the middle', () => { + const p = { hostname: 'example.com', pathname: '/**/img' } as const + expect(() => m(p, new URL('https://example.com'))).toThrow( + 'Pattern can only contain ** at end of pathname but found "/**/img"' + ) + }) + + it('should properly work with hasMatch', () => { + const url = new URL('https://example.com') + expect(hasMatch([], [], url)).toBe(false) + expect(hasMatch(['foo.com'], [], url)).toBe(false) + expect(hasMatch(['example.com'], [], url)).toBe(true) + expect(hasMatch(['**.example.com'], [], url)).toBe(false) + expect(hasMatch(['*.example.com'], [], url)).toBe(false) + expect(hasMatch(['*.example.com'], [], url)).toBe(false) + expect(hasMatch([], [{ hostname: 'foo.com' }], url)).toBe(false) + expect( + hasMatch([], [{ hostname: 'foo.com' }, { hostname: 'example.com' }], url) + ).toBe(true) + expect( + hasMatch([], [{ hostname: 'example.com', pathname: '/act123/**' }], url) + ).toBe(false) + expect( + hasMatch( + ['example.com'], + [{ hostname: 'example.com', pathname: '/act123/**' }], + url + ) + ).toBe(true) + expect( + hasMatch([], [{ protocol: 'https', hostname: 'example.com' }], url) + ).toBe(true) + expect( + hasMatch([], [{ protocol: 'http', hostname: 'example.com' }], url) + ).toBe(false) + expect( + hasMatch( + ['example.com'], + [{ protocol: 'http', hostname: 'example.com' }], + url + ) + ).toBe(true) + expect( + hasMatch( + ['foo.com'], + [{ protocol: 'http', hostname: 'example.com' }], + url + ) + ).toBe(false) + }) +}) diff --git a/tsec-exemptions.json b/tsec-exemptions.json index ec33c3b673ea..ed01f28e893e 100644 --- a/tsec-exemptions.json +++ b/tsec-exemptions.json @@ -1,20 +1,13 @@ { "ban-element-innerhtml-assignments": [ "packages/next/client/head-manager.ts", - "packages/next/client/script.tsx", - "packages/react-dev-overlay/src/internal/components/Overlay/maintain--tab-focus.ts" + "packages/next/client/script.tsx" ], "ban-element-setattribute": [ "packages/next/client/head-manager.ts", "packages/next/client/script.tsx" ], "ban-script-content-assignments": ["packages/next/client/script.tsx"], - "ban-script-src-assignments": [ - "packages/next/client/route-loader.ts", - "packages/next/client/script.tsx" - ], - "ban-window-stringfunctiondef": [ - "packages/next/lib/recursive-delete.ts", - "packages/next/client/dev/fouc.ts" - ] + "ban-script-src-assignments": ["packages/next/client/script.tsx"], + "ban-trustedtypes-createpolicy": ["packages/next/client/trusted-types.ts"] } diff --git a/turbo.json b/turbo.json new file mode 100644 index 000000000000..62b903aeb59f --- /dev/null +++ b/turbo.json @@ -0,0 +1,12 @@ +{ + "pipeline": { + "build-native": { + "dependsOn": ["^build-native"], + "outputs": ["native/*.node"] + }, + "build-wasm": { + "dependsOn": ["^build-wasm"], + "outputs": ["crates/wasm/pkg/*"] + } + } +} diff --git a/yarn.lock b/yarn.lock index f09f0c2999a7..3cae0cb367a2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5407,6 +5407,11 @@ dependencies: "@types/node" "*" +"@types/trusted-types@2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.2.tgz#fc25ad9943bcac11cceb8168db4f275e0e72e756" + integrity sha512-F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg== + "@types/ua-parser-js@0.7.36": version "0.7.36" resolved "https://registry.yarnpkg.com/@types/ua-parser-js/-/ua-parser-js-0.7.36.tgz#9bd0b47f26b5a3151be21ba4ce9f5fa457c5f190" @@ -20103,6 +20108,18 @@ tar@4.4.10: safe-buffer "^5.1.2" yallist "^3.0.3" +tar@6.1.11, tar@^6.1.11: + version "6.1.11" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" + integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA== + dependencies: + chownr "^2.0.0" + fs-minipass "^2.0.0" + minipass "^3.0.0" + minizlib "^2.1.1" + mkdirp "^1.0.3" + yallist "^4.0.0" + tar@^4, tar@^4.4.12: version "4.4.13" resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" @@ -20140,18 +20157,6 @@ tar@^6.1.0: mkdirp "^1.0.3" yallist "^4.0.0" -tar@^6.1.11: - version "6.1.11" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" - integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA== - dependencies: - chownr "^2.0.0" - fs-minipass "^2.0.0" - minipass "^3.0.0" - minizlib "^2.1.1" - mkdirp "^1.0.3" - yallist "^4.0.0" - taskr@1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/taskr/-/taskr-1.1.0.tgz#4f29d0ace26f4deae9a478eabf9aa0432e884438"