From a1a88d884cafb3ad5c7ac63ffbe86757f133c03b Mon Sep 17 00:00:00 2001 From: Yangshun Date: Wed, 6 Dec 2023 19:12:08 +0800 Subject: [PATCH] [all] chore: move to pnpm part 2 --- .npmrc | 1 + apps/web/package.json | 19 ++- ...serInterfaceCodingWorkspaceSaveContext.tsx | 6 +- apps/web/src/pages/api/payments/hooks.ts | 4 + .../questions-javascript-preprocess.ts | 2 +- pnpm-lock.yaml | 151 ++++++++++-------- 6 files changed, 106 insertions(+), 77 deletions(-) create mode 100644 .npmrc diff --git a/.npmrc b/.npmrc new file mode 100644 index 000000000..b7425b9ee --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +enable-pre-post-scripts=true \ No newline at end of file diff --git a/apps/web/package.json b/apps/web/package.json index 62a8cf9e4..d0ad3a59d 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -32,19 +32,24 @@ "@axiomhq/axiom-node": "^0.11.0", "@codesandbox/sandpack-client": "2.7.1", "@codesandbox/sandpack-react": "2.7.1", + "@formatjs/intl": "^2.9.9", "@formatjs/intl-localematcher": "^0.2.32", "@headlessui/react": "^1.7.11", "@mdx-js/react": "^2.3.0", "@monaco-editor/react": "^4.5.1", "@next/mdx": "13.4.19", "@prisma/client": "4.11.0", + "@radix-ui/react-accordion": "^1.1.2", + "@radix-ui/react-avatar": "^1.0.4", + "@radix-ui/react-hover-card": "^1.0.7", "@radix-ui/react-radio-group": "^1.1.3", + "@radix-ui/react-slider": "^1.1.2", "@react-email/components": "^0.0.12", "@stefanprobst/remark-extract-toc": "^2.2.0", - "@stripe/stripe-js": "^1.46.0", - "@supabase/auth-helpers-nextjs": "^0.6.0", - "@supabase/auth-helpers-react": "^0.3.1", - "@supabase/supabase-js": "^2.10.0", + "@stripe/stripe-js": "1.46.0", + "@supabase/auth-helpers-nextjs": "0.6.0", + "@supabase/auth-helpers-react": "0.3.1", + "@supabase/supabase-js": "2.10.0", "@tanstack/react-query": "^4.28.0", "@trpc/client": "^10.18.0", "@trpc/next": "^10.18.0", @@ -52,6 +57,7 @@ "@trpc/server": "^10.18.0", "@vercel/analytics": "^0.1.10", "axios": "^0.27.2", + "clean-set": "^1.1.2", "clsx": "^1.2.1", "console-feed": "3.3.0", "cookie": "^0.5.0", @@ -90,7 +96,7 @@ "remark-slug": "^7.0.1", "resend": "^2.0.0", "server-only": "^0.0.1", - "stripe": "^11.11.0", + "stripe": "11.11.0", "usehooks-ts": "^2.9.1", "uuid": "^9.0.0", "web-vitals": "^3.3.0", @@ -100,6 +106,7 @@ "@formatjs/cli": "^6.0.1", "@gfe/eslint-config-gfe-apps": "workspace:0.0.0", "@gfe/tsconfig": "workspace:0.0.0", + "@jest/globals": "^29.7.0", "@mdx-js/loader": "^2.3.0", "@tailwindcss/aspect-ratio": "^0.4.2", "@tailwindcss/container-queries": "^0.1.1", @@ -144,7 +151,7 @@ "rimraf": "^4.4.1", "slugify": "^1.6.5", "strip-comments": "^2.0.1", - "supabase": "^1.41.1", + "supabase": "1.41.1", "tailwindcss": "^3.3.2", "ts-jest": "^29.1.1", "ts-node": "^10.9.1", diff --git a/apps/web/src/components/workspace/user-interface/UserInterfaceCodingWorkspaceSaveContext.tsx b/apps/web/src/components/workspace/user-interface/UserInterfaceCodingWorkspaceSaveContext.tsx index 7f2512c49..92117777a 100644 --- a/apps/web/src/components/workspace/user-interface/UserInterfaceCodingWorkspaceSaveContext.tsx +++ b/apps/web/src/components/workspace/user-interface/UserInterfaceCodingWorkspaceSaveContext.tsx @@ -32,7 +32,11 @@ export function UserInterfaceCodingWorkspaceSavesContextProvider({ saveId: save.id, }, { - initialData: save, + initialData: { + ...save, + createdAt: save.createdAt.toISOString(), + updatedAt: save.updatedAt.toISOString(), + }, }, ); diff --git a/apps/web/src/pages/api/payments/hooks.ts b/apps/web/src/pages/api/payments/hooks.ts index 8d956fcfc..83cd7d41b 100644 --- a/apps/web/src/pages/api/payments/hooks.ts +++ b/apps/web/src/pages/api/payments/hooks.ts @@ -53,6 +53,10 @@ export default async function handler( return res.send('Unknown checkout'); } + if (customerId == null) { + return res.send('Missing customerId'); + } + if (price.type !== 'one_time') { return res.send( `Checkout is not for a one-time subscription, handled in subscription update event instead`, diff --git a/apps/web/src/scripts/questions-javascript-preprocess.ts b/apps/web/src/scripts/questions-javascript-preprocess.ts index 5f66fb313..aba4b9802 100644 --- a/apps/web/src/scripts/questions-javascript-preprocess.ts +++ b/apps/web/src/scripts/questions-javascript-preprocess.ts @@ -92,7 +92,7 @@ async function preprocessRawFile( // Format the generated JS file const jsContent = fs.readFileSync(jsPath, 'utf-8'); - const formattedJsContent = prettier.format(jsContent, prettierConfig); + const formattedJsContent = await prettier.format(jsContent, prettierConfig); fs.writeFileSync(jsPath, formattedJsContent, 'utf-8'); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 643b91e85..ae92f2232 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -129,6 +129,9 @@ importers: '@codesandbox/sandpack-react': specifier: 2.7.1 version: 2.7.1(@lezer/common@1.1.1)(react-dom@18.2.0)(react@18.2.0) + '@formatjs/intl': + specifier: ^2.9.9 + version: 2.9.9(typescript@4.9.5) '@formatjs/intl-localematcher': specifier: ^0.2.32 version: 0.2.32 @@ -147,9 +150,21 @@ importers: '@prisma/client': specifier: 4.11.0 version: 4.11.0(prisma@4.11.0) + '@radix-ui/react-accordion': + specifier: ^1.1.2 + version: 1.1.2(@types/react-dom@18.0.11)(@types/react@18.0.28)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-avatar': + specifier: ^1.0.4 + version: 1.0.4(@types/react-dom@18.0.11)(@types/react@18.0.28)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-hover-card': + specifier: ^1.0.7 + version: 1.0.7(@types/react-dom@18.0.11)(@types/react@18.0.28)(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-radio-group': specifier: ^1.1.3 version: 1.1.3(@types/react-dom@18.0.11)(@types/react@18.0.28)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-slider': + specifier: ^1.1.2 + version: 1.1.2(@types/react-dom@18.0.11)(@types/react@18.0.28)(react-dom@18.2.0)(react@18.2.0) '@react-email/components': specifier: ^0.0.12 version: 0.0.12(@types/react@18.0.28)(react@18.2.0) @@ -157,17 +172,17 @@ importers: specifier: ^2.2.0 version: 2.2.0 '@stripe/stripe-js': - specifier: ^1.46.0 - version: 1.54.2 + specifier: 1.46.0 + version: 1.46.0 '@supabase/auth-helpers-nextjs': - specifier: ^0.6.0 - version: 0.6.1(@supabase/supabase-js@2.39.0) + specifier: 0.6.0 + version: 0.6.0(@supabase/supabase-js@2.10.0) '@supabase/auth-helpers-react': - specifier: ^0.3.1 - version: 0.3.1(@supabase/supabase-js@2.39.0) + specifier: 0.3.1 + version: 0.3.1(@supabase/supabase-js@2.10.0) '@supabase/supabase-js': - specifier: ^2.10.0 - version: 2.39.0 + specifier: 2.10.0 + version: 2.10.0(encoding@0.1.13) '@tanstack/react-query': specifier: ^4.28.0 version: 4.36.1(react-dom@18.2.0)(react@18.2.0) @@ -189,6 +204,9 @@ importers: axios: specifier: ^0.27.2 version: 0.27.2 + clean-set: + specifier: ^1.1.2 + version: 1.1.2 clsx: specifier: ^1.2.1 version: 1.2.1 @@ -304,8 +322,8 @@ importers: specifier: ^0.0.1 version: 0.0.1 stripe: - specifier: ^11.11.0 - version: 11.18.0 + specifier: 11.11.0 + version: 11.11.0 usehooks-ts: specifier: ^2.9.1 version: 2.9.1(react-dom@18.2.0)(react@18.2.0) @@ -328,6 +346,9 @@ importers: '@gfe/tsconfig': specifier: workspace:0.0.0 version: link:../../packages/tsconfig + '@jest/globals': + specifier: ^29.7.0 + version: 29.7.0 '@mdx-js/loader': specifier: ^2.3.0 version: 2.3.0(webpack@5.89.0) @@ -458,8 +479,8 @@ importers: specifier: ^2.0.1 version: 2.0.1 supabase: - specifier: ^1.41.1 - version: 1.115.5 + specifier: 1.41.1 + version: 1.41.1 tailwindcss: specifier: ^3.3.2 version: 3.3.6(ts-node@10.9.1) @@ -4401,34 +4422,34 @@ packages: resolution: {integrity: sha512-Gfkvwk9o9kE9r9XNBmJRfV8zONvXThnm1tcuojL04Uy5uRyqg93DC83lDebl0rocZCfKSjUv+fWYtMQmEDJldg==} dev: false - /@stripe/stripe-js@1.54.2: - resolution: {integrity: sha512-R1PwtDvUfs99cAjfuQ/WpwJ3c92+DAMy9xGApjqlWQMj0FKQabUAys2swfTRNzuYAYJh7NqK2dzcYVNkKLEKUg==} + /@stripe/stripe-js@1.46.0: + resolution: {integrity: sha512-dkm0zCEoRLu5rTnsIgwDf/QG2DKcalOT2dk1IVgMySOHWTChLyOvQwMYhEduGgLvyYWTwNhAUV4WOLPQvjwLwA==} dev: false - /@supabase/auth-helpers-nextjs@0.6.1(@supabase/supabase-js@2.39.0): - resolution: {integrity: sha512-ffDAR4pW2Cosj/CuuGRAhzOFfHtqzdgax7zqRGGyq334gxxPplsmJFGaLPRJ3Z/4mTSIJHyFd6LYdHMN0a+5Bw==} + /@supabase/auth-helpers-nextjs@0.6.0(@supabase/supabase-js@2.10.0): + resolution: {integrity: sha512-f1e5blmpt9F/Bnb2hKreWHqf3zEhl29P357d5fnXzQ3Ph7DuW2Wha7uwQVTgE2QH3niqVpJpY0Pg0zBT5NmNWQ==} peerDependencies: '@supabase/supabase-js': ^2.0.4 dependencies: - '@supabase/auth-helpers-shared': 0.3.4(@supabase/supabase-js@2.39.0) - '@supabase/supabase-js': 2.39.0 + '@supabase/auth-helpers-shared': 0.3.3(@supabase/supabase-js@2.10.0) + '@supabase/supabase-js': 2.10.0(encoding@0.1.13) dev: false - /@supabase/auth-helpers-react@0.3.1(@supabase/supabase-js@2.39.0): + /@supabase/auth-helpers-react@0.3.1(@supabase/supabase-js@2.10.0): resolution: {integrity: sha512-g3SFv08Dz9FapNif/ZY1b7qKGlMJDyTLSayHBz3kb3FuYxg7aLWgQtydDhm5AGbc0XtvpIBuhGTIOVevwpdosA==} peerDependencies: '@supabase/supabase-js': ^2.0.4 dependencies: - '@supabase/supabase-js': 2.39.0 + '@supabase/supabase-js': 2.10.0(encoding@0.1.13) dev: false - /@supabase/auth-helpers-shared@0.3.4(@supabase/supabase-js@2.39.0): - resolution: {integrity: sha512-8I3D0SPHHexkFTSfPg0nZgJSVazWoB3tZDpT6IjRv6w89vDMUzO99Lit4H9anVLF4teW8c/nJJxawDNbDlgbgg==} + /@supabase/auth-helpers-shared@0.3.3(@supabase/supabase-js@2.10.0): + resolution: {integrity: sha512-ZwZGffApfyz9MiT3knnZoF1DMWE56H/Q0Mrsn22J9ubhss7/+e7TP3dChxxwlUYqtDmjmLV6OV8W0BANENfUew==} peerDependencies: '@supabase/supabase-js': ^2.0.4 dependencies: - '@supabase/supabase-js': 2.39.0 - jose: 4.15.4 + '@supabase/supabase-js': 2.10.0(encoding@0.1.13) + js-base64: 3.7.5 dev: false /@supabase/functions-js@2.1.5: @@ -4474,17 +4495,18 @@ packages: '@supabase/node-fetch': 2.6.15 dev: false - /@supabase/supabase-js@2.39.0: - resolution: {integrity: sha512-cYfnwWRW5rYBbPT/BNIejtRT9ULdD9PnIExQV28PZpqcqm3PLwS4f3pY7WGB01Da63VYdvktZPKuYvreqsj/Zg==} + /@supabase/supabase-js@2.10.0(encoding@0.1.13): + resolution: {integrity: sha512-/vkpPxGDyLfTASWnVHL8vdgQxn9SX/Cs+BotTxFhLSIeGFSazC6rpQSMKu6RqzO7gjBD1KqTv0h3auWfClWs+Q==} dependencies: '@supabase/functions-js': 2.1.5 '@supabase/gotrue-js': 2.58.0 - '@supabase/node-fetch': 2.6.15 '@supabase/postgrest-js': 1.9.0 '@supabase/realtime-js': 2.9.0 '@supabase/storage-js': 2.5.5 + cross-fetch: 3.1.8(encoding@0.1.13) transitivePeerDependencies: - bufferutil + - encoding - utf-8-validate dev: false @@ -5244,15 +5266,6 @@ packages: - supports-color dev: true - /agent-base@7.1.0: - resolution: {integrity: sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==} - engines: {node: '>= 14'} - dependencies: - debug: 4.3.4 - transitivePeerDependencies: - - supports-color - dev: true - /ajv-keywords@3.5.2(ajv@6.12.6): resolution: {integrity: sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==} peerDependencies: @@ -6016,6 +6029,14 @@ packages: cross-spawn: 7.0.3 dev: true + /cross-fetch@3.1.8(encoding@0.1.13): + resolution: {integrity: sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==} + dependencies: + node-fetch: 2.7.0(encoding@0.1.13) + transitivePeerDependencies: + - encoding + dev: false + /cross-spawn@7.0.3: resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==} engines: {node: '>= 8'} @@ -6326,7 +6347,6 @@ packages: resolution: {integrity: sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==} dependencies: iconv-lite: 0.6.3 - dev: true /enhanced-resolve@5.15.0: resolution: {integrity: sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==} @@ -7539,16 +7559,6 @@ packages: - supports-color dev: true - /https-proxy-agent@7.0.2: - resolution: {integrity: sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==} - engines: {node: '>= 14'} - dependencies: - agent-base: 7.1.0 - debug: 4.3.4 - transitivePeerDependencies: - - supports-color - dev: true - /human-signals@2.1.0: resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==} engines: {node: '>=10.17.0'} @@ -7565,7 +7575,6 @@ packages: engines: {node: '>=0.10.0'} dependencies: safer-buffer: 2.1.2 - dev: true /ieee754@1.2.1: resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==} @@ -8365,14 +8374,14 @@ packages: hasBin: true dev: true - /jose@4.15.4: - resolution: {integrity: sha512-W+oqK4H+r5sITxfxpSU+MMdr/YSWGvgZMQDIsNoBDGGy4i7GBPTtvFKibQzW06n3U3TqHjhvBJsirShsEJ6eeQ==} - dev: false - /jquery@3.7.1: resolution: {integrity: sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==} dev: false + /js-base64@3.7.5: + resolution: {integrity: sha512-3MEt5DTINKqfScXKfJFrRbxkrnk2AxPWGBL/ycjz4dK8iqiSJ06UxD8jh8xuh6p10TX4t2+7FsBYVxxQbMg+qA==} + dev: false + /js-beautify@1.14.11: resolution: {integrity: sha512-rPogWqAfoYh1Ryqqh2agUpVfbxAhbjuN1SmU86dskQUKouRiggUTCO4+2ym9UPXllc2WAp0J+T5qxn7Um3lCdw==} engines: {node: '>=14'} @@ -9363,11 +9372,6 @@ packages: engines: {node: '>=8'} dev: true - /minipass@5.0.0: - resolution: {integrity: sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==} - engines: {node: '>=8'} - dev: true - /minipass@7.0.4: resolution: {integrity: sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==} engines: {node: '>=16 || 14 >=14.17'} @@ -9514,6 +9518,19 @@ packages: resolution: {integrity: sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==} engines: {node: '>=10.5.0'} + /node-fetch@2.7.0(encoding@0.1.13): + resolution: {integrity: sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==} + engines: {node: 4.x || >=6.0.0} + peerDependencies: + encoding: ^0.1.0 + peerDependenciesMeta: + encoding: + optional: true + dependencies: + encoding: 0.1.13 + whatwg-url: 5.0.0 + dev: false + /node-fetch@3.3.2: resolution: {integrity: sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} @@ -10865,8 +10882,8 @@ packages: resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==} engines: {node: '>=8'} - /stripe@11.18.0: - resolution: {integrity: sha512-OUA32uhNoSoM6wOodyFbV+3IBCoO140uzdXmBArQ0S88D4EbH91xl2v+Ml1sKalcFKUBadHLeHfU/p9AbsOfGw==} + /stripe@11.11.0: + resolution: {integrity: sha512-CT8TZJ+bUaMmqCOljHdKwHTWym0bscrCHrKmvK2KoTaz/9gDIzG+lXTJOFUOb3K7Jwaoaori4yEVzOgA7U46+g==} engines: {node: '>=12.*'} dependencies: '@types/node': 18.19.2 @@ -10913,18 +10930,14 @@ packages: ts-interface-checker: 0.1.13 dev: true - /supabase@1.115.5: - resolution: {integrity: sha512-jAJ/d3Dge1/mV284RHBp6dkGLJCmdMO3FE6hnyn1S1Si3Bx4/EUD3zXtkkSNs4lAx6jcyibwh3iULm6n4yFzZA==} - engines: {npm: '>=8'} + /supabase@1.41.1: + resolution: {integrity: sha512-r7/jkjxPDpMsdTdeC51SrQfjyhZHLzaRIteds5mGp+p+Na9K5zWTAWumnKjzXON+FIwruz20Ebgu9ByXw0BUdQ==} hasBin: true requiresBuild: true dependencies: bin-links: 4.0.3 - https-proxy-agent: 7.0.2 node-fetch: 3.3.2 - tar: 6.2.0 - transitivePeerDependencies: - - supports-color + tar: 6.1.13 dev: true /supports-color@5.5.0: @@ -10988,13 +11001,13 @@ packages: resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==} engines: {node: '>=6'} - /tar@6.2.0: - resolution: {integrity: sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==} + /tar@6.1.13: + resolution: {integrity: sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw==} engines: {node: '>=10'} dependencies: chownr: 2.0.0 fs-minipass: 2.1.0 - minipass: 5.0.0 + minipass: 4.2.8 minizlib: 2.1.2 mkdirp: 1.0.4 yallist: 4.0.0