upgrade node pin, fix docker build

.github/workflows/deploy-api.yml

@@ -101,11 +101,19 @@ jobs:
     runs-on: ubuntu-latest
     needs: deploy
     steps:
-      - name: Invalidate SSR caches
+      - name: Invalidate Gnocchi SSR cache
         uses: chetan/invalidate-cloudfront-action@v2
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.DEPLOYER_AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.DEPLOYER_AWS_SECRET_ACCESS_KEY }}
           DISTRIBUTION: ${{ secrets.CLOUDFRONT_ID_GNOCCHI_HUB }}
           PATHS: '/*'
           AWS_REGION: 'us-east-1'
+      # - name: Invalidate Wish Wash SSR cache
+      #   uses: chetan/invalidate-cloudfront-action@v2
+      #   env:
+      #     AWS_ACCESS_KEY_ID: ${{ secrets.DEPLOYER_AWS_ACCESS_KEY_ID }}
+      #     AWS_SECRET_ACCESS_KEY: ${{ secrets.DEPLOYER_AWS_SECRET_ACCESS_KEY }}
+      #     DISTRIBUTION: ${{ secrets.CLOUDFRONT_ID_WISH_WASH_HUB }}
+      #     PATHS: '/*'
+      #     AWS_REGION: 'us-east-1'

Dockerfile

@@ -5,19 +5,17 @@ RUN npm install -g pnpm
 WORKDIR /root/monorepo
 
 # add git
-RUN apk add --no-cache git
-
-# missing dep for turbo - mentioned by @nathanhammond
+# and libc6-compat - missing dep for turbo - mentioned by @nathanhammond
 # on https://github.com/vercel/turborepo/issues/2293
-RUN apk add --no-cache libc6-compat
+RUN apk add --no-cache git libc6-compat py3-pip g++ make
 
 ENV CYPRESS_INSTALL_BINARY=0
 ENV PNPM_HOME=/usr/local/share/pnpm
 ENV PATH="$PNPM_HOME:$PATH"
 
 ENV VITE_APP_GNOCCHI_ORIGIN=https://gnocchi.biscuits.club
 
-FROM base as dev
+FROM base AS dev
 COPY ./pnpm-lock.yaml .
 RUN pnpm fetch
 

apps/wish-wash/common/tsconfig.json

@@ -2,13 +2,9 @@
   "extends": "../../../tsconfig.json",
   "compilerOptions": {
     "jsx": "preserve",
-    "outDir": "./dist/server",
-    "rootDir": "./src",
+    "outDir": "./dist",
+    "rootDir": ".",
     "baseUrl": ".",
-    "paths": {
-      "@/*": ["./src/*"]
-    },
-    "types": ["vite/client"],
     "customConditions": ["development"]
   },
   "include": ["src"]

apps/wish-wash/hub/package.json

@@ -29,8 +29,8 @@
   },
   "devDependencies": {
     "@originjs/vite-plugin-commonjs": "^1.0.3",
-    "@types/react": "^18.2.79",
-    "@types/react-dom": "^18.2.25",
+    "@types/react": "^18.3.3",
+    "@types/react-dom": "^18.3.0",
     "@unocss/transformer-variant-group": "^0.58.0",
     "@vitejs/plugin-react-swc": "^3.5.0",
     "concurrently": "^7.5.0",

apps/wish-wash/hub/src/components/Context.tsx

@@ -1,3 +1,4 @@
+import React from 'react';
 import { createContext, useContext } from 'react';
 
 export const HubContext = createContext<{ wishlistSlug: string } | null>(null);

apps/wish-wash/hub/src/components/IdeaCardContent.tsx

@@ -2,7 +2,7 @@ import { HubWishlistItem } from '@/types.js';
 import { Card } from '@a-type/ui/components/card';
 import { ItemCardTitle } from './ItemCardTitle.jsx';
 import { ItemCardPrice } from './ItemCardPrice.jsx';
-import { ReactNode } from 'react';
+import React, { ReactNode } from 'react';
 import { Dialog } from '@a-type/ui/components/dialog';
 import { SearchButton, searchProviders } from '@wish-wash.biscuits/common';
 

apps/wish-wash/hub/src/components/ItemCard.tsx

@@ -1,3 +1,4 @@
+import React from 'react';
 import { HubWishlistItem } from '@/types.js';
 import { ItemCardMarquee } from './ItemCardMarquee.jsx';
 import { Card } from '@a-type/ui/components/card';

apps/wish-wash/hub/src/components/ItemCardMarquee.tsx

@@ -1,3 +1,4 @@
+import React from 'react';
 import { HubWishlistItem } from '@/types.js';
 import { CardImage } from '@a-type/ui/components/card';
 import { Marquee } from '@a-type/ui/components/marquee';

apps/wish-wash/hub/src/components/ItemCardPrice.tsx

@@ -1,3 +1,4 @@
+import React from 'react';
 import { HubWishlistItem } from '@/types.js';
 import { Card } from '@a-type/ui/components/card';
 

apps/wish-wash/hub/src/components/ItemCardTitle.tsx

@@ -1,3 +1,4 @@
+import React from 'react';
 import { HubWishlistItem } from '@/types.js';
 import { Card } from '@a-type/ui/components/card';
 

apps/wish-wash/hub/src/components/ProductCardContent.tsx

@@ -1,3 +1,4 @@
+import React from 'react';
 import { HubWishlistItem } from '@/types.js';
 import { Card } from '@a-type/ui/components/card';
 import { ItemCardTitle } from './ItemCardTitle.jsx';

apps/wish-wash/hub/src/entry-server.tsx

@@ -6,6 +6,6 @@ import { HubWishlistData } from './types.js';
 
 export type { HubWishlistData } from './types.js';
 
-export function serverRender(snapshot: HubWishlistData) {
+export function serverRender(snapshot: HubWishlistData): string {
   return ReactDOMServer.renderToStaticMarkup(<App list={snapshot} />);
 }

apps/wish-wash/hub/src/hooks.ts

@@ -51,7 +51,7 @@ export function usePurchaseItem(id: string) {
       variables: {
         input: {
           wishlistSlug,
-          id,
+          itemId: id,
           quantity,
           name,
         },

apps/wish-wash/hub/tsconfig.json

@@ -5,6 +5,7 @@
     "outDir": "./dist/server",
     "rootDir": "./src",
     "baseUrl": ".",
+    "lib": ["esnext", "dom", "dom.iterable"],
     "paths": {
       "@/*": ["./src/*"]
     },

apps/wish-wash/verdant/package.json

@@ -17,5 +17,8 @@
     "@verdant-web/common": "2.5.2",
     "@verdant-web/react": "38.0.0",
     "@verdant-web/store": "3.12.0"
+  },
+  "volta": {
+    "node": "20.17.0"
   }
 }

packages/client/src/graphql.ts

@@ -205,13 +205,4 @@ export {
   useSuspenseQuery,
   ApolloProvider,
 } from '@apollo/client';
-export type {
-  ErrorPolicy,
-  GraphQLRequest,
-  UseBackgroundQueryResult,
-  UseFragmentOptions,
-  UseFragmentResult,
-  UseLoadableQueryResult,
-  UseReadQueryResult,
-  UseSuspenseQueryResult,
-} from '@apollo/client';
+export type * from '@apollo/client';