feat: add fallback support for env not being passed to weaverse clien…

…t from server entry
Weaverse · Nov 23, 2023 · 8fa9c1e · 8fa9c1e
1 parent 55be2b5
commit 8fa9c1e
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 13 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "weaverse-sdks",
-  "version": "2.6.3",
+  "version": "2.7.0",
   "description": "Weaverse SDKs monorepo.",
   "license": "MIT",
   "scripts": {

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -2,7 +2,7 @@
   "name": "@weaverse/core",
   "author": "Weaverse Team",
   "description": "Weaverse Core",
-  "version": "2.6.3",
+  "version": "2.7.0",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/packages/hydrogen/package.json b/packages/hydrogen/package.json
@@ -2,7 +2,7 @@
   "name": "@weaverse/hydrogen",
   "author": "Weaverse Team",
   "description": "Components, hooks, and utilities for building Shopify Hydrogen websites with Weaverse",
-  "version": "2.6.3",
+  "version": "2.7.0",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

diff --git a/packages/hydrogen/src/types.ts b/packages/hydrogen/src/types.ts
@@ -181,6 +181,7 @@ export interface HydrogenComponent<T extends HydrogenComponentProps = any> {
 
 export type WeaverseStudioQueries = {
   weaverseProjectId: string
+  weaverseApiKey: string
   weaverseHost: string
   weaverseVersion: string
   isDesignMode: boolean
@@ -194,6 +195,7 @@ export type PublicEnv = {
 export type WeaverseProjectConfigs = {
   projectId: string
   weaverseHost: string
+  weaverseApiKey: string
   weaverseVersion?: string
   isDesignMode?: boolean
   publicEnv?: PublicEnv
@@ -274,6 +276,7 @@ export type FetchProjectPayload = {
 
 export type HydrogenThemeEnv = {
   WEAVERSE_PROJECT_ID: string
+  WEAVERSE_API_KEY: string
   WEAVERSE_HOST: string
   PUBLIC_STORE_DOMAIN: string
   PUBLIC_STOREFRONT_API_TOKEN: string

diff --git a/packages/hydrogen/src/utils.ts b/packages/hydrogen/src/utils.ts
@@ -24,15 +24,17 @@ export function getWeaverseConfigs(
   let queries = getRequestQueries<WeaverseStudioQueries>(request)
   let {
     WEAVERSE_PROJECT_ID,
+    WEAVERSE_API_KEY,
     WEAVERSE_HOST,
     PUBLIC_STORE_DOMAIN,
     PUBLIC_STOREFRONT_API_TOKEN,
   } = env || {}
-  let { weaverseProjectId, weaverseHost, isDesignMode, weaverseVersion } =
+  let { weaverseProjectId, weaverseHost, isDesignMode, weaverseVersion,weaverseApiKey } =
     queries
   return {
-    projectId: weaverseProjectId || WEAVERSE_PROJECT_ID || '',
-    weaverseHost: weaverseHost || WEAVERSE_HOST || 'https://weaverse.io',
+    projectId: weaverseProjectId || WEAVERSE_PROJECT_ID || process?.env?.WEAVERSE_PROJECT_ID || '',
+    weaverseHost: weaverseHost || WEAVERSE_HOST || process?.env?.WEAVERSE_HOST || 'https://weaverse.io',
+    weaverseApiKey: weaverseApiKey || WEAVERSE_API_KEY || process?.env?.WEAVERSE_API_KEY || '',
     weaverseVersion: weaverseVersion || '',
     isDesignMode: isDesignMode || false,
     publicEnv: {

diff --git a/packages/hydrogen/src/weaverse-client.ts b/packages/hydrogen/src/weaverse-client.ts
@@ -58,6 +58,7 @@ export class WeaverseClient {
     this.basePageConfigs = {
       projectId: this.configs.projectId,
       weaverseHost: this.configs.weaverseHost,
+      weaverseApiKey: this.configs.weaverseApiKey,
       weaverseVersion: this.configs.weaverseVersion,
       isDesignMode: this.configs.isDesignMode,
     }

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -2,7 +2,7 @@
   "name": "@weaverse/react",
   "author": "Weaverse Team",
   "description": "React bindings for Weaverse",
-  "version": "2.6.3",
+  "version": "2.7.0",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

diff --git a/packages/shopify/package.json b/packages/shopify/package.json
@@ -2,7 +2,7 @@
   "name": "@weaverse/shopify",
   "author": "Weaverse Team",
   "description": "Weaverse Components for Shopify Online Store 2.0 Section builder",
-  "version": "2.6.3",
+  "version": "2.7.0",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/templates/pilot b/templates/pilot
+4 −0		.env.example
+1 −1		.eslintrc.js
+14 −1		app/root.tsx
+4 −4		app/routes/($locale).blogs.$blogHandle.$articleHandle.tsx
+46 −26		app/sections/collection-header.tsx
+3 −5		app/sections/image-with-text.tsx
+87 −24		app/sections/map.tsx
+14 −5		app/sections/rich-text/descriptions-item.tsx
+15 −7		app/sections/rich-text/headings-item.tsx
+22 −15		app/sections/video-with-text/video-description-item.tsx
+22 −15		app/sections/video-with-text/video-subheading-item.tsx
+2 −26		app/styles/app.css
+2 −2		app/styles/custom-font.css
+66 −42		app/weaverse/schema.server.ts
+23 −28		app/weaverse/style.tsx
+2 −2		package.json
+11 −8		tailwind.config.js