Merge upstream changes

yalla-coop · Oct 12, 2023 · 3f68a31 · 3f68a31
1 parent a1ebac2
commit 3f68a31
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 6 deletions.
diff --git a/dashboard/CHANGELOG.md b/dashboard/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @nhost/dashboard
 
+## 0.20.24
+
+### Patch Changes
+
+- e10389ecf: fix(dashboard): disable run tab when developing locally
+  - @nhost/react-apollo@5.0.37
+
 ## 0.20.23
 
 ### Patch Changes

diff --git a/dashboard/package.json b/dashboard/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nhost/dashboard",
-  "version": "0.20.23",
+  "version": "0.20.24",
   "private": true,
   "scripts": {
     "preinstall": "npx only-allow pnpm",

diff --git a/dashboard/src/features/projects/common/hooks/useProjectRoutes/useProjectRoutes.tsx b/dashboard/src/features/projects/common/hooks/useProjectRoutes/useProjectRoutes.tsx
@@ -142,6 +142,7 @@ export default function useProjectRoutes() {
       exact: false,
       label: 'Run',
       icon: <ServicesIcon />,
+      disabled: !isPlatform,
     },
     ...nhostRoutes,
   ];

diff --git a/dashboard/src/pages/[workspaceSlug]/[appSlug]/services/index.tsx b/dashboard/src/pages/[workspaceSlug]/[appSlug]/services/index.tsx
@@ -44,7 +44,7 @@ export default function ServicesPage() {
   const router = useRouter();
   const { openDrawer, openAlertDialog } = useDialog();
   const { currentProject } = useCurrentWorkspaceAndProject();
-  const isPlanFree = currentProject.plan.isFree;
+  const isPlanFree = currentProject?.plan?.isFree;
 
   const [currentPage, setCurrentPage] = useState(
     parseInt(router.query.page as string, 10) || 1,

diff --git a/examples/quickstarts/nextjs-server-components/tsconfig.json b/examples/quickstarts/nextjs-server-components/tsconfig.json
@@ -8,7 +8,7 @@
     "noEmit": true,
     "esModuleInterop": true,
     "module": "esnext",
-    "moduleResolution": "bundler",
+    "moduleResolution": "node",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "jsx": "preserve",

diff --git a/examples/quickstarts/nhost-backend/nhost/nhost.toml b/examples/quickstarts/nhost-backend/nhost/nhost.toml
@@ -25,7 +25,7 @@ httpPoolSize = 100
 
 [functions]
 [functions.node]
-version = 16
+version = 18
 
 [auth]
 version = '0.21.3'

diff --git a/integrations/apollo/CHANGELOG.md b/integrations/apollo/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @nhost/apollo
 
+## 5.2.20
+
+### Patch Changes
+
+- 7459a9413: fix: apollo-integration: reset accessToken to null after sign-out
+
 ## 5.2.19
 
 ### Patch Changes

diff --git a/integrations/apollo/package.json b/integrations/apollo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nhost/apollo",
-  "version": "5.2.19",
+  "version": "5.2.20",
   "description": "Nhost Apollo Client library",
   "license": "MIT",
   "keywords": [

diff --git a/integrations/react-apollo/CHANGELOG.md b/integrations/react-apollo/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @nhost/react-apollo
 
+## 5.0.37
+
+### Patch Changes
+
+- Updated dependencies [7459a9413]
+  - @nhost/apollo@5.2.20
+
 ## 5.0.36
 
 ### Patch Changes

diff --git a/integrations/react-apollo/package.json b/integrations/react-apollo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nhost/react-apollo",
-  "version": "5.0.36",
+  "version": "5.0.37",
   "description": "Nhost React Apollo client",
   "license": "MIT",
   "keywords": [