From c09d5a7b68a064c0f31c2dd2e65e45f2df8e7a39 Mon Sep 17 00:00:00 2001 From: timngyn Date: Fri, 27 Oct 2023 11:09:12 -0700 Subject: [PATCH 1/3] Use 'output' config for exporting --- next.config.mjs | 30 +++--------------------------- package.json | 2 +- 2 files changed, 4 insertions(+), 28 deletions(-) diff --git a/next.config.mjs b/next.config.mjs index dd0f9929bb6..6345904b2f5 100644 --- a/next.config.mjs +++ b/next.config.mjs @@ -44,6 +44,8 @@ export default async (phase, { defaultConfig }) => { }); let nextConfig = withMDX({ + output: 'export', + distDir: 'client/www/next-build', env: { BUILD_ENV: process.env.BUILD_ENV, nextImageExportOptimizer_imageFolderPath: 'public', @@ -74,33 +76,7 @@ export default async (phase, { defaultConfig }) => { transpilePackages: [ '@algolia/autocomplete-shared', 'next-image-export-optimizer' - ], - // eslint-disable-next-line @typescript-eslint/require-await - async headers() { - return [ - { - // Apply these headers to all routes in your application. - source: '/(.*)', - headers: [ - // IMPORTANT: - // These are ONLY used for the Dev server and MUST - // be kept in sync with customHttp.yml - { - key: 'Strict-Transport-Security', - value: 'max-age=63072000; includeSubDomains' - }, - { - key: 'X-Frame-Options', - value: 'SAMEORIGIN' - }, - { - key: 'X-Content-Type-Options', - value: 'nosniff' - } - ] - } - ]; - } + ] }); if (shouldAnalyzeBundles) { diff --git a/package.json b/package.json index d8c5b6b1652..1cf70aac6f6 100644 --- a/package.json +++ b/package.json @@ -142,7 +142,7 @@ "dev": "next dev", "spellcheck": "cspell \"src/**/*.mdx\" --no-progress", "spellcheck-diff": "git diff --name-only --cached | awk \"/src.*\\.mdx/{print}\" | npx cspell --no-must-find-files --file-list stdin", - "build": "node tasks/generate-sitemap.mjs && next build && next export -o client/www/next-build", + "build": "node tasks/generate-sitemap.mjs && next build", "build:release": "yarn build && next-image-export-optimizer --exportFolderPath client/www/next-build", "next-build": "next build", "next-start": "next start", From ac70d67a24e421cb0c7aa297408d9e0fc7f01c89 Mon Sep 17 00:00:00 2001 From: timngyn Date: Fri, 27 Oct 2023 11:28:09 -0700 Subject: [PATCH 2/3] Update maxWorkers to jest run --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1cf70aac6f6..8b4221b674e 100644 --- a/package.json +++ b/package.json @@ -138,7 +138,7 @@ "scripts": { "clean": "rm -rf node_modules yarn.lock", "refresh": "yarn clean && yarn", - "test": "jest", + "test": "jest --maxWorkers 2", "dev": "next dev", "spellcheck": "cspell \"src/**/*.mdx\" --no-progress", "spellcheck-diff": "git diff --name-only --cached | awk \"/src.*\\.mdx/{print}\" | npx cspell --no-must-find-files --file-list stdin", From ba8c4e200f0c91f4d9d40c37c5f6f1086c3bc24c Mon Sep 17 00:00:00 2001 From: timngyn Date: Fri, 27 Oct 2023 11:51:43 -0700 Subject: [PATCH 3/3] Update next to 13.5.6 --- package.json | 4 +- yarn.lock | 124 +++++++++++++++++++++++++-------------------------- 2 files changed, 64 insertions(+), 64 deletions(-) diff --git a/package.json b/package.json index 8b4221b674e..69df25d8227 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "gray-matter": "4.0.3", "html-entities": "^1.2.1", "instantsearch.js": "^4.39.1", - "next": "^13.2.4", + "next": "^13.5.6", "next-image-export-optimizer": "^1.8.3", "next-transpile-modules": "^9.0.0", "parse-imports": "^1.1.0", @@ -138,7 +138,7 @@ "scripts": { "clean": "rm -rf node_modules yarn.lock", "refresh": "yarn clean && yarn", - "test": "jest --maxWorkers 2", + "test": "jest", "dev": "next dev", "spellcheck": "cspell \"src/**/*.mdx\" --no-progress", "spellcheck-diff": "git diff --name-only --cached | awk \"/src.*\\.mdx/{print}\" | npx cspell --no-must-find-files --file-list stdin", diff --git a/yarn.lock b/yarn.lock index 33dd9fa3391..84444018234 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3371,10 +3371,10 @@ dependencies: webpack-bundle-analyzer "4.7.0" -"@next/env@13.5.5": - version "13.5.5" - resolved "https://registry.yarnpkg.com/@next/env/-/env-13.5.5.tgz#c26fb9784fe4eae1279c0f2906d925c2297816e9" - integrity sha512-agvIhYWp+ilbScg81s/sLueZo8CNEYLjNOqhISxheLmD/AQI4/VxV7bV76i/KzxH4iHy/va0YS9z0AOwGnw4Fg== +"@next/env@13.5.6": + version "13.5.6" + resolved "https://registry.yarnpkg.com/@next/env/-/env-13.5.6.tgz#c1148e2e1aa166614f05161ee8f77ded467062bc" + integrity sha512-Yac/bV5sBGkkEXmAX5FWPS9Mmo2rthrOPRQQNfycJPkjUAUclomCPH7QFVCDQ4Mp2k2K1SSM6m0zrxYrOwtFQw== "@next/eslint-plugin-next@13.5.5": version "13.5.5" @@ -3388,50 +3388,50 @@ resolved "https://registry.yarnpkg.com/@next/mdx/-/mdx-10.2.3.tgz#226d25530e4b98af3a200be3e2616beebf81b56c" integrity sha512-hseekptFqOCxLbdaNDS/yelaG2Q2uaNDilnRjq8Uv/LWHuZ9F2cp7ndwTolW9acJsbDedamKRMgdw4V2Fz0pUA== -"@next/swc-darwin-arm64@13.5.5": - version "13.5.5" - resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.5.5.tgz#0ab604e2ae39d9ca5d8d7190f6eedc2f63ef89a1" - integrity sha512-FvTdcJdTA7H1FGY8dKPPbf/O0oDC041/znHZwXA7liiGUhgw5hOQ+9z8tWvuz0M5a/SDjY/IRPBAb5FIFogYww== - -"@next/swc-darwin-x64@13.5.5": - version "13.5.5" - resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-13.5.5.tgz#400fe2a2845998c76c0547b6605877d7ba65aa67" - integrity sha512-mTqNIecaojmyia7appVO2QggBe1Z2fdzxgn6jb3x9qlAk8yY2sy4MAcsj71kC9RlenCqDmr9vtC/ESFf110TPA== - -"@next/swc-linux-arm64-gnu@13.5.5": - version "13.5.5" - resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.5.5.tgz#b21291e2a5b691ac426331ce6cb0b1c4e8c3e1c7" - integrity sha512-U9e+kNkfvwh/T8yo+xcslvNXgyMzPPX1IbwCwnHHFmX5ckb1Uc3XZSInNjFQEQR5xhJpB5sFdal+IiBIiLYkZA== - -"@next/swc-linux-arm64-musl@13.5.5": - version "13.5.5" - resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.5.5.tgz#2dc33466edbe8db37f08aefd2ae472db437ac3ca" - integrity sha512-h7b58eIoNCSmKVC5fr167U0HWZ/yGLbkKD9wIller0nGdyl5zfTji0SsPKJvrG8jvKPFt2xOkVBmXlFOtuKynw== - -"@next/swc-linux-x64-gnu@13.5.5": - version "13.5.5" - resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.5.5.tgz#3239655c97fbc13449841bc44f9b2b86c3c7ef35" - integrity sha512-6U4y21T1J6FfcpM9uqzBJicxycpB5gJKLyQ3g6KOfBzT8H1sMwfHTRrvHKB09GIn1BCRy5YJHrA1G26DzqR46w== - -"@next/swc-linux-x64-musl@13.5.5": - version "13.5.5" - resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.5.5.tgz#60c66bc1b2c3d1f3993dd2fa55da1ff7c8247901" - integrity sha512-OuqWSAQHJQM2EsapPFTSU/FLQ0wKm7UeRNatiR/jLeCe1V02aB9xmzuWYo2Neaxxag4rss3S8fj+lvMLzwDaFA== - -"@next/swc-win32-arm64-msvc@13.5.5": - version "13.5.5" - resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.5.5.tgz#521b3073bac7d4b89df520a61b7ae71510a0bc5c" - integrity sha512-+yLrOZIIZDY4uGn9bLOc0wTgs+M8RuOUFSUK3BhmcLav9e+tcAj0jyBHD4aXv2qWhppUeuYMsyBo1I58/eE6Dg== - -"@next/swc-win32-ia32-msvc@13.5.5": - version "13.5.5" - resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.5.5.tgz#a21e29a57bd0534c646ba3e6d73191064f396b96" - integrity sha512-SyMxXyJtf9ScMH0Dh87THJMXNFvfkRAk841xyW9SeOX3KxM1buXX3hN7vof4kMGk0Yg996OGsX+7C9ueS8ugsw== - -"@next/swc-win32-x64-msvc@13.5.5": - version "13.5.5" - resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.5.5.tgz#7a442ee669dd6b0e5c774a86cd98457cd945c867" - integrity sha512-n5KVf2Ok0BbLwofAaHiiKf+BQCj1M8WmTujiER4/qzYAVngnsNSjqEWvJ03raeN9eURqxDO+yL5VRoDrR33H9A== +"@next/swc-darwin-arm64@13.5.6": + version "13.5.6" + resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.5.6.tgz#b15d139d8971360fca29be3bdd703c108c9a45fb" + integrity sha512-5nvXMzKtZfvcu4BhtV0KH1oGv4XEW+B+jOfmBdpFI3C7FrB/MfujRpWYSBBO64+qbW8pkZiSyQv9eiwnn5VIQA== + +"@next/swc-darwin-x64@13.5.6": + version "13.5.6" + resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-13.5.6.tgz#9c72ee31cc356cb65ce6860b658d807ff39f1578" + integrity sha512-6cgBfxg98oOCSr4BckWjLLgiVwlL3vlLj8hXg2b+nDgm4bC/qVXXLfpLB9FHdoDu4057hzywbxKvmYGmi7yUzA== + +"@next/swc-linux-arm64-gnu@13.5.6": + version "13.5.6" + resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.5.6.tgz#59f5f66155e85380ffa26ee3d95b687a770cfeab" + integrity sha512-txagBbj1e1w47YQjcKgSU4rRVQ7uF29YpnlHV5xuVUsgCUf2FmyfJ3CPjZUvpIeXCJAoMCFAoGnbtX86BK7+sg== + +"@next/swc-linux-arm64-musl@13.5.6": + version "13.5.6" + resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.5.6.tgz#f012518228017052736a87d69bae73e587c76ce2" + integrity sha512-cGd+H8amifT86ZldVJtAKDxUqeFyLWW+v2NlBULnLAdWsiuuN8TuhVBt8ZNpCqcAuoruoSWynvMWixTFcroq+Q== + +"@next/swc-linux-x64-gnu@13.5.6": + version "13.5.6" + resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.5.6.tgz#339b867a7e9e7ee727a700b496b269033d820df4" + integrity sha512-Mc2b4xiIWKXIhBy2NBTwOxGD3nHLmq4keFk+d4/WL5fMsB8XdJRdtUlL87SqVCTSaf1BRuQQf1HvXZcy+rq3Nw== + +"@next/swc-linux-x64-musl@13.5.6": + version "13.5.6" + resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.5.6.tgz#ae0ae84d058df758675830bcf70ca1846f1028f2" + integrity sha512-CFHvP9Qz98NruJiUnCe61O6GveKKHpJLloXbDSWRhqhkJdZD2zU5hG+gtVJR//tyW897izuHpM6Gtf6+sNgJPQ== + +"@next/swc-win32-arm64-msvc@13.5.6": + version "13.5.6" + resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.5.6.tgz#a5cc0c16920485a929a17495064671374fdbc661" + integrity sha512-aFv1ejfkbS7PUa1qVPwzDHjQWQtknzAZWGTKYIAaS4NMtBlk3VyA6AYn593pqNanlicewqyl2jUhQAaFV/qXsg== + +"@next/swc-win32-ia32-msvc@13.5.6": + version "13.5.6" + resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.5.6.tgz#6a2409b84a2cbf34bf92fe714896455efb4191e4" + integrity sha512-XqqpHgEIlBHvzwG8sp/JXMFkLAfGLqkbVsyN+/Ih1mR8INb6YCc2x/Mbwi6hsAgUnqQztz8cvEbHJUbSl7RHDg== + +"@next/swc-win32-x64-msvc@13.5.6": + version "13.5.6" + resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.5.6.tgz#4a3e2a206251abc729339ba85f60bc0433c2865d" + integrity sha512-Cqfe1YmOS7k+5mGu92nl5ULkzpKuxJrP3+4AEuPmrpFZ3BHxTY3TnHmU1On3bFmFFs6FbTcdF58CCUProGpIGQ== "@nodelib/fs.scandir@2.1.5": version "2.1.5" @@ -10343,12 +10343,12 @@ next-transpile-modules@^9.0.0: enhanced-resolve "^5.10.0" escalade "^3.1.1" -next@^13.2.4: - version "13.5.5" - resolved "https://registry.yarnpkg.com/next/-/next-13.5.5.tgz#65addd98a1ae42845d455e08bc491448bb34929b" - integrity sha512-LddFJjpfrtrMMw8Q9VLhIURuSidiCNcMQjRqcPtrKd+Fx07MsG7hYndJb/f2d3I+mTbTotsTJfCnn0eZ/YPk8w== +next@^13.5.6: + version "13.5.6" + resolved "https://registry.yarnpkg.com/next/-/next-13.5.6.tgz#e964b5853272236c37ce0dd2c68302973cf010b1" + integrity sha512-Y2wTcTbO4WwEsVb4A8VSnOsG1I9ok+h74q0ZdxkwM3EODqrs4pasq7O0iUxbcS9VtWMicG7f3+HAj0r1+NtKSw== dependencies: - "@next/env" "13.5.5" + "@next/env" "13.5.6" "@swc/helpers" "0.5.2" busboy "1.6.0" caniuse-lite "^1.0.30001406" @@ -10356,15 +10356,15 @@ next@^13.2.4: styled-jsx "5.1.1" watchpack "2.4.0" optionalDependencies: - "@next/swc-darwin-arm64" "13.5.5" - "@next/swc-darwin-x64" "13.5.5" - "@next/swc-linux-arm64-gnu" "13.5.5" - "@next/swc-linux-arm64-musl" "13.5.5" - "@next/swc-linux-x64-gnu" "13.5.5" - "@next/swc-linux-x64-musl" "13.5.5" - "@next/swc-win32-arm64-msvc" "13.5.5" - "@next/swc-win32-ia32-msvc" "13.5.5" - "@next/swc-win32-x64-msvc" "13.5.5" + "@next/swc-darwin-arm64" "13.5.6" + "@next/swc-darwin-x64" "13.5.6" + "@next/swc-linux-arm64-gnu" "13.5.6" + "@next/swc-linux-arm64-musl" "13.5.6" + "@next/swc-linux-x64-gnu" "13.5.6" + "@next/swc-linux-x64-musl" "13.5.6" + "@next/swc-win32-arm64-msvc" "13.5.6" + "@next/swc-win32-ia32-msvc" "13.5.6" + "@next/swc-win32-x64-msvc" "13.5.6" nice-try@^1.0.4: version "1.0.5"