From 1707a9b25d7b6772a60ae08db943da5d24c86749 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98yvind=20Eikeland?= <oyvind@eikeland.me>
Date: Thu, 7 Nov 2024 12:32:55 +0100
Subject: [PATCH 1/2] chore(vue-press): changing example of app-config-ts

---
 cookbooks/app-react/app.config.ts  |  2 +-
 packages/cli/docs/configuration.md | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cookbooks/app-react/app.config.ts b/cookbooks/app-react/app.config.ts
index 84d401a4f..66501880c 100644
--- a/cookbooks/app-react/app.config.ts
+++ b/cookbooks/app-react/app.config.ts
@@ -1,6 +1,6 @@
 import { defineAppConfig } from '@equinor/fusion-framework-cli';
 
-export default defineAppConfig((_nev) => {
+export default defineAppConfig(() => {
     return {
         endpoints: {
             api: {
diff --git a/packages/cli/docs/configuration.md b/packages/cli/docs/configuration.md
index cd43ab01a..a8cb88292 100644
--- a/packages/cli/docs/configuration.md
+++ b/packages/cli/docs/configuration.md
@@ -14,9 +14,9 @@ the cli will look for a `app.config.{ts,js,json}` which will be provided to the
 
 ```ts
 // app.config.ts
-import { mergeAppConfigs, defineAppConfig } from '@equinor/fusion-framework-cli';
-export default defineAppConfig((_env, { base }) =>
-    mergeAppConfigs(base, {
+import { defineAppConfig } from '@equinor/fusion-framework-cli';
+export default defineAppConfig() => {
+    return {
         environment: {
           fish: 'they can fly?',
           shrimp: {
@@ -30,8 +30,8 @@ export default defineAppConfig((_env, { base }) =>
             scopes: ['default'],
           },
         },
-    }),
-);
+    },
+});
 ```
 
 You can configure framework services in the `src/config.ts` file.

From 20519d82f211fd26e814988d0954d06bdbf0e154 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98yvind=20Eikeland?= <oyvind@eikeland.me>
Date: Thu, 7 Nov 2024 12:35:25 +0100
Subject: [PATCH 2/2] chore: changeset

---
 .changeset/famous-spiders-wonder.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/famous-spiders-wonder.md

diff --git a/.changeset/famous-spiders-wonder.md b/.changeset/famous-spiders-wonder.md
new file mode 100644
index 000000000..3a372fa4a
--- /dev/null
+++ b/.changeset/famous-spiders-wonder.md
@@ -0,0 +1,5 @@
+---
+'@equinor/fusion-framework-docs': patch
+---
+
+Changing example of app-config.ts in cli docs