Merge pull request #2113 from graphcommerce-org/feature/upgrades

Upgrade yarn to version 4, next to 14, updated others, resolved peer dependency issues

.changeset/fifty-parents-move.md

@@ -0,0 +1,5 @@
+---
+'@graphcommerce/graphql-mesh': patch
+---
+
+Remove requirement of toplevelAwait for graphqlSsrClient and solve logging issue in cli

.changeset/fuzzy-rings-hug.md

@@ -0,0 +1,5 @@
+---
+'@graphcommerce/next-config': patch
+---
+
+Moved all internal @graphcommerce/\* dependencies to peerDependencies and resolve remaining peerDependency issues

.changeset/tame-dots-call.md

@@ -0,0 +1,5 @@
+---
+'@graphcommerce/next-config': minor
+---
+
+Upgraded to yarn 4 package manager

.changeset/tricky-spoons-lick.md

@@ -0,0 +1,5 @@
+---
+'@graphcommerce/next-config': patch
+---
+
+Upgraded to nextjs 14.0.2, and updated other related dependencies. Removed @mui/material/modern alias as that doesnt work in combination with nextjs 14.0.2.

.github/workflows/bundlesize.yml

@@ -7,33 +7,25 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event.pull_request.draft == false
     steps:
-      - uses: actions/setup-node@v1
-        with:
-          node-version: 16
-          registry-url: 'https://registry.npmjs.org'
-          scope: '@graphcommerce'
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           path: new
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           path: old
           ref: ${{ github.base_ref }}
-      - uses: bahmutov/npm-install@v1
+      - uses: actions/setup-node@v3
         with:
-          useRollingCache: true
-          working-directory: new
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-      - run: yarn --cwd ./new/examples/magento-graphcms build > new.txt
+          cache: yarn
+          node-version: 18
+          registry-url: 'https://registry.npmjs.org'
+          scope: '@graphcommerce'
+          cache-dependency-path: ./old/yarn.lock
+      - run: cd new && yarn install && cd ..
+      - run: cd new/examples/magento-graphcms && yarn build > ../../../new.txt && cd ../../..
       - run: cat new.txt
-      - uses: bahmutov/npm-install@v1
-        with:
-          useRollingCache: true
-          working-directory: old
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-      - run: yarn --cwd ./old/examples/magento-graphcms build > old.txt
+      - run: cd old && yarn install && cd ..
+      - run: cd old/examples/magento-graphcms && yarn build > ../../../old.txt && cd ../../..
       - run: cat old.txt
       - uses: ho-nl/next-bundlesize-action@master
         id: 'bundlesize'

.github/workflows/release-canary.yml

@@ -18,7 +18,7 @@ jobs:
           ref: canary
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           registry-url: 'https://registry.npmjs.org'
           scope: '@graphcommerce'
       - uses: bahmutov/npm-install@v1

.github/workflows/release-main.yml

@@ -17,7 +17,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           registry-url: 'https://registry.npmjs.org'
           scope: '@graphcommerce'
       - uses: bahmutov/npm-install@v1

.gitignore

@@ -1,7 +1,5 @@
 # dependencies
 node_modules
-/.pnp
-.pnp.js
 
 # testing
 /coverage
@@ -40,3 +38,11 @@ build
 
 *.gql.ts
 *.tsbuildinfo
+
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions

.yarnrc.yml

@@ -0,0 +1,3 @@
+nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-4.0.1.cjs

docs/framework/config.md

@@ -285,10 +285,6 @@ Configuration for the SidebarGallery component
 
 Hide the wishlist functionality for guests.
 
-#### `wishlistIgnoreProductWishlistStatus: Boolean`
-
-Ignores whether a product is already in the wishlist, makes the toggle an add only.
-
 #### `wishlistShowFeedbackMessage: Boolean`
 
 Show a message when the product is added to the wishlist.

docs/package.json

@@ -4,8 +4,8 @@
   "repository": "github:graphcommerce-org/graphcommerce/docs",
   "version": "7.1.0-canary.38",
   "sideEffects": true,
-  "devDependencies": {
-    "@graphcommerce/prettier-config-pwa": "7.1.0-canary.38"
+  "peerDependencies": {
+    "@graphcommerce/prettier-config-pwa": "*"
   },
   "prettier": "@graphcommerce/prettier-config-pwa"
 }

examples/magento-graphcms/lib/graphql/graphqlSsrClient.ts

@@ -14,8 +14,6 @@ import { MeshApolloLink, getBuiltMesh } from '@graphcommerce/graphql-mesh'
 import { storefrontConfig, storefrontConfigDefault } from '@graphcommerce/next-ui'
 import { i18nSsrLoader } from '../i18n/I18nProvider'
 
-const mesh = await getBuiltMesh()
-
 function client(locale: string | undefined, fetchPolicy: FetchPolicy = 'no-cache') {
   const config = graphqlConfig({
     storefront: storefrontConfig(locale) ?? storefrontConfigDefault(),
@@ -26,7 +24,7 @@ function client(locale: string | undefined, fetchPolicy: FetchPolicy = 'no-cache
       measurePerformanceLink,
       errorLink,
       ...config.links,
-      new MeshApolloLink(mesh),
+      new MeshApolloLink(getBuiltMesh()),
     ]),
     cache: new InMemoryCache({
       possibleTypes: fragments.possibleTypes,

examples/magento-graphcms/package.json

@@ -19,7 +19,8 @@
     "create-patch": "patch-package --exclude 'package.json$|gql.ts$|interceptor.tsx$'"
   },
   "dependencies": {
-    "@ducanh2912/next-pwa": "9.5.0",
+    "@apollo/client": "~3.8.7",
+    "@ducanh2912/next-pwa": "9.7.2",
     "@graphcommerce/cli": "7.1.0-canary.38",
     "@graphcommerce/demo-magento-graphcommerce": "7.1.0-canary.38",
     "@graphcommerce/ecommerce-ui": "7.1.0-canary.38",
@@ -65,42 +66,43 @@
     "@graphcommerce/magento-wishlist": "7.1.0-canary.38",
     "@graphcommerce/next-config": "7.1.0-canary.38",
     "@graphcommerce/next-ui": "7.1.0-canary.38",
-    "@lingui/core": "4.4.2",
-    "@lingui/macro": "4.4.2",
-    "@lingui/react": "4.4.2",
-    "@mui/lab": "5.0.0-alpha.142",
-    "@mui/material": "5.14.7",
-    "@next/env": "13.4.19",
+    "@graphcommerce/react-hook-form": "7.1.0-canary.38",
+    "@lingui/core": "4.5.0",
+    "@lingui/macro": "4.5.0",
+    "@lingui/react": "4.5.0",
+    "@mui/lab": "5.0.0-alpha.152",
+    "@mui/material": "5.14.17",
+    "@next/env": "14.0.2",
     "@parcel/watcher": "^2.3.0",
-    "concurrently": "8.2.1",
+    "concurrently": "8.2.2",
     "cross-env": "^7.0.3",
     "dotenv": "16.3.1",
-    "framer-motion": "10.16.3",
+    "framer-motion": "10.16.4",
     "graphql": "^16.8.1",
-    "next": "13.4.20-canary.16",
-    "next-sitemap": "4.2.2",
+    "next": "14.0.2",
+    "next-sitemap": "4.2.3",
     "patch-package": "8.0.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "sharp": "0.32.5",
-    "webpack": "5.88.2"
-  },
-  "resolutions": {
-    "graphql-jit": "0.8.2"
+    "react-hook-form": "^7.48.2",
+    "sharp": "0.32.6",
+    "webpack": "5.89.0"
   },
   "devDependencies": {
     "@graphcommerce/eslint-config-pwa": "7.1.0-canary.38",
     "@graphcommerce/prettier-config-pwa": "7.1.0-canary.38",
     "@graphcommerce/typescript-config-pwa": "7.1.0-canary.38",
-    "@lingui/cli": "4.4.2",
-    "@playwright/test": "1.37.1",
-    "@types/node": "^16",
-    "@types/react": "^18.2.21",
-    "@types/react-dom": "^18.2.7",
-    "@types/react-is": "^18.2.1",
-    "eslint": "8.48.0",
-    "prettier": "3.0.3",
-    "type-fest": "^4.3.1",
+    "@lingui/cli": "4.5.0",
+    "@playwright/test": "1.39.0",
+    "@types/babel-plugin-macros": "^3",
+    "@types/node": "^16.18.61",
+    "@types/react": "^18.2.37",
+    "@types/react-dom": "^18.2.15",
+    "@types/react-is": "^18.2.4",
+    "babel-plugin-macros": "^3.1.0",
+    "eslint": "8.53.0",
+    "prettier": "3.1.0",
+    "type-fest": "^4.7.1",
     "typescript": "5.2.2"
   },
   "browserslist": [

package.json

@@ -3,6 +3,7 @@
   "name": "root",
   "repository": "github:graphcommerce-org/graphcommerce",
   "version": "5.0.0",
+  "packageManager": "[email protected]",
   "private": true,
   "workspaces": [
     "docs",
@@ -44,16 +45,18 @@
   },
   "dependencies": {
     "@changesets/cli": "2.26.2",
-    "@testing-library/jest-dom": "^6.1.2",
-    "@testing-library/react": "^14.0.0",
-    "concurrently": "8.2.1",
-    "jest-environment-jsdom": "^29.5.0",
-    "patch-package": "8.0.0"
+    "@testing-library/jest-dom": "^6.1.4",
+    "@testing-library/react": "^14.1.0",
+    "concurrently": "8.2.2",
+    "jest-environment-jsdom": "^29.7.0",
+    "patch-package": "8.0.0",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@playwright/test": "1.37.1",
-    "eslint": "8.48.0",
-    "prettier": "3.0.3",
+    "@playwright/test": "1.39.0",
+    "eslint": "8.53.0",
+    "prettier": "3.1.0",
     "typescript": "5.2.2"
   },
   "resolutions": {

packages/address-fields-nl/package.json

@@ -11,24 +11,20 @@
       "project": "./tsconfig.json"
     }
   },
-  "devDependencies": {
-    "@graphcommerce/eslint-config-pwa": "7.1.0-canary.38",
-    "@graphcommerce/prettier-config-pwa": "7.1.0-canary.38",
-    "@graphcommerce/typescript-config-pwa": "7.1.0-canary.38"
-  },
-  "dependencies": {
-    "@graphcommerce/ecommerce-ui": "7.1.0-canary.38",
-    "@graphcommerce/graphql": "7.1.0-canary.38",
-    "@graphcommerce/magento-customer": "7.1.0-canary.38",
-    "@graphcommerce/magento-store": "7.1.0-canary.38",
-    "@graphcommerce/next-ui": "7.1.0-canary.38"
-  },
   "peerDependencies": {
-    "@lingui/react": "^4.2.1",
+    "@graphcommerce/ecommerce-ui": "*",
+    "@graphcommerce/eslint-config-pwa": "*",
+    "@graphcommerce/graphql": "*",
+    "@graphcommerce/magento-customer": "*",
+    "@graphcommerce/magento-store": "*",
+    "@graphcommerce/next-ui": "*",
+    "@graphcommerce/prettier-config-pwa": "*",
+    "@graphcommerce/typescript-config-pwa": "*",
     "@lingui/core": "^4.2.1",
     "@lingui/macro": "^4.2.1",
+    "@lingui/react": "^4.2.1",
     "@mui/material": "^5.10.16",
-    "next": "^13.2.0",
+    "next": "*",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }

packages/algolia-search/package.json

@@ -11,31 +11,28 @@
       "project": "./tsconfig.json"
     }
   },
-  "devDependencies": {
-    "@graphcommerce/eslint-config-pwa": "7.1.0-canary.38",
-    "@graphcommerce/next-config": "^7.1.0-canary.38",
-    "@graphcommerce/prettier-config-pwa": "7.1.0-canary.38",
-    "@graphcommerce/typescript-config-pwa": "7.1.0-canary.38"
-  },
   "dependencies": {
-    "@graphcommerce/graphql": "7.1.0-canary.38",
-    "@graphcommerce/ecommerce-ui": "7.1.0-canary.38",
-    "@graphcommerce/magento-search": "7.1.0-canary.38",
-    "@graphcommerce/next-config": "^7.1.0-canary.38",
-    "@graphcommerce/next-ui": "7.1.0-canary.38",
-    "@graphcommerce/magento-product": "7.1.0-canary.38",
-    "@graphcommerce/graphql-mesh": "7.1.0-canary.38",
-    "@graphcommerce/magento-store": "7.1.0-canary.38",
-    "algoliasearch": "^4.15.0",
-    "react-instantsearch-hooks-web": "^6.41.0"
+    "algoliasearch": "^4.20.0",
+    "react-instantsearch-hooks-web": "^6.47.3"
   },
   "peerDependencies": {
+    "@graphcommerce/ecommerce-ui": "*",
+    "@graphcommerce/eslint-config-pwa": "*",
+    "@graphcommerce/graphql": "*",
+    "@graphcommerce/graphql-mesh": "*",
+    "@graphcommerce/magento-product": "*",
+    "@graphcommerce/magento-search": "*",
+    "@graphcommerce/magento-store": "*",
+    "@graphcommerce/next-config": "^*",
+    "@graphcommerce/next-ui": "*",
+    "@graphcommerce/prettier-config-pwa": "*",
+    "@graphcommerce/typescript-config-pwa": "*",
     "@lingui/core": "^4.2.1",
-    "@lingui/react": "^4.2.1",
     "@lingui/macro": "^4.2.1",
+    "@lingui/react": "^4.2.1",
     "@mui/material": "^5.10.16",
-    "next": "^13.2.0",
+    "next": "*",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }
-}
+}