From 103bc05920223ed7352738aa0880d3cf568b63d1 Mon Sep 17 00:00:00 2001 From: Abdellah Hariti Date: Fri, 8 Nov 2024 16:59:39 +0100 Subject: [PATCH 01/23] move prisma seed config to changelog package.json --- apps/changelog/package.json | 3 +++ package.json | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/changelog/package.json b/apps/changelog/package.json index f79aa468c46a1..3803d835f56da 100644 --- a/apps/changelog/package.json +++ b/apps/changelog/package.json @@ -14,6 +14,9 @@ "lint": "next lint", "migrate:dev": "dotenv -e .env.development -- yarn prisma migrate reset" }, + "prisma": { + "seed": "node prisma/seed/seed.mjs" + }, "dependencies": { "@auth/prisma-adapter": "^1.2.0", "@google-cloud/storage": "^7.7.0", diff --git a/package.json b/package.json index 9ae83b51a4be6..ce452e8d84f62 100644 --- a/package.json +++ b/package.json @@ -35,9 +35,6 @@ "test:ci": "vitest run", "enforce-redirects": "node ./scripts/no-vercel-json-redirects.mjs" }, - "prisma": { - "seed": "node prisma/seed/seed.mjs" - }, "dependencies": { "@ariakit/react": "^0.4.5", "@auth/prisma-adapter": "^1.2.0", From 26f7490d62b2b22cee6e577ea44c0484ac8d084d Mon Sep 17 00:00:00 2001 From: Abdellah Hariti Date: Fri, 8 Nov 2024 17:05:20 +0100 Subject: [PATCH 02/23] get rid of prisma related dependencies and scripts from the main app package.json --- package.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/package.json b/package.json index ce452e8d84f62..bbbc249110441 100644 --- a/package.json +++ b/package.json @@ -18,10 +18,9 @@ "dev": "yarn enforce-redirects && concurrently \"yarn sidecar\" \"node ./src/hotReloadWatcher.mjs\" \"next dev\"", "dev:developer-docs": "yarn enforce-redirects && NEXT_PUBLIC_DEVELOPER_DOCS=1 yarn dev", "build:developer-docs": "yarn enforce-redirects && git submodule init && git submodule update && NEXT_PUBLIC_DEVELOPER_DOCS=1 yarn build", - "build": "yarn enforce-redirects && prisma generate && next build", + "build": "yarn enforce-redirects && next build", "vercel:build:developer-docs": "yarn enforce-redirects && git submodule init && git submodule update && NEXT_PUBLIC_DEVELOPER_DOCS=1 yarn build", "start": "next start", - "migrate:dev": "dotenv -e .env.development -- yarn prisma migrate reset", "lint": "next lint", "lint:ts": "tsc --skipLibCheck", "lint:docs": "bin/lint-docs.ts", @@ -37,7 +36,6 @@ }, "dependencies": { "@ariakit/react": "^0.4.5", - "@auth/prisma-adapter": "^1.2.0", "@emotion/core": "^11.0.0", "@emotion/react": "^11.11.0", "@emotion/styled": "^11.0.0", @@ -47,7 +45,6 @@ "@next/mdx": "^14.2.4", "@popperjs/core": "^2.11.8", "@prettier/plugin-xml": "^3.3.1", - "@prisma/client": "^5.8.1", "@radix-ui/colors": "^3.0.0", "@radix-ui/react-collapsible": "^1.0.3", "@radix-ui/react-dropdown-menu": "^2.0.6", @@ -123,7 +120,6 @@ "jest-environment-jsdom": "^29.5.0", "postcss": "^8.4.33", "prettier": "^3.2.4", - "prisma": "^5.8.1", "tailwindcss": "^3.4.1", "ts-node": "^10.9.1", "typescript": "^5", From bcac4229698556807e4b894378798835eabbc5cf Mon Sep 17 00:00:00 2001 From: Abdellah Hariti Date: Fri, 8 Nov 2024 18:05:37 +0100 Subject: [PATCH 03/23] fail seed script on errors --- apps/changelog/prisma/seed/seed.mjs | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/changelog/prisma/seed/seed.mjs b/apps/changelog/prisma/seed/seed.mjs index 052f2b50ce3e5..fa745011fdd53 100644 --- a/apps/changelog/prisma/seed/seed.mjs +++ b/apps/changelog/prisma/seed/seed.mjs @@ -76,6 +76,7 @@ async function seed() { console.log('Seed data created successfully!'); } catch (error) { console.error('Error seeding data:', error); + process.exit(1); } finally { await prisma.$disconnect(); } From ffd842ab00c37ef069b9b2205c4ecb5d5bb48a06 Mon Sep 17 00:00:00 2001 From: Abdellah Hariti Date: Fri, 8 Nov 2024 18:11:18 +0100 Subject: [PATCH 04/23] add changelogs hash to body tag --- apps/changelog/prisma/seed/seed.mjs | 6 +++-- .../src/app/changelog/feed.xml/route.ts | 2 +- apps/changelog/src/app/changelog/page.tsx | 2 +- apps/changelog/src/app/layout.tsx | 6 +++-- apps/changelog/src/server/utils.ts | 24 ++++++++++++++++++- 5 files changed, 33 insertions(+), 7 deletions(-) diff --git a/apps/changelog/prisma/seed/seed.mjs b/apps/changelog/prisma/seed/seed.mjs index fa745011fdd53..22519ea7a84a3 100644 --- a/apps/changelog/prisma/seed/seed.mjs +++ b/apps/changelog/prisma/seed/seed.mjs @@ -43,8 +43,10 @@ async function seed() { updatedAt: new Date('01/01/2020'), title: 'Changelog 3', slug: 'changelog-3', - content: 'Changelog 3 content with [markdown content](https://de.wikipedia.org/wiki/Markdown)', - summary: 'Changelog 3 summary with [markdown content](https://de.wikipedia.org/wiki/Markdown)', + content: + 'Changelog 3 content with [markdown content](https://de.wikipedia.org/wiki/Markdown)', + summary: + 'Changelog 3 summary with [markdown content](https://de.wikipedia.org/wiki/Markdown)', published: true, deleted: false, }, diff --git a/apps/changelog/src/app/changelog/feed.xml/route.ts b/apps/changelog/src/app/changelog/feed.xml/route.ts index f10ec584857ac..070b6e07c9c61 100644 --- a/apps/changelog/src/app/changelog/feed.xml/route.ts +++ b/apps/changelog/src/app/changelog/feed.xml/route.ts @@ -14,7 +14,7 @@ export async function GET() { ttl: 60, }); - const allChangelogs = await getChangelogs(); + const {changelogs: allChangelogs} = await getChangelogs(); if (allChangelogs) { allChangelogs diff --git a/apps/changelog/src/app/changelog/page.tsx b/apps/changelog/src/app/changelog/page.tsx index acb2b0a9c6346..a95c723191b7b 100644 --- a/apps/changelog/src/app/changelog/page.tsx +++ b/apps/changelog/src/app/changelog/page.tsx @@ -13,7 +13,7 @@ import {Element} from 'hast'; export const dynamic = 'force-dynamic'; export default async function Page() { - const changelogs = await getChangelogs(); + const {changelogs} = await getChangelogs(); const changelogsWithPublishedAt = changelogs.filter(changelog => { return changelog.publishedAt !== null; diff --git a/apps/changelog/src/app/layout.tsx b/apps/changelog/src/app/layout.tsx index 78cf52de3cb55..5e8540daf1a5f 100644 --- a/apps/changelog/src/app/layout.tsx +++ b/apps/changelog/src/app/layout.tsx @@ -1,3 +1,4 @@ +import {getChangelogs} from '@/server/utils'; import './globals.css'; import {Theme} from '@radix-ui/themes'; @@ -30,10 +31,11 @@ export const metadata: Metadata = { }, }; -export default function RootLayout({children}: {children: React.ReactNode}) { +export default async function RootLayout({children}: {children: React.ReactNode}) { + const {hash: chngelogsHash} = await getChangelogs(); return ( - + {children} diff --git a/apps/changelog/src/server/utils.ts b/apps/changelog/src/server/utils.ts index 6e8265c98a49b..371ea5a3791f4 100644 --- a/apps/changelog/src/server/utils.ts +++ b/apps/changelog/src/server/utils.ts @@ -1,9 +1,10 @@ import {prismaClient} from '@/server/prisma-client'; +import {Changelog} from '@prisma/client'; import {unstable_cache} from 'next/cache'; export const getChangelogs = unstable_cache( async () => { - return await prismaClient.changelog.findMany({ + const changelogs = await prismaClient.changelog.findMany({ include: { categories: true, }, @@ -14,6 +15,27 @@ export const getChangelogs = unstable_cache( publishedAt: 'desc', }, }); + const hashHex = (buffer: ArrayBuffer) => { + const hexCodes = Array.from(new Uint8Array(buffer)).map(value => + value.toString(16).padStart(2, '0') + ); + return hexCodes.join(''); + }; + const hashChangelogs = (changelogs: Changelog[]) => + crypto.subtle + .digest( + 'SHA-256', + new TextEncoder().encode( + changelogs + .map(changelogs => changelogs.id + ':' + changelogs.updatedAt) + .join(',') + ) + ) + .then(hashHex); + return { + changelogs, + hash: await hashChangelogs(changelogs), + }; }, ['changelogs'], {tags: ['changelogs']} From 46f55f4b42c4ed79fb1dcbf8e38393f92d9706b0 Mon Sep 17 00:00:00 2001 From: Abdellah Hariti Date: Fri, 8 Nov 2024 23:02:59 +0100 Subject: [PATCH 05/23] skip changelog builds on related source code chnage --- skip-build.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/skip-build.sh b/skip-build.sh index 49dfbc783f63d..f4d057628d928 100755 --- a/skip-build.sh +++ b/skip-build.sh @@ -14,6 +14,17 @@ docs_diff_status=$(git diff HEAD^ HEAD --quiet -- docs includes platform-include # have changes occurred outside of the content directories non_content_diff_status=$(git diff HEAD^ HEAD --name-only | grep -vE '^(docs/|platform-includes/|includes/|develop-docs/)' | wc -l) +# apps/changelog changes or workspace deps changes (yarn.lock) +changelog_diff_status=$(git diff HEAD^ HEAD --name-only | grep -vE '^(apps/changelog/|yarn.lock)' | wc -l) + +if [[ "$NEXT_PUBLIC_CHANGELOG" === "1" ]] ; then + if [[ $changelog_diff_status -gt 0 ]] ; then + exit 1 + else + exit 0 + fi +fi + # always build on changes in non-content related directories if [[ $non_content_diff_status -gt 0 ]] ; then exit 1 From 6fecb4846966cd716828a552bdf16aa4ae61ccaf Mon Sep 17 00:00:00 2001 From: Abdellah Hariti Date: Fri, 8 Nov 2024 23:33:33 +0100 Subject: [PATCH 06/23] fix typo --- apps/changelog/src/app/layout.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/changelog/src/app/layout.tsx b/apps/changelog/src/app/layout.tsx index 5e8540daf1a5f..1d97f4afd3638 100644 --- a/apps/changelog/src/app/layout.tsx +++ b/apps/changelog/src/app/layout.tsx @@ -32,10 +32,10 @@ export const metadata: Metadata = { }; export default async function RootLayout({children}: {children: React.ReactNode}) { - const {hash: chngelogsHash} = await getChangelogs(); + const {hash: changelogsHash} = await getChangelogs(); return ( - + {children} From a0a86faaebe4380a57a50475ae3cd53b39edd48e Mon Sep 17 00:00:00 2001 From: Abdellah Hariti Date: Sat, 9 Nov 2024 14:38:35 +0100 Subject: [PATCH 07/23] swap ts-node for tsx --- package.json | 4 +- yarn.lock | 257 ++++++++++++++++++++++++++++++++++----------------- 2 files changed, 172 insertions(+), 89 deletions(-) diff --git a/package.json b/package.json index bbbc249110441..ccf2a94e41ad4 100644 --- a/package.json +++ b/package.json @@ -97,7 +97,8 @@ "server-only": "^0.0.1", "sharp": "^0.33.4", "tailwindcss-scoped-preflight": "^3.0.4", - "textarea-markdown-editor": "^1.0.4" + "textarea-markdown-editor": "^1.0.4", + "tsx": "^4.19.2" }, "devDependencies": { "@babel/preset-typescript": "^7.15.0", @@ -121,7 +122,6 @@ "postcss": "^8.4.33", "prettier": "^3.2.4", "tailwindcss": "^3.4.1", - "ts-node": "^10.9.1", "typescript": "^5", "vite-tsconfig-paths": "^5.0.1", "vitest": "^2.1.1", diff --git a/yarn.lock b/yarn.lock index c1a90d7b4728a..81f9e42edd273 100644 --- a/yarn.lock +++ b/yarn.lock @@ -664,13 +664,6 @@ "@codecov/bundler-plugin-core" "^1.0.0" unplugin "^1.10.1" -"@cspotcode/source-map-support@^0.8.0": - version "0.8.1" - resolved "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz" - integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw== - dependencies: - "@jridgewell/trace-mapping" "0.3.9" - "@emnapi/runtime@^1.1.1": version "1.2.0" resolved "https://registry.yarnpkg.com/@emnapi/runtime/-/runtime-1.2.0.tgz#71d018546c3a91f3b51106530edbc056b9f2f2e3" @@ -834,6 +827,11 @@ resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz#c7184a326533fcdf1b8ee0733e21c713b975575f" integrity sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ== +"@esbuild/aix-ppc64@0.23.1": + version "0.23.1" + resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.23.1.tgz#51299374de171dbd80bb7d838e1cfce9af36f353" + integrity sha512-6VhYk1diRqrhBAqpJEdjASR/+WVRtfjpqKuNw11cLiaWpAT/Uu+nokB+UJnevzy/P9C/ty6AOe0dwueMrGh/iQ== + "@esbuild/android-arm64@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz#7ad65a36cfdb7e0d429c353e00f680d737c2aed4" @@ -844,6 +842,11 @@ resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz#09d9b4357780da9ea3a7dfb833a1f1ff439b4052" integrity sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A== +"@esbuild/android-arm64@0.23.1": + version "0.23.1" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.23.1.tgz#58565291a1fe548638adb9c584237449e5e14018" + integrity sha512-xw50ipykXcLstLeWH7WRdQuysJqejuAGPd30vd1i5zSyKK3WE+ijzHmLKxdiCMtH1pHz78rOg0BKSYOSB/2Khw== + "@esbuild/android-arm@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.19.12.tgz#b0c26536f37776162ca8bde25e42040c203f2824" @@ -854,6 +857,11 @@ resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.21.5.tgz#9b04384fb771926dfa6d7ad04324ecb2ab9b2e28" integrity sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg== +"@esbuild/android-arm@0.23.1": + version "0.23.1" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.23.1.tgz#5eb8c652d4c82a2421e3395b808e6d9c42c862ee" + integrity sha512-uz6/tEy2IFm9RYOyvKl88zdzZfwEfKZmnX9Cj1BHjeSGNuGLuMD1kR8y5bteYmwqKm1tj8m4cb/aKEorr6fHWQ== + "@esbuild/android-x64@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.19.12.tgz#cb13e2211282012194d89bf3bfe7721273473b3d" @@ -864,6 +872,11 @@ resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.21.5.tgz#29918ec2db754cedcb6c1b04de8cd6547af6461e" integrity sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA== +"@esbuild/android-x64@0.23.1": + version "0.23.1" + resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.23.1.tgz#ae19d665d2f06f0f48a6ac9a224b3f672e65d517" + integrity sha512-nlN9B69St9BwUoB+jkyU090bru8L0NA3yFvAd7k8dNsVH8bi9a8cUAUSEcEEgTp2z3dbEDGJGfP6VUnkQnlReg== + "@esbuild/darwin-arm64@0.19.12": version "0.19.12" resolved "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz" @@ -874,6 +887,11 @@ resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz#e495b539660e51690f3928af50a76fb0a6ccff2a" integrity sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ== +"@esbuild/darwin-arm64@0.23.1": + version "0.23.1" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.23.1.tgz#05b17f91a87e557b468a9c75e9d85ab10c121b16" + integrity sha512-YsS2e3Wtgnw7Wq53XXBLcV6JhRsEq8hkfg91ESVadIrzr9wO6jJDMZnCQbHm1Guc5t/CdDiFSSfWP58FNuvT3Q== + "@esbuild/darwin-x64@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz#e37d9633246d52aecf491ee916ece709f9d5f4cd" @@ -884,6 +902,11 @@ resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz#c13838fa57372839abdddc91d71542ceea2e1e22" integrity sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw== +"@esbuild/darwin-x64@0.23.1": + version "0.23.1" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.23.1.tgz#c58353b982f4e04f0d022284b8ba2733f5ff0931" + integrity sha512-aClqdgTDVPSEGgoCS8QDG37Gu8yc9lTHNAQlsztQ6ENetKEO//b8y31MMu2ZaPbn4kVsIABzVLXYLhCGekGDqw== + "@esbuild/freebsd-arm64@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz#1ee4d8b682ed363b08af74d1ea2b2b4dbba76487" @@ -894,6 +917,11 @@ resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz#646b989aa20bf89fd071dd5dbfad69a3542e550e" integrity sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g== +"@esbuild/freebsd-arm64@0.23.1": + version "0.23.1" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.23.1.tgz#f9220dc65f80f03635e1ef96cfad5da1f446f3bc" + integrity sha512-h1k6yS8/pN/NHlMl5+v4XPfikhJulk4G+tKGFIOwURBSFzE8bixw1ebjluLOjfwtLqY0kewfjLSrO6tN2MgIhA== + "@esbuild/freebsd-x64@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz#37a693553d42ff77cd7126764b535fb6cc28a11c" @@ -904,6 +932,11 @@ resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz#aa615cfc80af954d3458906e38ca22c18cf5c261" integrity sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ== +"@esbuild/freebsd-x64@0.23.1": + version "0.23.1" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.23.1.tgz#69bd8511fa013b59f0226d1609ac43f7ce489730" + integrity sha512-lK1eJeyk1ZX8UklqFd/3A60UuZ/6UVfGT2LuGo3Wp4/z7eRTRYY+0xOu2kpClP+vMTi9wKOfXi2vjUpO1Ro76g== + "@esbuild/linux-arm64@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz#be9b145985ec6c57470e0e051d887b09dddb2d4b" @@ -914,6 +947,11 @@ resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz#70ac6fa14f5cb7e1f7f887bcffb680ad09922b5b" integrity sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q== +"@esbuild/linux-arm64@0.23.1": + version "0.23.1" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.23.1.tgz#8050af6d51ddb388c75653ef9871f5ccd8f12383" + integrity sha512-/93bf2yxencYDnItMYV/v116zff6UyTjo4EtEQjUBeGiVpMmffDNUyD9UN2zV+V3LRV3/on4xdZ26NKzn6754g== + "@esbuild/linux-arm@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz#207ecd982a8db95f7b5279207d0ff2331acf5eef" @@ -924,6 +962,11 @@ resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz#fc6fd11a8aca56c1f6f3894f2bea0479f8f626b9" integrity sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA== +"@esbuild/linux-arm@0.23.1": + version "0.23.1" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.23.1.tgz#ecaabd1c23b701070484990db9a82f382f99e771" + integrity sha512-CXXkzgn+dXAPs3WBwE+Kvnrf4WECwBdfjfeYHpMeVxWE0EceB6vhWGShs6wi0IYEqMSIzdOF1XjQ/Mkm5d7ZdQ== + "@esbuild/linux-ia32@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz#d0d86b5ca1562523dc284a6723293a52d5860601" @@ -934,6 +977,11 @@ resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz#3271f53b3f93e3d093d518d1649d6d68d346ede2" integrity sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg== +"@esbuild/linux-ia32@0.23.1": + version "0.23.1" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.23.1.tgz#3ed2273214178109741c09bd0687098a0243b333" + integrity sha512-VTN4EuOHwXEkXzX5nTvVY4s7E/Krz7COC8xkftbbKRYAl96vPiUssGkeMELQMOnLOJ8k3BY1+ZY52tttZnHcXQ== + "@esbuild/linux-loong64@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz#9a37f87fec4b8408e682b528391fa22afd952299" @@ -944,6 +992,11 @@ resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz#ed62e04238c57026aea831c5a130b73c0f9f26df" integrity sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg== +"@esbuild/linux-loong64@0.23.1": + version "0.23.1" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.23.1.tgz#a0fdf440b5485c81b0fbb316b08933d217f5d3ac" + integrity sha512-Vx09LzEoBa5zDnieH8LSMRToj7ir/Jeq0Gu6qJ/1GcBq9GkfoEAoXvLiW1U9J1qE/Y/Oyaq33w5p2ZWrNNHNEw== + "@esbuild/linux-mips64el@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz#4ddebd4e6eeba20b509d8e74c8e30d8ace0b89ec" @@ -954,6 +1007,11 @@ resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz#e79b8eb48bf3b106fadec1ac8240fb97b4e64cbe" integrity sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg== +"@esbuild/linux-mips64el@0.23.1": + version "0.23.1" + resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.23.1.tgz#e11a2806346db8375b18f5e104c5a9d4e81807f6" + integrity sha512-nrFzzMQ7W4WRLNUOU5dlWAqa6yVeI0P78WKGUo7lg2HShq/yx+UYkeNSE0SSfSure0SqgnsxPvmAUu/vu0E+3Q== + "@esbuild/linux-ppc64@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz#adb67dadb73656849f63cd522f5ecb351dd8dee8" @@ -964,6 +1022,11 @@ resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz#5f2203860a143b9919d383ef7573521fb154c3e4" integrity sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w== +"@esbuild/linux-ppc64@0.23.1": + version "0.23.1" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.23.1.tgz#06a2744c5eaf562b1a90937855b4d6cf7c75ec96" + integrity sha512-dKN8fgVqd0vUIjxuJI6P/9SSSe/mB9rvA98CSH2sJnlZ/OCZWO1DJvxj8jvKTfYUdGfcq2dDxoKaC6bHuTlgcw== + "@esbuild/linux-riscv64@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz#11bc0698bf0a2abf8727f1c7ace2112612c15adf" @@ -974,6 +1037,11 @@ resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz#07bcafd99322d5af62f618cb9e6a9b7f4bb825dc" integrity sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA== +"@esbuild/linux-riscv64@0.23.1": + version "0.23.1" + resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.23.1.tgz#65b46a2892fc0d1af4ba342af3fe0fa4a8fe08e7" + integrity sha512-5AV4Pzp80fhHL83JM6LoA6pTQVWgB1HovMBsLQ9OZWLDqVY8MVobBXNSmAJi//Csh6tcY7e7Lny2Hg1tElMjIA== + "@esbuild/linux-s390x@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz#e86fb8ffba7c5c92ba91fc3b27ed5a70196c3cc8" @@ -984,6 +1052,11 @@ resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz#b7ccf686751d6a3e44b8627ababc8be3ef62d8de" integrity sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A== +"@esbuild/linux-s390x@0.23.1": + version "0.23.1" + resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.23.1.tgz#e71ea18c70c3f604e241d16e4e5ab193a9785d6f" + integrity sha512-9ygs73tuFCe6f6m/Tb+9LtYxWR4c9yg7zjt2cYkjDbDpV/xVn+68cQxMXCjUpYwEkze2RcU/rMnfIXNRFmSoDw== + "@esbuild/linux-x64@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz#5f37cfdc705aea687dfe5dfbec086a05acfe9c78" @@ -994,6 +1067,11 @@ resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz#6d8f0c768e070e64309af8004bb94e68ab2bb3b0" integrity sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ== +"@esbuild/linux-x64@0.23.1": + version "0.23.1" + resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.23.1.tgz#d47f97391e80690d4dfe811a2e7d6927ad9eed24" + integrity sha512-EV6+ovTsEXCPAp58g2dD68LxoP/wK5pRvgy0J/HxPGB009omFPv3Yet0HiaqvrIrgPTBuC6wCH1LTOY91EO5hQ== + "@esbuild/netbsd-x64@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz#29da566a75324e0d0dd7e47519ba2f7ef168657b" @@ -1004,6 +1082,16 @@ resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz#bbe430f60d378ecb88decb219c602667387a6047" integrity sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg== +"@esbuild/netbsd-x64@0.23.1": + version "0.23.1" + resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.23.1.tgz#44e743c9778d57a8ace4b72f3c6b839a3b74a653" + integrity sha512-aevEkCNu7KlPRpYLjwmdcuNz6bDFiE7Z8XC4CPqExjTvrHugh28QzUXVOZtiYghciKUacNktqxdpymplil1beA== + +"@esbuild/openbsd-arm64@0.23.1": + version "0.23.1" + resolved "https://registry.yarnpkg.com/@esbuild/openbsd-arm64/-/openbsd-arm64-0.23.1.tgz#05c5a1faf67b9881834758c69f3e51b7dee015d7" + integrity sha512-3x37szhLexNA4bXhLrCC/LImN/YtWis6WXr1VESlfVtVeoFJBRINPJ3f0a/6LV8zpikqoUg4hyXw0sFBt5Cr+Q== + "@esbuild/openbsd-x64@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz#306c0acbdb5a99c95be98bdd1d47c916e7dc3ff0" @@ -1014,6 +1102,11 @@ resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz#99d1cf2937279560d2104821f5ccce220cb2af70" integrity sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow== +"@esbuild/openbsd-x64@0.23.1": + version "0.23.1" + resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.23.1.tgz#2e58ae511bacf67d19f9f2dcd9e8c5a93f00c273" + integrity sha512-aY2gMmKmPhxfU+0EdnN+XNtGbjfQgwZj43k8G3fyrDM/UdZww6xrWxmDkuz2eCZchqVeABjV5BpildOrUbBTqA== + "@esbuild/sunos-x64@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz#0933eaab9af8b9b2c930236f62aae3fc593faf30" @@ -1024,6 +1117,11 @@ resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz#08741512c10d529566baba837b4fe052c8f3487b" integrity sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg== +"@esbuild/sunos-x64@0.23.1": + version "0.23.1" + resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.23.1.tgz#adb022b959d18d3389ac70769cef5a03d3abd403" + integrity sha512-RBRT2gqEl0IKQABT4XTj78tpk9v7ehp+mazn2HbUeZl1YMdaGAQqhapjGTCe7uw7y0frDi4gS0uHzhvpFuI1sA== + "@esbuild/win32-arm64@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz#773bdbaa1971b36db2f6560088639ccd1e6773ae" @@ -1034,6 +1132,11 @@ resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz#675b7385398411240735016144ab2e99a60fc75d" integrity sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A== +"@esbuild/win32-arm64@0.23.1": + version "0.23.1" + resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.23.1.tgz#84906f50c212b72ec360f48461d43202f4c8b9a2" + integrity sha512-4O+gPR5rEBe2FpKOVyiJ7wNDPA8nGzDuJ6gN4okSA1gEOYZ67N8JPk58tkWtdtPeLz7lBnY6I5L3jdsr3S+A6A== + "@esbuild/win32-ia32@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz#000516cad06354cc84a73f0943a4aa690ef6fd67" @@ -1044,6 +1147,11 @@ resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz#1bfc3ce98aa6ca9a0969e4d2af72144c59c1193b" integrity sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA== +"@esbuild/win32-ia32@0.23.1": + version "0.23.1" + resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.23.1.tgz#5e3eacc515820ff729e90d0cb463183128e82fac" + integrity sha512-BcaL0Vn6QwCwre3Y717nVHZbAa4UBEigzFm6VdsVdT/MbZ38xoj1X9HPkZhbmaBGUD1W8vxAfffbDe8bA6AKnQ== + "@esbuild/win32-x64@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz#c57c8afbb4054a3ab8317591a0b7320360b444ae" @@ -1054,6 +1162,11 @@ resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz#acad351d582d157bb145535db2a6ff53dd514b5c" integrity sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw== +"@esbuild/win32-x64@0.23.1": + version "0.23.1" + resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.23.1.tgz#81fd50d11e2c32b2d6241470e3185b70c7b30699" + integrity sha512-BHpFFeslkWrXWyUPnbKm+xYYVYruCinGcftSBaa8zoF9hZO4BcSCFUvHVTtzpIY6YzUnYtuEhZ+C9iEXjxnasg== + "@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0": version "4.4.0" resolved "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz" @@ -1656,7 +1769,7 @@ "@jridgewell/sourcemap-codec" "^1.4.10" "@jridgewell/trace-mapping" "^0.3.24" -"@jridgewell/resolve-uri@^3.0.3", "@jridgewell/resolve-uri@^3.1.0": +"@jridgewell/resolve-uri@^3.1.0": version "3.1.2" resolved "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz" integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw== @@ -1676,14 +1789,6 @@ resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz#3188bcb273a414b0d215fd22a58540b989b9409a" integrity sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ== -"@jridgewell/trace-mapping@0.3.9": - version "0.3.9" - resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz" - integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ== - dependencies: - "@jridgewell/resolve-uri" "^3.0.3" - "@jridgewell/sourcemap-codec" "^1.4.10" - "@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.18", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25": version "0.3.25" resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz" @@ -3577,26 +3682,6 @@ resolved "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz" integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== -"@tsconfig/node10@^1.0.7": - version "1.0.11" - resolved "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz" - integrity sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw== - -"@tsconfig/node12@^1.0.7": - version "1.0.11" - resolved "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz" - integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag== - -"@tsconfig/node14@^1.0.0": - version "1.0.3" - resolved "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz" - integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow== - -"@tsconfig/node16@^1.0.2": - version "1.0.4" - resolved "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz" - integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA== - "@types/acorn@^4.0.0": version "4.0.6" resolved "https://registry.npmjs.org/@types/acorn/-/acorn-4.0.6.tgz" @@ -4458,7 +4543,7 @@ acorn-walk@^7.1.1: resolved "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz" integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA== -acorn-walk@^8.0.2, acorn-walk@^8.1.1: +acorn-walk@^8.0.2: version "8.3.2" resolved "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz" integrity sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A== @@ -4468,7 +4553,7 @@ acorn@^7.1.1: resolved "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -acorn@^8.0.0, acorn@^8.1.0, acorn@^8.2.4, acorn@^8.4.1, acorn@^8.8.1, acorn@^8.8.2, acorn@^8.9.0: +acorn@^8.0.0, acorn@^8.1.0, acorn@^8.2.4, acorn@^8.8.1, acorn@^8.8.2, acorn@^8.9.0: version "8.11.3" resolved "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz" integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg== @@ -4577,11 +4662,6 @@ anymatch@^3.0.3, anymatch@~3.1.2: normalize-path "^3.0.0" picomatch "^2.0.4" -arg@^4.1.0: - version "4.1.3" - resolved "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz" - integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA== - arg@^5.0.2: version "5.0.2" resolved "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz" @@ -5349,11 +5429,6 @@ create-jest@^29.7.0: jest-util "^29.7.0" prompts "^2.0.1" -create-require@^1.1.0: - version "1.1.1" - resolved "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz" - integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ== - cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz" @@ -5911,11 +5986,6 @@ diff-sequences@^29.6.3: resolved "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz" integrity sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q== -diff@^4.0.1: - version "4.0.2" - resolved "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz" - integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== - diff@^5.0.0: version "5.2.0" resolved "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz" @@ -6313,6 +6383,36 @@ esbuild@^0.21.3: "@esbuild/win32-ia32" "0.21.5" "@esbuild/win32-x64" "0.21.5" +esbuild@~0.23.0: + version "0.23.1" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.23.1.tgz#40fdc3f9265ec0beae6f59824ade1bd3d3d2dab8" + integrity sha512-VVNz/9Sa0bs5SELtn3f7qhJCDPCF5oMEl5cO9/SSinpE9hbPVvxbd572HH5AKiP7WD8INO53GgfDDhRjkylHEg== + optionalDependencies: + "@esbuild/aix-ppc64" "0.23.1" + "@esbuild/android-arm" "0.23.1" + "@esbuild/android-arm64" "0.23.1" + "@esbuild/android-x64" "0.23.1" + "@esbuild/darwin-arm64" "0.23.1" + "@esbuild/darwin-x64" "0.23.1" + "@esbuild/freebsd-arm64" "0.23.1" + "@esbuild/freebsd-x64" "0.23.1" + "@esbuild/linux-arm" "0.23.1" + "@esbuild/linux-arm64" "0.23.1" + "@esbuild/linux-ia32" "0.23.1" + "@esbuild/linux-loong64" "0.23.1" + "@esbuild/linux-mips64el" "0.23.1" + "@esbuild/linux-ppc64" "0.23.1" + "@esbuild/linux-riscv64" "0.23.1" + "@esbuild/linux-s390x" "0.23.1" + "@esbuild/linux-x64" "0.23.1" + "@esbuild/netbsd-x64" "0.23.1" + "@esbuild/openbsd-arm64" "0.23.1" + "@esbuild/openbsd-x64" "0.23.1" + "@esbuild/sunos-x64" "0.23.1" + "@esbuild/win32-arm64" "0.23.1" + "@esbuild/win32-ia32" "0.23.1" + "@esbuild/win32-x64" "0.23.1" + escalade@^3.1.1: version "3.1.2" resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz" @@ -7130,6 +7230,13 @@ get-tsconfig@^4.5.0: dependencies: resolve-pkg-maps "^1.0.0" +get-tsconfig@^4.7.5: + version "4.8.1" + resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.8.1.tgz#8995eb391ae6e1638d251118c7b56de7eb425471" + integrity sha512-k9PN+cFBmaLWtVz29SkUoqU5O0slLuHJXt/2P+tMVFT+phsSGXGkp9t3rQIqdz0e+06EHNGs3oM6ZX1s2zHxRg== + dependencies: + resolve-pkg-maps "^1.0.0" + github-slugger@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/github-slugger/-/github-slugger-2.0.0.tgz" @@ -9019,11 +9126,6 @@ make-dir@^4.0.0: dependencies: semver "^7.5.3" -make-error@^1.1.1: - version "1.3.6" - resolved "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz" - integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== - makeerror@1.0.12: version "1.0.12" resolved "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz" @@ -12702,25 +12804,6 @@ ts-interface-checker@^0.1.9: resolved "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz" integrity sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA== -ts-node@^10.9.1: - version "10.9.2" - resolved "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz" - integrity sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ== - dependencies: - "@cspotcode/source-map-support" "^0.8.0" - "@tsconfig/node10" "^1.0.7" - "@tsconfig/node12" "^1.0.7" - "@tsconfig/node14" "^1.0.0" - "@tsconfig/node16" "^1.0.2" - acorn "^8.4.1" - acorn-walk "^8.1.1" - arg "^4.1.0" - create-require "^1.1.0" - diff "^4.0.1" - make-error "^1.1.1" - v8-compile-cache-lib "^3.0.1" - yn "3.1.1" - tsconfck@^3.0.3: version "3.1.3" resolved "https://registry.yarnpkg.com/tsconfck/-/tsconfck-3.1.3.tgz#a8202f51dab684c426314796cdb0bbd0fe0cdf80" @@ -12753,6 +12836,16 @@ tsutils@^3.21.0: dependencies: tslib "^1.8.1" +tsx@^4.19.2: + version "4.19.2" + resolved "https://registry.yarnpkg.com/tsx/-/tsx-4.19.2.tgz#2d7814783440e0ae42354d0417d9c2989a2ae92c" + integrity sha512-pOUl6Vo2LUq/bSa8S5q7b91cgNSjctn9ugq/+Mvow99qW6x/UZYwzxy/3NmqoT66eHYfCVvFvACC58UBPFf28g== + dependencies: + esbuild "~0.23.0" + get-tsconfig "^4.7.5" + optionalDependencies: + fsevents "~2.3.3" + tunnel@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c" @@ -13133,11 +13226,6 @@ uvu@^0.5.0: kleur "^4.0.3" sade "^1.7.3" -v8-compile-cache-lib@^3.0.1: - version "3.0.1" - resolved "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz" - integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg== - v8-to-istanbul@^9.0.1: version "9.2.0" resolved "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.2.0.tgz" @@ -13609,11 +13697,6 @@ yargs@^17.3.1, yargs@^17.7.2: y18n "^5.0.5" yargs-parser "^21.1.1" -yn@3.1.1: - version "3.1.1" - resolved "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz" - integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q== - yocto-queue@^0.1.0: version "0.1.0" resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz" From 80d903adbf6d125b6778ea70d5d59213c18694eb Mon Sep 17 00:00:00 2001 From: Abdellah Hariti Date: Sat, 9 Nov 2024 14:42:26 +0100 Subject: [PATCH 08/23] add content change logic to skip build on changelog --- apps/changelog/has-content-changes.ts | 30 +++++++++++ apps/changelog/src/server/utils.ts | 73 +++++++++++++-------------- skip-build.sh | 4 ++ 3 files changed, 68 insertions(+), 39 deletions(-) create mode 100644 apps/changelog/has-content-changes.ts diff --git a/apps/changelog/has-content-changes.ts b/apps/changelog/has-content-changes.ts new file mode 100644 index 0000000000000..47ddc03ddec84 --- /dev/null +++ b/apps/changelog/has-content-changes.ts @@ -0,0 +1,30 @@ +import {getChangelogsUncached} from './src/server/utils'; + +async function checkChanges() { + const {hash, changelogs} = await getChangelogsUncached(); + console.log({changelogs}); + // extract the hash from the body tag of the live site + // example: + const prodHash = await fetch('https://sentry.io/changelog/') + .then(r => r.text()) + .then(html => { + const match = html.match(/data-content-hash="([^"]+)"/); + return match ? match[1] : null; + }); + + if (prodHash === null) { + console.error('could not find changelogs hash on on live changelog page'); + // build anyway since we are not sure + process.exit(1); + } + + if (prodHash !== hash) { + console.info('⚠️ changelogs have changed since last deployment'); + // should build + process.exit(1); + } + console.info('changelogs are up to date'); + // skip build + process.exit(0); +} +checkChanges(); diff --git a/apps/changelog/src/server/utils.ts b/apps/changelog/src/server/utils.ts index 371ea5a3791f4..85556f9ecf6a8 100644 --- a/apps/changelog/src/server/utils.ts +++ b/apps/changelog/src/server/utils.ts @@ -1,42 +1,37 @@ -import {prismaClient} from '@/server/prisma-client'; +import {prismaClient} from './prisma-client'; import {Changelog} from '@prisma/client'; import {unstable_cache} from 'next/cache'; -export const getChangelogs = unstable_cache( - async () => { - const changelogs = await prismaClient.changelog.findMany({ - include: { - categories: true, - }, - where: { - published: true, - }, - orderBy: { - publishedAt: 'desc', - }, - }); - const hashHex = (buffer: ArrayBuffer) => { - const hexCodes = Array.from(new Uint8Array(buffer)).map(value => - value.toString(16).padStart(2, '0') - ); - return hexCodes.join(''); - }; - const hashChangelogs = (changelogs: Changelog[]) => - crypto.subtle - .digest( - 'SHA-256', - new TextEncoder().encode( - changelogs - .map(changelogs => changelogs.id + ':' + changelogs.updatedAt) - .join(',') - ) - ) - .then(hashHex); - return { - changelogs, - hash: await hashChangelogs(changelogs), - }; - }, - ['changelogs'], - {tags: ['changelogs']} -); +const hashHex = (buffer: ArrayBuffer) => { + const hexCodes = Array.from(new Uint8Array(buffer)).map(value => + value.toString(16).padStart(2, '0') + ); + return hexCodes.join(''); +}; + +const hashChangelogs = async (changelogs: Changelog[]) => { + return crypto.subtle + .digest('SHA-256', new TextEncoder().encode(JSON.stringify(changelogs))) + .then(hashHex); +}; +export const getChangelogsUncached = async () => { + const changelogs = await prismaClient.changelog.findMany({ + include: { + categories: true, + }, + where: { + published: true, + }, + orderBy: { + publishedAt: 'desc', + }, + }); + return { + changelogs, + hash: await hashChangelogs(changelogs), + }; +}; + +export const getChangelogs = unstable_cache(getChangelogsUncached, ['changelogs'], { + tags: ['changelogs'], +}); diff --git a/skip-build.sh b/skip-build.sh index f4d057628d928..54359ae5cf928 100755 --- a/skip-build.sh +++ b/skip-build.sh @@ -18,6 +18,10 @@ non_content_diff_status=$(git diff HEAD^ HEAD --name-only | grep -vE '^(docs/|pl changelog_diff_status=$(git diff HEAD^ HEAD --name-only | grep -vE '^(apps/changelog/|yarn.lock)' | wc -l) if [[ "$NEXT_PUBLIC_CHANGELOG" === "1" ]] ; then + if yarn tsx ./apps/changelog/has-content-changes.ts ; then + exit 1 + fi + if [[ $changelog_diff_status -gt 0 ]] ; then exit 1 else From 339abea2f3a53c2f7411c54c5918e4c507e17ee6 Mon Sep 17 00:00:00 2001 From: Abdellah Hariti Date: Sat, 9 Nov 2024 14:48:21 +0100 Subject: [PATCH 09/23] build in case of errors --- apps/changelog/has-content-changes.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/apps/changelog/has-content-changes.ts b/apps/changelog/has-content-changes.ts index 47ddc03ddec84..556d14825cb14 100644 --- a/apps/changelog/has-content-changes.ts +++ b/apps/changelog/has-content-changes.ts @@ -1,5 +1,13 @@ import {getChangelogsUncached} from './src/server/utils'; +try { + checkChanges(); +} catch (e) { + console.error(e); + // build in case of errors + process.exit(1); +} + async function checkChanges() { const {hash, changelogs} = await getChangelogsUncached(); console.log({changelogs}); @@ -27,4 +35,3 @@ async function checkChanges() { // skip build process.exit(0); } -checkChanges(); From 2bf5ba4ed0e005eab390942c72cae97deeeec153 Mon Sep 17 00:00:00 2001 From: Abdellah Hariti Date: Sat, 9 Nov 2024 15:03:27 +0100 Subject: [PATCH 10/23] remove ts-node from script --- bin/lint-docs.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/lint-docs.ts b/bin/lint-docs.ts index 2843b3adf5429..b054e07d60edb 100755 --- a/bin/lint-docs.ts +++ b/bin/lint-docs.ts @@ -1,4 +1,4 @@ -#!/usr/bin/env ts-node +#!/usr/bin/env yarn tsx // This file used to lint for wizard errors. Wizard docs have been removed // (possibly permanently). If they come back, this should be ported from the From f81781fce05234ebcb69dcc203b316169ab509ed Mon Sep 17 00:00:00 2001 From: Abdellah Hariti Date: Sat, 9 Nov 2024 15:04:50 +0100 Subject: [PATCH 11/23] remove console.log --- apps/changelog/has-content-changes.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/changelog/has-content-changes.ts b/apps/changelog/has-content-changes.ts index 556d14825cb14..dbfc5050f4ef1 100644 --- a/apps/changelog/has-content-changes.ts +++ b/apps/changelog/has-content-changes.ts @@ -9,8 +9,7 @@ try { } async function checkChanges() { - const {hash, changelogs} = await getChangelogsUncached(); - console.log({changelogs}); + const {hash} = await getChangelogsUncached(); // extract the hash from the body tag of the live site // example: const prodHash = await fetch('https://sentry.io/changelog/') From b2c406ee64666f847bfcf963d8c110156bc46c82 Mon Sep 17 00:00:00 2001 From: Abdellah Hariti Date: Sat, 9 Nov 2024 15:05:16 +0100 Subject: [PATCH 12/23] eslint ignore console --- apps/changelog/has-content-changes.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/changelog/has-content-changes.ts b/apps/changelog/has-content-changes.ts index dbfc5050f4ef1..61e6bac6aa922 100644 --- a/apps/changelog/has-content-changes.ts +++ b/apps/changelog/has-content-changes.ts @@ -3,6 +3,7 @@ import {getChangelogsUncached} from './src/server/utils'; try { checkChanges(); } catch (e) { + // eslint-disable-next-line no-console console.error(e); // build in case of errors process.exit(1); @@ -20,16 +21,19 @@ async function checkChanges() { }); if (prodHash === null) { + // eslint-disable-next-line no-console console.error('could not find changelogs hash on on live changelog page'); // build anyway since we are not sure process.exit(1); } if (prodHash !== hash) { + // eslint-disable-next-line no-console console.info('⚠️ changelogs have changed since last deployment'); // should build process.exit(1); } + // eslint-disable-next-line no-console console.info('changelogs are up to date'); // skip build process.exit(0); From d54a21a3a05e6ab48d2a5ff3bb6965eb4068adb5 Mon Sep 17 00:00:00 2001 From: Abdellah Hariti Date: Sat, 9 Nov 2024 15:07:59 +0100 Subject: [PATCH 13/23] fix shebang again? --- bin/lint-docs.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/lint-docs.ts b/bin/lint-docs.ts index b054e07d60edb..337dbc30cd3c1 100755 --- a/bin/lint-docs.ts +++ b/bin/lint-docs.ts @@ -1,4 +1,4 @@ -#!/usr/bin/env yarn tsx +#!/usr/bin/env tsx // This file used to lint for wizard errors. Wizard docs have been removed // (possibly permanently). If they come back, this should be ported from the From bc2a0e8d8dc2ba9bf95acd96460ae96339dc75be Mon Sep 17 00:00:00 2001 From: Abdellah Hariti Date: Mon, 11 Nov 2024 12:47:56 +0100 Subject: [PATCH 14/23] Revert "eslint ignore console" This reverts commit b2c406ee64666f847bfcf963d8c110156bc46c82. --- apps/changelog/has-content-changes.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/apps/changelog/has-content-changes.ts b/apps/changelog/has-content-changes.ts index 61e6bac6aa922..dbfc5050f4ef1 100644 --- a/apps/changelog/has-content-changes.ts +++ b/apps/changelog/has-content-changes.ts @@ -3,7 +3,6 @@ import {getChangelogsUncached} from './src/server/utils'; try { checkChanges(); } catch (e) { - // eslint-disable-next-line no-console console.error(e); // build in case of errors process.exit(1); @@ -21,19 +20,16 @@ async function checkChanges() { }); if (prodHash === null) { - // eslint-disable-next-line no-console console.error('could not find changelogs hash on on live changelog page'); // build anyway since we are not sure process.exit(1); } if (prodHash !== hash) { - // eslint-disable-next-line no-console console.info('⚠️ changelogs have changed since last deployment'); // should build process.exit(1); } - // eslint-disable-next-line no-console console.info('changelogs are up to date'); // skip build process.exit(0); From 4afc06e88c439c75d4e6d04af58dca5634caf8db Mon Sep 17 00:00:00 2001 From: Abdellah Hariti Date: Mon, 11 Nov 2024 12:47:58 +0100 Subject: [PATCH 15/23] Revert "remove console.log" This reverts commit f81781fce05234ebcb69dcc203b316169ab509ed. --- apps/changelog/has-content-changes.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/changelog/has-content-changes.ts b/apps/changelog/has-content-changes.ts index dbfc5050f4ef1..556d14825cb14 100644 --- a/apps/changelog/has-content-changes.ts +++ b/apps/changelog/has-content-changes.ts @@ -9,7 +9,8 @@ try { } async function checkChanges() { - const {hash} = await getChangelogsUncached(); + const {hash, changelogs} = await getChangelogsUncached(); + console.log({changelogs}); // extract the hash from the body tag of the live site // example: const prodHash = await fetch('https://sentry.io/changelog/') From da9d4ffcbf30a37d987c6ed6b99f4e41e391602c Mon Sep 17 00:00:00 2001 From: Abdellah Hariti Date: Mon, 11 Nov 2024 12:48:43 +0100 Subject: [PATCH 16/23] Revert "remove ts-node from script" This reverts commit 2bf5ba4ed0e005eab390942c72cae97deeeec153. --- bin/lint-docs.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/lint-docs.ts b/bin/lint-docs.ts index 337dbc30cd3c1..2843b3adf5429 100755 --- a/bin/lint-docs.ts +++ b/bin/lint-docs.ts @@ -1,4 +1,4 @@ -#!/usr/bin/env tsx +#!/usr/bin/env ts-node // This file used to lint for wizard errors. Wizard docs have been removed // (possibly permanently). If they come back, this should be ported from the From 103f92b30b0f335a42e21e89b6e2a0668fcdfad0 Mon Sep 17 00:00:00 2001 From: Abdellah Hariti Date: Mon, 11 Nov 2024 12:48:44 +0100 Subject: [PATCH 17/23] Revert "build in case of errors" This reverts commit 339abea2f3a53c2f7411c54c5918e4c507e17ee6. --- apps/changelog/has-content-changes.ts | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/apps/changelog/has-content-changes.ts b/apps/changelog/has-content-changes.ts index 556d14825cb14..47ddc03ddec84 100644 --- a/apps/changelog/has-content-changes.ts +++ b/apps/changelog/has-content-changes.ts @@ -1,13 +1,5 @@ import {getChangelogsUncached} from './src/server/utils'; -try { - checkChanges(); -} catch (e) { - console.error(e); - // build in case of errors - process.exit(1); -} - async function checkChanges() { const {hash, changelogs} = await getChangelogsUncached(); console.log({changelogs}); @@ -35,3 +27,4 @@ async function checkChanges() { // skip build process.exit(0); } +checkChanges(); From aa200956c62aeefb05d6a3d31d6cfd51141566b5 Mon Sep 17 00:00:00 2001 From: Abdellah Hariti Date: Mon, 11 Nov 2024 12:48:46 +0100 Subject: [PATCH 18/23] Revert "add content change logic to skip build on changelog" This reverts commit 80d903adbf6d125b6778ea70d5d59213c18694eb. --- apps/changelog/has-content-changes.ts | 30 ----------- apps/changelog/src/server/utils.ts | 73 ++++++++++++++------------- skip-build.sh | 4 -- 3 files changed, 39 insertions(+), 68 deletions(-) delete mode 100644 apps/changelog/has-content-changes.ts diff --git a/apps/changelog/has-content-changes.ts b/apps/changelog/has-content-changes.ts deleted file mode 100644 index 47ddc03ddec84..0000000000000 --- a/apps/changelog/has-content-changes.ts +++ /dev/null @@ -1,30 +0,0 @@ -import {getChangelogsUncached} from './src/server/utils'; - -async function checkChanges() { - const {hash, changelogs} = await getChangelogsUncached(); - console.log({changelogs}); - // extract the hash from the body tag of the live site - // example: - const prodHash = await fetch('https://sentry.io/changelog/') - .then(r => r.text()) - .then(html => { - const match = html.match(/data-content-hash="([^"]+)"/); - return match ? match[1] : null; - }); - - if (prodHash === null) { - console.error('could not find changelogs hash on on live changelog page'); - // build anyway since we are not sure - process.exit(1); - } - - if (prodHash !== hash) { - console.info('⚠️ changelogs have changed since last deployment'); - // should build - process.exit(1); - } - console.info('changelogs are up to date'); - // skip build - process.exit(0); -} -checkChanges(); diff --git a/apps/changelog/src/server/utils.ts b/apps/changelog/src/server/utils.ts index 85556f9ecf6a8..371ea5a3791f4 100644 --- a/apps/changelog/src/server/utils.ts +++ b/apps/changelog/src/server/utils.ts @@ -1,37 +1,42 @@ -import {prismaClient} from './prisma-client'; +import {prismaClient} from '@/server/prisma-client'; import {Changelog} from '@prisma/client'; import {unstable_cache} from 'next/cache'; -const hashHex = (buffer: ArrayBuffer) => { - const hexCodes = Array.from(new Uint8Array(buffer)).map(value => - value.toString(16).padStart(2, '0') - ); - return hexCodes.join(''); -}; - -const hashChangelogs = async (changelogs: Changelog[]) => { - return crypto.subtle - .digest('SHA-256', new TextEncoder().encode(JSON.stringify(changelogs))) - .then(hashHex); -}; -export const getChangelogsUncached = async () => { - const changelogs = await prismaClient.changelog.findMany({ - include: { - categories: true, - }, - where: { - published: true, - }, - orderBy: { - publishedAt: 'desc', - }, - }); - return { - changelogs, - hash: await hashChangelogs(changelogs), - }; -}; - -export const getChangelogs = unstable_cache(getChangelogsUncached, ['changelogs'], { - tags: ['changelogs'], -}); +export const getChangelogs = unstable_cache( + async () => { + const changelogs = await prismaClient.changelog.findMany({ + include: { + categories: true, + }, + where: { + published: true, + }, + orderBy: { + publishedAt: 'desc', + }, + }); + const hashHex = (buffer: ArrayBuffer) => { + const hexCodes = Array.from(new Uint8Array(buffer)).map(value => + value.toString(16).padStart(2, '0') + ); + return hexCodes.join(''); + }; + const hashChangelogs = (changelogs: Changelog[]) => + crypto.subtle + .digest( + 'SHA-256', + new TextEncoder().encode( + changelogs + .map(changelogs => changelogs.id + ':' + changelogs.updatedAt) + .join(',') + ) + ) + .then(hashHex); + return { + changelogs, + hash: await hashChangelogs(changelogs), + }; + }, + ['changelogs'], + {tags: ['changelogs']} +); diff --git a/skip-build.sh b/skip-build.sh index 54359ae5cf928..f4d057628d928 100755 --- a/skip-build.sh +++ b/skip-build.sh @@ -18,10 +18,6 @@ non_content_diff_status=$(git diff HEAD^ HEAD --name-only | grep -vE '^(docs/|pl changelog_diff_status=$(git diff HEAD^ HEAD --name-only | grep -vE '^(apps/changelog/|yarn.lock)' | wc -l) if [[ "$NEXT_PUBLIC_CHANGELOG" === "1" ]] ; then - if yarn tsx ./apps/changelog/has-content-changes.ts ; then - exit 1 - fi - if [[ $changelog_diff_status -gt 0 ]] ; then exit 1 else From b65f8cdc97db0338ec31be1d5e717bf92aa06739 Mon Sep 17 00:00:00 2001 From: Abdellah Hariti Date: Mon, 11 Nov 2024 12:48:47 +0100 Subject: [PATCH 19/23] Revert "swap ts-node for tsx" This reverts commit a0a86faaebe4380a57a50475ae3cd53b39edd48e. --- package.json | 4 +- yarn.lock | 257 +++++++++++++++++---------------------------------- 2 files changed, 89 insertions(+), 172 deletions(-) diff --git a/package.json b/package.json index ccf2a94e41ad4..bbbc249110441 100644 --- a/package.json +++ b/package.json @@ -97,8 +97,7 @@ "server-only": "^0.0.1", "sharp": "^0.33.4", "tailwindcss-scoped-preflight": "^3.0.4", - "textarea-markdown-editor": "^1.0.4", - "tsx": "^4.19.2" + "textarea-markdown-editor": "^1.0.4" }, "devDependencies": { "@babel/preset-typescript": "^7.15.0", @@ -122,6 +121,7 @@ "postcss": "^8.4.33", "prettier": "^3.2.4", "tailwindcss": "^3.4.1", + "ts-node": "^10.9.1", "typescript": "^5", "vite-tsconfig-paths": "^5.0.1", "vitest": "^2.1.1", diff --git a/yarn.lock b/yarn.lock index 81f9e42edd273..c1a90d7b4728a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -664,6 +664,13 @@ "@codecov/bundler-plugin-core" "^1.0.0" unplugin "^1.10.1" +"@cspotcode/source-map-support@^0.8.0": + version "0.8.1" + resolved "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz" + integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw== + dependencies: + "@jridgewell/trace-mapping" "0.3.9" + "@emnapi/runtime@^1.1.1": version "1.2.0" resolved "https://registry.yarnpkg.com/@emnapi/runtime/-/runtime-1.2.0.tgz#71d018546c3a91f3b51106530edbc056b9f2f2e3" @@ -827,11 +834,6 @@ resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz#c7184a326533fcdf1b8ee0733e21c713b975575f" integrity sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ== -"@esbuild/aix-ppc64@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.23.1.tgz#51299374de171dbd80bb7d838e1cfce9af36f353" - integrity sha512-6VhYk1diRqrhBAqpJEdjASR/+WVRtfjpqKuNw11cLiaWpAT/Uu+nokB+UJnevzy/P9C/ty6AOe0dwueMrGh/iQ== - "@esbuild/android-arm64@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz#7ad65a36cfdb7e0d429c353e00f680d737c2aed4" @@ -842,11 +844,6 @@ resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz#09d9b4357780da9ea3a7dfb833a1f1ff439b4052" integrity sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A== -"@esbuild/android-arm64@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.23.1.tgz#58565291a1fe548638adb9c584237449e5e14018" - integrity sha512-xw50ipykXcLstLeWH7WRdQuysJqejuAGPd30vd1i5zSyKK3WE+ijzHmLKxdiCMtH1pHz78rOg0BKSYOSB/2Khw== - "@esbuild/android-arm@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.19.12.tgz#b0c26536f37776162ca8bde25e42040c203f2824" @@ -857,11 +854,6 @@ resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.21.5.tgz#9b04384fb771926dfa6d7ad04324ecb2ab9b2e28" integrity sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg== -"@esbuild/android-arm@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.23.1.tgz#5eb8c652d4c82a2421e3395b808e6d9c42c862ee" - integrity sha512-uz6/tEy2IFm9RYOyvKl88zdzZfwEfKZmnX9Cj1BHjeSGNuGLuMD1kR8y5bteYmwqKm1tj8m4cb/aKEorr6fHWQ== - "@esbuild/android-x64@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.19.12.tgz#cb13e2211282012194d89bf3bfe7721273473b3d" @@ -872,11 +864,6 @@ resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.21.5.tgz#29918ec2db754cedcb6c1b04de8cd6547af6461e" integrity sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA== -"@esbuild/android-x64@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.23.1.tgz#ae19d665d2f06f0f48a6ac9a224b3f672e65d517" - integrity sha512-nlN9B69St9BwUoB+jkyU090bru8L0NA3yFvAd7k8dNsVH8bi9a8cUAUSEcEEgTp2z3dbEDGJGfP6VUnkQnlReg== - "@esbuild/darwin-arm64@0.19.12": version "0.19.12" resolved "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz" @@ -887,11 +874,6 @@ resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz#e495b539660e51690f3928af50a76fb0a6ccff2a" integrity sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ== -"@esbuild/darwin-arm64@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.23.1.tgz#05b17f91a87e557b468a9c75e9d85ab10c121b16" - integrity sha512-YsS2e3Wtgnw7Wq53XXBLcV6JhRsEq8hkfg91ESVadIrzr9wO6jJDMZnCQbHm1Guc5t/CdDiFSSfWP58FNuvT3Q== - "@esbuild/darwin-x64@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz#e37d9633246d52aecf491ee916ece709f9d5f4cd" @@ -902,11 +884,6 @@ resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz#c13838fa57372839abdddc91d71542ceea2e1e22" integrity sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw== -"@esbuild/darwin-x64@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.23.1.tgz#c58353b982f4e04f0d022284b8ba2733f5ff0931" - integrity sha512-aClqdgTDVPSEGgoCS8QDG37Gu8yc9lTHNAQlsztQ6ENetKEO//b8y31MMu2ZaPbn4kVsIABzVLXYLhCGekGDqw== - "@esbuild/freebsd-arm64@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz#1ee4d8b682ed363b08af74d1ea2b2b4dbba76487" @@ -917,11 +894,6 @@ resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz#646b989aa20bf89fd071dd5dbfad69a3542e550e" integrity sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g== -"@esbuild/freebsd-arm64@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.23.1.tgz#f9220dc65f80f03635e1ef96cfad5da1f446f3bc" - integrity sha512-h1k6yS8/pN/NHlMl5+v4XPfikhJulk4G+tKGFIOwURBSFzE8bixw1ebjluLOjfwtLqY0kewfjLSrO6tN2MgIhA== - "@esbuild/freebsd-x64@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz#37a693553d42ff77cd7126764b535fb6cc28a11c" @@ -932,11 +904,6 @@ resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz#aa615cfc80af954d3458906e38ca22c18cf5c261" integrity sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ== -"@esbuild/freebsd-x64@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.23.1.tgz#69bd8511fa013b59f0226d1609ac43f7ce489730" - integrity sha512-lK1eJeyk1ZX8UklqFd/3A60UuZ/6UVfGT2LuGo3Wp4/z7eRTRYY+0xOu2kpClP+vMTi9wKOfXi2vjUpO1Ro76g== - "@esbuild/linux-arm64@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz#be9b145985ec6c57470e0e051d887b09dddb2d4b" @@ -947,11 +914,6 @@ resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz#70ac6fa14f5cb7e1f7f887bcffb680ad09922b5b" integrity sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q== -"@esbuild/linux-arm64@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.23.1.tgz#8050af6d51ddb388c75653ef9871f5ccd8f12383" - integrity sha512-/93bf2yxencYDnItMYV/v116zff6UyTjo4EtEQjUBeGiVpMmffDNUyD9UN2zV+V3LRV3/on4xdZ26NKzn6754g== - "@esbuild/linux-arm@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz#207ecd982a8db95f7b5279207d0ff2331acf5eef" @@ -962,11 +924,6 @@ resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz#fc6fd11a8aca56c1f6f3894f2bea0479f8f626b9" integrity sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA== -"@esbuild/linux-arm@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.23.1.tgz#ecaabd1c23b701070484990db9a82f382f99e771" - integrity sha512-CXXkzgn+dXAPs3WBwE+Kvnrf4WECwBdfjfeYHpMeVxWE0EceB6vhWGShs6wi0IYEqMSIzdOF1XjQ/Mkm5d7ZdQ== - "@esbuild/linux-ia32@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz#d0d86b5ca1562523dc284a6723293a52d5860601" @@ -977,11 +934,6 @@ resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz#3271f53b3f93e3d093d518d1649d6d68d346ede2" integrity sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg== -"@esbuild/linux-ia32@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.23.1.tgz#3ed2273214178109741c09bd0687098a0243b333" - integrity sha512-VTN4EuOHwXEkXzX5nTvVY4s7E/Krz7COC8xkftbbKRYAl96vPiUssGkeMELQMOnLOJ8k3BY1+ZY52tttZnHcXQ== - "@esbuild/linux-loong64@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz#9a37f87fec4b8408e682b528391fa22afd952299" @@ -992,11 +944,6 @@ resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz#ed62e04238c57026aea831c5a130b73c0f9f26df" integrity sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg== -"@esbuild/linux-loong64@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.23.1.tgz#a0fdf440b5485c81b0fbb316b08933d217f5d3ac" - integrity sha512-Vx09LzEoBa5zDnieH8LSMRToj7ir/Jeq0Gu6qJ/1GcBq9GkfoEAoXvLiW1U9J1qE/Y/Oyaq33w5p2ZWrNNHNEw== - "@esbuild/linux-mips64el@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz#4ddebd4e6eeba20b509d8e74c8e30d8ace0b89ec" @@ -1007,11 +954,6 @@ resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz#e79b8eb48bf3b106fadec1ac8240fb97b4e64cbe" integrity sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg== -"@esbuild/linux-mips64el@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.23.1.tgz#e11a2806346db8375b18f5e104c5a9d4e81807f6" - integrity sha512-nrFzzMQ7W4WRLNUOU5dlWAqa6yVeI0P78WKGUo7lg2HShq/yx+UYkeNSE0SSfSure0SqgnsxPvmAUu/vu0E+3Q== - "@esbuild/linux-ppc64@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz#adb67dadb73656849f63cd522f5ecb351dd8dee8" @@ -1022,11 +964,6 @@ resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz#5f2203860a143b9919d383ef7573521fb154c3e4" integrity sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w== -"@esbuild/linux-ppc64@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.23.1.tgz#06a2744c5eaf562b1a90937855b4d6cf7c75ec96" - integrity sha512-dKN8fgVqd0vUIjxuJI6P/9SSSe/mB9rvA98CSH2sJnlZ/OCZWO1DJvxj8jvKTfYUdGfcq2dDxoKaC6bHuTlgcw== - "@esbuild/linux-riscv64@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz#11bc0698bf0a2abf8727f1c7ace2112612c15adf" @@ -1037,11 +974,6 @@ resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz#07bcafd99322d5af62f618cb9e6a9b7f4bb825dc" integrity sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA== -"@esbuild/linux-riscv64@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.23.1.tgz#65b46a2892fc0d1af4ba342af3fe0fa4a8fe08e7" - integrity sha512-5AV4Pzp80fhHL83JM6LoA6pTQVWgB1HovMBsLQ9OZWLDqVY8MVobBXNSmAJi//Csh6tcY7e7Lny2Hg1tElMjIA== - "@esbuild/linux-s390x@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz#e86fb8ffba7c5c92ba91fc3b27ed5a70196c3cc8" @@ -1052,11 +984,6 @@ resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz#b7ccf686751d6a3e44b8627ababc8be3ef62d8de" integrity sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A== -"@esbuild/linux-s390x@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.23.1.tgz#e71ea18c70c3f604e241d16e4e5ab193a9785d6f" - integrity sha512-9ygs73tuFCe6f6m/Tb+9LtYxWR4c9yg7zjt2cYkjDbDpV/xVn+68cQxMXCjUpYwEkze2RcU/rMnfIXNRFmSoDw== - "@esbuild/linux-x64@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz#5f37cfdc705aea687dfe5dfbec086a05acfe9c78" @@ -1067,11 +994,6 @@ resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz#6d8f0c768e070e64309af8004bb94e68ab2bb3b0" integrity sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ== -"@esbuild/linux-x64@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.23.1.tgz#d47f97391e80690d4dfe811a2e7d6927ad9eed24" - integrity sha512-EV6+ovTsEXCPAp58g2dD68LxoP/wK5pRvgy0J/HxPGB009omFPv3Yet0HiaqvrIrgPTBuC6wCH1LTOY91EO5hQ== - "@esbuild/netbsd-x64@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz#29da566a75324e0d0dd7e47519ba2f7ef168657b" @@ -1082,16 +1004,6 @@ resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz#bbe430f60d378ecb88decb219c602667387a6047" integrity sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg== -"@esbuild/netbsd-x64@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.23.1.tgz#44e743c9778d57a8ace4b72f3c6b839a3b74a653" - integrity sha512-aevEkCNu7KlPRpYLjwmdcuNz6bDFiE7Z8XC4CPqExjTvrHugh28QzUXVOZtiYghciKUacNktqxdpymplil1beA== - -"@esbuild/openbsd-arm64@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/openbsd-arm64/-/openbsd-arm64-0.23.1.tgz#05c5a1faf67b9881834758c69f3e51b7dee015d7" - integrity sha512-3x37szhLexNA4bXhLrCC/LImN/YtWis6WXr1VESlfVtVeoFJBRINPJ3f0a/6LV8zpikqoUg4hyXw0sFBt5Cr+Q== - "@esbuild/openbsd-x64@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz#306c0acbdb5a99c95be98bdd1d47c916e7dc3ff0" @@ -1102,11 +1014,6 @@ resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz#99d1cf2937279560d2104821f5ccce220cb2af70" integrity sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow== -"@esbuild/openbsd-x64@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.23.1.tgz#2e58ae511bacf67d19f9f2dcd9e8c5a93f00c273" - integrity sha512-aY2gMmKmPhxfU+0EdnN+XNtGbjfQgwZj43k8G3fyrDM/UdZww6xrWxmDkuz2eCZchqVeABjV5BpildOrUbBTqA== - "@esbuild/sunos-x64@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz#0933eaab9af8b9b2c930236f62aae3fc593faf30" @@ -1117,11 +1024,6 @@ resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz#08741512c10d529566baba837b4fe052c8f3487b" integrity sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg== -"@esbuild/sunos-x64@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.23.1.tgz#adb022b959d18d3389ac70769cef5a03d3abd403" - integrity sha512-RBRT2gqEl0IKQABT4XTj78tpk9v7ehp+mazn2HbUeZl1YMdaGAQqhapjGTCe7uw7y0frDi4gS0uHzhvpFuI1sA== - "@esbuild/win32-arm64@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz#773bdbaa1971b36db2f6560088639ccd1e6773ae" @@ -1132,11 +1034,6 @@ resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz#675b7385398411240735016144ab2e99a60fc75d" integrity sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A== -"@esbuild/win32-arm64@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.23.1.tgz#84906f50c212b72ec360f48461d43202f4c8b9a2" - integrity sha512-4O+gPR5rEBe2FpKOVyiJ7wNDPA8nGzDuJ6gN4okSA1gEOYZ67N8JPk58tkWtdtPeLz7lBnY6I5L3jdsr3S+A6A== - "@esbuild/win32-ia32@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz#000516cad06354cc84a73f0943a4aa690ef6fd67" @@ -1147,11 +1044,6 @@ resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz#1bfc3ce98aa6ca9a0969e4d2af72144c59c1193b" integrity sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA== -"@esbuild/win32-ia32@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.23.1.tgz#5e3eacc515820ff729e90d0cb463183128e82fac" - integrity sha512-BcaL0Vn6QwCwre3Y717nVHZbAa4UBEigzFm6VdsVdT/MbZ38xoj1X9HPkZhbmaBGUD1W8vxAfffbDe8bA6AKnQ== - "@esbuild/win32-x64@0.19.12": version "0.19.12" resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz#c57c8afbb4054a3ab8317591a0b7320360b444ae" @@ -1162,11 +1054,6 @@ resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz#acad351d582d157bb145535db2a6ff53dd514b5c" integrity sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw== -"@esbuild/win32-x64@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.23.1.tgz#81fd50d11e2c32b2d6241470e3185b70c7b30699" - integrity sha512-BHpFFeslkWrXWyUPnbKm+xYYVYruCinGcftSBaa8zoF9hZO4BcSCFUvHVTtzpIY6YzUnYtuEhZ+C9iEXjxnasg== - "@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0": version "4.4.0" resolved "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz" @@ -1769,7 +1656,7 @@ "@jridgewell/sourcemap-codec" "^1.4.10" "@jridgewell/trace-mapping" "^0.3.24" -"@jridgewell/resolve-uri@^3.1.0": +"@jridgewell/resolve-uri@^3.0.3", "@jridgewell/resolve-uri@^3.1.0": version "3.1.2" resolved "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz" integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw== @@ -1789,6 +1676,14 @@ resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz#3188bcb273a414b0d215fd22a58540b989b9409a" integrity sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ== +"@jridgewell/trace-mapping@0.3.9": + version "0.3.9" + resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz" + integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ== + dependencies: + "@jridgewell/resolve-uri" "^3.0.3" + "@jridgewell/sourcemap-codec" "^1.4.10" + "@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.18", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25": version "0.3.25" resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz" @@ -3682,6 +3577,26 @@ resolved "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz" integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== +"@tsconfig/node10@^1.0.7": + version "1.0.11" + resolved "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz" + integrity sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw== + +"@tsconfig/node12@^1.0.7": + version "1.0.11" + resolved "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz" + integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag== + +"@tsconfig/node14@^1.0.0": + version "1.0.3" + resolved "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz" + integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow== + +"@tsconfig/node16@^1.0.2": + version "1.0.4" + resolved "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz" + integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA== + "@types/acorn@^4.0.0": version "4.0.6" resolved "https://registry.npmjs.org/@types/acorn/-/acorn-4.0.6.tgz" @@ -4543,7 +4458,7 @@ acorn-walk@^7.1.1: resolved "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz" integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA== -acorn-walk@^8.0.2: +acorn-walk@^8.0.2, acorn-walk@^8.1.1: version "8.3.2" resolved "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz" integrity sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A== @@ -4553,7 +4468,7 @@ acorn@^7.1.1: resolved "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -acorn@^8.0.0, acorn@^8.1.0, acorn@^8.2.4, acorn@^8.8.1, acorn@^8.8.2, acorn@^8.9.0: +acorn@^8.0.0, acorn@^8.1.0, acorn@^8.2.4, acorn@^8.4.1, acorn@^8.8.1, acorn@^8.8.2, acorn@^8.9.0: version "8.11.3" resolved "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz" integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg== @@ -4662,6 +4577,11 @@ anymatch@^3.0.3, anymatch@~3.1.2: normalize-path "^3.0.0" picomatch "^2.0.4" +arg@^4.1.0: + version "4.1.3" + resolved "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz" + integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA== + arg@^5.0.2: version "5.0.2" resolved "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz" @@ -5429,6 +5349,11 @@ create-jest@^29.7.0: jest-util "^29.7.0" prompts "^2.0.1" +create-require@^1.1.0: + version "1.1.1" + resolved "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz" + integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ== + cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz" @@ -5986,6 +5911,11 @@ diff-sequences@^29.6.3: resolved "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz" integrity sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q== +diff@^4.0.1: + version "4.0.2" + resolved "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz" + integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== + diff@^5.0.0: version "5.2.0" resolved "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz" @@ -6383,36 +6313,6 @@ esbuild@^0.21.3: "@esbuild/win32-ia32" "0.21.5" "@esbuild/win32-x64" "0.21.5" -esbuild@~0.23.0: - version "0.23.1" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.23.1.tgz#40fdc3f9265ec0beae6f59824ade1bd3d3d2dab8" - integrity sha512-VVNz/9Sa0bs5SELtn3f7qhJCDPCF5oMEl5cO9/SSinpE9hbPVvxbd572HH5AKiP7WD8INO53GgfDDhRjkylHEg== - optionalDependencies: - "@esbuild/aix-ppc64" "0.23.1" - "@esbuild/android-arm" "0.23.1" - "@esbuild/android-arm64" "0.23.1" - "@esbuild/android-x64" "0.23.1" - "@esbuild/darwin-arm64" "0.23.1" - "@esbuild/darwin-x64" "0.23.1" - "@esbuild/freebsd-arm64" "0.23.1" - "@esbuild/freebsd-x64" "0.23.1" - "@esbuild/linux-arm" "0.23.1" - "@esbuild/linux-arm64" "0.23.1" - "@esbuild/linux-ia32" "0.23.1" - "@esbuild/linux-loong64" "0.23.1" - "@esbuild/linux-mips64el" "0.23.1" - "@esbuild/linux-ppc64" "0.23.1" - "@esbuild/linux-riscv64" "0.23.1" - "@esbuild/linux-s390x" "0.23.1" - "@esbuild/linux-x64" "0.23.1" - "@esbuild/netbsd-x64" "0.23.1" - "@esbuild/openbsd-arm64" "0.23.1" - "@esbuild/openbsd-x64" "0.23.1" - "@esbuild/sunos-x64" "0.23.1" - "@esbuild/win32-arm64" "0.23.1" - "@esbuild/win32-ia32" "0.23.1" - "@esbuild/win32-x64" "0.23.1" - escalade@^3.1.1: version "3.1.2" resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz" @@ -7230,13 +7130,6 @@ get-tsconfig@^4.5.0: dependencies: resolve-pkg-maps "^1.0.0" -get-tsconfig@^4.7.5: - version "4.8.1" - resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.8.1.tgz#8995eb391ae6e1638d251118c7b56de7eb425471" - integrity sha512-k9PN+cFBmaLWtVz29SkUoqU5O0slLuHJXt/2P+tMVFT+phsSGXGkp9t3rQIqdz0e+06EHNGs3oM6ZX1s2zHxRg== - dependencies: - resolve-pkg-maps "^1.0.0" - github-slugger@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/github-slugger/-/github-slugger-2.0.0.tgz" @@ -9126,6 +9019,11 @@ make-dir@^4.0.0: dependencies: semver "^7.5.3" +make-error@^1.1.1: + version "1.3.6" + resolved "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz" + integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== + makeerror@1.0.12: version "1.0.12" resolved "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz" @@ -12804,6 +12702,25 @@ ts-interface-checker@^0.1.9: resolved "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz" integrity sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA== +ts-node@^10.9.1: + version "10.9.2" + resolved "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz" + integrity sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ== + dependencies: + "@cspotcode/source-map-support" "^0.8.0" + "@tsconfig/node10" "^1.0.7" + "@tsconfig/node12" "^1.0.7" + "@tsconfig/node14" "^1.0.0" + "@tsconfig/node16" "^1.0.2" + acorn "^8.4.1" + acorn-walk "^8.1.1" + arg "^4.1.0" + create-require "^1.1.0" + diff "^4.0.1" + make-error "^1.1.1" + v8-compile-cache-lib "^3.0.1" + yn "3.1.1" + tsconfck@^3.0.3: version "3.1.3" resolved "https://registry.yarnpkg.com/tsconfck/-/tsconfck-3.1.3.tgz#a8202f51dab684c426314796cdb0bbd0fe0cdf80" @@ -12836,16 +12753,6 @@ tsutils@^3.21.0: dependencies: tslib "^1.8.1" -tsx@^4.19.2: - version "4.19.2" - resolved "https://registry.yarnpkg.com/tsx/-/tsx-4.19.2.tgz#2d7814783440e0ae42354d0417d9c2989a2ae92c" - integrity sha512-pOUl6Vo2LUq/bSa8S5q7b91cgNSjctn9ugq/+Mvow99qW6x/UZYwzxy/3NmqoT66eHYfCVvFvACC58UBPFf28g== - dependencies: - esbuild "~0.23.0" - get-tsconfig "^4.7.5" - optionalDependencies: - fsevents "~2.3.3" - tunnel@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c" @@ -13226,6 +13133,11 @@ uvu@^0.5.0: kleur "^4.0.3" sade "^1.7.3" +v8-compile-cache-lib@^3.0.1: + version "3.0.1" + resolved "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz" + integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg== + v8-to-istanbul@^9.0.1: version "9.2.0" resolved "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.2.0.tgz" @@ -13697,6 +13609,11 @@ yargs@^17.3.1, yargs@^17.7.2: y18n "^5.0.5" yargs-parser "^21.1.1" +yn@3.1.1: + version "3.1.1" + resolved "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz" + integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q== + yocto-queue@^0.1.0: version "0.1.0" resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz" From 14e641cd0158f7ed34b6ddddf127f4c81c66a776 Mon Sep 17 00:00:00 2001 From: Abdellah Hariti Date: Mon, 11 Nov 2024 12:48:48 +0100 Subject: [PATCH 20/23] Revert "fix typo" This reverts commit 6fecb4846966cd716828a552bdf16aa4ae61ccaf. --- apps/changelog/src/app/layout.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/changelog/src/app/layout.tsx b/apps/changelog/src/app/layout.tsx index 1d97f4afd3638..5e8540daf1a5f 100644 --- a/apps/changelog/src/app/layout.tsx +++ b/apps/changelog/src/app/layout.tsx @@ -32,10 +32,10 @@ export const metadata: Metadata = { }; export default async function RootLayout({children}: {children: React.ReactNode}) { - const {hash: changelogsHash} = await getChangelogs(); + const {hash: chngelogsHash} = await getChangelogs(); return ( - + {children} From cbc80c72a4c785e973da1b0304dde6ca2cd8c5a6 Mon Sep 17 00:00:00 2001 From: Abdellah Hariti Date: Mon, 11 Nov 2024 12:48:49 +0100 Subject: [PATCH 21/23] Revert "skip changelog builds on related source code chnage" This reverts commit 46f55f4b42c4ed79fb1dcbf8e38393f92d9706b0. --- skip-build.sh | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/skip-build.sh b/skip-build.sh index f4d057628d928..49dfbc783f63d 100755 --- a/skip-build.sh +++ b/skip-build.sh @@ -14,17 +14,6 @@ docs_diff_status=$(git diff HEAD^ HEAD --quiet -- docs includes platform-include # have changes occurred outside of the content directories non_content_diff_status=$(git diff HEAD^ HEAD --name-only | grep -vE '^(docs/|platform-includes/|includes/|develop-docs/)' | wc -l) -# apps/changelog changes or workspace deps changes (yarn.lock) -changelog_diff_status=$(git diff HEAD^ HEAD --name-only | grep -vE '^(apps/changelog/|yarn.lock)' | wc -l) - -if [[ "$NEXT_PUBLIC_CHANGELOG" === "1" ]] ; then - if [[ $changelog_diff_status -gt 0 ]] ; then - exit 1 - else - exit 0 - fi -fi - # always build on changes in non-content related directories if [[ $non_content_diff_status -gt 0 ]] ; then exit 1 From a69c3a167571334ddcd79307cee1b3c96439edd9 Mon Sep 17 00:00:00 2001 From: Abdellah Hariti Date: Mon, 11 Nov 2024 12:48:52 +0100 Subject: [PATCH 22/23] Revert "add changelogs hash to body tag" This reverts commit ffd842ab00c37ef069b9b2205c4ecb5d5bb48a06. --- apps/changelog/prisma/seed/seed.mjs | 6 ++--- .../src/app/changelog/feed.xml/route.ts | 2 +- apps/changelog/src/app/changelog/page.tsx | 2 +- apps/changelog/src/app/layout.tsx | 6 ++--- apps/changelog/src/server/utils.ts | 24 +------------------ 5 files changed, 7 insertions(+), 33 deletions(-) diff --git a/apps/changelog/prisma/seed/seed.mjs b/apps/changelog/prisma/seed/seed.mjs index 22519ea7a84a3..fa745011fdd53 100644 --- a/apps/changelog/prisma/seed/seed.mjs +++ b/apps/changelog/prisma/seed/seed.mjs @@ -43,10 +43,8 @@ async function seed() { updatedAt: new Date('01/01/2020'), title: 'Changelog 3', slug: 'changelog-3', - content: - 'Changelog 3 content with [markdown content](https://de.wikipedia.org/wiki/Markdown)', - summary: - 'Changelog 3 summary with [markdown content](https://de.wikipedia.org/wiki/Markdown)', + content: 'Changelog 3 content with [markdown content](https://de.wikipedia.org/wiki/Markdown)', + summary: 'Changelog 3 summary with [markdown content](https://de.wikipedia.org/wiki/Markdown)', published: true, deleted: false, }, diff --git a/apps/changelog/src/app/changelog/feed.xml/route.ts b/apps/changelog/src/app/changelog/feed.xml/route.ts index 070b6e07c9c61..f10ec584857ac 100644 --- a/apps/changelog/src/app/changelog/feed.xml/route.ts +++ b/apps/changelog/src/app/changelog/feed.xml/route.ts @@ -14,7 +14,7 @@ export async function GET() { ttl: 60, }); - const {changelogs: allChangelogs} = await getChangelogs(); + const allChangelogs = await getChangelogs(); if (allChangelogs) { allChangelogs diff --git a/apps/changelog/src/app/changelog/page.tsx b/apps/changelog/src/app/changelog/page.tsx index a95c723191b7b..acb2b0a9c6346 100644 --- a/apps/changelog/src/app/changelog/page.tsx +++ b/apps/changelog/src/app/changelog/page.tsx @@ -13,7 +13,7 @@ import {Element} from 'hast'; export const dynamic = 'force-dynamic'; export default async function Page() { - const {changelogs} = await getChangelogs(); + const changelogs = await getChangelogs(); const changelogsWithPublishedAt = changelogs.filter(changelog => { return changelog.publishedAt !== null; diff --git a/apps/changelog/src/app/layout.tsx b/apps/changelog/src/app/layout.tsx index 5e8540daf1a5f..78cf52de3cb55 100644 --- a/apps/changelog/src/app/layout.tsx +++ b/apps/changelog/src/app/layout.tsx @@ -1,4 +1,3 @@ -import {getChangelogs} from '@/server/utils'; import './globals.css'; import {Theme} from '@radix-ui/themes'; @@ -31,11 +30,10 @@ export const metadata: Metadata = { }, }; -export default async function RootLayout({children}: {children: React.ReactNode}) { - const {hash: chngelogsHash} = await getChangelogs(); +export default function RootLayout({children}: {children: React.ReactNode}) { return ( - + {children} diff --git a/apps/changelog/src/server/utils.ts b/apps/changelog/src/server/utils.ts index 371ea5a3791f4..6e8265c98a49b 100644 --- a/apps/changelog/src/server/utils.ts +++ b/apps/changelog/src/server/utils.ts @@ -1,10 +1,9 @@ import {prismaClient} from '@/server/prisma-client'; -import {Changelog} from '@prisma/client'; import {unstable_cache} from 'next/cache'; export const getChangelogs = unstable_cache( async () => { - const changelogs = await prismaClient.changelog.findMany({ + return await prismaClient.changelog.findMany({ include: { categories: true, }, @@ -15,27 +14,6 @@ export const getChangelogs = unstable_cache( publishedAt: 'desc', }, }); - const hashHex = (buffer: ArrayBuffer) => { - const hexCodes = Array.from(new Uint8Array(buffer)).map(value => - value.toString(16).padStart(2, '0') - ); - return hexCodes.join(''); - }; - const hashChangelogs = (changelogs: Changelog[]) => - crypto.subtle - .digest( - 'SHA-256', - new TextEncoder().encode( - changelogs - .map(changelogs => changelogs.id + ':' + changelogs.updatedAt) - .join(',') - ) - ) - .then(hashHex); - return { - changelogs, - hash: await hashChangelogs(changelogs), - }; }, ['changelogs'], {tags: ['changelogs']} From 09fa6ed03b7984b6ad273cfc4e7f6dce8869acb4 Mon Sep 17 00:00:00 2001 From: Abdellah Hariti Date: Mon, 11 Nov 2024 12:50:58 +0100 Subject: [PATCH 23/23] simple skip build logic for changelog --- skip-build.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/skip-build.sh b/skip-build.sh index 49dfbc783f63d..654c6fe0b0025 100755 --- a/skip-build.sh +++ b/skip-build.sh @@ -14,6 +14,17 @@ docs_diff_status=$(git diff HEAD^ HEAD --quiet -- docs includes platform-include # have changes occurred outside of the content directories non_content_diff_status=$(git diff HEAD^ HEAD --name-only | grep -vE '^(docs/|platform-includes/|includes/|develop-docs/)' | wc -l) +# apps/changelog changes or workspace deps changes (yarn.lock) +changelog_diff_status=$(git diff HEAD^ HEAD --name-only | grep -E '^(apps/changelog/|yarn.lock)' | wc -l) + +if [[ "$NEXT_PUBLIC_CHANGELOG" == "1" ]] ; then + if [[ $changelog_diff_status -gt 0 ]] ; then + exit 1 + else + exit 0 + fi +fi + # always build on changes in non-content related directories if [[ $non_content_diff_status -gt 0 ]] ; then exit 1