fix: made firebase-admin and firebase-functions peers deps more flexi…

…ble (#1094)
firebase · Oct 22, 2024 · 624a090 · 624a090
1 parent 4d831e4
commit 624a090
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 318 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,6 +23,7 @@ js/testapps/firebase-functions-sample1/public/config.js
 ui-debug.log
 firebase-debug.log
 **/*.env
+.genkit
 # RAG sample files
 !js/testapps/rag/package.json
 js/testapps/rag/*.json

diff --git a/js/flow/package.json b/js/flow/package.json
@@ -33,8 +33,8 @@
  "body-parser": "^1.20.3",
  "cors": "^2.8.5",
  "express": "^4.21.0",
- "firebase-admin": "^12.1.0",
- "firebase-functions": "^4.8.0 || ^5.0.0",
+ "firebase-admin": ">=12.2",
+ "firebase-functions": ">=4.8",
  "uuid": "^9.0.1",
  "zod": "^3.22.4"
  },

diff --git a/js/plugins/firebase/package.json b/js/plugins/firebase/package.json
@@ -37,9 +37,9 @@
  "zod": "^3.22.4"
  },
  "peerDependencies": {
- "@google-cloud/firestore": "^7.6.0",
- "firebase-admin": "^12.2.0",
- "firebase-functions": "^4.8.0 || ^5.0.0",
+ "@google-cloud/firestore": ">7.6",
+ "firebase-admin": ">=12.2",
+ "firebase-functions": ">=4.8",
  "@genkit-ai/ai": "workspace:*",
  "@genkit-ai/core": "workspace:*",
  "@genkit-ai/flow": "workspace:*"

diff --git a/js/plugins/vertexai/package.json b/js/plugins/vertexai/package.json
@@ -52,7 +52,7 @@
  },
  "optionalDependencies": {
  "@google-cloud/bigquery": "^7.8.0",
- "firebase-admin": "^12.1.0"
+ "firebase-admin": ">=12.2"
  },
  "devDependencies": {
  "@types/node": "^20.11.16",

diff --git a/js/pnpm-lock.yaml b/js/pnpm-lock.yaml
diff --git a/js/testapps/cat-eval/package.json b/js/testapps/cat-eval/package.json
@@ -25,7 +25,7 @@
  "@genkit-ai/vertexai": "workspace:*",
  "@google-cloud/firestore": "^7.9.0",
  "@opentelemetry/sdk-trace-base": "^1.22.0",
- "firebase-admin": "^12.3.0",
+ "firebase-admin": ">=12.2",
  "genkitx-pinecone": "workspace:*",
  "llm-chunk": "^0.0.1",
  "pdf-parse": "^1.1.1",

diff --git a/js/testapps/dev-ui-gallery/package.json b/js/testapps/dev-ui-gallery/package.json
@@ -28,7 +28,7 @@
  "@genkit-ai/flow": "workspace:*",
  "@genkit-ai/googleai": "workspace:*",
  "@genkit-ai/vertexai": "workspace:*",
- "firebase-admin": "^12.1.0",
+ "firebase-admin": ">=12.2",
  "genkitx-chromadb": "workspace:*",
  "genkitx-ollama": "workspace:*",
  "genkitx-pinecone": "workspace:*",

diff --git a/js/testapps/firebase-functions-sample1/functions/package.json b/js/testapps/firebase-functions-sample1/functions/package.json
@@ -19,8 +19,8 @@
  "@genkit-ai/firebase": "*",
  "@genkit-ai/flow": "*",
  "@genkit-ai/vertexai": "*",
- "firebase-admin": "^11.8.0",
- "firebase-functions": "^4.8.0 || ^5.0.0",
+ "firebase-admin": ">=12.2",
+ "firebase-functions": ">=4.8",
  "zod": "^3.22.4"
  },
  "devDependencies": {

diff --git a/js/testapps/flow-simple-ai/package.json b/js/testapps/flow-simple-ai/package.json
@@ -25,7 +25,7 @@
  "@genkit-ai/vertexai": "workspace:*",
  "@google/generative-ai": "^0.15.0",
  "@opentelemetry/sdk-trace-base": "^1.25.0",
- "firebase-admin": "^12.1.0",
+ "firebase-admin": ">=12.2",
  "partial-json": "^0.1.7",
  "zod": "^3.22.4"
  },

diff --git a/js/testapps/vertexai-vector-search-firestore/package.json b/js/testapps/vertexai-vector-search-firestore/package.json
@@ -25,7 +25,7 @@
  "@genkit-ai/vertexai": "workspace:*",
  "dotenv": "^16.4.5",
  "express": "^4.21.0",
- "firebase-admin": "^12.1.0",
+ "firebase-admin": ">=12.2",
  "genkitx-chromadb": "workspace:*",
  "genkitx-langchain": "workspace:*",
  "genkitx-pinecone": "workspace:*",