@tinacms/app 1.2.28 → 1.2.30

package/CHANGELOG.md

@@ -1,5 +1,32 @@
 # @tinacms/app
 
+## 1.2.30
+
+### Patch Changes
+
+- a937aabf0: Add support for build.basePath to be an environment variable
+- 661239b2a: update final form to fix peer deps issues
+- Updated dependencies [131b4dc55]
+- Updated dependencies [93bfc804a]
+- Updated dependencies [1fc2c4a99]
+- Updated dependencies [693cf5bd6]
+- Updated dependencies [afd1c7c97]
+- Updated dependencies [a937aabf0]
+- Updated dependencies [661239b2a]
+- Updated dependencies [630ab9436]
+  - tinacms@1.5.23
+  - @tinacms/mdx@1.3.21
+
+## 1.2.29
+
+### Patch Changes
+
+- Updated dependencies [b6fbab887]
+- Updated dependencies [4ae43fdde]
+- Updated dependencies [aec44a7dc]
+  - @tinacms/mdx@1.3.20
+  - tinacms@1.5.22
+
 ## 1.2.28
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/app",
-  "version": "1.2.28",
+  "version": "1.2.30",
   "main": "src/main.tsx",
   "license": "Apache-2.0",
   "devDependencies": {
@@ -14,9 +14,9 @@
     "@headlessui/react": "1.6.6",
     "@heroicons/react": "1.0.6",
     "@monaco-editor/react": "4.4.5",
-    "@tinacms/mdx": "1.3.19",
+    "@tinacms/mdx": "1.3.21",
     "@xstate/react": "3.0.0",
-    "final-form": "4.20.7",
+    "final-form": "4.20.10",
     "graphiql": "3.0.0-alpha.1",
     "graphql": "15.8.0",
     "monaco-editor": "0.31.0",
@@ -25,7 +25,7 @@
     "react-dom": "17.0.2",
     "react-router-dom": "6.3.0",
     "tailwindcss": "^3.2.7",
-    "tinacms": "1.5.21",
+    "tinacms": "1.5.23",
     "typescript": "^4.6.4",
     "zod": "^3.14.3"
   }

package/src/App.tsx

@@ -38,10 +38,8 @@ const SetPreview = () => {
       ...MdxFieldPluginExtendible,
       Component: Editor,
     })
-    let basePath
-    if (config.build.basePath) {
-      basePath = config.build.basePath.replace(/^\/|\/$/g, '')
-    }
+    const basePath = __BASE_PATH__.replace(/^\/|\/$/g, '')
+    cms.flags.set('tina-basepath', basePath)
     cms.flags.set(
       'tina-preview',
       `${basePath ? `${basePath}/` : ''}${config.build.outputFolder.replace(

package/src/Playground.tsx

@@ -8,11 +8,6 @@ import { queries } from 'CLIENT_IMPORT'
 
 import 'graphiql/graphiql.min.css'
 
-const fetcher = createGraphiQLFetcher({
-  url: __API_URL__,
-  headers: { 'X-API-KEY': __TOKEN__ },
-})
-
 const Playground = () => {
   const cms = useCMS()
   const [query, setQuery] = React.useState('')
@@ -61,6 +56,10 @@ const Playground = () => {
 
   const ref = React.useRef()
 
+  const getToken = () => {
+    return JSON.parse(localStorage.getItem('tinacms-auth') || '{}')?.id_token
+  }
+
   if (!autoQueries) {
     return null
   }
@@ -130,11 +129,16 @@ const Playground = () => {
       </div>
     )
   }
-
   return (
     <div style={{ height: '100vh' }}>
       <GraphiQL
-        fetcher={fetcher}
+        fetcher={async (params, options) => {
+          const fetcher = createGraphiQLFetcher({
+            url: __API_URL__,
+            headers: { Authorization: `Bearer ${getToken()}` },
+          })
+          return fetcher(params, options)
+        }}
         query={query}
         defaultEditorToolsVisibility="variables"
         isHeadersEditorEnabled={false}

package/src/lib/graphql-reducer.ts

@@ -271,14 +271,12 @@ export const useGraphQLReducer = (
             }
           })
           let value = source[fieldName] as unknown
-          if (!value) {
-            aliases.forEach((alias) => {
-              const aliasValue = source[alias]
-              if (aliasValue) {
-                value = aliasValue
-              }
-            })
-          }
+          aliases.forEach((alias) => {
+            const aliasValue = source[alias]
+            if (aliasValue) {
+              value = aliasValue
+            }
+          })
           if (fieldName === '_sys') {
             return source._internalSys
           }

package/src/vite-env.d.ts

@@ -4,4 +4,5 @@
 
 /// <reference types="vite/client" />
 declare const __API_URL__: string
+declare const __BASE_PATH__: string
 declare const __TINA_GRAPHQL_VERSION__: string