-
Notifications
You must be signed in to change notification settings - Fork 72
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2380 from graphcommerce-org/fix/various
Solve issue with url?.startsWith and various others
- Loading branch information
Showing
77 changed files
with
4,432 additions
and
4,286 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
--- | ||
'@graphcommerce/magento-customer': patch | ||
--- | ||
|
||
Solve issue where persisted Form-data would remain in the sessionStorage after logging out. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
--- | ||
'@graphcommerce/next-config': minor | ||
'@graphcommerce/graphql-mesh': minor | ||
--- | ||
|
||
Solves the issue `TypeError: url?.startsWith is not a function`. The generated `.mesh/index.ts` would be generated as a requirejs module while next.js expects an esm module. In the end we properly generated the mesh correctly and now there is an `import.meta.url` instead of using `require('node:url')`. To solve this we needed to solve a chain of issues: | ||
|
||
1. The generation of the mesh is based on the version of the mesh that is imported (esm or commonjs). See [source](https://github.com/ardatan/graphql-mesh/blob/bf588d372c0078378aaa24beea2da794af7949e6/scripts/replace-import-meta-url-in-cjs.ts#L9-L10) for the lines that need to be different. This meant that we needed to change the @graphcommerce/cli package to be of type:module instead of a commonjs module. | ||
|
||
2) To properly convert the module to an esm module we've migrated the build of the cli package to use 'pkgroll' instead of tsc, because tsc is limited in what it outputs and can't really convert classic imports to esm. | ||
|
||
3) To load possible mesh plugins we require additional .ts files to be loaded with [tsx](https://tsx.is/). To get the tsx loader to work properly in combination with esm modules, we need at least [node 18.19.0](https://nodejs.org/en/blog/release/v18.19.0#new-nodemodule-api-register-for-module-customization-hooks-new-initialize-hook). Minimal Node version upped to 18.19.0 and add support for node 22. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
--- | ||
'@graphcommerce/magento-search': patch | ||
'@graphcommerce/ecommerce-ui': patch | ||
--- | ||
|
||
Solve issue: Warning: Cannot update a component (`FormAutoSubmitBase`) while rendering a different component (`ActionCardListForm`). |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
--- | ||
'@graphcommerce/magento-customer': patch | ||
--- | ||
|
||
Remove the inContext directive from the query before sending to the server |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
--- | ||
'@graphcommerce/next-ui': patch | ||
--- | ||
|
||
Solve an issue where internal full URL's would cause prefetching errors and would use a hard navigation. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
--- | ||
'@graphcommerce/graphql': patch | ||
--- | ||
|
||
measurePerformanceLink now reports queries made in the subgraph and is only included during development and not in production. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,7 +7,7 @@ | |
"sideEffects": false, | ||
"packageManager": "[email protected]", | ||
"engines": { | ||
"node": "16.x.x||18.x.x||20.x.x" | ||
"node": ">=18.19.0 <22.0.0" | ||
}, | ||
"scripts": { | ||
"dev": "concurrently -k -n codegen,next 'graphql-codegen -w' 'next dev'", | ||
|
@@ -20,7 +20,7 @@ | |
"create-patch": "patch-package --exclude 'package.json$|gql.ts$|interceptor.tsx$'" | ||
}, | ||
"dependencies": { | ||
"@apollo/client": "~3.10.8", | ||
"@apollo/client": "~3.11.8", | ||
"@ducanh2912/next-pwa": "9.7.2", | ||
"@graphcommerce/cli": "9.0.0-canary.100", | ||
"@graphcommerce/demo-magento-graphcommerce": "9.0.0-canary.100", | ||
|
@@ -70,49 +70,53 @@ | |
"@graphcommerce/next-config": "9.0.0-canary.100", | ||
"@graphcommerce/next-ui": "9.0.0-canary.100", | ||
"@graphcommerce/react-hook-form": "9.0.0-canary.100", | ||
"@lingui/conf": "4.11.2", | ||
"@lingui/core": "4.11.2", | ||
"@lingui/macro": "4.11.2", | ||
"@lingui/react": "4.11.2", | ||
"@mui/lab": "5.0.0-alpha.171", | ||
"@mui/material": "5.16.4", | ||
"@next/env": "14.2.5", | ||
"@lingui/conf": "4.11.4", | ||
"@lingui/core": "4.11.4", | ||
"@lingui/macro": "4.11.4", | ||
"@lingui/react": "4.11.4", | ||
"@mui/lab": "5.0.0-alpha.173", | ||
"@mui/material": "5.16.7", | ||
"@mui/utils": "^5.16.6", | ||
"@next/env": "14.2.14", | ||
"@parcel/watcher": "^2.4.1", | ||
"@unts/patch-package": "^8.0.0", | ||
"concurrently": "8.2.2", | ||
"cross-env": "^7.0.3", | ||
"dotenv": "16.4.5", | ||
"framer-motion": "10.18.0", | ||
"framer-motion": "11.11.1", | ||
"graphql": "^16.9.0", | ||
"next": "14.2.5", | ||
"next": "14.2.14", | ||
"next-assetlinks": "^1.0.0", | ||
"react": "^18.3.1", | ||
"react-dom": "^18.3.1", | ||
"react-hook-form": "^7.52.1", | ||
"sharp": "0.33.4", | ||
"react-hook-form": "^7.53.0", | ||
"sharp": "0.33.5", | ||
"ts-node": "^10.9.2", | ||
"webpack": "~5.93.0" | ||
}, | ||
"devDependencies": { | ||
"@graphcommerce/eslint-config-pwa": "9.0.0-canary.100", | ||
"@graphcommerce/prettier-config-pwa": "9.0.0-canary.100", | ||
"@graphcommerce/typescript-config-pwa": "9.0.0-canary.100", | ||
"@lingui/cli": "4.11.2", | ||
"@playwright/test": "1.45.1", | ||
"@types/node": "^18.19.40", | ||
"@types/react": "^18.3.3", | ||
"@lingui/cli": "4.11.4", | ||
"@playwright/test": "1.47.2", | ||
"@types/node": "^18.19.54", | ||
"@types/react": "^18.3.11", | ||
"@types/react-dom": "^18.3.0", | ||
"@types/react-is": "^18.3.0", | ||
"babel-plugin-macros": "^3.1.0", | ||
"eslint": "^8", | ||
"prettier": "3.3.3", | ||
"type-fest": "^4.22.0", | ||
"typescript": "5.5.3" | ||
"type-fest": "^4.26.1", | ||
"typescript": "5.6.2" | ||
}, | ||
"browserslist": [ | ||
"> 1% in alt-EU", | ||
"not IE 11" | ||
], | ||
"resolutions": { | ||
"@emotion/react": "11.12.0" | ||
}, | ||
"prettier": "@graphcommerce/prettier-config-pwa", | ||
"eslintConfig": { | ||
"extends": "@graphcommerce/eslint-config-pwa", | ||
|
65 changes: 0 additions & 65 deletions
65
examples/magento-graphcms/patches/@graphql-tools+delegate+10.0.17.patch
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.