From ca7f7f72e3b1e5fcb49ffc4a3f6d6f629e644b20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iiro=20J=C3=A4ppinen?= Date: Mon, 31 Jan 2022 08:59:12 +0200 Subject: [PATCH] revert: revert "Experimental Next.js 12 Output File Tracing (#2169)" (#2324) This reverts commit e01571fa347cfb71741eb092482b69dc5b54eb52. --- .gitignore | 1 - README.md | 1 - jest.config.js | 2 - .../next-app-experimental/next-env.d.ts | 1 + .../next-app-experimental/package.json | 2 +- .../next-app-experimental/serverless.yml | 1 - .../next-app-experimental/tsconfig.json | 3 +- .../e2e-tests/next-app-experimental/yarn.lock | 524 +++++------------- packages/libs/core/src/build/builder.ts | 35 +- packages/libs/core/src/types.ts | 1 - packages/libs/lambda-at-edge/package.json | 2 +- packages/libs/lambda-at-edge/src/build.ts | 199 +++---- .../src/lib/copyOutputFileTraces.ts | 66 --- .../src/lib/copyRequiredServerFiles.ts | 42 -- .../lambda-at-edge/src/lib/isPathInsideDir.ts | 11 - .../fixture/next-env.d.ts | 1 + .../fixture/tsconfig.json | 3 +- .../with-next-12-output-file-tracing.test.ts | 56 -- .../tests/lib/copyOutputFileTraces.test.ts | 171 ------ .../tests/lib/copyRequiredServerFiles.test.ts | 113 ---- .../tests/lib/isPathInsideDir.test.ts | 21 - packages/libs/lambda/src/build/builder.ts | 4 +- .../__tests__/custom-inputs.test.ts | 27 - .../fixtures/no-target-app/.next/BUILD_ID | 1 - .../no-target-app/.next/build-manifest.json | 3 - .../no-target-app/.next/images-manifest.json | 28 - .../.next/next-server.js.nft.json | 1 - .../.next/prerender-manifest.json | 11 - .../.next/react-loadable-manifest.json | 1 - .../.next/required-server-files.json | 15 - .../no-target-app/.next/routes-manifest.json | 1 - .../no-target-app/.next/server/chunks/1.js | 0 .../.next/server/font-manifest.json | 1 - .../.next/server/middleware-manifest.json | 6 - .../.next/server/pages-manifest.json | 18 - .../no-target-app/.next/server/pages/404.html | 0 .../.next/server/pages/404.js.nft.json | 1 - .../.next/server/pages/[root].js | 0 .../.next/server/pages/[root].js.nft.json | 1 - .../.next/server/pages/_app.js.nft.json | 1 - .../.next/server/pages/_document.js.nft.json | 1 - .../.next/server/pages/_error.js | 0 .../.next/server/pages/_error.js.nft.json | 1 - .../.next/server/pages/about.html | 0 .../.next/server/pages/about.js.nft.json | 1 - .../.next/server/pages/api/customers.js | 0 .../server/pages/api/customers.js.nft.json | 1 - .../.next/server/pages/api/customers/[id].js | 0 .../pages/api/customers/[id].js.nft.json | 1 - .../.next/server/pages/api/customers/new.js | 0 .../pages/api/customers/new.js.nft.json | 1 - .../no-target-app/.next/server/pages/blog.js | 0 .../.next/server/pages/blog.js.nft.json | 1 - .../.next/server/pages/blog/[post].html | 0 .../server/pages/blog/[post].js.nft.json | 1 - .../server/pages/customers/[...catchAll].js | 0 .../pages/customers/[...catchAll].js.nft.json | 1 - .../server/pages/customers/[customer].js | 0 .../pages/customers/[customer].js.nft.json | 1 - .../pages/customers/[customer]/[post].js | 0 .../customers/[customer]/[post].js.nft.json | 1 - .../pages/customers/[customer]/profile.js | 0 .../customers/[customer]/profile.js.nft.json | 1 - .../.next/server/pages/customers/new.js | 0 .../server/pages/customers/new.js.nft.json | 1 - .../.next/server/pages/index.html | 0 .../no-target-app/.next/server/pages/index.js | 0 .../.next/server/pages/index.js.nft.json | 1 - .../.next/server/pages/index.json | 0 .../.next/server/pages/terms.html | 0 .../.next/server/pages/terms.js.nft.json | 1 - .../.next/static/chunks/chunk1.js | 0 .../.next/static/test-build-id/placeholder.js | 0 .../fixtures/no-target-app/next.config.js | 1 - .../fixtures/no-target-app/public/favicon.ico | 0 .../no-target-app/public/sub/image.png | 0 .../fixtures/no-target-app/public/sw.js | 0 .../no-target-app/static/donotdelete.txt | 0 .../nextjs-component/src/component.ts | 9 +- .../nextjs-component/types.d.ts | 1 - yarn.lock | 323 +---------- 81 files changed, 250 insertions(+), 1475 deletions(-) delete mode 100644 packages/libs/lambda-at-edge/src/lib/copyOutputFileTraces.ts delete mode 100644 packages/libs/lambda-at-edge/src/lib/copyRequiredServerFiles.ts delete mode 100644 packages/libs/lambda-at-edge/src/lib/isPathInsideDir.ts delete mode 100644 packages/libs/lambda-at-edge/tests/integration/with-empty-next-config/with-next-12-output-file-tracing.test.ts delete mode 100644 packages/libs/lambda-at-edge/tests/lib/copyOutputFileTraces.test.ts delete mode 100644 packages/libs/lambda-at-edge/tests/lib/copyRequiredServerFiles.test.ts delete mode 100644 packages/libs/lambda-at-edge/tests/lib/isPathInsideDir.test.ts delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/BUILD_ID delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/build-manifest.json delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/images-manifest.json delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/next-server.js.nft.json delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/prerender-manifest.json delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/react-loadable-manifest.json delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/required-server-files.json delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/routes-manifest.json delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/chunks/1.js delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/font-manifest.json delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/middleware-manifest.json delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages-manifest.json delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/404.html delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/404.js.nft.json delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/[root].js delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/[root].js.nft.json delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/_app.js.nft.json delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/_document.js.nft.json delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/_error.js delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/_error.js.nft.json delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/about.html delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/about.js.nft.json delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/api/customers.js delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/api/customers.js.nft.json delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/api/customers/[id].js delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/api/customers/[id].js.nft.json delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/api/customers/new.js delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/api/customers/new.js.nft.json delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/blog.js delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/blog.js.nft.json delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/blog/[post].html delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/blog/[post].js.nft.json delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/customers/[...catchAll].js delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/customers/[...catchAll].js.nft.json delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/customers/[customer].js delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/customers/[customer].js.nft.json delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/customers/[customer]/[post].js delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/customers/[customer]/[post].js.nft.json delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/customers/[customer]/profile.js delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/customers/[customer]/profile.js.nft.json delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/customers/new.js delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/customers/new.js.nft.json delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/index.html delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/index.js delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/index.js.nft.json delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/index.json delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/terms.html delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/terms.js.nft.json delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/static/chunks/chunk1.js delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/static/test-build-id/placeholder.js delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/next.config.js delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/public/favicon.ico delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/public/sub/image.png delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/public/sw.js delete mode 100644 packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/static/donotdelete.txt diff --git a/.gitignore b/.gitignore index 521f0ba911..39690f9617 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,6 @@ node_modules /coverage.data /coverage/ -junit.xml examples/basic-next-serverless-app/build .serverless .next diff --git a/README.md b/README.md index 54007bd9fa..71f17679d1 100644 --- a/README.md +++ b/README.md @@ -544,7 +544,6 @@ The fourth cache behaviour handles next API requests `api/*`. | build.cleanupDotNext | `boolean` | `true` | Whether to clean up `.next` directory before running the build step | | build.assetIgnorePatterns | `string[]` | `[]` | Glob patterns to ignore when discovering files to copy from _next/static, public, static directories. | | build.useV2Handler | `boolean` | `false` | **Experimental** Set this to true to use V2 handlers which starts to use genericized handlers. Note: this has the functionality of `separateApiLambda` and `disableOriginResponseHandler` so it should not be used together. Also, it is not completely optimized yet in terms of code size, but should still be performant. In the future, we will likely use this mode by default. | -| build.outputFileTracing |`boolean` |`false` | **Experimental** Use the Next.js 12 [Output File Tracing](https://nextjs.org/docs/advanced-features/output-file-tracing) for copying required files into the Lambdas. This option doesn't set any `target` and instead relies on the default value, because `target` is now deprecated. | | cloudfront | `object` | `{}` | Inputs to be passed to [aws-cloudfront](https://github.com/serverless-components/aws-cloudfront) | | certificateArn | `string` | `` | Specific certificate ARN to use for CloudFront distribution. Helpful if you have a wildcard SSL cert you wish to use. This currently works only in tandem with the`domain`input. Please check [custom CloudFront configuration](https://github.com/serverless-nextjs/serverless-next.js#custom-cloudfront-configuration) for how to specify`certificate`without needing to use the`domain`input (note that doing so will override any certificate due to the domain input). | | domainType |`string` |`"both"` | Can be one of:`"apex"`- apex domain only, don't create a www subdomain.`"www"` - www domain only, don't create an apex subdomain.`"both"`- create both www and apex domains when either one is provided. | diff --git a/jest.config.js b/jest.config.js index c3bc3af64c..f342bbb8f2 100644 --- a/jest.config.js +++ b/jest.config.js @@ -21,8 +21,6 @@ module.exports = { "/e2e-tests/", "/tests/", "/scripts/", - ".test_sls_next_output", - "__tests__", "babel.config.js", "jest.config.js", "/packages/serverless-components/aws-s3", diff --git a/packages/e2e-tests/next-app-experimental/next-env.d.ts b/packages/e2e-tests/next-app-experimental/next-env.d.ts index 4f11a03dc6..9bc3dd46b9 100644 --- a/packages/e2e-tests/next-app-experimental/next-env.d.ts +++ b/packages/e2e-tests/next-app-experimental/next-env.d.ts @@ -1,4 +1,5 @@ /// +/// /// // NOTE: This file should not be edited diff --git a/packages/e2e-tests/next-app-experimental/package.json b/packages/e2e-tests/next-app-experimental/package.json index c88bd2c6b7..0dcb40df7a 100644 --- a/packages/e2e-tests/next-app-experimental/package.json +++ b/packages/e2e-tests/next-app-experimental/package.json @@ -20,7 +20,7 @@ "homepage": "https://github.com/serverless-next.js/serverless-next.js", "dependencies": { "isomorphic-fetch": "3.0.0", - "next": "12.0.8", + "next": "11.1.3", "react": "17.0.2", "react-dom": "17.0.2" }, diff --git a/packages/e2e-tests/next-app-experimental/serverless.yml b/packages/e2e-tests/next-app-experimental/serverless.yml index a5dd49ee11..dd168fe3cd 100644 --- a/packages/e2e-tests/next-app-experimental/serverless.yml +++ b/packages/e2e-tests/next-app-experimental/serverless.yml @@ -8,7 +8,6 @@ next-app-experimental: foo: bar build: useV2Handler: true - outputFileTracing: true #separateApiLambda: false #disableOriginResponseHandler: true postBuildCommands: ["node scripts/post-build-test.js"] diff --git a/packages/e2e-tests/next-app-experimental/tsconfig.json b/packages/e2e-tests/next-app-experimental/tsconfig.json index e6e87dd972..3f21ac23f3 100644 --- a/packages/e2e-tests/next-app-experimental/tsconfig.json +++ b/packages/e2e-tests/next-app-experimental/tsconfig.json @@ -17,8 +17,7 @@ "resolveJsonModule": true, "isolatedModules": true, "jsx": "preserve", - "baseUrl": "src", - "incremental": true + "baseUrl": "src" }, "exclude": [ "node_modules", diff --git a/packages/e2e-tests/next-app-experimental/yarn.lock b/packages/e2e-tests/next-app-experimental/yarn.lock index 14993fccb8..f101a6f2b5 100644 --- a/packages/e2e-tests/next-app-experimental/yarn.lock +++ b/packages/e2e-tests/next-app-experimental/yarn.lock @@ -1,3 +1,6 @@ +# This file is generated by running "yarn install" inside your project. +# Manual changes might be lost - proceed with caution! + __metadata: version: 5 cacheKey: 8 @@ -1012,12 +1015,12 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:7.15.4": - version: 7.15.4 - resolution: "@babel/runtime@npm:7.15.4" +"@babel/runtime@npm:7.15.3": + version: 7.15.3 + resolution: "@babel/runtime@npm:7.15.3" dependencies: regenerator-runtime: ^0.13.4 - checksum: c40825430400e47c19b97e4142d5315d2910305b9714d44a711472587ee2fd4521fdba5f02ddd9df3902f5e988d9854fa83f4da1e0c091f70f6983fa52480606 + checksum: 2f0b8d2d4e36035ab1d84af0ec26aafa098536870f27c8e07de0a0e398f7a394fdea68a88165535ffb52ded6a68912bdc3450bdf91f229eb132e1c89470789f5 languageName: node linkType: hard @@ -1267,13 +1270,6 @@ __metadata: languageName: node linkType: hard -"@napi-rs/triples@npm:1.0.3": - version: 1.0.3 - resolution: "@napi-rs/triples@npm:1.0.3" - checksum: c83a4cc55f69115bf4ce1d5924efce7f5faf2dc79fd52257385559f668ce91a03c5d7d004df01ebba56028a9b663955eb97f31b65ac0acff7a93c143f0d809af - languageName: node - linkType: hard - "@napi-rs/triples@npm:^1.0.3": version: 1.1.0 resolution: "@napi-rs/triples@npm:1.1.0" @@ -1288,13 +1284,6 @@ __metadata: languageName: node linkType: hard -"@next/env@npm:12.0.7": - version: 12.0.7 - resolution: "@next/env@npm:12.0.7" - checksum: 98258ead3fd384ead612385c89aad4f4bbcb71fdd28a2e8c8abaa7cbdc63070edb849efc859b3d45215aa5c37cb256fb8cb4958708ea2e1f4b3e968102eba93b - languageName: node - linkType: hard - "@next/polyfill-module@npm:11.1.3": version: 11.1.3 resolution: "@next/polyfill-module@npm:11.1.3" @@ -1302,13 +1291,6 @@ __metadata: languageName: node linkType: hard -"@next/polyfill-module@npm:12.0.7": - version: 12.0.7 - resolution: "@next/polyfill-module@npm:12.0.7" - checksum: 6bf5bd8746eb8419196160b3e7f87b30ca25499bc40b125d82677401f853c4e2adf7b7f1fdf0b686ad24293839a3b78c2b36805802330ee9d09163a1a12c8e36 - languageName: node - linkType: hard - "@next/react-dev-overlay@npm:11.1.3": version: 11.1.3 resolution: "@next/react-dev-overlay@npm:11.1.3" @@ -1320,10 +1302,10 @@ __metadata: css.escape: 1.5.1 data-uri-to-buffer: 3.0.1 platform: 1.3.6 - shell-quote: 1.7.3 + shell-quote: 1.7.2 source-map: 0.8.0-beta.0 stacktrace-parser: 0.1.10 - strip-ansi: 6.0.1 + strip-ansi: 6.0.0 peerDependencies: react: ^17.0.2 react-dom: ^17.0.2 @@ -1331,32 +1313,6 @@ __metadata: languageName: node linkType: hard -"@next/react-dev-overlay@npm:12.0.7": - version: 12.0.7 - resolution: "@next/react-dev-overlay@npm:12.0.7" - dependencies: - "@babel/code-frame": 7.12.11 - anser: 1.4.9 - chalk: 4.0.0 - classnames: 2.2.6 - css.escape: 1.5.1 - data-uri-to-buffer: 3.0.1 - platform: 1.3.6 - shell-quote: 1.7.3 - source-map: 0.8.0-beta.0 - stacktrace-parser: 0.1.10 - strip-ansi: 6.0.1 - peerDependencies: - react: ^17.0.2 - react-dom: ^17.0.2 - webpack: ^4 || ^5 - peerDependenciesMeta: - webpack: - optional: true - checksum: 47caa6a8a3494f8cff9b3f212c9a3197a7c6b020cf685852248db92e4625e03f378bfbc9a39bf7b2fc0595535dfe2cfea9b00a228644ce79b36dbb4ee5cb1219 - languageName: node - linkType: hard - "@next/react-refresh-utils@npm:11.1.3": version: 11.1.3 resolution: "@next/react-refresh-utils@npm:11.1.3" @@ -1370,26 +1326,6 @@ __metadata: languageName: node linkType: hard -"@next/react-refresh-utils@npm:12.0.7": - version: 12.0.7 - resolution: "@next/react-refresh-utils@npm:12.0.7" - peerDependencies: - react-refresh: 0.8.3 - webpack: ^4 || ^5 - peerDependenciesMeta: - webpack: - optional: true - checksum: 04d29941089bd402fc276ad8e17195bc4636c92f9eb25cc75b3d4a81d9be128cb9917271b9ae6d2998b2e3219b80ff54a623366cd6696711664a1d4161f14bc1 - languageName: node - linkType: hard - -"@next/swc-android-arm64@npm:12.0.7": - version: 12.0.7 - resolution: "@next/swc-android-arm64@npm:12.0.7" - conditions: os=android & cpu=arm64 - languageName: node - linkType: hard - "@next/swc-darwin-arm64@npm:11.1.3": version: 11.1.3 resolution: "@next/swc-darwin-arm64@npm:11.1.3" @@ -1397,13 +1333,6 @@ __metadata: languageName: node linkType: hard -"@next/swc-darwin-arm64@npm:12.0.7": - version: 12.0.7 - resolution: "@next/swc-darwin-arm64@npm:12.0.7" - conditions: os=darwin & cpu=arm64 - languageName: node - linkType: hard - "@next/swc-darwin-x64@npm:11.1.3": version: 11.1.3 resolution: "@next/swc-darwin-x64@npm:11.1.3" @@ -1411,34 +1340,6 @@ __metadata: languageName: node linkType: hard -"@next/swc-darwin-x64@npm:12.0.7": - version: 12.0.7 - resolution: "@next/swc-darwin-x64@npm:12.0.7" - conditions: os=darwin & cpu=x64 - languageName: node - linkType: hard - -"@next/swc-linux-arm-gnueabihf@npm:12.0.7": - version: 12.0.7 - resolution: "@next/swc-linux-arm-gnueabihf@npm:12.0.7" - conditions: os=linux & cpu=arm - languageName: node - linkType: hard - -"@next/swc-linux-arm64-gnu@npm:12.0.7": - version: 12.0.7 - resolution: "@next/swc-linux-arm64-gnu@npm:12.0.7" - conditions: os=linux & cpu=arm64 - languageName: node - linkType: hard - -"@next/swc-linux-arm64-musl@npm:12.0.7": - version: 12.0.7 - resolution: "@next/swc-linux-arm64-musl@npm:12.0.7" - conditions: os=linux & cpu=arm64 - languageName: node - linkType: hard - "@next/swc-linux-x64-gnu@npm:11.1.3": version: 11.1.3 resolution: "@next/swc-linux-x64-gnu@npm:11.1.3" @@ -1446,34 +1347,6 @@ __metadata: languageName: node linkType: hard -"@next/swc-linux-x64-gnu@npm:12.0.7": - version: 12.0.7 - resolution: "@next/swc-linux-x64-gnu@npm:12.0.7" - conditions: os=linux & cpu=x64 - languageName: node - linkType: hard - -"@next/swc-linux-x64-musl@npm:12.0.7": - version: 12.0.7 - resolution: "@next/swc-linux-x64-musl@npm:12.0.7" - conditions: os=linux & cpu=x64 - languageName: node - linkType: hard - -"@next/swc-win32-arm64-msvc@npm:12.0.7": - version: 12.0.7 - resolution: "@next/swc-win32-arm64-msvc@npm:12.0.7" - conditions: os=win32 & cpu=arm64 - languageName: node - linkType: hard - -"@next/swc-win32-ia32-msvc@npm:12.0.7": - version: 12.0.7 - resolution: "@next/swc-win32-ia32-msvc@npm:12.0.7" - conditions: os=win32 & cpu=ia32 - languageName: node - linkType: hard - "@next/swc-win32-x64-msvc@npm:11.1.3": version: 11.1.3 resolution: "@next/swc-win32-x64-msvc@npm:11.1.3" @@ -1481,10 +1354,12 @@ __metadata: languageName: node linkType: hard -"@next/swc-win32-x64-msvc@npm:12.0.7": - version: 12.0.7 - resolution: "@next/swc-win32-x64-msvc@npm:12.0.7" - conditions: os=win32 & cpu=x64 +"@node-rs/helper@npm:1.2.1": + version: 1.2.1 + resolution: "@node-rs/helper@npm:1.2.1" + dependencies: + "@napi-rs/triples": ^1.0.3 + checksum: c7b96e46df8a4195e62e51b6f60ed05aff398653c270dc9cffaed749303a4c428215d5826de8511b57cf66f2b0165fb3544fb2aec2aaf385c13ac3b9468bb000 languageName: node linkType: hard @@ -1707,15 +1582,6 @@ __metadata: languageName: node linkType: hard -"acorn@npm:8.5.0": - version: 8.5.0 - resolution: "acorn@npm:8.5.0" - bin: - acorn: bin/acorn - checksum: 2e4c1dbed3da327684863debf31d341bf8882c6893c506653872c00977eee45675feb9129255d6c74c88424d2b20d889ca6de5b39776e5e3cccfc756b3ca1da8 - languageName: node - linkType: hard - "acorn@npm:^7.0.0": version: 7.4.1 resolution: "acorn@npm:7.4.1" @@ -1977,7 +1843,7 @@ __metadata: languageName: node linkType: hard -"assert@npm:^1.4.0": +"assert@npm:^1.1.1, assert@npm:^1.4.0": version: 1.5.0 resolution: "assert@npm:1.5.0" dependencies: @@ -1994,6 +1860,13 @@ __metadata: languageName: node linkType: hard +"ast-types@npm:0.13.2": + version: 0.13.2 + resolution: "ast-types@npm:0.13.2" + checksum: afb39affbf1d35703862a655e811966a76bb4e8c27f22657acf990b3d482faa0114f818c2ea10ed9bc20b57a99da723fc5e1dd256eb97c87d407466717695de1 + languageName: node + linkType: hard + "astral-regex@npm:^2.0.0": version: 2.0.0 resolution: "astral-regex@npm:2.0.0" @@ -2487,7 +2360,7 @@ __metadata: languageName: node linkType: hard -"browserify-zlib@npm:0.2.0, browserify-zlib@npm:~0.2.0": +"browserify-zlib@npm:0.2.0, browserify-zlib@npm:^0.2.0, browserify-zlib@npm:~0.2.0": version: 0.2.0 resolution: "browserify-zlib@npm:0.2.0" dependencies: @@ -2663,7 +2536,7 @@ __metadata: languageName: node linkType: hard -"buffer@npm:4.9.2": +"buffer@npm:4.9.2, buffer@npm:^4.3.0": version: 4.9.2 resolution: "buffer@npm:4.9.2" dependencies: @@ -3202,7 +3075,7 @@ __metadata: languageName: node linkType: hard -"constants-browserify@npm:1.0.0, constants-browserify@npm:~1.0.0": +"constants-browserify@npm:1.0.0, constants-browserify@npm:^1.0.0, constants-browserify@npm:~1.0.0": version: 1.0.0 resolution: "constants-browserify@npm:1.0.0" checksum: f7ac8c6d0b6e4e0c77340a1d47a3574e25abd580bfd99ad707b26ff7618596cf1a5e5ce9caf44715e9e01d4a5d12cb3b4edaf1176f34c19adb2874815a56e64f @@ -3327,7 +3200,7 @@ __metadata: languageName: node linkType: hard -"crypto-browserify@npm:3.12.0, crypto-browserify@npm:^3.0.0": +"crypto-browserify@npm:3.12.0, crypto-browserify@npm:^3.0.0, crypto-browserify@npm:^3.11.0": version: 3.12.0 resolution: "crypto-browserify@npm:3.12.0" dependencies: @@ -3676,7 +3549,7 @@ __metadata: languageName: node linkType: hard -"domain-browser@npm:^1.2.0": +"domain-browser@npm:^1.1.1, domain-browser@npm:^1.2.0": version: 1.2.0 resolution: "domain-browser@npm:1.2.0" checksum: 8f1235c7f49326fb762f4675795246a6295e7dd566b4697abec24afdba2460daa7dfbd1a73d31efbf5606b3b7deadb06ce47cf06f0a476e706153d62a4ff2b90 @@ -3884,13 +3757,6 @@ __metadata: languageName: node linkType: hard -"events@npm:3.3.0": - version: 3.3.0 - resolution: "events@npm:3.3.0" - checksum: f6f487ad2198aa41d878fa31452f1a3c00958f46e9019286ff4787c84aac329332ab45c9cdc8c445928fc6d7ded294b9e005a7fce9426488518017831b272780 - languageName: node - linkType: hard - "events@npm:^2.0.0": version: 2.1.0 resolution: "events@npm:2.1.0" @@ -3898,6 +3764,13 @@ __metadata: languageName: node linkType: hard +"events@npm:^3.0.0": + version: 3.3.0 + resolution: "events@npm:3.3.0" + checksum: f6f487ad2198aa41d878fa31452f1a3c00958f46e9019286ff4787c84aac329332ab45c9cdc8c445928fc6d7ded294b9e005a7fce9426488518017831b272780 + languageName: node + linkType: hard + "evp_bytestokey@npm:^1.0.0, evp_bytestokey@npm:^1.0.3": version: 1.0.3 resolution: "evp_bytestokey@npm:1.0.3" @@ -6093,6 +5966,15 @@ __metadata: languageName: node linkType: hard +"native-url@npm:0.3.4": + version: 0.3.4 + resolution: "native-url@npm:0.3.4" + dependencies: + querystring: ^0.2.0 + checksum: 2c82baa9d0e71bd67bd893d139d33b29acb34d4ac4d39251625c1ee6e31663ae4ce62349c7b926d2d4a7056c6730ef96827d437e65bc71599edfef2006367bcc + languageName: node + linkType: hard + "negotiator@npm:^0.6.2": version: 0.6.2 resolution: "negotiator@npm:0.6.2" @@ -6118,7 +6000,7 @@ __metadata: cypress: 9.0.0 isomorphic-fetch: 3.0.0 istanbul-lib-coverage: 3.2.0 - next: 12.0.7 + next: 11.1.3 nyc: 15.1.0 react: 17.0.2 react-dom: 17.0.2 @@ -6133,7 +6015,7 @@ __metadata: version: 11.1.3 resolution: "next@npm:11.1.3" dependencies: - "@babel/runtime": 7.15.4 + "@babel/runtime": 7.15.3 "@hapi/accept": 5.0.2 "@next/env": 11.1.3 "@next/polyfill-module": 11.1.3 @@ -6145,6 +6027,7 @@ __metadata: "@next/swc-win32-x64-msvc": 11.1.3 "@node-rs/helper": 1.2.1 assert: 2.0.0 + ast-types: 0.13.2 browserify-zlib: 0.2.0 browserslist: 4.16.6 buffer: 5.6.0 @@ -6157,61 +6040,48 @@ __metadata: domain-browser: 4.19.0 encoding: 0.1.13 etag: 1.8.1 - events: 3.3.0 find-cache-dir: 3.3.1 get-orientation: 1.1.2 https-browserify: 1.0.0 image-size: 1.0.0 jest-worker: 27.0.0-next.5 + native-url: 0.3.4 node-fetch: 2.6.1 node-html-parser: 1.4.9 + node-libs-browser: ^2.2.1 os-browserify: 0.3.0 p-limit: 3.1.0 path-browserify: 1.0.1 + pnp-webpack-plugin: 1.6.4 postcss: 8.2.15 process: 0.11.10 querystring-es3: 0.2.1 raw-body: 2.4.1 react-is: 17.0.2 react-refresh: 0.8.3 - regenerator-runtime: 0.13.4 stream-browserify: 3.0.0 stream-http: 3.1.1 string_decoder: 1.3.0 - styled-jsx: 5.0.0-beta.3 + styled-jsx: 4.0.1 timers-browserify: 2.0.12 tty-browserify: 0.0.1 use-subscription: 1.5.1 util: 0.12.4 vm-browserify: 1.1.2 - watchpack: 2.3.0 + watchpack: 2.1.1 peerDependencies: fibers: ">= 3.1.0" - node-sass: ^4.0.0 || ^5.0.0 || ^6.0.0 - react: ^17.0.2 || ^18.0.0-0 - react-dom: ^17.0.2 || ^18.0.0-0 + node-sass: ^4.0.0 || ^5.0.0 + react: ^17.0.2 + react-dom: ^17.0.2 sass: ^1.3.0 dependenciesMeta: - "@next/swc-android-arm64": - optional: true "@next/swc-darwin-arm64": optional: true "@next/swc-darwin-x64": optional: true - "@next/swc-linux-arm-gnueabihf": - optional: true - "@next/swc-linux-arm64-gnu": - optional: true - "@next/swc-linux-arm64-musl": - optional: true "@next/swc-linux-x64-gnu": optional: true - "@next/swc-linux-x64-musl": - optional: true - "@next/swc-win32-arm64-msvc": - optional: true - "@next/swc-win32-ia32-msvc": - optional: true "@next/swc-win32-x64-msvc": optional: true peerDependenciesMeta: @@ -6227,112 +6097,6 @@ __metadata: languageName: node linkType: hard -"next@npm:12.0.7": - version: 12.0.7 - resolution: "next@npm:12.0.7" - dependencies: - "@babel/runtime": 7.15.4 - "@hapi/accept": 5.0.2 - "@napi-rs/triples": 1.0.3 - "@next/env": 12.0.7 - "@next/polyfill-module": 12.0.7 - "@next/react-dev-overlay": 12.0.7 - "@next/react-refresh-utils": 12.0.7 - "@next/swc-android-arm64": 12.0.7 - "@next/swc-darwin-arm64": 12.0.7 - "@next/swc-darwin-x64": 12.0.7 - "@next/swc-linux-arm-gnueabihf": 12.0.7 - "@next/swc-linux-arm64-gnu": 12.0.7 - "@next/swc-linux-arm64-musl": 12.0.7 - "@next/swc-linux-x64-gnu": 12.0.7 - "@next/swc-linux-x64-musl": 12.0.7 - "@next/swc-win32-arm64-msvc": 12.0.7 - "@next/swc-win32-ia32-msvc": 12.0.7 - "@next/swc-win32-x64-msvc": 12.0.7 - acorn: 8.5.0 - assert: 2.0.0 - browserify-zlib: 0.2.0 - browserslist: 4.16.6 - buffer: 5.6.0 - caniuse-lite: ^1.0.30001228 - chalk: 2.4.2 - chokidar: 3.5.1 - constants-browserify: 1.0.0 - crypto-browserify: 3.12.0 - cssnano-simple: 3.0.0 - domain-browser: 4.19.0 - encoding: 0.1.13 - etag: 1.8.1 - events: 3.3.0 - find-cache-dir: 3.3.1 - get-orientation: 1.1.2 - https-browserify: 1.0.0 - image-size: 1.0.0 - jest-worker: 27.0.0-next.5 - node-fetch: 2.6.1 - node-html-parser: 1.4.9 - os-browserify: 0.3.0 - p-limit: 3.1.0 - path-browserify: 1.0.1 - postcss: 8.2.15 - process: 0.11.10 - querystring-es3: 0.2.1 - raw-body: 2.4.1 - react-is: 17.0.2 - react-refresh: 0.8.3 - regenerator-runtime: 0.13.4 - stream-browserify: 3.0.0 - stream-http: 3.1.1 - string_decoder: 1.3.0 - styled-jsx: 5.0.0-beta.3 - timers-browserify: 2.0.12 - tty-browserify: 0.0.1 - use-subscription: 1.5.1 - util: 0.12.4 - vm-browserify: 1.1.2 - watchpack: 2.3.0 - peerDependencies: - fibers: ">= 3.1.0" - node-sass: ^4.0.0 || ^5.0.0 || ^6.0.0 - react: ^17.0.2 || ^18.0.0-0 - react-dom: ^17.0.2 || ^18.0.0-0 - sass: ^1.3.0 - dependenciesMeta: - "@next/swc-android-arm64": - optional: true - "@next/swc-darwin-arm64": - optional: true - "@next/swc-darwin-x64": - optional: true - "@next/swc-linux-arm-gnueabihf": - optional: true - "@next/swc-linux-arm64-gnu": - optional: true - "@next/swc-linux-arm64-musl": - optional: true - "@next/swc-linux-x64-gnu": - optional: true - "@next/swc-linux-x64-musl": - optional: true - "@next/swc-win32-arm64-msvc": - optional: true - "@next/swc-win32-ia32-msvc": - optional: true - "@next/swc-win32-x64-msvc": - optional: true - peerDependenciesMeta: - fibers: - optional: true - node-sass: - optional: true - sass: - optional: true - bin: - next: dist/bin/next - checksum: 78a0ebd697b71e76f4ffaf6ba093390a16a15a750978acfc976cb32759bee18b5da82e8d2fc0170135105bb55c8c5fe86f7cbd0d45ab5b7255161d57deafa93f - languageName: node - linkType: hard - "node-fetch@npm:2.6.1": version: 2.6.1 resolution: "node-fetch@npm:2.6.1" @@ -6378,6 +6142,37 @@ __metadata: languageName: node linkType: hard +"node-libs-browser@npm:^2.2.1": + version: 2.2.1 + resolution: "node-libs-browser@npm:2.2.1" + dependencies: + assert: ^1.1.1 + browserify-zlib: ^0.2.0 + buffer: ^4.3.0 + console-browserify: ^1.1.0 + constants-browserify: ^1.0.0 + crypto-browserify: ^3.11.0 + domain-browser: ^1.1.1 + events: ^3.0.0 + https-browserify: ^1.0.0 + os-browserify: ^0.3.0 + path-browserify: 0.0.1 + process: ^0.11.10 + punycode: ^1.2.4 + querystring-es3: ^0.2.0 + readable-stream: ^2.3.3 + stream-browserify: ^2.0.1 + stream-http: ^2.7.2 + string_decoder: ^1.0.0 + timers-browserify: ^2.0.4 + tty-browserify: 0.0.0 + url: ^0.11.0 + util: ^0.11.0 + vm-browserify: ^1.0.1 + checksum: 41fa7927378edc0cb98a8cc784d3f4a47e43378d3b42ec57a23f81125baa7287c4b54d6d26d062072226160a3ce4d8b7a62e873d2fb637aceaddf71f5a26eca0 + languageName: node + linkType: hard + "node-preload@npm:^0.2.1": version: 0.2.1 resolution: "node-preload@npm:0.2.1" @@ -6576,7 +6371,7 @@ __metadata: languageName: node linkType: hard -"os-browserify@npm:0.3.0, os-browserify@npm:~0.3.0": +"os-browserify@npm:0.3.0, os-browserify@npm:^0.3.0, os-browserify@npm:~0.3.0": version: 0.3.0 resolution: "os-browserify@npm:0.3.0" checksum: 16e37ba3c0e6a4c63443c7b55799ce4066d59104143cb637ecb9fce586d5da319cdca786ba1c867abbe3890d2cbf37953f2d51eea85e20dd6c4570d6c54bfebf @@ -6699,6 +6494,13 @@ __metadata: languageName: node linkType: hard +"path-browserify@npm:0.0.1, path-browserify@npm:~0.0.0": + version: 0.0.1 + resolution: "path-browserify@npm:0.0.1" + checksum: ae8dcd45d0d3cfbaf595af4f206bf3ed82d77f72b4877ae7e77328079e1468c84f9386754bb417d994d5a19bf47882fd253565c18441cd5c5c90ae5187599e35 + languageName: node + linkType: hard + "path-browserify@npm:1.0.1": version: 1.0.1 resolution: "path-browserify@npm:1.0.1" @@ -6706,13 +6508,6 @@ __metadata: languageName: node linkType: hard -"path-browserify@npm:~0.0.0": - version: 0.0.1 - resolution: "path-browserify@npm:0.0.1" - checksum: ae8dcd45d0d3cfbaf595af4f206bf3ed82d77f72b4877ae7e77328079e1468c84f9386754bb417d994d5a19bf47882fd253565c18441cd5c5c90ae5187599e35 - languageName: node - linkType: hard - "path-dirname@npm:^1.0.0": version: 1.0.2 resolution: "path-dirname@npm:1.0.2" @@ -6826,6 +6621,15 @@ __metadata: languageName: node linkType: hard +"pnp-webpack-plugin@npm:1.6.4": + version: 1.6.4 + resolution: "pnp-webpack-plugin@npm:1.6.4" + dependencies: + ts-pnp: ^1.1.6 + checksum: 0606a63db96400b07f182300168298da9518727a843f9e10cf5045d2a102a4be06bb18c73dc481281e3e0f1ed8d04ef0d285a342b6dcd0eff1340e28e5d2328d + languageName: node + linkType: hard + "posix-character-classes@npm:^0.1.0": version: 0.1.1 resolution: "posix-character-classes@npm:0.1.1" @@ -6867,7 +6671,7 @@ __metadata: languageName: node linkType: hard -"process@npm:0.11.10, process@npm:~0.11.0": +"process@npm:0.11.10, process@npm:^0.11.10, process@npm:~0.11.0": version: 0.11.10 resolution: "process@npm:0.11.10" checksum: bfcce49814f7d172a6e6a14d5fa3ac92cc3d0c3b9feb1279774708a719e19acd673995226351a082a9ae99978254e320ccda4240ddc474ba31a76c79491ca7c3 @@ -6936,7 +6740,7 @@ __metadata: languageName: node linkType: hard -"punycode@npm:^1.3.2": +"punycode@npm:^1.2.4, punycode@npm:^1.3.2": version: 1.4.1 resolution: "punycode@npm:1.4.1" checksum: fa6e698cb53db45e4628559e557ddaf554103d2a96a1d62892c8f4032cd3bc8871796cae9eabc1bc700e2b6677611521ce5bb1d9a27700086039965d0cf34518 @@ -6957,7 +6761,7 @@ __metadata: languageName: node linkType: hard -"querystring-es3@npm:0.2.1, querystring-es3@npm:~0.2.0": +"querystring-es3@npm:0.2.1, querystring-es3@npm:^0.2.0, querystring-es3@npm:~0.2.0": version: 0.2.1 resolution: "querystring-es3@npm:0.2.1" checksum: 691e8d6b8b157e7cd49ae8e83fcf86de39ab3ba948c25abaa94fba84c0986c641aa2f597770848c64abce290ed17a39c9df6df737dfa7e87c3b63acc7d225d61 @@ -6971,6 +6775,13 @@ __metadata: languageName: node linkType: hard +"querystring@npm:^0.2.0": + version: 0.2.1 + resolution: "querystring@npm:0.2.1" + checksum: 7b83b45d641e75fd39cd6625ddfd44e7618e741c61e95281b57bbae8fde0afcc12cf851924559e5cc1ef9baa3b1e06e22b164ea1397d65dd94b801f678d9c8ce + languageName: node + linkType: hard + "queue-microtask@npm:^1.2.2": version: 1.2.3 resolution: "queue-microtask@npm:1.2.3" @@ -7064,21 +6875,6 @@ __metadata: languageName: node linkType: hard -"readable-stream@npm:^2.0.2, readable-stream@npm:^2.0.6, readable-stream@npm:^2.2.2, readable-stream@npm:^2.3.6, readable-stream@npm:~2.3.6": - version: 2.3.7 - resolution: "readable-stream@npm:2.3.7" - dependencies: - core-util-is: ~1.0.0 - inherits: ~2.0.3 - isarray: ~1.0.0 - process-nextick-args: ~2.0.0 - safe-buffer: ~5.1.1 - string_decoder: ~1.1.1 - util-deprecate: ~1.0.1 - checksum: e4920cf7549a60f8aaf694d483a0e61b2a878b969d224f89b3bc788b8d920075132c4b55a7494ee944c7b6a9a0eada28a7f6220d80b0312ece70bbf08eeca755 - languageName: node - linkType: hard - "readable-stream@npm:^2.0.2, readable-stream@npm:^2.2.2, readable-stream@npm:^2.3.3, readable-stream@npm:^2.3.6, readable-stream@npm:~2.3.6": version: 2.3.7 resolution: "readable-stream@npm:2.3.7" @@ -7141,13 +6937,6 @@ __metadata: languageName: node linkType: hard -"regenerator-runtime@npm:0.13.4": - version: 0.13.4 - resolution: "regenerator-runtime@npm:0.13.4" - checksum: ba49669ddbb56a12f8acf3e09427dfb89d83c4db466c387e8d7df8c13285695c6622a0112e12bdae492a97fdad3e68b2ef3f171bcc44d30a00adb1c9e121eaaa - languageName: node - linkType: hard - "regenerator-runtime@npm:^0.11.0": version: 0.11.1 resolution: "regenerator-runtime@npm:0.11.1" @@ -7577,13 +7366,6 @@ __metadata: languageName: node linkType: hard -"shell-quote@npm:1.7.3": - version: 1.7.3 - resolution: "shell-quote@npm:1.7.3" - checksum: aca58e73a3a5d933d02e0bdddedc53ee14f7c2ec264f97ac915b9d4482d077a38e422aa664631d60a672cd3cdb4054eb2e6c0303f54882453dacb6483e482d34 - languageName: node - linkType: hard - "shell-quote@npm:^1.4.2, shell-quote@npm:^1.6.1": version: 1.7.3 resolution: "shell-quote@npm:1.7.3" @@ -7855,7 +7637,7 @@ __metadata: languageName: node linkType: hard -"stream-browserify@npm:^2.0.0": +"stream-browserify@npm:^2.0.0, stream-browserify@npm:^2.0.1": version: 2.0.2 resolution: "stream-browserify@npm:2.0.2" dependencies: @@ -7887,7 +7669,7 @@ __metadata: languageName: node linkType: hard -"stream-http@npm:^2.0.0": +"stream-http@npm:^2.0.0, stream-http@npm:^2.7.2": version: 2.8.3 resolution: "stream-http@npm:2.8.3" dependencies: @@ -7969,7 +7751,7 @@ __metadata: languageName: node linkType: hard -"string_decoder@npm:1.3.0, string_decoder@npm:^1.1.1": +"string_decoder@npm:1.3.0, string_decoder@npm:^1.0.0, string_decoder@npm:^1.1.1": version: 1.3.0 resolution: "string_decoder@npm:1.3.0" dependencies: @@ -7991,17 +7773,8 @@ __metadata: version: 6.0.0 resolution: "strip-ansi@npm:6.0.0" dependencies: - ansi-regex: ^5.0.1 - checksum: f3cd25890aef3ba6e1a74e20896c21a46f482e93df4a06567cebf2b57edabb15133f1f94e57434e0a958d61186087b1008e89c94875d019910a213181a14fc8c - languageName: node - linkType: hard - -"strip-ansi@npm:6.0.1, strip-ansi@npm:^6.0.1": - version: 6.0.1 - resolution: "strip-ansi@npm:6.0.1" - dependencies: - ansi-regex: ^5.0.1 - checksum: f3cd25890aef3ba6e1a74e20896c21a46f482e93df4a06567cebf2b57edabb15133f1f94e57434e0a958d61186087b1008e89c94875d019910a213181a14fc8c + ansi-regex: ^5.0.0 + checksum: 04c3239ede44c4d195b0e66c0ad58b932f08bec7d05290416d361ff908ad282ecdaf5d9731e322c84f151d427436bde01f05b7422c3ec26dd927586736b0e5d0 languageName: node linkType: hard @@ -8014,21 +7787,12 @@ __metadata: languageName: node linkType: hard -"strip-ansi@npm:^6.0.0": - version: 6.0.0 - resolution: "strip-ansi@npm:6.0.0" - dependencies: - ansi-regex: ^5.0.0 - checksum: 04c3239ede44c4d195b0e66c0ad58b932f08bec7d05290416d361ff908ad282ecdaf5d9731e322c84f151d427436bde01f05b7422c3ec26dd927586736b0e5d0 - languageName: node - linkType: hard - "strip-ansi@npm:^6.0.0, strip-ansi@npm:^6.0.1": version: 6.0.1 resolution: "strip-ansi@npm:6.0.1" dependencies: - ansi-regex: ^5.0.0 - checksum: 04c3239ede44c4d195b0e66c0ad58b932f08bec7d05290416d361ff908ad282ecdaf5d9731e322c84f151d427436bde01f05b7422c3ec26dd927586736b0e5d0 + ansi-regex: ^5.0.1 + checksum: f3cd25890aef3ba6e1a74e20896c21a46f482e93df4a06567cebf2b57edabb15133f1f94e57434e0a958d61186087b1008e89c94875d019910a213181a14fc8c languageName: node linkType: hard @@ -8046,9 +7810,9 @@ __metadata: languageName: node linkType: hard -"styled-jsx@npm:5.0.0-beta.3": - version: 5.0.0-beta.3 - resolution: "styled-jsx@npm:5.0.0-beta.3" +"styled-jsx@npm:4.0.1": + version: 4.0.1 + resolution: "styled-jsx@npm:4.0.1" dependencies: "@babel/plugin-syntax-jsx": 7.14.5 "@babel/types": 7.15.0 @@ -8063,7 +7827,7 @@ __metadata: peerDependenciesMeta: "@babel/core": optional: true - checksum: cc328a92b56fe4aadcb29031be1b006279f1194592f66677079abc7d4294d388962f9634ef67dccdc592ef3d8ceaa8af9603c60198cbd371444e46074a6b1747 + checksum: a4260ba093086ed50c903ce1e4e564c4162d041238c02d8f9f8d1b259224f54ac49b49e9b4a6e3396c27e688dd870da7552c35ea9622c25aaa4777b2df64bb26 languageName: node linkType: hard @@ -8184,7 +7948,7 @@ __metadata: languageName: node linkType: hard -"timers-browserify@npm:2.0.12": +"timers-browserify@npm:2.0.12, timers-browserify@npm:^2.0.4": version: 2.0.12 resolution: "timers-browserify@npm:2.0.12" dependencies: @@ -8351,13 +8115,6 @@ __metadata: languageName: node linkType: hard -"tslib@npm:^1.9.0": - version: 1.14.1 - resolution: "tslib@npm:1.14.1" - checksum: dbe628ef87f66691d5d2959b3e41b9ca0045c3ee3c7c7b906cc1e328b39f199bb1ad9e671c39025bd56122ac57dfbf7385a94843b1cc07c60a4db74795829acd - languageName: node - linkType: hard - "tslib@npm:~2.1.0": version: 2.1.0 resolution: "tslib@npm:2.1.0" @@ -8365,6 +8122,13 @@ __metadata: languageName: node linkType: hard +"tty-browserify@npm:0.0.0": + version: 0.0.0 + resolution: "tty-browserify@npm:0.0.0" + checksum: a06f746acc419cb2527ba19b6f3bd97b4a208c03823bfb37b2982629d2effe30ebd17eaed0d7e2fc741f3c4f2a0c43455bd5fb4194354b378e78cfb7ca687f59 + languageName: node + linkType: hard + "tty-browserify@npm:0.0.1": version: 0.0.1 resolution: "tty-browserify@npm:0.0.1" @@ -8671,20 +8435,6 @@ __metadata: languageName: node linkType: hard -"util@npm:^0.12.0": - version: 0.12.3 - resolution: "util@npm:0.12.3" - dependencies: - inherits: ^2.0.3 - is-arguments: ^1.0.4 - is-generator-function: ^1.0.7 - is-typed-array: ^1.1.3 - safe-buffer: ^5.1.2 - which-typed-array: ^1.1.2 - checksum: e64d4a901999017d3125ba20d66f3f97429240ed1f7cf60a705abba8a4901277b909250677f616e043cd49f7ce5e4f2f4df5aa3960e8fdf83941f828f3643e9a - languageName: node - linkType: hard - "util@npm:~0.10.1": version: 0.10.4 resolution: "util@npm:0.10.4" @@ -8732,7 +8482,7 @@ __metadata: languageName: node linkType: hard -"vm-browserify@npm:1.1.2, vm-browserify@npm:^1.0.0": +"vm-browserify@npm:1.1.2, vm-browserify@npm:^1.0.0, vm-browserify@npm:^1.0.1": version: 1.1.2 resolution: "vm-browserify@npm:1.1.2" checksum: 10a1c50aab54ff8b4c9042c15fc64aefccce8d2fb90c0640403242db0ee7fb269f9b102bdb69cfb435d7ef3180d61fd4fb004a043a12709abaf9056cfd7e039d @@ -8756,13 +8506,13 @@ __metadata: languageName: node linkType: hard -"watchpack@npm:2.3.0": - version: 2.3.0 - resolution: "watchpack@npm:2.3.0" +"watchpack@npm:2.1.1": + version: 2.1.1 + resolution: "watchpack@npm:2.1.1" dependencies: glob-to-regexp: ^0.4.1 graceful-fs: ^4.1.2 - checksum: 54f577fe311ae6130b43c3202ddc5c66ea8cdc5e0569b6e1dbccf5c0f5f4f8d4d00b7b97f6ae6d53e9361766bf0dc4e6dc7b30e57392948af9795217f6d9d7a7 + checksum: 4a2d7ed1b441814b232db9c065beaee40ad0e37f77279331d663fa950b6b1926210a8dfa6009dc806b248f15d48826c9c6ce1a7fd6e6c94178d13c6c0a33f32c languageName: node linkType: hard diff --git a/packages/libs/core/src/build/builder.ts b/packages/libs/core/src/build/builder.ts index f14e337842..ab8cc68bcc 100644 --- a/packages/libs/core/src/build/builder.ts +++ b/packages/libs/core/src/build/builder.ts @@ -43,7 +43,7 @@ export default abstract class CoreBuilder { protected nextConfigDir: string; protected nextStaticDir: string; protected dotNextDir: string; - protected nextTargetDir: string; + protected serverlessDir: string; protected outputDir: string; protected buildOptions = defaultBuildOptions; @@ -57,12 +57,7 @@ export default abstract class CoreBuilder { this.buildOptions.nextStaticDir ?? this.buildOptions.nextConfigDir ); this.dotNextDir = path.join(this.nextConfigDir, ".next"); - this.nextTargetDir = path.join( - this.dotNextDir, - buildOptions && buildOptions.outputFileTracing - ? "server" - : "serverless" - ); + this.serverlessDir = path.join(this.dotNextDir, "serverless"); this.outputDir = this.buildOptions.outputDir; } @@ -192,7 +187,7 @@ export default abstract class CoreBuilder { } protected async readPagesManifest(): Promise<{ [key: string]: string }> { - const path = join(this.nextTargetDir, "pages-manifest.json"); + const path = join(this.serverlessDir, "pages-manifest.json"); const hasServerlessPageManifest = await fse.pathExists(path); if (!hasServerlessPageManifest) { @@ -271,7 +266,7 @@ export default abstract class CoreBuilder { this.isSSRJSFile( pageManifest, pathToPosix( - path.relative(path.join(this.nextTargetDir, "pages"), file) + path.relative(path.join(this.serverlessDir, "pages"), file) ) // important: make sure to use posix path to generate forward-slash path across both posix/windows ); @@ -287,9 +282,9 @@ export default abstract class CoreBuilder { * Copy code chunks generated by Next.js. */ protected async copyChunks(handlerDir: string): Promise { - return (await fse.pathExists(join(this.nextTargetDir, "chunks"))) + return (await fse.pathExists(join(this.serverlessDir, "chunks"))) ? fse.copy( - join(this.nextTargetDir, "chunks"), + join(this.serverlessDir, "chunks"), join(this.outputDir, handlerDir, "chunks") ) : Promise.resolve(); @@ -300,15 +295,15 @@ export default abstract class CoreBuilder { */ protected async copyJSFiles(handlerDir: string): Promise { await Promise.all([ - (await fse.pathExists(join(this.nextTargetDir, "webpack-api-runtime.js"))) + (await fse.pathExists(join(this.serverlessDir, "webpack-api-runtime.js"))) ? fse.copy( - join(this.nextTargetDir, "webpack-api-runtime.js"), + join(this.serverlessDir, "webpack-api-runtime.js"), join(this.outputDir, handlerDir, "webpack-api-runtime.js") ) : Promise.resolve(), - (await fse.pathExists(join(this.nextTargetDir, "webpack-runtime.js"))) + (await fse.pathExists(join(this.serverlessDir, "webpack-runtime.js"))) ? fse.copy( - join(this.nextTargetDir, "webpack-runtime.js"), + join(this.serverlessDir, "webpack-runtime.js"), join(this.outputDir, handlerDir, "webpack-runtime.js") ) : Promise.resolve() @@ -346,6 +341,8 @@ export default abstract class CoreBuilder { const nextConfigDir = this.nextConfigDir; const nextStaticDir = this.nextStaticDir; + const dotNextDirectory = path.join(this.nextConfigDir, ".next"); + const assetOutputDirectory = path.join(this.outputDir, ASSETS_DIR); const normalizedBasePath = basePath ? basePath.slice(1) : ""; @@ -363,12 +360,12 @@ export default abstract class CoreBuilder { // Copy BUILD_ID file const copyBuildId = copyIfExists( - path.join(this.dotNextDir, "BUILD_ID"), + path.join(dotNextDirectory, "BUILD_ID"), path.join(assetOutputDirectory, withBasePath("BUILD_ID")) ); const buildStaticFiles = await readDirectoryFiles( - path.join(this.dotNextDir, "static"), + path.join(dotNextDirectory, "static"), ignorePatterns ); @@ -408,7 +405,7 @@ export default abstract class CoreBuilder { }); const htmlAssets = [...htmlFiles, ...fallbackFiles].map((file) => { - const source = path.join(this.nextTargetDir, `pages${file}`); + const source = path.join(dotNextDirectory, `serverless/pages${file}`); const destination = path.join( assetOutputDirectory, withBasePath(`static-pages/${buildId}${file}`) @@ -418,7 +415,7 @@ export default abstract class CoreBuilder { }); const jsonAssets = jsonFiles.map((file) => { - const source = path.join(this.nextTargetDir, `pages${file}`); + const source = path.join(dotNextDirectory, `serverless/pages${file}`); const destination = path.join( assetOutputDirectory, withBasePath(`_next/data/${buildId}${file}`) diff --git a/packages/libs/core/src/types.ts b/packages/libs/core/src/types.ts index f2919d7847..4b145ded1e 100644 --- a/packages/libs/core/src/types.ts +++ b/packages/libs/core/src/types.ts @@ -292,5 +292,4 @@ export type CoreBuildOptions = { baseDir?: string; cleanupDotNext?: boolean; assetIgnorePatterns?: string[]; - outputFileTracing?: boolean; }; diff --git a/packages/libs/lambda-at-edge/package.json b/packages/libs/lambda-at-edge/package.json index 195836a21f..ecb0a4c1b3 100644 --- a/packages/libs/lambda-at-edge/package.json +++ b/packages/libs/lambda-at-edge/package.json @@ -64,7 +64,7 @@ "fetch-mock-jest": "1.5.1", "jest": "27.4.7", "klaw": "4.0.1", - "next": "12.0.7", + "next": "11.1.2", "react": "17.0.2", "react-dom": "17.0.2", "rimraf": "3.0.2", diff --git a/packages/libs/lambda-at-edge/src/build.ts b/packages/libs/lambda-at-edge/src/build.ts index d069a2709b..026797d70f 100644 --- a/packages/libs/lambda-at-edge/src/build.ts +++ b/packages/libs/lambda-at-edge/src/build.ts @@ -21,9 +21,6 @@ import { NextConfig } from "@sls-next/core"; import { NextI18nextIntegration } from "@sls-next/core/dist/build/third-party/next-i18next"; import normalizePath from "normalize-path"; -import { copyOutputFileTraces } from "./lib/copyOutputFileTraces"; -import { copyRequiredServerFiles } from "./lib/copyRequiredServerFiles"; - export const DEFAULT_LAMBDA_CODE_DIR = "default-lambda"; export const API_LAMBDA_CODE_DIR = "api-lambda"; export const IMAGE_LAMBDA_CODE_DIR = "image-lambda"; @@ -55,13 +52,12 @@ type BuildOptions = { separateApiLambda?: boolean; disableOriginResponseHandler?: boolean; useV2Handler?: boolean; - outputFileTracing?: boolean; }; const defaultBuildOptions = { args: [], cwd: process.cwd(), - env: {} as NodeJS.ProcessEnv, + env: {}, cmd: "./node_modules/.bin/next", useServerlessTraceTarget: false, logLambdaExecutionTimes: false, @@ -82,7 +78,7 @@ class Builder { nextConfigDir: string; nextStaticDir: string; dotNextDir: string; - nextTargetDir: string; + serverlessDir: string; outputDir: string; buildOptions: BuildOptions = defaultBuildOptions; @@ -95,10 +91,7 @@ class Builder { this.nextConfigDir = path.resolve(nextConfigDir); this.nextStaticDir = path.resolve(nextStaticDir ?? nextConfigDir); this.dotNextDir = path.join(this.nextConfigDir, ".next"); - this.nextTargetDir = path.join( - this.dotNextDir, - buildOptions && buildOptions.outputFileTracing ? "server" : "serverless" - ); + this.serverlessDir = path.join(this.dotNextDir, "serverless"); this.outputDir = outputDir; if (buildOptions) { this.buildOptions = buildOptions; @@ -123,7 +116,7 @@ class Builder { } async readPagesManifest(): Promise<{ [key: string]: string }> { - const path = join(this.nextTargetDir, "pages-manifest.json"); + const path = join(this.serverlessDir, "pages-manifest.json"); const hasServerlessPageManifest = await fse.pathExists(path); if (!hasServerlessPageManifest) { @@ -139,8 +132,7 @@ class Builder { fileList: string[], reasons: NodeFileTraceReasons, handlerDirectory: string, - base: string, - omitPackageJson = true + base: string ): Promise[] { return fileList .filter((file) => { @@ -156,14 +148,13 @@ class Builder { const reason = reasons.get(file); return ( - (!reason || reason.type !== "initial") && - (omitPackageJson ? file !== "package.json" : true) + (!reason || reason.type !== "initial") && file !== "package.json" ); }) .map((filePath: string) => { const resolvedFilePath = path.resolve(join(base, filePath)); const dst = normalizeNodeModules( - path.relative(this.nextTargetDir, resolvedFilePath) + path.relative(this.serverlessDir, resolvedFilePath) ); if (resolvedFilePath !== join(this.outputDir, handlerDirectory, dst)) { @@ -255,28 +246,9 @@ class Builder { buildManifest: OriginRequestDefaultHandlerManifest, destination: string ): Promise { - if (this.buildOptions.outputFileTracing) { - const allSsrPages = [ - ...Object.values(buildManifest.pages.ssr.nonDynamic), - ...Object.values(buildManifest.pages.ssr.dynamic) - ]; - - const ssrPages = Object.values(allSsrPages).map((pageFile) => - path.join(this.dotNextDir, "server", pageFile) - ); + let copyTraces: Promise[] = []; - await Promise.all([ - copyOutputFileTraces({ - serverlessDir: this.nextTargetDir, - destination: path.join(this.outputDir, destination), - pages: ssrPages - }), - copyRequiredServerFiles({ - nextConfigDir: this.nextConfigDir, - destination: path.join(this.outputDir, destination) - }) - ]); - } else if (this.buildOptions.useServerlessTraceTarget) { + if (this.buildOptions.useServerlessTraceTarget) { const ignoreAppAndDocumentPages = (page: string): boolean => { const basename = path.basename(page); return basename !== "_app.js" && basename !== "_document.js"; @@ -288,7 +260,7 @@ class Builder { ].filter(ignoreAppAndDocumentPages); const ssrPages = Object.values(allSsrPages).map((pageFile) => - path.join(this.nextTargetDir, pageFile) + path.join(this.serverlessDir, pageFile) ); const base = this.buildOptions.baseDir || process.cwd(); @@ -297,15 +269,15 @@ class Builder { resolve: this.buildOptions.resolve }); - await Promise.all( - this.copyLambdaHandlerDependencies( - Array.from(fileList), - reasons, - destination, - base - ) + copyTraces = this.copyLambdaHandlerDependencies( + Array.from(fileList), + reasons, + destination, + base ); } + + await Promise.all(copyTraces); } async buildDefaultLambda( @@ -315,7 +287,7 @@ class Builder { useV2Handler: boolean ): Promise { const hasAPIRoutes = await fse.pathExists( - join(this.nextTargetDir, "pages/api") + join(this.serverlessDir, "pages/api") ); return Promise.all([ @@ -340,7 +312,7 @@ class Builder { buildManifest ), fse.copy( - join(this.nextTargetDir, "pages"), + join(this.serverlessDir, "pages"), join(this.outputDir, DEFAULT_LAMBDA_CODE_DIR, "pages"), { filter: (file: string) => { @@ -363,7 +335,7 @@ class Builder { this.isSSRJSFile( buildManifest, pathToPosix( - path.relative(path.join(this.nextTargetDir, "pages"), file) + path.relative(path.join(this.serverlessDir, "pages"), file) ) // important: make sure to use posix path to generate forward-slash path across both posix/windows ); @@ -396,49 +368,36 @@ class Builder { async buildApiLambda( apiBuildManifest: OriginRequestApiHandlerManifest ): Promise { - const promises: Promise[] = []; - - const allApiPages = [ - ...Object.values(apiBuildManifest.apis.nonDynamic), - ...Object.values(apiBuildManifest.apis.dynamic).map((entry) => entry.file) - ]; + let copyTraces: Promise[] = []; - const apiPages = Object.values(allApiPages).map((pageFile) => - path.join(this.nextTargetDir, pageFile) - ); + if (this.buildOptions.useServerlessTraceTarget) { + const allApiPages = [ + ...Object.values(apiBuildManifest.apis.nonDynamic), + ...Object.values(apiBuildManifest.apis.dynamic).map( + (entry) => entry.file + ) + ]; - if (this.buildOptions.outputFileTracing) { - promises.push( - copyOutputFileTraces({ - serverlessDir: this.nextTargetDir, - destination: path.join(this.outputDir, API_LAMBDA_CODE_DIR), - pages: apiPages - }), - copyRequiredServerFiles({ - nextConfigDir: this.nextConfigDir, - destination: path.join(this.outputDir, API_LAMBDA_CODE_DIR) - }) + const apiPages = Object.values(allApiPages).map((pageFile) => + path.join(this.serverlessDir, pageFile) ); - } else if (this.buildOptions.useServerlessTraceTarget) { - const base = this.buildOptions.baseDir || process.cwd(); + const base = this.buildOptions.baseDir || process.cwd(); const { fileList, reasons } = await nodeFileTrace(apiPages, { base, resolve: this.buildOptions.resolve }); - promises.push( - ...this.copyLambdaHandlerDependencies( - Array.from(fileList), - reasons, - API_LAMBDA_CODE_DIR, - base - ) + copyTraces = this.copyLambdaHandlerDependencies( + Array.from(fileList), + reasons, + API_LAMBDA_CODE_DIR, + base ); } return Promise.all([ - ...promises, + ...copyTraces, this.processAndCopyHandler( "api-handler", join(this.outputDir, API_LAMBDA_CODE_DIR), @@ -451,7 +410,7 @@ class Builder { ) : Promise.resolve(), fse.copy( - join(this.nextTargetDir, "pages/api"), + join(this.serverlessDir, "pages/api"), join(this.outputDir, API_LAMBDA_CODE_DIR, "pages/api") ), this.copyJSFiles(API_LAMBDA_CODE_DIR), @@ -485,7 +444,7 @@ class Builder { this.copyJSFiles(REGENERATION_LAMBDA_CODE_DIR), this.copyChunks(REGENERATION_LAMBDA_CODE_DIR), fse.copy( - join(this.nextTargetDir, "pages"), + join(this.serverlessDir, "pages"), join(this.outputDir, REGENERATION_LAMBDA_CODE_DIR, "pages"), { filter: (file: string) => { @@ -506,38 +465,31 @@ class Builder { /** * copy chunks if present and not using serverless trace - * or Next.js 12 Output File Tracing */ - async copyChunks(handlerDir: string): Promise { - const { useServerlessTraceTarget, outputFileTracing } = this.buildOptions; - if (useServerlessTraceTarget || outputFileTracing) return; - - const hasChunks = fse.existsSync(join(this.nextTargetDir, "chunks")); - if (hasChunks) { - await fse.copy( - join(this.nextTargetDir, "chunks"), - join(this.outputDir, handlerDir, "chunks") - ); - } + copyChunks(handlerDir: string): Promise { + return !this.buildOptions.useServerlessTraceTarget && + fse.existsSync(join(this.serverlessDir, "chunks")) + ? fse.copy( + join(this.serverlessDir, "chunks"), + join(this.outputDir, handlerDir, "chunks") + ) + : Promise.resolve(); } /** * Copy additional JS files needed such as webpack-runtime.js (new in Next.js 12) */ async copyJSFiles(handlerDir: string): Promise { - // Included in Next.js 12 Output File Traces - if (this.buildOptions.outputFileTracing) return; - await Promise.all([ - (await fse.pathExists(join(this.nextTargetDir, "webpack-api-runtime.js"))) + (await fse.pathExists(join(this.serverlessDir, "webpack-api-runtime.js"))) ? fse.copy( - join(this.nextTargetDir, "webpack-api-runtime.js"), + join(this.serverlessDir, "webpack-api-runtime.js"), join(this.outputDir, handlerDir, "webpack-api-runtime.js") ) : Promise.resolve(), - (await fse.pathExists(join(this.nextTargetDir, "webpack-runtime.js"))) + (await fse.pathExists(join(this.serverlessDir, "webpack-runtime.js"))) ? fse.copy( - join(this.nextTargetDir, "webpack-runtime.js"), + join(this.serverlessDir, "webpack-runtime.js"), join(this.outputDir, handlerDir, "webpack-runtime.js") ) : Promise.resolve() @@ -621,6 +573,8 @@ class Builder { const nextConfigDir = this.nextConfigDir; const nextStaticDir = this.nextStaticDir; + const dotNextDirectory = path.join(this.nextConfigDir, ".next"); + const assetOutputDirectory = path.join(this.outputDir, ASSETS_DIR); const normalizedBasePath = basePath ? basePath.slice(1) : ""; @@ -638,12 +592,12 @@ class Builder { // Copy BUILD_ID file const copyBuildId = copyIfExists( - path.join(this.dotNextDir, "BUILD_ID"), + path.join(dotNextDirectory, "BUILD_ID"), path.join(assetOutputDirectory, withBasePath("BUILD_ID")) ); const buildStaticFiles = await readDirectoryFiles( - path.join(this.dotNextDir, "static"), + path.join(dotNextDirectory, "static"), ignorePatterns ); @@ -683,7 +637,7 @@ class Builder { }); const htmlAssets = [...htmlFiles, ...fallbackFiles].map((file) => { - const source = path.join(this.nextTargetDir, `pages${file}`); + const source = path.join(dotNextDirectory, `serverless/pages${file}`); const destination = path.join( assetOutputDirectory, withBasePath(`static-pages/${buildId}${file}`) @@ -693,7 +647,7 @@ class Builder { }); const jsonAssets = jsonFiles.map((file) => { - const source = path.join(this.nextTargetDir, `pages${file}`); + const source = path.join(dotNextDirectory, `serverless/pages${file}`); const destination = path.join( assetOutputDirectory, withBasePath(`_next/data/${buildId}${file}`) @@ -777,8 +731,7 @@ class Builder { cleanupDotNext, assetIgnorePatterns, separateApiLambda, - useV2Handler, - outputFileTracing + useV2Handler } = Object.assign(defaultBuildOptions, this.buildOptions); await Promise.all([ @@ -790,11 +743,13 @@ class Builder { fse.emptyDir(join(this.outputDir, ASSETS_DIR)) ]); - /** - * No need to add `target: "serverless"` when using - * Next.js 12 Output File Tracing. - */ - if (outputFileTracing) { + const { restoreUserConfig } = await createServerlessConfig( + cwd, + path.join(this.nextConfigDir), + useServerlessTraceTarget + ); + + try { const subprocess = execa(cmd, args, { cwd, env @@ -806,28 +761,8 @@ class Builder { } await subprocess; - } else { - const { restoreUserConfig } = await createServerlessConfig( - cwd, - path.join(this.nextConfigDir), - useServerlessTraceTarget - ); - - try { - const subprocess = execa(cmd, args, { - cwd, - env - }); - - if (debugMode) { - // @ts-ignore - subprocess.stdout.pipe(process.stdout); - } - - await subprocess; - } finally { - await restoreUserConfig(); - } + } finally { + await restoreUserConfig(); } // eslint-disable-next-line @typescript-eslint/no-var-requires diff --git a/packages/libs/lambda-at-edge/src/lib/copyOutputFileTraces.ts b/packages/libs/lambda-at-edge/src/lib/copyOutputFileTraces.ts deleted file mode 100644 index c18929b314..0000000000 --- a/packages/libs/lambda-at-edge/src/lib/copyOutputFileTraces.ts +++ /dev/null @@ -1,66 +0,0 @@ -import normalizeNodeModules from "@sls-next/core/dist/build/lib/normalizeNodeModules"; -import fse from "fs-extra"; -import path from "path"; -import { isPathInsideDir } from "./isPathInsideDir"; - -/** - * @see https://nextjs.org/docs/advanced-features/output-file-tracing - */ -export const copyOutputFileTraces = async ({ - serverlessDir, - destination, - pages -}: { - serverlessDir: string; - destination: string; - pages: string[]; -}): Promise => { - const DOT_NEXT = path.join(serverlessDir, "../"); - const NEXT_SERVER_JS_NFT_JSON = path.join( - DOT_NEXT, - "next-server.js.nft.json" - ); - - const nftJsonFiles = [NEXT_SERVER_JS_NFT_JSON].concat( - pages.map((f) => `${f}.nft.json`) - ); - - const traces: Set = new Set(); - - const readNft = async (nft: string) => { - const basePath = path.dirname(nft); - try { - const { files } = (await fse.readJSON(nft)) as { files: string[] }; - files.forEach((file) => { - const absolutePath = path.join(basePath, file); - traces.add(absolutePath); - }); - } catch (error) { - return Promise.reject( - `Failed to read trace \`${nft}\`. Check that you're using the \`outputFileTracing\` option with Node.js 12.` - ); - } - }; - - await Promise.all(nftJsonFiles.map((file) => readNft(file))); - - const isInsideDestination = isPathInsideDir(destination); - - await Promise.all( - Array.from(traces) - .filter((file) => !file.endsWith("package.json")) - .map((src) => { - const normalized = normalizeNodeModules(src); - const dest = path.join( - destination, - normalized.startsWith("node_modules/") - ? normalized - : path.relative(serverlessDir, src) - ); - - return isInsideDestination(dest) - ? fse.copy(src, dest) - : Promise.resolve(); - }) - ); -}; diff --git a/packages/libs/lambda-at-edge/src/lib/copyRequiredServerFiles.ts b/packages/libs/lambda-at-edge/src/lib/copyRequiredServerFiles.ts deleted file mode 100644 index a7dc067082..0000000000 --- a/packages/libs/lambda-at-edge/src/lib/copyRequiredServerFiles.ts +++ /dev/null @@ -1,42 +0,0 @@ -import path from "path"; -import fse from "fs-extra"; -import { isPathInsideDir } from "./isPathInsideDir"; - -export const copyRequiredServerFiles = async ({ - nextConfigDir, - destination -}: { - nextConfigDir: string; - destination: string; -}): Promise => { - const REQUIRED_SERVER_FILES = path.join( - nextConfigDir, - ".next/required-server-files.json" - ); - - try { - const { files } = (await fse.readJSON(REQUIRED_SERVER_FILES)) as { - files: string[]; - }; - - const isInsideDestination = isPathInsideDir(destination); - - await Promise.all( - files.map((file) => { - const absoluteFile = path.join(nextConfigDir, file); - const destinationFile = path.join( - destination, - path.relative(nextConfigDir, absoluteFile) - ); - - return isInsideDestination(destinationFile) - ? fse.copy(absoluteFile, destinationFile, { errorOnExist: false }) - : Promise.resolve(); - }) - ); - } catch (error) { - return Promise.reject( - `Failed to process \`required-server-files.json\`. Check that you're using the \`outputFileTracing\` option with Node.js 12.` - ); - } -}; diff --git a/packages/libs/lambda-at-edge/src/lib/isPathInsideDir.ts b/packages/libs/lambda-at-edge/src/lib/isPathInsideDir.ts deleted file mode 100644 index 1cd83476e6..0000000000 --- a/packages/libs/lambda-at-edge/src/lib/isPathInsideDir.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { isAbsolute, relative } from "path"; - -/** Returns `true` if `path` is inside `dir` */ -export const isPathInsideDir = (dir: string) => (path: string) => { - const relativePath = relative(dir, path); - return ( - !!relativePath && - !relativePath.startsWith("..") && - !isAbsolute(relativePath) - ); -}; diff --git a/packages/libs/lambda-at-edge/tests/integration/serverless-trace-with-dynamic-import-typescript/fixture/next-env.d.ts b/packages/libs/lambda-at-edge/tests/integration/serverless-trace-with-dynamic-import-typescript/fixture/next-env.d.ts index 4f11a03dc6..9bc3dd46b9 100644 --- a/packages/libs/lambda-at-edge/tests/integration/serverless-trace-with-dynamic-import-typescript/fixture/next-env.d.ts +++ b/packages/libs/lambda-at-edge/tests/integration/serverless-trace-with-dynamic-import-typescript/fixture/next-env.d.ts @@ -1,4 +1,5 @@ /// +/// /// // NOTE: This file should not be edited diff --git a/packages/libs/lambda-at-edge/tests/integration/serverless-trace-with-dynamic-import-typescript/fixture/tsconfig.json b/packages/libs/lambda-at-edge/tests/integration/serverless-trace-with-dynamic-import-typescript/fixture/tsconfig.json index 5bee8c4d57..35d51eac90 100644 --- a/packages/libs/lambda-at-edge/tests/integration/serverless-trace-with-dynamic-import-typescript/fixture/tsconfig.json +++ b/packages/libs/lambda-at-edge/tests/integration/serverless-trace-with-dynamic-import-typescript/fixture/tsconfig.json @@ -16,8 +16,7 @@ "moduleResolution": "node", "resolveJsonModule": true, "isolatedModules": true, - "jsx": "preserve", - "incremental": true + "jsx": "preserve" }, "include": [ "next-env.d.ts", diff --git a/packages/libs/lambda-at-edge/tests/integration/with-empty-next-config/with-next-12-output-file-tracing.test.ts b/packages/libs/lambda-at-edge/tests/integration/with-empty-next-config/with-next-12-output-file-tracing.test.ts deleted file mode 100644 index dea4667f6a..0000000000 --- a/packages/libs/lambda-at-edge/tests/integration/with-empty-next-config/with-next-12-output-file-tracing.test.ts +++ /dev/null @@ -1,56 +0,0 @@ -import { remove, readdir, pathExists, readFile } from "fs-extra"; -import path from "path"; -import { getNextBinary } from "../../test-utils"; -import os from "os"; -import Builder from "../../../src/build"; - -jest.unmock("execa"); - -describe("Next.js 12 Output File Tracing", () => { - const nextBinary = getNextBinary(); - const fixtureDir = path.join(__dirname, "./fixture"); - let outputDir: string; - - beforeAll(async () => { - outputDir = path.join( - os.tmpdir(), - new Date().getUTCMilliseconds().toString(), - "slsnext-test-build" - ); - console.log("outputDir:", outputDir); - - const builder = new Builder(fixtureDir, outputDir, { - cwd: fixtureDir, - cmd: nextBinary, - args: ["build"], - outputFileTracing: true - }); - - await builder.build(); - }); - - afterAll(() => { - return Promise.all( - [".next"].map((file) => remove(path.join(fixtureDir, file))) - ); - }); - - it("copies node_modules to default lambda artefact", async () => { - const nodeModules = await readdir( - path.join(outputDir, "default-lambda/node_modules") - ); - expect(nodeModules.length).toBeGreaterThan(5); // 5 is just an arbitrary number to ensure dependencies are being copied - }); - - it("copies index.html page to static assets", async () => { - const BUILD_ID = ( - await readFile(path.join(outputDir, "assets", "BUILD_ID")) - ).toString(); - - const staticFileInOutput = await pathExists( - path.join(outputDir, "assets", "static-pages", BUILD_ID, "index.html") - ); - - expect(staticFileInOutput).toBe(true); - }); -}); diff --git a/packages/libs/lambda-at-edge/tests/lib/copyOutputFileTraces.test.ts b/packages/libs/lambda-at-edge/tests/lib/copyOutputFileTraces.test.ts deleted file mode 100644 index d47d9d0508..0000000000 --- a/packages/libs/lambda-at-edge/tests/lib/copyOutputFileTraces.test.ts +++ /dev/null @@ -1,171 +0,0 @@ -import fse from "fs-extra"; - -import { copyOutputFileTraces } from "../../src/lib/copyOutputFileTraces"; - -const mockReadJSON = jest.spyOn(fse, "readJSON"); -const mockCopy = jest.spyOn(fse, "copy"); - -describe("copyOutputFileTraces", () => { - const OPTIONS = { - serverlessDir: "/app/.next/serverless", - destination: "/serverless-nextjs/default-lambda", - pages: ["/app/.next/serverless/pages/index.js"] - }; - - beforeEach(() => { - mockReadJSON.mockReset().mockImplementation(async () => { - await Promise.resolve(); - // @ts-expect-error: throw by default - return JSON.parse(undefined); - }); - - mockCopy.mockReset().mockImplementation(() => Promise.resolve()); - }); - - it("should throw with missing file", async () => { - await expect(copyOutputFileTraces(OPTIONS)).rejects.toEqual( - "Failed to read trace `/app/.next/next-server.js.nft.json`. Check that you're using the `outputFileTracing` option with Node.js 12." - ); - - expect(mockReadJSON).toHaveBeenCalledTimes(2); - expect(mockReadJSON).toHaveBeenNthCalledWith( - 1, - "/app/.next/next-server.js.nft.json" - ); - expect(mockReadJSON).toHaveBeenNthCalledWith( - 2, - "/app/.next/serverless/pages/index.js.nft.json" - ); - - expect(mockCopy).not.toHaveBeenCalled(); - }); - - it("should throw with invalid file", async () => { - // File missing `files: string[]` - mockReadJSON.mockImplementation(() => Promise.resolve({})); - - await expect(copyOutputFileTraces(OPTIONS)).rejects.toEqual( - "Failed to read trace `/app/.next/next-server.js.nft.json`. Check that you're using the `outputFileTracing` option with Node.js 12." - ); - - expect(mockReadJSON).toHaveBeenCalledTimes(2); - expect(mockReadJSON).toHaveBeenNthCalledWith( - 1, - "/app/.next/next-server.js.nft.json" - ); - expect(mockReadJSON).toHaveBeenNthCalledWith( - 2, - "/app/.next/serverless/pages/index.js.nft.json" - ); - - expect(mockCopy).not.toHaveBeenCalled(); - }); - - it("should resolve with valid file without any traces", async () => { - mockReadJSON.mockImplementation(() => Promise.resolve({ files: [] })); - - await expect(copyOutputFileTraces(OPTIONS)).resolves.toEqual(undefined); - - expect(mockReadJSON).toHaveBeenCalledTimes(2); - expect(mockReadJSON).toHaveBeenNthCalledWith( - 1, - "/app/.next/next-server.js.nft.json" - ); - expect(mockReadJSON).toHaveBeenNthCalledWith( - 2, - "/app/.next/serverless/pages/index.js.nft.json" - ); - - expect(mockCopy).not.toHaveBeenCalled(); - }); - - it("should copy trace from same directory", async () => { - // .next/next-server.js.nft.json - mockReadJSON.mockImplementationOnce(() => Promise.resolve({ files: [] })); - - // .next/serverless/pages/index.js - mockReadJSON.mockImplementationOnce(() => - Promise.resolve({ - files: ["./file_1.js"] - }) - ); - - await expect(copyOutputFileTraces(OPTIONS)).resolves.toEqual(undefined); - - expect(mockReadJSON).toHaveBeenCalledTimes(2); - expect(mockReadJSON).toHaveBeenNthCalledWith( - 1, - "/app/.next/next-server.js.nft.json" - ); - expect(mockReadJSON).toHaveBeenNthCalledWith( - 2, - "/app/.next/serverless/pages/index.js.nft.json" - ); - - expect(mockCopy).toHaveBeenCalledTimes(1); - expect(mockCopy).toHaveBeenCalledWith( - "/app/.next/serverless/pages/file_1.js", - "/serverless-nextjs/default-lambda/pages/file_1.js" - ); - }); - - it("should copy trace from parent directory", async () => { - // .next/next-server.js.nft.json - mockReadJSON.mockImplementationOnce(() => Promise.resolve({ files: [] })); - - // .next/serverless/pages/index.js - mockReadJSON.mockImplementationOnce(() => - Promise.resolve({ - files: ["../file_2.js"] - }) - ); - - await expect(copyOutputFileTraces(OPTIONS)).resolves.toEqual(undefined); - - expect(mockReadJSON).toHaveBeenCalledTimes(2); - expect(mockReadJSON).toHaveBeenNthCalledWith( - 1, - "/app/.next/next-server.js.nft.json" - ); - expect(mockReadJSON).toHaveBeenNthCalledWith( - 2, - "/app/.next/serverless/pages/index.js.nft.json" - ); - - expect(mockCopy).toHaveBeenCalledTimes(1); - expect(mockCopy).toHaveBeenCalledWith( - "/app/.next/serverless/file_2.js", - "/serverless-nextjs/default-lambda/file_2.js" - ); - }); - - it("should copy trace from node_modules", async () => { - // .next/next-server.js.nft.json - mockReadJSON.mockImplementationOnce(() => Promise.resolve({ files: [] })); - - // .next/serverless/pages/index.js - mockReadJSON.mockImplementationOnce(() => - Promise.resolve({ - files: ["../../../node_modules/module/index.js"] - }) - ); - - await expect(copyOutputFileTraces(OPTIONS)).resolves.toEqual(undefined); - - expect(mockReadJSON).toHaveBeenCalledTimes(2); - expect(mockReadJSON).toHaveBeenNthCalledWith( - 1, - "/app/.next/next-server.js.nft.json" - ); - expect(mockReadJSON).toHaveBeenNthCalledWith( - 2, - "/app/.next/serverless/pages/index.js.nft.json" - ); - - expect(mockCopy).toHaveBeenCalledTimes(1); - expect(mockCopy).toHaveBeenCalledWith( - "/app/node_modules/module/index.js", - "/serverless-nextjs/default-lambda/node_modules/module/index.js" - ); - }); -}); diff --git a/packages/libs/lambda-at-edge/tests/lib/copyRequiredServerFiles.test.ts b/packages/libs/lambda-at-edge/tests/lib/copyRequiredServerFiles.test.ts deleted file mode 100644 index c32c21244a..0000000000 --- a/packages/libs/lambda-at-edge/tests/lib/copyRequiredServerFiles.test.ts +++ /dev/null @@ -1,113 +0,0 @@ -import fse from "fs-extra"; - -import { copyRequiredServerFiles } from "../../src/lib/copyRequiredServerFiles"; - -const mockReadJSON = jest - .spyOn(fse, "readJSON") - .mockImplementation(async () => { - await Promise.resolve(); - // @ts-expect-error: throw by default - return JSON.parse(undefined); - }); - -const mockCopy = jest - .spyOn(fse, "copy") - .mockImplementation(() => Promise.resolve()); - -describe("copyRequiredServerFiles", () => { - const OPTIONS = { - nextConfigDir: "/app", - destination: "/serverless-nextjs/default-lambda" - }; - - beforeEach(() => { - mockReadJSON.mockClear(); - mockCopy.mockClear(); - }); - - it("should throw with missing file", async () => { - await expect(copyRequiredServerFiles(OPTIONS)).rejects.toEqual( - "Failed to process `required-server-files.json`. Check that you're using the `outputFileTracing` option with Node.js 12." - ); - - expect(mockReadJSON).toHaveBeenCalledTimes(1); - expect(mockReadJSON).toHaveBeenCalledWith( - "/app/.next/required-server-files.json" - ); - - expect(mockCopy).not.toHaveBeenCalled(); - }); - - it("should throw with invalid file", async () => { - // File missing `files: string[]` - mockReadJSON.mockImplementation(() => Promise.resolve({})); - - await expect(copyRequiredServerFiles(OPTIONS)).rejects.toEqual( - "Failed to process `required-server-files.json`. Check that you're using the `outputFileTracing` option with Node.js 12." - ); - - expect(mockReadJSON).toHaveBeenCalledTimes(1); - expect(mockReadJSON).toHaveBeenCalledWith( - "/app/.next/required-server-files.json" - ); - - expect(mockCopy).not.toHaveBeenCalled(); - }); - - it("should resolve with valid file without any traces", async () => { - mockReadJSON.mockImplementation(() => Promise.resolve({ files: [] })); - - await expect(copyRequiredServerFiles(OPTIONS)).resolves.toEqual(undefined); - - expect(mockReadJSON).toHaveBeenCalledTimes(1); - expect(mockReadJSON).toHaveBeenCalledWith( - "/app/.next/required-server-files.json" - ); - - expect(mockCopy).not.toHaveBeenCalled(); - }); - - it("should copy trace from same directory", async () => { - mockReadJSON.mockImplementationOnce(() => - Promise.resolve({ - files: ["./file_1.js"] - }) - ); - - await expect(copyRequiredServerFiles(OPTIONS)).resolves.toEqual(undefined); - - expect(mockReadJSON).toHaveBeenCalledTimes(1); - expect(mockReadJSON).toHaveBeenCalledWith( - "/app/.next/required-server-files.json" - ); - - expect(mockCopy).toHaveBeenCalledTimes(1); - expect(mockCopy).toHaveBeenCalledWith( - "/app/file_1.js", - "/serverless-nextjs/default-lambda/file_1.js", - { errorOnExist: false } - ); - }); - - it("should copy trace from node_modules", async () => { - mockReadJSON.mockImplementationOnce(() => - Promise.resolve({ - files: ["./node_modules/module/index.js"] - }) - ); - - await expect(copyRequiredServerFiles(OPTIONS)).resolves.toEqual(undefined); - - expect(mockReadJSON).toHaveBeenCalledTimes(1); - expect(mockReadJSON).toHaveBeenCalledWith( - "/app/.next/required-server-files.json" - ); - - expect(mockCopy).toHaveBeenCalledTimes(1); - expect(mockCopy).toHaveBeenCalledWith( - "/app/node_modules/module/index.js", - "/serverless-nextjs/default-lambda/node_modules/module/index.js", - { errorOnExist: false } - ); - }); -}); diff --git a/packages/libs/lambda-at-edge/tests/lib/isPathInsideDir.test.ts b/packages/libs/lambda-at-edge/tests/lib/isPathInsideDir.test.ts deleted file mode 100644 index 8bb4f9178b..0000000000 --- a/packages/libs/lambda-at-edge/tests/lib/isPathInsideDir.test.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { isPathInsideDir } from "../../src/lib/isPathInsideDir"; - -describe("isPathInsideDir", () => { - it("should return false when path is not inside dir", () => { - const isInsideDir = isPathInsideDir("/serverless/default-lambda"); - - expect(isInsideDir("/")).toEqual(false); - expect(isInsideDir("/foo")).toEqual(false); - expect(isInsideDir("/serverless")).toEqual(false); - expect(isInsideDir("/serverless/default-lambda")).toEqual(false); - }); - - it("should return true when path is inside dir", () => { - const isInsideDir = isPathInsideDir("/serverless/default-lambda"); - - expect(isInsideDir("/serverless/default-lambda/index.js")).toEqual(true); - expect( - isInsideDir("/serverless/default-lambda/node_modules/index.js") - ).toEqual(true); - }); -}); diff --git a/packages/libs/lambda/src/build/builder.ts b/packages/libs/lambda/src/build/builder.ts index 3b616bebce..5c3fb17cc0 100644 --- a/packages/libs/lambda/src/build/builder.ts +++ b/packages/libs/lambda/src/build/builder.ts @@ -100,7 +100,7 @@ export class LambdaBuilder extends CoreBuilder { lambdaManifest: LambdaManifest ): Promise { const hasAPIRoutes = await fse.pathExists( - join(this.nextTargetDir, "pages/api") + join(this.serverlessDir, "pages/api") ); await fse.mkdir(join(this.outputDir, DEFAULT_LAMBDA_CODE_DIR)); @@ -132,7 +132,7 @@ export class LambdaBuilder extends CoreBuilder { this.buildOptions.minifyHandlers ? undefined : { spaces: 2 } ), fse.copy( - join(this.nextTargetDir, "pages"), + join(this.serverlessDir, "pages"), join(this.outputDir, DEFAULT_LAMBDA_CODE_DIR, "pages"), { filter: this.getDefaultHandlerFileFilter(hasAPIRoutes, pageManifest) diff --git a/packages/serverless-components/nextjs-component/__tests__/custom-inputs.test.ts b/packages/serverless-components/nextjs-component/__tests__/custom-inputs.test.ts index 6e32e5c6bb..8c2ee44d7d 100644 --- a/packages/serverless-components/nextjs-component/__tests__/custom-inputs.test.ts +++ b/packages/serverless-components/nextjs-component/__tests__/custom-inputs.test.ts @@ -1148,33 +1148,6 @@ describe("Custom inputs", () => { }); }); - describe("Build using outputFileTracing", () => { - const fixturePath = path.join(__dirname, "./fixtures/no-target-app"); - let tmpCwd: string; - - beforeEach(() => { - tmpCwd = process.cwd(); - process.chdir(fixturePath); - - mockServerlessComponentDependencies({ expectedDomain: undefined }); - }); - - afterEach(() => { - process.chdir(tmpCwd); - return cleanupFixtureDirectory(fixturePath); - }); - - it("builds correctly", async () => { - await createNextComponent().default({ - build: { - cmd: "node_modules/.bin/next", - args: ["build"], - outputFileTracing: true - } - }); - }); - }); - describe.each([false, "false"])( "Skip deployment after build", (deployInput) => { diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/BUILD_ID b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/BUILD_ID deleted file mode 100644 index 5ad897a7a0..0000000000 --- a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/BUILD_ID +++ /dev/null @@ -1 +0,0 @@ -test-build-id \ No newline at end of file diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/build-manifest.json b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/build-manifest.json deleted file mode 100644 index bf517e5366..0000000000 --- a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/build-manifest.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "pages": {} -} diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/images-manifest.json b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/images-manifest.json deleted file mode 100644 index 22ea5d8852..0000000000 --- a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/images-manifest.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "version": 1, - "images": { - "deviceSizes": [640, 750, 828, 1080, 1200, 1920, 2048, 3840], - "imageSizes": [16, 32, 48, 64, 96, 128, 256, 384], - "domains": [], - "path": "/_next/image", - "loader": "default", - "sizes": [ - 640, - 750, - 828, - 1080, - 1200, - 1920, - 2048, - 3840, - 16, - 32, - 48, - 64, - 96, - 128, - 256, - 384 - ] - } -} diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/next-server.js.nft.json b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/next-server.js.nft.json deleted file mode 100644 index c0d3a6cc89..0000000000 --- a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/next-server.js.nft.json +++ /dev/null @@ -1 +0,0 @@ -{"version":1,"cacheKey":"test-build-id","files":[]} \ No newline at end of file diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/prerender-manifest.json b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/prerender-manifest.json deleted file mode 100644 index aece3980e1..0000000000 --- a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/prerender-manifest.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "version": 2, - "routes": { - "/": { - "initialRevalidateSeconds": false, - "srcRoute": null, - "dataRoute": "/_next/data/zsWqBqLjpgRmswfQomanp/index.json" - } - }, - "dynamicRoutes": {} -} diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/react-loadable-manifest.json b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/react-loadable-manifest.json deleted file mode 100644 index 9e26dfeeb6..0000000000 --- a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/react-loadable-manifest.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/required-server-files.json b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/required-server-files.json deleted file mode 100644 index 0fbf69d9de..0000000000 --- a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/required-server-files.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "version": 1, - "appDir": "packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app", - "files": [ - ".next/routes-manifest.json", - ".next/server/pages-manifest.json", - ".next/build-manifest.json", - ".next/prerender-manifest.json", - ".next/server/middleware-manifest.json", - ".next/react-loadable-manifest.json", - ".next/server/font-manifest.json", - ".next/BUILD_ID" - ], - "ignore": [] -} diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/routes-manifest.json b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/routes-manifest.json deleted file mode 100644 index 46a422f819..0000000000 --- a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/routes-manifest.json +++ /dev/null @@ -1 +0,0 @@ -{"version":1,"pages404":true,"basePath":"","redirects":[],"rewrites":[],"headers":[],"dynamicRoutes":[]} diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/chunks/1.js b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/chunks/1.js deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/font-manifest.json b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/font-manifest.json deleted file mode 100644 index 0637a088a0..0000000000 --- a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/font-manifest.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/middleware-manifest.json b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/middleware-manifest.json deleted file mode 100644 index c5eb773385..0000000000 --- a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/middleware-manifest.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "sortedMiddleware": [], - "clientInfo": [], - "middleware": {}, - "version": 1 -} \ No newline at end of file diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages-manifest.json b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages-manifest.json deleted file mode 100644 index add630f7e1..0000000000 --- a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages-manifest.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "/[root]": "pages/[root].js", - "/customers/[customer]": "pages/customers/[customer].js", - "/customers/[customer]/[post]": "pages/customers/[customer]/[post].js", - "/customers/new": "pages/customers/new.js", - "/customers/[customer]/profile": "pages/customers/[customer]/profile.js", - "/customers/[...catchAll]": "pages/customers/[...catchAll].js", - "/api/customers": "pages/api/customers.js", - "/api/customers/[id]": "pages/api/customers/[id].js", - "/api/customers/new": "pages/api/customers/new.js", - "/terms": "pages/terms.html", - "/about": "pages/about.html", - "/blog/[post]": "pages/blog/[post].html", - "/": "pages/index.js", - "/_app": "pages/_app.js", - "/_document": "pages/_document.js", - "/404": "pages/404.html" -} diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/404.html b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/404.html deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/404.js.nft.json b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/404.js.nft.json deleted file mode 100644 index d00eeb8ec4..0000000000 --- a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/404.js.nft.json +++ /dev/null @@ -1 +0,0 @@ -{"version":1,"files":[]} \ No newline at end of file diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/[root].js b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/[root].js deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/[root].js.nft.json b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/[root].js.nft.json deleted file mode 100644 index e6aa142f67..0000000000 --- a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/[root].js.nft.json +++ /dev/null @@ -1 +0,0 @@ -{"version":1,"files":["../chunks/1.js"]} \ No newline at end of file diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/_app.js.nft.json b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/_app.js.nft.json deleted file mode 100644 index d00eeb8ec4..0000000000 --- a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/_app.js.nft.json +++ /dev/null @@ -1 +0,0 @@ -{"version":1,"files":[]} \ No newline at end of file diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/_document.js.nft.json b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/_document.js.nft.json deleted file mode 100644 index d00eeb8ec4..0000000000 --- a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/_document.js.nft.json +++ /dev/null @@ -1 +0,0 @@ -{"version":1,"files":[]} \ No newline at end of file diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/_error.js b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/_error.js deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/_error.js.nft.json b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/_error.js.nft.json deleted file mode 100644 index d00eeb8ec4..0000000000 --- a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/_error.js.nft.json +++ /dev/null @@ -1 +0,0 @@ -{"version":1,"files":[]} \ No newline at end of file diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/about.html b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/about.html deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/about.js.nft.json b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/about.js.nft.json deleted file mode 100644 index d00eeb8ec4..0000000000 --- a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/about.js.nft.json +++ /dev/null @@ -1 +0,0 @@ -{"version":1,"files":[]} \ No newline at end of file diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/api/customers.js b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/api/customers.js deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/api/customers.js.nft.json b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/api/customers.js.nft.json deleted file mode 100644 index d00eeb8ec4..0000000000 --- a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/api/customers.js.nft.json +++ /dev/null @@ -1 +0,0 @@ -{"version":1,"files":[]} \ No newline at end of file diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/api/customers/[id].js b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/api/customers/[id].js deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/api/customers/[id].js.nft.json b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/api/customers/[id].js.nft.json deleted file mode 100644 index d00eeb8ec4..0000000000 --- a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/api/customers/[id].js.nft.json +++ /dev/null @@ -1 +0,0 @@ -{"version":1,"files":[]} \ No newline at end of file diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/api/customers/new.js b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/api/customers/new.js deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/api/customers/new.js.nft.json b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/api/customers/new.js.nft.json deleted file mode 100644 index d00eeb8ec4..0000000000 --- a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/api/customers/new.js.nft.json +++ /dev/null @@ -1 +0,0 @@ -{"version":1,"files":[]} \ No newline at end of file diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/blog.js b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/blog.js deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/blog.js.nft.json b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/blog.js.nft.json deleted file mode 100644 index d00eeb8ec4..0000000000 --- a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/blog.js.nft.json +++ /dev/null @@ -1 +0,0 @@ -{"version":1,"files":[]} \ No newline at end of file diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/blog/[post].html b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/blog/[post].html deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/blog/[post].js.nft.json b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/blog/[post].js.nft.json deleted file mode 100644 index d00eeb8ec4..0000000000 --- a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/blog/[post].js.nft.json +++ /dev/null @@ -1 +0,0 @@ -{"version":1,"files":[]} \ No newline at end of file diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/customers/[...catchAll].js b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/customers/[...catchAll].js deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/customers/[...catchAll].js.nft.json b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/customers/[...catchAll].js.nft.json deleted file mode 100644 index d00eeb8ec4..0000000000 --- a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/customers/[...catchAll].js.nft.json +++ /dev/null @@ -1 +0,0 @@ -{"version":1,"files":[]} \ No newline at end of file diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/customers/[customer].js b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/customers/[customer].js deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/customers/[customer].js.nft.json b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/customers/[customer].js.nft.json deleted file mode 100644 index d00eeb8ec4..0000000000 --- a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/customers/[customer].js.nft.json +++ /dev/null @@ -1 +0,0 @@ -{"version":1,"files":[]} \ No newline at end of file diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/customers/[customer]/[post].js b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/customers/[customer]/[post].js deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/customers/[customer]/[post].js.nft.json b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/customers/[customer]/[post].js.nft.json deleted file mode 100644 index d00eeb8ec4..0000000000 --- a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/customers/[customer]/[post].js.nft.json +++ /dev/null @@ -1 +0,0 @@ -{"version":1,"files":[]} \ No newline at end of file diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/customers/[customer]/profile.js b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/customers/[customer]/profile.js deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/customers/[customer]/profile.js.nft.json b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/customers/[customer]/profile.js.nft.json deleted file mode 100644 index d00eeb8ec4..0000000000 --- a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/customers/[customer]/profile.js.nft.json +++ /dev/null @@ -1 +0,0 @@ -{"version":1,"files":[]} \ No newline at end of file diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/customers/new.js b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/customers/new.js deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/customers/new.js.nft.json b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/customers/new.js.nft.json deleted file mode 100644 index d00eeb8ec4..0000000000 --- a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/customers/new.js.nft.json +++ /dev/null @@ -1 +0,0 @@ -{"version":1,"files":[]} \ No newline at end of file diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/index.html b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/index.html deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/index.js b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/index.js deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/index.js.nft.json b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/index.js.nft.json deleted file mode 100644 index d00eeb8ec4..0000000000 --- a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/index.js.nft.json +++ /dev/null @@ -1 +0,0 @@ -{"version":1,"files":[]} \ No newline at end of file diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/index.json b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/index.json deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/terms.html b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/terms.html deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/terms.js.nft.json b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/terms.js.nft.json deleted file mode 100644 index d00eeb8ec4..0000000000 --- a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/server/pages/terms.js.nft.json +++ /dev/null @@ -1 +0,0 @@ -{"version":1,"files":[]} \ No newline at end of file diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/static/chunks/chunk1.js b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/static/chunks/chunk1.js deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/static/test-build-id/placeholder.js b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/.next/static/test-build-id/placeholder.js deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/next.config.js b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/next.config.js deleted file mode 100644 index 16d5af9e9e..0000000000 --- a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/next.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = { target: "serverless" }; diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/public/favicon.ico b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/public/favicon.ico deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/public/sub/image.png b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/public/sub/image.png deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/public/sw.js b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/public/sw.js deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/static/donotdelete.txt b/packages/serverless-components/nextjs-component/__tests__/fixtures/no-target-app/static/donotdelete.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/serverless-components/nextjs-component/src/component.ts b/packages/serverless-components/nextjs-component/src/component.ts index f167681d92..4b4afe24ac 100644 --- a/packages/serverless-components/nextjs-component/src/component.ts +++ b/packages/serverless-components/nextjs-component/src/component.ts @@ -218,11 +218,6 @@ class NextjsComponent extends Component { ? nextConfigPath : resolve(inputs.build.baseDir); - const outputFileTracing = - typeof inputs.build !== "boolean" && - typeof inputs.build !== "undefined" && - !!inputs.build.outputFileTracing; - const buildConfig: BuildOptions = { enabled: inputs.build ? // @ts-ignore @@ -235,8 +230,7 @@ class NextjsComponent extends Component { ...(typeof inputs.build === "object" ? inputs.build : {}), cwd: buildCwd, baseDir: buildBaseDir, // @ts-ignore - cleanupDotNext: inputs.build?.cleanupDotNext ?? true, - outputFileTracing + cleanupDotNext: inputs.build?.cleanupDotNext ?? true }; if (buildConfig.enabled) { @@ -249,7 +243,6 @@ class NextjsComponent extends Component { env: buildConfig.env, args: buildConfig.args, useServerlessTraceTarget: inputs.useServerlessTraceTarget || false, - outputFileTracing: buildConfig.outputFileTracing, logLambdaExecutionTimes: inputs.logLambdaExecutionTimes || false, domainRedirects: inputs.domainRedirects || {}, minifyHandlers: inputs.minifyHandlers || false, diff --git a/packages/serverless-components/nextjs-component/types.d.ts b/packages/serverless-components/nextjs-component/types.d.ts index 7d362a2879..b9ede6e66a 100644 --- a/packages/serverless-components/nextjs-component/types.d.ts +++ b/packages/serverless-components/nextjs-component/types.d.ts @@ -93,7 +93,6 @@ export type BuildOptions = { separateApiLambda?: boolean; disableOriginResponseHandler?: boolean; useV2Handler?: boolean; - outputFileTracing?: boolean; }; export type LambdaType = diff --git a/yarn.lock b/yarn.lock index 889570d910..75459812a3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3656,7 +3656,7 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:7.15.4, @babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.8.4": +"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.8.4": version: 7.15.4 resolution: "@babel/runtime@npm:7.15.4" dependencies: @@ -5267,7 +5267,7 @@ __metadata: languageName: node linkType: hard -"@napi-rs/triples@npm:1.0.3, @napi-rs/triples@npm:^1.0.3": +"@napi-rs/triples@npm:^1.0.3": version: 1.0.3 resolution: "@napi-rs/triples@npm:1.0.3" checksum: c83a4cc55f69115bf4ce1d5924efce7f5faf2dc79fd52257385559f668ce91a03c5d7d004df01ebba56028a9b663955eb97f31b65ac0acff7a93c143f0d809af @@ -5281,13 +5281,6 @@ __metadata: languageName: node linkType: hard -"@next/env@npm:12.0.7": - version: 12.0.7 - resolution: "@next/env@npm:12.0.7" - checksum: 98258ead3fd384ead612385c89aad4f4bbcb71fdd28a2e8c8abaa7cbdc63070edb849efc859b3d45215aa5c37cb256fb8cb4958708ea2e1f4b3e968102eba93b - languageName: node - linkType: hard - "@next/polyfill-module@npm:11.1.2": version: 11.1.2 resolution: "@next/polyfill-module@npm:11.1.2" @@ -5295,13 +5288,6 @@ __metadata: languageName: node linkType: hard -"@next/polyfill-module@npm:12.0.7": - version: 12.0.7 - resolution: "@next/polyfill-module@npm:12.0.7" - checksum: 6bf5bd8746eb8419196160b3e7f87b30ca25499bc40b125d82677401f853c4e2adf7b7f1fdf0b686ad24293839a3b78c2b36805802330ee9d09163a1a12c8e36 - languageName: node - linkType: hard - "@next/react-dev-overlay@npm:11.1.2": version: 11.1.2 resolution: "@next/react-dev-overlay@npm:11.1.2" @@ -5324,32 +5310,6 @@ __metadata: languageName: node linkType: hard -"@next/react-dev-overlay@npm:12.0.7": - version: 12.0.7 - resolution: "@next/react-dev-overlay@npm:12.0.7" - dependencies: - "@babel/code-frame": 7.12.11 - anser: 1.4.9 - chalk: 4.0.0 - classnames: 2.2.6 - css.escape: 1.5.1 - data-uri-to-buffer: 3.0.1 - platform: 1.3.6 - shell-quote: 1.7.3 - source-map: 0.8.0-beta.0 - stacktrace-parser: 0.1.10 - strip-ansi: 6.0.1 - peerDependencies: - react: ^17.0.2 - react-dom: ^17.0.2 - webpack: ^4 || ^5 - peerDependenciesMeta: - webpack: - optional: true - checksum: 47caa6a8a3494f8cff9b3f212c9a3197a7c6b020cf685852248db92e4625e03f378bfbc9a39bf7b2fc0595535dfe2cfea9b00a228644ce79b36dbb4ee5cb1219 - languageName: node - linkType: hard - "@next/react-refresh-utils@npm:11.1.2": version: 11.1.2 resolution: "@next/react-refresh-utils@npm:11.1.2" @@ -5363,26 +5323,6 @@ __metadata: languageName: node linkType: hard -"@next/react-refresh-utils@npm:12.0.7": - version: 12.0.7 - resolution: "@next/react-refresh-utils@npm:12.0.7" - peerDependencies: - react-refresh: 0.8.3 - webpack: ^4 || ^5 - peerDependenciesMeta: - webpack: - optional: true - checksum: 04d29941089bd402fc276ad8e17195bc4636c92f9eb25cc75b3d4a81d9be128cb9917271b9ae6d2998b2e3219b80ff54a623366cd6696711664a1d4161f14bc1 - languageName: node - linkType: hard - -"@next/swc-android-arm64@npm:12.0.7": - version: 12.0.7 - resolution: "@next/swc-android-arm64@npm:12.0.7" - conditions: os=android & cpu=arm64 - languageName: node - linkType: hard - "@next/swc-darwin-arm64@npm:11.1.2": version: 11.1.2 resolution: "@next/swc-darwin-arm64@npm:11.1.2" @@ -5390,13 +5330,6 @@ __metadata: languageName: node linkType: hard -"@next/swc-darwin-arm64@npm:12.0.7": - version: 12.0.7 - resolution: "@next/swc-darwin-arm64@npm:12.0.7" - conditions: os=darwin & cpu=arm64 - languageName: node - linkType: hard - "@next/swc-darwin-x64@npm:11.1.2": version: 11.1.2 resolution: "@next/swc-darwin-x64@npm:11.1.2" @@ -5404,34 +5337,6 @@ __metadata: languageName: node linkType: hard -"@next/swc-darwin-x64@npm:12.0.7": - version: 12.0.7 - resolution: "@next/swc-darwin-x64@npm:12.0.7" - conditions: os=darwin & cpu=x64 - languageName: node - linkType: hard - -"@next/swc-linux-arm-gnueabihf@npm:12.0.7": - version: 12.0.7 - resolution: "@next/swc-linux-arm-gnueabihf@npm:12.0.7" - conditions: os=linux & cpu=arm - languageName: node - linkType: hard - -"@next/swc-linux-arm64-gnu@npm:12.0.7": - version: 12.0.7 - resolution: "@next/swc-linux-arm64-gnu@npm:12.0.7" - conditions: os=linux & cpu=arm64 - languageName: node - linkType: hard - -"@next/swc-linux-arm64-musl@npm:12.0.7": - version: 12.0.7 - resolution: "@next/swc-linux-arm64-musl@npm:12.0.7" - conditions: os=linux & cpu=arm64 - languageName: node - linkType: hard - "@next/swc-linux-x64-gnu@npm:11.1.2": version: 11.1.2 resolution: "@next/swc-linux-x64-gnu@npm:11.1.2" @@ -5439,34 +5344,6 @@ __metadata: languageName: node linkType: hard -"@next/swc-linux-x64-gnu@npm:12.0.7": - version: 12.0.7 - resolution: "@next/swc-linux-x64-gnu@npm:12.0.7" - conditions: os=linux & cpu=x64 - languageName: node - linkType: hard - -"@next/swc-linux-x64-musl@npm:12.0.7": - version: 12.0.7 - resolution: "@next/swc-linux-x64-musl@npm:12.0.7" - conditions: os=linux & cpu=x64 - languageName: node - linkType: hard - -"@next/swc-win32-arm64-msvc@npm:12.0.7": - version: 12.0.7 - resolution: "@next/swc-win32-arm64-msvc@npm:12.0.7" - conditions: os=win32 & cpu=arm64 - languageName: node - linkType: hard - -"@next/swc-win32-ia32-msvc@npm:12.0.7": - version: 12.0.7 - resolution: "@next/swc-win32-ia32-msvc@npm:12.0.7" - conditions: os=win32 & cpu=ia32 - languageName: node - linkType: hard - "@next/swc-win32-x64-msvc@npm:11.1.2": version: 11.1.2 resolution: "@next/swc-win32-x64-msvc@npm:11.1.2" @@ -5474,13 +5351,6 @@ __metadata: languageName: node linkType: hard -"@next/swc-win32-x64-msvc@npm:12.0.7": - version: 12.0.7 - resolution: "@next/swc-win32-x64-msvc@npm:12.0.7" - conditions: os=win32 & cpu=x64 - languageName: node - linkType: hard - "@node-rs/helper@npm:1.2.1": version: 1.2.1 resolution: "@node-rs/helper@npm:1.2.1" @@ -6241,7 +6111,7 @@ __metadata: get-stream: 6.0.1 jest: 27.4.7 klaw: 4.0.1 - next: 12.0.7 + next: 11.1.2 node-fetch: 2.6.5 normalize-path: 3.0.0 react: 17.0.2 @@ -7317,21 +7187,21 @@ __metadata: languageName: node linkType: hard -"acorn@npm:8.5.0, acorn@npm:^8.2.4, acorn@npm:^8.4.1": - version: 8.5.0 - resolution: "acorn@npm:8.5.0" +"acorn@npm:^7.1.1": + version: 7.4.1 + resolution: "acorn@npm:7.4.1" bin: acorn: bin/acorn - checksum: 2e4c1dbed3da327684863debf31d341bf8882c6893c506653872c00977eee45675feb9129255d6c74c88424d2b20d889ca6de5b39776e5e3cccfc756b3ca1da8 + checksum: 1860f23c2107c910c6177b7b7be71be350db9e1080d814493fae143ae37605189504152d1ba8743ba3178d0b37269ce1ffc42b101547fdc1827078f82671e407 languageName: node linkType: hard -"acorn@npm:^7.1.1": - version: 7.4.1 - resolution: "acorn@npm:7.4.1" +"acorn@npm:^8.2.4, acorn@npm:^8.4.1": + version: 8.5.0 + resolution: "acorn@npm:8.5.0" bin: acorn: bin/acorn - checksum: 1860f23c2107c910c6177b7b7be71be350db9e1080d814493fae143ae37605189504152d1ba8743ba3178d0b37269ce1ffc42b101547fdc1827078f82671e407 + checksum: 2e4c1dbed3da327684863debf31d341bf8882c6893c506653872c00977eee45675feb9129255d6c74c88424d2b20d889ca6de5b39776e5e3cccfc756b3ca1da8 languageName: node linkType: hard @@ -11155,7 +11025,7 @@ __metadata: languageName: node linkType: hard -"events@npm:3.3.0, events@npm:^3.0.0, events@npm:^3.2.0, events@npm:^3.3.0": +"events@npm:^3.0.0, events@npm:^3.2.0, events@npm:^3.3.0": version: 3.3.0 resolution: "events@npm:3.3.0" checksum: f6f487ad2198aa41d878fa31452f1a3c00958f46e9019286ff4787c84aac329332ab45c9cdc8c445928fc6d7ded294b9e005a7fce9426488518017831b272780 @@ -16112,112 +15982,6 @@ __metadata: languageName: node linkType: hard -"next@npm:12.0.7": - version: 12.0.7 - resolution: "next@npm:12.0.7" - dependencies: - "@babel/runtime": 7.15.4 - "@hapi/accept": 5.0.2 - "@napi-rs/triples": 1.0.3 - "@next/env": 12.0.7 - "@next/polyfill-module": 12.0.7 - "@next/react-dev-overlay": 12.0.7 - "@next/react-refresh-utils": 12.0.7 - "@next/swc-android-arm64": 12.0.7 - "@next/swc-darwin-arm64": 12.0.7 - "@next/swc-darwin-x64": 12.0.7 - "@next/swc-linux-arm-gnueabihf": 12.0.7 - "@next/swc-linux-arm64-gnu": 12.0.7 - "@next/swc-linux-arm64-musl": 12.0.7 - "@next/swc-linux-x64-gnu": 12.0.7 - "@next/swc-linux-x64-musl": 12.0.7 - "@next/swc-win32-arm64-msvc": 12.0.7 - "@next/swc-win32-ia32-msvc": 12.0.7 - "@next/swc-win32-x64-msvc": 12.0.7 - acorn: 8.5.0 - assert: 2.0.0 - browserify-zlib: 0.2.0 - browserslist: 4.16.6 - buffer: 5.6.0 - caniuse-lite: ^1.0.30001228 - chalk: 2.4.2 - chokidar: 3.5.1 - constants-browserify: 1.0.0 - crypto-browserify: 3.12.0 - cssnano-simple: 3.0.0 - domain-browser: 4.19.0 - encoding: 0.1.13 - etag: 1.8.1 - events: 3.3.0 - find-cache-dir: 3.3.1 - get-orientation: 1.1.2 - https-browserify: 1.0.0 - image-size: 1.0.0 - jest-worker: 27.0.0-next.5 - node-fetch: 2.6.1 - node-html-parser: 1.4.9 - os-browserify: 0.3.0 - p-limit: 3.1.0 - path-browserify: 1.0.1 - postcss: 8.2.15 - process: 0.11.10 - querystring-es3: 0.2.1 - raw-body: 2.4.1 - react-is: 17.0.2 - react-refresh: 0.8.3 - regenerator-runtime: 0.13.4 - stream-browserify: 3.0.0 - stream-http: 3.1.1 - string_decoder: 1.3.0 - styled-jsx: 5.0.0-beta.3 - timers-browserify: 2.0.12 - tty-browserify: 0.0.1 - use-subscription: 1.5.1 - util: 0.12.4 - vm-browserify: 1.1.2 - watchpack: 2.3.0 - peerDependencies: - fibers: ">= 3.1.0" - node-sass: ^4.0.0 || ^5.0.0 || ^6.0.0 - react: ^17.0.2 || ^18.0.0-0 - react-dom: ^17.0.2 || ^18.0.0-0 - sass: ^1.3.0 - dependenciesMeta: - "@next/swc-android-arm64": - optional: true - "@next/swc-darwin-arm64": - optional: true - "@next/swc-darwin-x64": - optional: true - "@next/swc-linux-arm-gnueabihf": - optional: true - "@next/swc-linux-arm64-gnu": - optional: true - "@next/swc-linux-arm64-musl": - optional: true - "@next/swc-linux-x64-gnu": - optional: true - "@next/swc-linux-x64-musl": - optional: true - "@next/swc-win32-arm64-msvc": - optional: true - "@next/swc-win32-ia32-msvc": - optional: true - "@next/swc-win32-x64-msvc": - optional: true - peerDependenciesMeta: - fibers: - optional: true - node-sass: - optional: true - sass: - optional: true - bin: - next: dist/bin/next - checksum: 78a0ebd697b71e76f4ffaf6ba093390a16a15a750978acfc976cb32759bee18b5da82e8d2fc0170135105bb55c8c5fe86f7cbd0d45ab5b7255161d57deafa93f - languageName: node - linkType: hard - "node-abi@npm:^2.21.0": version: 2.30.1 resolution: "node-abi@npm:2.30.1" @@ -18085,13 +17849,6 @@ __metadata: languageName: node linkType: hard -"regenerator-runtime@npm:0.13.4": - version: 0.13.4 - resolution: "regenerator-runtime@npm:0.13.4" - checksum: ba49669ddbb56a12f8acf3e09427dfb89d83c4db466c387e8d7df8c13285695c6622a0112e12bdae492a97fdad3e68b2ef3f171bcc44d30a00adb1c9e121eaaa - languageName: node - linkType: hard - "regenerator-runtime@npm:^0.13.4": version: 0.13.9 resolution: "regenerator-runtime@npm:0.13.9" @@ -18825,13 +18582,6 @@ __metadata: languageName: node linkType: hard -"shell-quote@npm:1.7.3": - version: 1.7.3 - resolution: "shell-quote@npm:1.7.3" - checksum: aca58e73a3a5d933d02e0bdddedc53ee14f7c2ec264f97ac915b9d4482d077a38e422aa664631d60a672cd3cdb4054eb2e6c0303f54882453dacb6483e482d34 - languageName: node - linkType: hard - "side-channel@npm:^1.0.3, side-channel@npm:^1.0.4": version: 1.0.4 resolution: "side-channel@npm:1.0.4" @@ -19467,15 +19217,6 @@ __metadata: languageName: node linkType: hard -"strip-ansi@npm:6.0.1, strip-ansi@npm:^6.0.0, strip-ansi@npm:^6.0.1": - version: 6.0.1 - resolution: "strip-ansi@npm:6.0.1" - dependencies: - ansi-regex: ^5.0.1 - checksum: f3cd25890aef3ba6e1a74e20896c21a46f482e93df4a06567cebf2b57edabb15133f1f94e57434e0a958d61186087b1008e89c94875d019910a213181a14fc8c - languageName: node - linkType: hard - "strip-ansi@npm:^3.0.0, strip-ansi@npm:^3.0.1": version: 3.0.1 resolution: "strip-ansi@npm:3.0.1" @@ -19494,6 +19235,15 @@ __metadata: languageName: node linkType: hard +"strip-ansi@npm:^6.0.0, strip-ansi@npm:^6.0.1": + version: 6.0.1 + resolution: "strip-ansi@npm:6.0.1" + dependencies: + ansi-regex: ^5.0.1 + checksum: f3cd25890aef3ba6e1a74e20896c21a46f482e93df4a06567cebf2b57edabb15133f1f94e57434e0a958d61186087b1008e89c94875d019910a213181a14fc8c + languageName: node + linkType: hard + "strip-ansi@npm:^7.0.1": version: 7.0.1 resolution: "strip-ansi@npm:7.0.1" @@ -19581,27 +19331,6 @@ __metadata: languageName: node linkType: hard -"styled-jsx@npm:5.0.0-beta.3": - version: 5.0.0-beta.3 - resolution: "styled-jsx@npm:5.0.0-beta.3" - dependencies: - "@babel/plugin-syntax-jsx": 7.14.5 - "@babel/types": 7.15.0 - convert-source-map: 1.7.0 - loader-utils: 1.2.3 - source-map: 0.7.3 - string-hash: 1.1.3 - stylis: 3.5.4 - stylis-rule-sheet: 0.0.10 - peerDependencies: - react: ">= 16.8.0 || 17.x.x || 18.x.x" - peerDependenciesMeta: - "@babel/core": - optional: true - checksum: cc328a92b56fe4aadcb29031be1b006279f1194592f66677079abc7d4294d388962f9634ef67dccdc592ef3d8ceaa8af9603c60198cbd371444e46074a6b1747 - languageName: node - linkType: hard - "stylis-rule-sheet@npm:0.0.10": version: 0.0.10 resolution: "stylis-rule-sheet@npm:0.0.10" @@ -20751,16 +20480,6 @@ typescript@~3.9.10: languageName: node linkType: hard -"watchpack@npm:2.3.0": - version: 2.3.0 - resolution: "watchpack@npm:2.3.0" - dependencies: - glob-to-regexp: ^0.4.1 - graceful-fs: ^4.1.2 - checksum: 54f577fe311ae6130b43c3202ddc5c66ea8cdc5e0569b6e1dbccf5c0f5f4f8d4d00b7b97f6ae6d53e9361766bf0dc4e6dc7b30e57392948af9795217f6d9d7a7 - languageName: node - linkType: hard - "watchpack@npm:^2.2.0": version: 2.2.0 resolution: "watchpack@npm:2.2.0"