Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add NextJs 14 as a valid peerDependencies #119

Merged
merged 2 commits into from
Oct 30, 2023
Merged

Add NextJs 14 as a valid peerDependencies #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec9cb9c
nextjs dep: add v14
phryneas Oct 30, 2023
006ba16
suppress potential hydration warning
phryneas Oct 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions examples/app-dir-experiments/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
"lint": "next lint"
},
"dependencies": {
"@apollo/client": ">=3.8.0-rc.1",
"@apollo/client": "^3.8.6",
"@apollo/experimental-nextjs-app-support": "workspace:^",
"@apollo/server": "^4.6.0",
"@apollo/server": "^4.9.5",
"@as-integrations/next": "^1.3.0",
"@types/node": "18.15.3",
"@types/react": "^18.2.14",
Expand All @@ -23,7 +23,7 @@
"eslint-config-next": "13.2.4",
"graphql": "^16.6.0",
"html-differ": "^1.4.0",
"next": "^13.5.1",
"next": "^14.0.0",
"react": "18.2.0",
"react-dom": "18.2.0",
"server-only": "^0.0.1",
Expand Down
4 changes: 2 additions & 2 deletions examples/hack-the-supergraph-ssr/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"lint": "next lint"
},
"dependencies": {
"@apollo/client": ">=3.8.0-rc.1",
"@apollo/client": "^3.8.6",
"@apollo/experimental-nextjs-app-support": "workspace:^",
"@apollo/space-kit": "^9.11.0",
"@chakra-ui/next-js": "^2.1.2",
Expand All @@ -25,7 +25,7 @@
"framer-motion": "^10.12.2",
"graphql": "^16.6.0",
"js-cookie": "^3.0.1",
"next": "^13.5.1",
"next": "^14.0.0",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-icons": "^4.8.0",
Expand Down
3 changes: 2 additions & 1 deletion examples/polls-demo/components/poll/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ export const Poll = ({
return (
<div>
<h1 className="text-6xl mb-6">{poll.question}</h1>
<p className="text-2xl mb-6">
{/* could be formatted with a different locale on the server than in the browser -> suppressHydrationWarning */}
<p className="text-2xl mb-6" suppressHydrationWarning>
Total votes: {poll.totalVotes.toLocaleString()}
</p>

Expand Down
6 changes: 3 additions & 3 deletions examples/polls-demo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
"codegen": "graphql-codegen --config codegen.ts"
},
"dependencies": {
"@apollo/client": ">=3.8.0-rc.1",
"@apollo/client": "^3.8.6",
"@apollo/experimental-nextjs-app-support": "workspace:^",
"@apollo/server": "^4.7.0",
"@apollo/server": "^4.9.5",
"@as-integrations/next": "^1.3.0",
"@types/node": "18.16.3",
"@types/react": "^18.2.14",
Expand All @@ -27,7 +27,7 @@
"eslint-config-next": "13.3.4",
"graphql": "^16.6.0",
"graphql-tag": "^2.12.6",
"next": "^13.5.1",
"next": "^14.0.0",
"postcss": "8.4.23",
"react": "18.2.0",
"react-dom": "18.2.0",
Expand Down
10 changes: 5 additions & 5 deletions integration-test/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,22 @@
"test": "yarn playwright test"
},
"dependencies": {
"@apollo/client": ">=3.8.0-rc.1",
"@apollo/client": "^3.8.6",
"@apollo/experimental-nextjs-app-support": "workspace:*",
"@apollo/server": "^4.7.5",
"@as-integrations/next": "^2.0.0",
"@apollo/server": "^4.9.5",
"@as-integrations/next": "^2.0.2",
"@graphql-tools/schema": "^10.0.0",
"@types/node": "20.3.1",
"@types/react": "^18.2.14",
"@types/react-dom": "18.2.6",
"graphql": "^16.7.1",
"graphql-tag": "^2.12.6",
"next": "^13.5.1",
"next": "^14.0.0",
"react": "18.2.0",
"react-dom": "18.2.0",
"typescript": "5.1.3"
},
"devDependencies": {
"@playwright/test": "^1.35.1"
"@playwright/test": "^1.39.0"
}
}
10 changes: 5 additions & 5 deletions package/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@
},
"packageManager": "[email protected]",
"devDependencies": {
"@apollo/client": ">=3.8.0-rc.1",
"@total-typescript/shoehorn": "^0.1.0",
"@tsconfig/recommended": "^1.0.1",
"@apollo/client": "^3.8.6",
"@total-typescript/shoehorn": "^0.1.1",
"@tsconfig/recommended": "^1.0.3",
"@typescript-eslint/eslint-plugin": "latest",
"@typescript-eslint/parser": "latest",
"eslint": "latest",
"eslint-plugin-react": "latest",
"next": "^13.5.1",
"next": "^14.0.0",
"react": "^18.2.0",
"rimraf": "^5.0.0",
"ts-node": "^10.9.1",
Expand All @@ -60,7 +60,7 @@
},
"peerDependencies": {
"@apollo/client": ">=3.8.0-rc || ^3.8.0",
"next": "^13.4.1",
"next": "^13.4.1 || ^14.0.0",
"react": "^18"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion package/src/ssr/hooks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export const useReadQuery = wrap(orig_useReadQuery, ["data", "networkStatus"]);

export const useBackgroundQuery: typeof orig_useBackgroundQuery = (...args: [any, any]) => {
useRehydrationContext();
return orig_useBackgroundQuery(...args);
return orig_useBackgroundQuery(...args) as any;
};

function wrap<T extends (...args: any[]) => any>(
Expand Down
Loading