diff --git a/.gitignore b/.gitignore index 2862b8731..75ce9fff1 100644 --- 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 index d57cf7df3..3f7f0f141 100644 --- 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 index 3827319de..d07583779 100644 --- 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 index 47e77e029..2e90bec47 100644 --- 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 index 20d959f51..969d56500 100644 --- a/js/pnpm-lock.yaml +++ b/js/pnpm-lock.yaml @@ -149,11 +149,11 @@ importers: specifier: ^4.21.0 version: 4.21.0 firebase-admin: - specifier: ^12.1.0 - version: 12.1.0(encoding@0.1.13) + specifier: '>=12.2' + version: 12.3.1(encoding@0.1.13) firebase-functions: - specifier: ^4.8.0 || ^5.0.0 - version: 5.0.1(firebase-admin@12.1.0(encoding@0.1.13)) + specifier: '>=4.8' + version: 5.0.1(firebase-admin@12.3.1(encoding@0.1.13)) uuid: specifier: ^9.0.1 version: 9.0.1 @@ -361,17 +361,17 @@ importers: specifier: workspace:* version: link:../google-cloud '@google-cloud/firestore': - specifier: ^7.6.0 - version: 7.6.0(encoding@0.1.13) + specifier: '>7.6' + version: 7.9.0(encoding@0.1.13) express: specifier: ^4.21.0 version: 4.21.0 firebase-admin: - specifier: ^12.2.0 - version: 12.2.0(encoding@0.1.13) + specifier: '>=12.2' + version: 12.3.1(encoding@0.1.13) firebase-functions: - specifier: ^4.8.0 || ^5.0.0 - version: 4.8.1(encoding@0.1.13)(firebase-admin@12.2.0(encoding@0.1.13)) + specifier: '>=4.8' + version: 5.0.1(firebase-admin@12.3.1(encoding@0.1.13)) google-auth-library: specifier: ^9.6.3 version: 9.7.0(encoding@0.1.13) @@ -686,8 +686,8 @@ importers: specifier: ^7.8.0 version: 7.8.0(encoding@0.1.13) firebase-admin: - specifier: ^12.1.0 - version: 12.2.0(encoding@0.1.13) + specifier: '>=12.2' + version: 12.3.1(encoding@0.1.13) devDependencies: '@types/node': specifier: ^20.11.16 @@ -849,7 +849,7 @@ importers: specifier: ^1.22.0 version: 1.25.1(@opentelemetry/api@1.9.0) firebase-admin: - specifier: ^12.3.0 + specifier: '>=12.2' version: 12.3.1(encoding@0.1.13) genkitx-pinecone: specifier: workspace:* @@ -910,8 +910,8 @@ importers: specifier: workspace:* version: link:../../plugins/vertexai firebase-admin: - specifier: ^12.1.0 - version: 12.1.0(encoding@0.1.13) + specifier: '>=12.2' + version: 12.3.1(encoding@0.1.13) genkitx-chromadb: specifier: workspace:* version: link:../../plugins/chroma @@ -1166,8 +1166,8 @@ importers: specifier: ^1.25.0 version: 1.25.1(@opentelemetry/api@1.9.0) firebase-admin: - specifier: ^12.1.0 - version: 12.1.0(encoding@0.1.13) + specifier: '>=12.2' + version: 12.3.1(encoding@0.1.13) partial-json: specifier: ^0.1.7 version: 0.1.7 @@ -1586,8 +1586,8 @@ importers: specifier: ^4.21.0 version: 4.21.0 firebase-admin: - specifier: ^12.1.0 - version: 12.2.0(encoding@0.1.13) + specifier: '>=12.2' + version: 12.3.1(encoding@0.1.13) genkitx-chromadb: specifier: workspace:* version: link:../../plugins/chroma @@ -1767,10 +1767,6 @@ packages: cpu: [x64] os: [win32] - '@fastify/busboy@2.1.1': - resolution: {integrity: sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==} - engines: {node: '>=14'} - '@fastify/busboy@3.0.0': resolution: {integrity: sha512-83rnH2nCvclWaPQQKvkJ2pdOjG4TZyEVuFDnlOF6KP08lDaaceVyw/W63mDuafQT+MKHCvXIPpE5uYWeM0rT4w==} @@ -1817,10 +1813,6 @@ packages: resolution: {integrity: sha512-WUDbaLY8UnPxgwsyIaxj6uxCtSDAaUyvzWJykNH5rZ9i92/SZCsPNNMN0ajrVpAR81hPIL4amXTaMJ40y5L+Yg==} engines: {node: '>=14.0.0'} - '@google-cloud/firestore@7.8.0': - resolution: {integrity: sha512-m21BWVZLz7H7NF8HZ5hCGUSCEJKNwYB5yzQqDTuE9YUzNDRMDei3BwVDht5k4xF636sGlnobyBL+dcbthSGONg==} - engines: {node: '>=14.0.0'} - '@google-cloud/firestore@7.9.0': resolution: {integrity: sha512-c4ALHT3G08rV7Zwv8Z2KG63gZh66iKdhCBeDfCpIkLrjX6EAjTD/szMdj14M+FnQuClZLFfW5bAgoOjfNmLtJg==} engines: {node: '>=14.0.0'} @@ -3042,13 +3034,6 @@ packages: binary-search@1.3.6: resolution: {integrity: sha512-nbE1WxOTTrUWIfsfZ4aHGYu5DOuNkbxGokjV6Z2kxfJK3uaAb8zNK1muzOeipoLHZjInT4Br88BHpzevc681xA==} - bl@4.1.0: - resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==} - - body-parser@1.20.2: - resolution: {integrity: sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==} - engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16} - body-parser@1.20.3: resolution: {integrity: sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==} engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16} @@ -3066,9 +3051,6 @@ packages: buffer-equal-constant-time@1.0.1: resolution: {integrity: sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==} - buffer@5.7.1: - resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==} - bundle-require@4.0.2: resolution: {integrity: sha512-jwzPOChofl67PSTW2SGubV9HBQAhhR2i6nskiOThauo9dzwDUgOWQScFVaJkjEfYX+UXiD+LEx8EblQMc2wIag==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} @@ -3110,9 +3092,6 @@ packages: resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==} engines: {node: '>= 8.10.0'} - chownr@1.1.4: - resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==} - chownr@2.0.0: resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==} engines: {node: '>=10'} @@ -3281,14 +3260,6 @@ packages: resolution: {integrity: sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==} engines: {node: '>=8'} - decompress-response@6.0.0: - resolution: {integrity: sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==} - engines: {node: '>=10'} - - deep-extend@0.6.0: - resolution: {integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==} - engines: {node: '>=4.0.0'} - define-data-property@1.1.4: resolution: {integrity: sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==} engines: {node: '>= 0.4'} @@ -3445,10 +3416,6 @@ packages: resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==} engines: {node: '>=10'} - expand-template@2.0.3: - resolution: {integrity: sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==} - engines: {node: '>=6'} - expr-eval@2.0.2: resolution: {integrity: sha512-4EMSHGOPSwAfBiibw3ndnP0AvjDWLsMvGOvWEZ2F96IGk0bIVdjQisOHxReSkE13mHcfbuCiXw+G4y0zv6N8Eg==} @@ -3467,10 +3434,6 @@ packages: resolution: {integrity: sha512-6ypT4XfgqJk/F3Yuv4SX26I3doUjt0GTG4a+JgWxXQpxXzTBq8fPUeGHfcYMMDPHJHm3yPOSjaeBwBGAHWXCdA==} engines: {node: '>=18.0.0'} - farmhash@3.3.1: - resolution: {integrity: sha512-XUizHanzlr/v7suBr/o85HSakOoWh6HKXZjFYl5C2+Gj0f0rkw+XTUZzrd9odDsgI9G5tRUcF4wSbKaX04T0DQ==} - engines: {node: '>=10'} - fast-deep-equal@3.1.3: resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==} @@ -3517,25 +3480,10 @@ packages: find-package@1.0.0: resolution: {integrity: sha512-yVn71XCCaNgxz58ERTl8nA/8YYtIQDY9mHSrgFBfiFtdNNfY0h183Vh8BRkKxD8x9TUw3ec290uJKhDVxqGZBw==} - firebase-admin@12.1.0: - resolution: {integrity: sha512-bU7uPKMmIXAihWxntpY/Ma9zucn5y3ec+HQPqFQ/zcEfP9Avk9E/6D8u+yT/VwKHNZyg7yDVWOoJi73TIdR4Ww==} - engines: {node: '>=14'} - - firebase-admin@12.2.0: - resolution: {integrity: sha512-R9xxENvPA/19XJ3mv0Kxfbz9kPXd9/HrM4083LZWOO0qAQGheRzcCQamYRe+JSrV2cdKXP3ZsfFGTYMrFM0pJg==} - engines: {node: '>=14'} - firebase-admin@12.3.1: resolution: {integrity: sha512-vEr3s3esl8nPIA9r/feDT4nzIXCfov1CyyCSpMQWp6x63Q104qke0MEGZlrHUZVROtl8FLus6niP/M9I1s4VBA==} engines: {node: '>=14'} - firebase-functions@4.8.1: - resolution: {integrity: sha512-SHA7ZUlG+MOOsKyp+D4vhSyF4FsJMD+qyVUkTcPry6wbbxDitv9k4xgUPXffhbiokxFi1AbeckA8SGD41AZiCg==} - engines: {node: '>=14.10.0'} - hasBin: true - peerDependencies: - firebase-admin: ^10.0.0 || ^11.0.0 || ^12.0.0 - firebase-functions@5.0.1: resolution: {integrity: sha512-1m+crtgAR8Tl36gjpM02KCY5zduAejFmDSXvih/DB93apg39f0U/WwRgT7sitGIRqyCcIpktNUbXJv7Y9JOF4A==} engines: {node: '>=14.10.0'} @@ -3587,9 +3535,6 @@ packages: front-matter@4.0.2: resolution: {integrity: sha512-I8ZuJ/qG92NWX8i5x1Y8qyj3vizhXS31OxjKDu3LKP+7/qBgfIKValiZIEwoVoJKUHlhWtYrktkxV1XsX+pPlg==} - fs-constants@1.0.0: - resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==} - fs-minipass@2.1.0: resolution: {integrity: sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==} engines: {node: '>= 8'} @@ -3660,9 +3605,6 @@ packages: get-tsconfig@4.7.3: resolution: {integrity: sha512-ZvkrzoUA0PQZM6fy6+/Hce561s+faD1rsNwhnO5FelNjyy7EMGJ3Rz1AQ8GYDWjhRs/7dBLOEJvhK8MiEJOAFg==} - github-from-package@0.0.0: - resolution: {integrity: sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==} - glob-parent@5.1.2: resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==} engines: {node: '>= 6'} @@ -3820,9 +3762,6 @@ packages: resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==} engines: {node: '>=0.10.0'} - ieee754@1.2.1: - resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==} - ignore@5.3.1: resolution: {integrity: sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==} engines: {node: '>= 4'} @@ -3840,9 +3779,6 @@ packages: inherits@2.0.4: resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==} - ini@1.3.8: - resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==} - internal-slot@1.0.7: resolution: {integrity: sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==} engines: {node: '>= 0.4'} @@ -4348,10 +4284,6 @@ packages: resolution: {integrity: sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==} engines: {node: '>=8'} - mimic-response@3.1.0: - resolution: {integrity: sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==} - engines: {node: '>=10'} - minimatch@10.0.1: resolution: {integrity: sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==} engines: {node: 20 || >=22} @@ -4390,9 +4322,6 @@ packages: resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==} engines: {node: '>= 8'} - mkdirp-classic@0.5.3: - resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==} - mkdirp@1.0.4: resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==} engines: {node: '>=10'} @@ -4435,9 +4364,6 @@ packages: nan@2.19.0: resolution: {integrity: sha512-nO1xXxfh/RWNxfd/XPfbIfFk5vgLsAxUR9y5O0cHMJu/AW9U95JLXqthYHjEp+8gQ5p96K9jUp8nbVOxCdRbtw==} - napi-build-utils@1.0.2: - resolution: {integrity: sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==} - negotiator@0.6.3: resolution: {integrity: sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==} engines: {node: '>= 0.6'} @@ -4448,13 +4374,6 @@ packages: nice-try@1.0.5: resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==} - node-abi@3.62.0: - resolution: {integrity: sha512-CPMcGa+y33xuL1E0TcNIu4YyaZCxnnvkVaEXrsosR3FxN+fV8xvb7Mzpb7IgKler10qeMkE6+Dp8qJhpzdq35g==} - engines: {node: '>=10'} - - node-addon-api@5.1.0: - resolution: {integrity: sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA==} - node-domexception@1.0.0: resolution: {integrity: sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==} engines: {node: '>=10.5.0'} @@ -4705,11 +4624,6 @@ packages: resolution: {integrity: sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==} engines: {node: '>=0.10.0'} - prebuild-install@7.1.2: - resolution: {integrity: sha512-UnNke3IQb6sgarcZIDU3gbMeTp/9SSU1DAIkil7PrqG1vZlBtY5msYccSKSHDqa3hNg436IXK+SNImReuA1wEQ==} - engines: {node: '>=10'} - hasBin: true - prettier-plugin-organize-imports@3.2.4: resolution: {integrity: sha512-6m8WBhIp0dfwu0SkgfOxJqh+HpdyfqSSLfKKRZSFbDuEQXDDndb8fTpRWkUrX/uBenkex3MgnVk0J3b3Y5byog==} peerDependencies: @@ -4787,10 +4701,6 @@ packages: resolution: {integrity: sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==} engines: {node: '>= 0.8'} - rc@1.2.8: - resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==} - hasBin: true - read-pkg@3.0.0: resolution: {integrity: sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==} engines: {node: '>=4'} @@ -4960,9 +4870,6 @@ packages: simple-get@3.1.1: resolution: {integrity: sha512-CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA==} - simple-get@4.0.1: - resolution: {integrity: sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==} - simple-swizzle@0.2.2: resolution: {integrity: sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==} @@ -5048,10 +4955,6 @@ packages: resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==} engines: {node: '>=6'} - strip-json-comments@2.0.1: - resolution: {integrity: sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==} - engines: {node: '>=0.10.0'} - strnum@1.0.5: resolution: {integrity: sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==} @@ -5075,13 +4978,6 @@ packages: resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==} engines: {node: '>= 0.4'} - tar-fs@2.1.1: - resolution: {integrity: sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==} - - tar-stream@2.2.0: - resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==} - engines: {node: '>=6'} - tar@6.2.1: resolution: {integrity: sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==} engines: {node: '>=10'} @@ -5159,9 +5055,6 @@ packages: engines: {node: '>=18.0.0'} hasBin: true - tunnel-agent@0.6.0: - resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==} - type-is@1.6.18: resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==} engines: {node: '>= 0.6'} @@ -5493,8 +5386,6 @@ snapshots: '@esbuild/win32-x64@0.19.12': optional: true - '@fastify/busboy@2.1.1': {} - '@fastify/busboy@3.0.0': {} '@firebase/app-check-interop-types@0.3.1': {} @@ -5590,17 +5481,6 @@ snapshots: - encoding - supports-color - '@google-cloud/firestore@7.8.0(encoding@0.1.13)': - dependencies: - fast-deep-equal: 3.1.3 - functional-red-black-tree: 1.0.1 - google-gax: 4.3.7(encoding@0.1.13) - protobufjs: 7.3.2 - transitivePeerDependencies: - - encoding - - supports-color - optional: true - '@google-cloud/firestore@7.9.0(encoding@0.1.13)': dependencies: fast-deep-equal: 3.1.3 @@ -6813,29 +6693,6 @@ snapshots: binary-search@1.3.6: {} - bl@4.1.0: - dependencies: - buffer: 5.7.1 - inherits: 2.0.4 - readable-stream: 3.6.2 - - body-parser@1.20.2: - dependencies: - bytes: 3.1.2 - content-type: 1.0.5 - debug: 2.6.9 - depd: 2.0.0 - destroy: 1.2.0 - http-errors: 2.0.0 - iconv-lite: 0.4.24 - on-finished: 2.4.1 - qs: 6.11.0 - raw-body: 2.5.2 - type-is: 1.6.18 - unpipe: 1.0.0 - transitivePeerDependencies: - - supports-color - body-parser@1.20.3: dependencies: bytes: 3.1.2 @@ -6868,11 +6725,6 @@ snapshots: buffer-equal-constant-time@1.0.1: {} - buffer@5.7.1: - dependencies: - base64-js: 1.5.1 - ieee754: 1.2.1 - bundle-require@4.0.2(esbuild@0.19.12): dependencies: esbuild: 0.19.12 @@ -6927,8 +6779,6 @@ snapshots: optionalDependencies: fsevents: 2.3.3 - chownr@1.1.4: {} - chownr@2.0.0: optional: true @@ -7089,12 +6939,6 @@ snapshots: mimic-response: 2.1.0 optional: true - decompress-response@6.0.0: - dependencies: - mimic-response: 3.1.0 - - deep-extend@0.6.0: {} - define-data-property@1.1.4: dependencies: es-define-property: 1.0.0 @@ -7116,7 +6960,8 @@ snapshots: destroy@1.2.0: {} - detect-libc@2.0.3: {} + detect-libc@2.0.3: + optional: true digest-fetch@1.3.0: dependencies: @@ -7305,8 +7150,6 @@ snapshots: signal-exit: 3.0.7 strip-final-newline: 2.0.0 - expand-template@2.0.3: {} - expr-eval@2.0.2: {} express@4.20.0: @@ -7385,11 +7228,6 @@ snapshots: farmhash-modern@1.1.0: {} - farmhash@3.3.1: - dependencies: - node-addon-api: 5.1.0 - prebuild-install: 7.1.2 - fast-deep-equal@3.1.3: {} fast-glob@3.3.2: @@ -7459,44 +7297,6 @@ snapshots: dependencies: parents: 1.0.1 - firebase-admin@12.1.0(encoding@0.1.13): - dependencies: - '@fastify/busboy': 2.1.1 - '@firebase/database-compat': 1.0.4 - '@firebase/database-types': 1.0.2 - '@types/node': 20.11.30 - farmhash: 3.3.1 - jsonwebtoken: 9.0.2 - jwks-rsa: 3.1.0 - long: 5.2.3 - node-forge: 1.3.1 - uuid: 9.0.1 - optionalDependencies: - '@google-cloud/firestore': 7.8.0(encoding@0.1.13) - '@google-cloud/storage': 7.10.1(encoding@0.1.13) - transitivePeerDependencies: - - encoding - - supports-color - - firebase-admin@12.2.0(encoding@0.1.13): - dependencies: - '@fastify/busboy': 2.1.1 - '@firebase/database-compat': 1.0.4 - '@firebase/database-types': 1.0.2 - '@types/node': 20.11.30 - farmhash-modern: 1.1.0 - jsonwebtoken: 9.0.2 - jwks-rsa: 3.1.0 - long: 5.2.3 - node-forge: 1.3.1 - uuid: 10.0.0 - optionalDependencies: - '@google-cloud/firestore': 7.8.0(encoding@0.1.13) - '@google-cloud/storage': 7.10.1(encoding@0.1.13) - transitivePeerDependencies: - - encoding - - supports-color - firebase-admin@12.3.1(encoding@0.1.13): dependencies: '@fastify/busboy': 3.0.0 @@ -7515,26 +7315,13 @@ snapshots: - encoding - supports-color - firebase-functions@4.8.1(encoding@0.1.13)(firebase-admin@12.2.0(encoding@0.1.13)): - dependencies: - '@types/cors': 2.8.17 - '@types/express': 4.17.3 - cors: 2.8.5 - express: 4.21.0 - firebase-admin: 12.2.0(encoding@0.1.13) - node-fetch: 2.7.0(encoding@0.1.13) - protobufjs: 7.2.6 - transitivePeerDependencies: - - encoding - - supports-color - - firebase-functions@5.0.1(firebase-admin@12.1.0(encoding@0.1.13)): + firebase-functions@5.0.1(firebase-admin@12.3.1(encoding@0.1.13)): dependencies: '@types/cors': 2.8.17 '@types/express': 4.17.3 cors: 2.8.5 express: 4.21.0 - firebase-admin: 12.1.0(encoding@0.1.13) + firebase-admin: 12.3.1(encoding@0.1.13) protobufjs: 7.2.6 transitivePeerDependencies: - supports-color @@ -7583,8 +7370,6 @@ snapshots: dependencies: js-yaml: 3.14.1 - fs-constants@1.0.0: {} - fs-minipass@2.1.0: dependencies: minipass: 3.3.6 @@ -7688,8 +7473,6 @@ snapshots: dependencies: resolve-pkg-maps: 1.0.0 - github-from-package@0.0.0: {} - glob-parent@5.1.2: dependencies: is-glob: 4.0.3 @@ -7961,8 +7744,6 @@ snapshots: dependencies: safer-buffer: 2.1.2 - ieee754@1.2.1: {} - ignore@5.3.1: {} import-in-the-middle@1.11.0: @@ -7982,8 +7763,6 @@ snapshots: inherits@2.0.4: {} - ini@1.3.8: {} - internal-slot@1.0.7: dependencies: es-errors: 1.3.0 @@ -8411,8 +8190,6 @@ snapshots: mimic-response@2.1.0: optional: true - mimic-response@3.1.0: {} - minimatch@10.0.1: dependencies: brace-expansion: 2.0.1 @@ -8449,8 +8226,6 @@ snapshots: yallist: 4.0.0 optional: true - mkdirp-classic@0.5.3: {} - mkdirp@1.0.4: optional: true @@ -8494,20 +8269,12 @@ snapshots: nan@2.19.0: optional: true - napi-build-utils@1.0.2: {} - negotiator@0.6.3: {} neo-async@2.6.2: {} nice-try@1.0.5: {} - node-abi@3.62.0: - dependencies: - semver: 7.6.0 - - node-addon-api@5.1.0: {} - node-domexception@1.0.0: {} node-ensure@0.0.0: {} @@ -8746,21 +8513,6 @@ snapshots: dependencies: xtend: 4.0.2 - prebuild-install@7.1.2: - dependencies: - detect-libc: 2.0.3 - expand-template: 2.0.3 - github-from-package: 0.0.0 - minimist: 1.2.8 - mkdirp-classic: 0.5.3 - napi-build-utils: 1.0.2 - node-abi: 3.62.0 - pump: 3.0.0 - rc: 1.2.8 - simple-get: 4.0.1 - tar-fs: 2.1.1 - tunnel-agent: 0.6.0 - prettier-plugin-organize-imports@3.2.4(prettier@3.2.5)(typescript@4.9.5): dependencies: prettier: 3.2.5 @@ -8851,13 +8603,6 @@ snapshots: iconv-lite: 0.4.24 unpipe: 1.0.0 - rc@1.2.8: - dependencies: - deep-extend: 0.6.0 - ini: 1.3.8 - minimist: 1.2.8 - strip-json-comments: 2.0.1 - read-pkg@3.0.0: dependencies: load-json-file: 4.0.0 @@ -9081,7 +8826,8 @@ snapshots: signal-exit@4.1.0: {} - simple-concat@1.0.1: {} + simple-concat@1.0.1: + optional: true simple-get@3.1.1: dependencies: @@ -9090,12 +8836,6 @@ snapshots: simple-concat: 1.0.1 optional: true - simple-get@4.0.1: - dependencies: - decompress-response: 6.0.0 - once: 1.4.0 - simple-concat: 1.0.1 - simple-swizzle@0.2.2: dependencies: is-arrayish: 0.3.2 @@ -9188,8 +8928,6 @@ snapshots: strip-final-newline@2.0.0: {} - strip-json-comments@2.0.1: {} - strnum@1.0.5: optional: true @@ -9215,21 +8953,6 @@ snapshots: supports-preserve-symlinks-flag@1.0.0: {} - tar-fs@2.1.1: - dependencies: - chownr: 1.1.4 - mkdirp-classic: 0.5.3 - pump: 3.0.0 - tar-stream: 2.2.0 - - tar-stream@2.2.0: - dependencies: - bl: 4.1.0 - end-of-stream: 1.4.4 - fs-constants: 1.0.0 - inherits: 2.0.4 - readable-stream: 3.6.2 - tar@6.2.1: dependencies: chownr: 2.0.0 @@ -9316,10 +9039,6 @@ snapshots: optionalDependencies: fsevents: 2.3.3 - tunnel-agent@0.6.0: - dependencies: - safe-buffer: 5.2.1 - type-is@1.6.18: dependencies: media-typer: 0.3.0 diff --git a/js/testapps/cat-eval/package.json b/js/testapps/cat-eval/package.json index 3d618f2ee..788feefb5 100644 --- 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 index e74f0f25f..43ad7f34c 100644 --- 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 index 0f230e14d..d525b2b8b 100644 --- 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 index 1fe48c994..6d37f0807 100644 --- 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 index 1bf7ab043..b990a26db 100644 --- 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:*",