Merge pull request #2060 from nhost/changeset-release/main

chore: update versions

dashboard/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @nhost/dashboard
 
+## 0.17.15
+
+### Patch Changes
+
+- f41fdc12a: chore(deps): bump `turbo` to `1.10.5`
+- 6199c1c55: fix(projects): don't redirect to 404 page
+- Updated dependencies [07a45fde0]
+  - @nhost/react-apollo@5.0.28
+  - @nhost/nextjs@1.13.30
+
+## 0.17.14
+
+### Patch Changes
+
+- 80b22724d: chore(deps): bump `@types/react` to `v18.2.13`, `@types/react-dom` to `v18.2.6` and `@storybook/testing-library` to `v0.2.0`
+
+## 0.17.13
+
+### Patch Changes
+
+- cc02902cb: chore(docs): update environment variable documentation
+
 ## 0.17.12
 
 ### Patch Changes

dashboard/Dockerfile

@@ -3,7 +3,7 @@ RUN apk add --no-cache libc6-compat
 RUN apk update
 WORKDIR /app
 
-RUN yarn global add turbo@1.10.3
+RUN yarn global add turbo@1.10.5
 COPY . .
 RUN turbo prune --scope="@nhost/dashboard" --docker
 

dashboard/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nhost/dashboard",
-  "version": "0.17.12",
+  "version": "0.17.15",
   "private": true,
   "scripts": {
     "preinstall": "npx only-allow pnpm",
@@ -96,7 +96,7 @@
     "@storybook/builder-webpack5": "^6.5.14",
     "@storybook/manager-webpack5": "^6.5.14",
     "@storybook/react": "^6.5.14",
-    "@storybook/testing-library": "^0.0.13",
+    "@storybook/testing-library": "^0.2.0",
     "@testing-library/dom": "^9.0.0",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^14.0.0",

dashboard/src/features/authentication/settings/components/WebAuthnSettings/WebAuthnSettings.tsx

@@ -66,7 +66,10 @@ export default function WebAuthnSettings() {
         config: {
           auth: {
             method: {
-              webauthn: values,
+              webauthn: {...values,
+              relyingParty: {
+                name: currentProject.name,
+              }},
             },
           },
         },

dashboard/src/features/projects/common/hooks/useCurrentWorkspaceAndProject/useCurrentWorkspaceAndProject.ts

@@ -3,7 +3,7 @@ import type { Project, Workspace } from '@/types/application';
 import { ApplicationStatus } from '@/types/application';
 import { getHasuraAdminSecret } from '@/utils/env';
 import { GetWorkspaceAndProjectDocument } from '@/utils/__generated__/graphql';
-import { useNhostClient, useUserData } from '@nhost/nextjs';
+import { useAuthenticationStatus, useNhostClient } from '@nhost/nextjs';
 import type { RefetchOptions } from '@tanstack/react-query';
 import { useQuery } from '@tanstack/react-query';
 import { useRouter } from 'next/router';
@@ -34,14 +34,24 @@ export interface UseCurrentWorkspaceAndProjectReturnType {
 
 export default function useCurrentWorkspaceAndProject(): UseCurrentWorkspaceAndProjectReturnType {
   const client = useNhostClient();
-  const user = useUserData();
   const isPlatform = useIsPlatform();
+  const { isAuthenticated, isLoading: isAuthLoading } =
+    useAuthenticationStatus();
 
   const {
     query: { workspaceSlug, appSlug },
-    isReady,
+    isReady: isRouterReady,
   } = useRouter();
 
+  const isWorkspaceSlugAvailable = Boolean(workspaceSlug);
+
+  const shouldFetchWorkspaceAndProject =
+    isPlatform &&
+    isRouterReady &&
+    isWorkspaceSlugAvailable &&
+    isAuthenticated &&
+    !isAuthLoading;
+
   // We can't use the hook exported by the codegen here because there are cases
   // where it doesn't target the Nhost backend, but the currently active project
   // instead.
@@ -59,7 +69,7 @@ export default function useCurrentWorkspaceAndProject(): UseCurrentWorkspaceAndP
       }),
     {
       keepPreviousData: true,
-      enabled: isPlatform && isReady && !!workspaceSlug && !!user,
+      enabled: shouldFetchWorkspaceAndProject,
       // multiple components are relying on this query, so we don't want to
       // refetch it too often - kind of a hack, should be improved later
       staleTime: 1000,
@@ -142,7 +152,7 @@ export default function useCurrentWorkspaceAndProject(): UseCurrentWorkspaceAndP
   return {
     currentWorkspace,
     currentProject,
-    loading: response ? false : isFetching,
+    loading: response ? false : isFetching || isAuthLoading,
     error: response?.error
       ? new Error(error?.message || 'Unknown error occurred.')
       : null,

dashboard/src/features/projects/environmentVariables/settings/components/SystemEnvironmentVariableSettings/SystemEnvironmentVariableSettings.tsx

@@ -123,7 +123,7 @@ export default function SystemEnvironmentVariableSettings() {
   return (
     <SettingsContainer
       title="System Environment Variables"
-      description="Environment Variables are key-value pairs configured outside your source code. They are used to store environment-specific values such as API keys."
+      description="System environment variables are automatically generated from the configuration file and your project's subdomain and region."
       docsLink="https://docs.nhost.io/platform/environment-variables#system-environment-variables"
       rootClassName="gap-0"
       className="mt-2 mb-2.5 px-0"

docs/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @nhost/docs
 
+## 0.3.3
+
+### Patch Changes
+
+- cc02902cb: chore(docs): update environment variable documentation
+
 ## 0.3.2
 
 ### Patch Changes

docs/docs/graphql/remote-schemas/stripe.mdx

@@ -138,13 +138,21 @@ export default server
 
 Add `STRIPE_SECRET_KEY` as an environment variable.
 
-If you're using Nhost, add `STRIPE_SECRET_KEY` to `.env.development` like this:
+If you're using Nhost, add `STRIPE_SECRET_KEY` to `nhost.toml` like this:
+
+```
+[[ global.environment ]]
+name=STRIPE_SECRET_KEY
+value='{{ secrets.STRIPE_SECRET_KEY }}'
+```
+
+And then add to your `.secrets` file:
 
 ```
 STRIPE_SECRET_KEY=sk_test_***
 ```
 
-And add the production key (`sk_live_***`) to [environment variables](/platform/environment-variables) in the Nhost dashboard.
+In production set your secret with your stripe production key (`sk_live_***`) in the Nhost dashboard.
 
 Learn more about [Stripe API keys](https://stripe.com/docs/keys#obtain-api-keys).
 

docs/docs/platform/environment-variables.mdx

@@ -6,10 +6,6 @@ image: /img/og/platform/environment-variables.png
 
 Environment Variables are key-value pairs configured outside your source code. They are used to store environment-specific values such as API keys.
 
-You can manage your project's Environment Variables in Nhost Dashboard under **Variables**. When you define a new variable, you can set one value for **production** and one for **development**.
-
-![Environment Variables](/img/platform/environment-variables/environment-variables.png)
-
 Environment Variables are available for:
 
 - [Hasura GraphQL Engine](/graphql)
@@ -17,13 +13,44 @@ Environment Variables are available for:
 
 When an Environment Variable has updated the changes happen immediately for Hasura GraphQL Engine. For Serverless Functions, a new deployment via [Git](/platform/git) is required.
 
+## Custom Environment Variables
+
+You can manage your project's Environment Variables in the Nhost Dashboard or by using the configuration file.
+
+### Dashboard
+
+![Environment Variables](/img/platform/environment-variables/environment-variables.png)
+
+Environment Variables can be managed in the Nhost Dashboard under **Settings** → **Environment Variables**.
+
+### Configuration File
+
+Environment Variables can also be managed by adding new `[[global.environment]]` sections to the `nhost.toml` file.
+
+```toml
+[global]
+[[global.environment]]
+name = 'MY_ENV_VAR'
+value = '<first-value>'
+
+[[global.environment]]
+name = 'MY_OTHER_ENV_VAR'
+value = '<second-value>'
+
+# ... omitted for brevity
+```
+
+These environment variables will also be available on the Nhost Dashboard after committing and pushing the changes to your Git repository.
+
 ## System Environment Variables
 
-System Environment Variables are automatically available in production and during local development. The following system Environment Variables are available:
+System environment variables are automatically generated from the configuration file and your project's subdomain and region.
+
+The following system environment variables are available:
 
 - `NHOST_ADMIN_SECRET`
 - `NHOST_WEBHOOK_SECRET`
-- `NHOST_BACKEND_URL` ([deprecated](https://github.com/nhost/nhost/discussions/1319))
+- ~~`NHOST_BACKEND_URL`~~ ([deprecated](https://github.com/nhost/nhost/discussions/1319))
 - `NHOST_SUBDOMAIN`
 - `NHOST_REGION`
 - `NHOST_HASURA_URL`
@@ -33,7 +60,9 @@ System Environment Variables are automatically available in production and durin
 - `NHOST_FUNCTIONS_URL`
 - `NHOST_JWT_SECRET`
 
-Example values:
+`NHOST_ADMIN_SECRET`, `NHOST_WEBHOOK_SECRET` and `NHOST_JWT_SECRET` are populated with values from the configuration file. The rest of the system environment variables are populated with values from your project's subdomain and region.
+
+**Example values**:
 
 ```text
 NHOST_ADMIN_SECRET=e7w36ag287qn5qry795f6ymm57qgvqup
@@ -58,10 +87,3 @@ NHOST_FUNCTIONS_URL=https://abc123abc.functions.eu-central-1.nhost.run/v1
 
 NHOST_JWT_SECRET={"type": "HS256", "key": "vumpbe2w2mgaqj5yqfp7dvxu6kywtvsgb68ejpdaqxerea8jwrsszdp2dhkjxsh4df69pzm3ja6ukedx8ja43zdt6q9kgbgg2w9vh2sedeppukud9a2qzy29v3afdn7m"}
 ```
-
-## Development Environment Variables
-
-When developing locally using the [CLI](/cli), Environment Variables set in `.env.development` are available in your local environment. There are two ways to manage them:
-
-1. Edit the `.env.development` file manually.
-2. Add development Environment Variables in the Nhost Dashboard and use `nhost env pull` to sync them. This way, your team members will also have access to the same Environment Variables.

docs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nhost/docs",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "private": true,
   "scripts": {
     "docusaurus": "docusaurus",

integrations/apollo/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @nhost/apollo
 
+## 5.2.12
+
+### Patch Changes
+
+- 07a45fde0: chore(deps): bump `graphql` to `v16.7.1`
+- Updated dependencies [07a45fde0]
+  - @nhost/nhost-js@2.2.10
+
 ## 5.2.11
 
 ### Patch Changes

integrations/apollo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nhost/apollo",
-  "version": "5.2.11",
+  "version": "5.2.12",
   "description": "Nhost Apollo Client library",
   "license": "MIT",
   "keywords": [
@@ -64,7 +64,7 @@
     "@nhost/nhost-js": "workspace:*"
   },
   "dependencies": {
-    "graphql": "16.6.0",
+    "graphql": "16.7.1",
     "graphql-ws": "^5.10.1"
   },
   "devDependencies": {

integrations/react-apollo/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @nhost/react-apollo
 
+## 5.0.28
+
+### Patch Changes
+
+- 07a45fde0: chore(deps): bump `graphql` to `v16.7.1`
+- Updated dependencies [07a45fde0]
+  - @nhost/apollo@5.2.12
+  - @nhost/react@2.0.24
+
 ## 5.0.27
 
 ### Patch Changes

integrations/react-apollo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nhost/react-apollo",
-  "version": "5.0.27",
+  "version": "5.0.28",
   "description": "Nhost React Apollo client",
   "license": "MIT",
   "keywords": [
@@ -74,7 +74,7 @@
     "@apollo/client": "^3.7.10",
     "@nhost/react": "workspace:*",
     "@types/react": "^18.0.34",
-    "graphql": "16.6.0",
+    "graphql": "16.7.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }

integrations/react-urql/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @nhost/react-urql
 
+## 2.0.25
+
+### Patch Changes
+
+- 07a45fde0: chore(deps): bump `graphql` to `v16.7.1`
+  - @nhost/react@2.0.24
+
 ## 2.0.24
 
 ### Patch Changes

integrations/react-urql/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nhost/react-urql",
-  "version": "2.0.24",
+  "version": "2.0.25",
   "description": "Nhost React URQL client",
   "license": "MIT",
   "keywords": [
@@ -73,7 +73,7 @@
   "devDependencies": {
     "@nhost/react": "workspace:*",
     "@types/react": "^18.0.34",
-    "graphql": "16.6.0",
+    "graphql": "16.7.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "urql": "^4.0.0"

integrations/stripe-graphql-js/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @nhost/stripe-graphql-js
 
+## 1.0.4
+
+### Patch Changes
+
+- 07a45fde0: chore(deps): bump `graphql` to `v16.7.1`
+
 ## 1.0.3
 
 ### Patch Changes

integrations/stripe-graphql-js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nhost/stripe-graphql-js",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "Stripe GraphQL API",
   "license": "MIT",
   "keywords": [
@@ -41,7 +41,7 @@
   },
   "dependencies": {
     "@pothos/core": "^3.21.0",
-    "graphql": "16.6.0",
+    "graphql": "16.7.1",
     "graphql-scalars": "^1.18.0",
     "graphql-yoga": "^3.4.0",
     "jsonwebtoken": "^9.0.0",

package.json

@@ -76,7 +76,7 @@
     "husky": "^8.0.1",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.7.1",
-    "turbo": "1.10.3",
+    "turbo": "1.10.5",
     "typedoc": "^0.22.18",
     "typescript": "4.9.5",
     "vite": "^4.3.8",
@@ -85,7 +85,7 @@
     "vitest": "^0.32.0"
   },
   "resolutions": {
-    "graphql": "16.6.0"
+    "graphql": "16.7.1"
   },
   "packageManager": "pnpm@8.6.2",
   "engines": {

packages/docgen/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @nhost/docgen
 
+## 0.1.11
+
+### Patch Changes
+
+- 5ef0b3157: chore(deps): bump `commander` to `v11`
+
 ## 0.1.10
 
 ### Patch Changes

packages/docgen/package.json

@@ -2,7 +2,7 @@
   "name": "@nhost/docgen",
   "description": "Documentation generator for classes and functions",
   "private": true,
-  "version": "0.1.10",
+  "version": "0.1.11",
   "license": "MIT",
   "main": "dist/index.cjs.js",
   "types": "dist/index.d.ts",
@@ -40,7 +40,7 @@
   },
   "dependencies": {
     "chalk": "4",
-    "commander": "^10.0.0",
+    "commander": "^11.0.0",
     "just-kebab-case": "^4.1.1",
     "prettier": "^2.7.1",
     "valtio": "^1.6.4"

packages/graphql-js/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @nhost/graphql-js
 
+## 0.1.4
+
+### Patch Changes
+
+- 07a45fde0: chore(deps): bump `graphql` to `v16.7.1`
+
 ## 0.1.3
 
 ### Patch Changes

packages/graphql-js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nhost/graphql-js",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Nhost GraphQL client",
   "license": "MIT",
   "keywords": [
@@ -61,6 +61,6 @@
   },
   "devDependencies": {
     "@nhost/docgen": "workspace:*",
-    "graphql": "16.6.0"
+    "graphql": "16.7.1"
   }
 }

packages/nextjs/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @nhost/nextjs
 
+## 1.13.30
+
+### Patch Changes
+
+- @nhost/react@2.0.24
+
 ## 1.13.29
 
 ### Patch Changes

packages/nextjs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nhost/nextjs",
-  "version": "1.13.29",
+  "version": "1.13.30",
   "description": "Nhost NextJS library",
   "license": "MIT",
   "keywords": [

packages/nhost-js/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @nhost/nhost-js
 
+## 2.2.10
+
+### Patch Changes
+
+- 07a45fde0: chore(deps): bump `graphql` to `v16.7.1`
+- Updated dependencies [07a45fde0]
+  - @nhost/graphql-js@0.1.4
+
 ## 2.2.9
 
 ### Patch Changes

packages/nhost-js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nhost/nhost-js",
-  "version": "2.2.9",
+  "version": "2.2.10",
   "description": "Nhost JavaScript SDK",
   "license": "MIT",
   "keywords": [
@@ -69,7 +69,7 @@
   },
   "devDependencies": {
     "@nhost/docgen": "workspace:*",
-    "graphql": "16.6.0"
+    "graphql": "16.7.1"
   },
   "peerDependencies": {
     "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"

packages/react/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @nhost/react
 
+## 2.0.24
+
+### Patch Changes
+
+- Updated dependencies [07a45fde0]
+  - @nhost/nhost-js@2.2.10
+
 ## 2.0.23
 
 ### Patch Changes

packages/react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nhost/react",
-  "version": "2.0.23",
+  "version": "2.0.24",
   "description": "Nhost React library",
   "license": "MIT",
   "keywords": [

packages/vue/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @nhost/vue
 
+## 1.13.30
+
+### Patch Changes
+
+- Updated dependencies [07a45fde0]
+  - @nhost/nhost-js@2.2.10
+
 ## 1.13.29
 
 ### Patch Changes

packages/vue/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nhost/vue",
-  "version": "1.13.29",
+  "version": "1.13.30",
   "description": "Nhost Vue library",
   "license": "MIT",
   "keywords": [