fix: replaced firebase dependencies to root dependency. (#941)

MoralisWeb3 · Jan 4, 2023 · 11b751d · 11b751d · github-actions · Jan 4, 2023
1 parent 878d86b
commit 11b751d
Show file tree

Hide file tree

Showing 21 changed files with 73 additions and 182 deletions.
diff --git a/.changeset/early-cats-wave.md b/.changeset/early-cats-wave.md
@@ -0,0 +1,10 @@
+---
+'@moralisweb3/client-firebase-auth-utils': patch
+'@moralisweb3/client-firebase-api-utils': patch
+'@moralisweb3/client-firebase-evm-auth': patch
+'@moralisweb3/client-firebase-sol-auth': patch
+'@moralisweb3/client-firebase-evm-api': patch
+'@moralisweb3/client-firebase-sol-api': patch
+---
+
+Replaced Firebase dependencies to single root dependency (`firebase`).
diff --git a/demos/firebase-auth-ext/hosting/package.json b/demos/firebase-auth-ext/hosting/package.json
@@ -10,7 +10,7 @@
     "@walletconnect/web3-provider": "^1.8.0",
     "assert": "^2.0.0",
     "buffer": "^6.0.3",
-    "firebase": "^9.10.0",
+    "firebase": "^9.15.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-scripts": "5.0.1",

diff --git a/demos/firebase-auth-ext/hosting/src/App.tsx b/demos/firebase-auth-ext/hosting/src/App.tsx
@@ -1,7 +1,7 @@
 import { signInWithMoralis as signInWithMoralisByEvm } from '@moralisweb3/client-firebase-evm-auth';
 import { signInWithMoralis as signInWithMoralisBySolana } from '@moralisweb3/client-firebase-sol-auth';
-import { httpsCallable } from '@firebase/functions';
-import { User } from '@firebase/auth';
+import { httpsCallable } from 'firebase/functions';
+import { User } from 'firebase/auth';
 import { Fragment, useState } from 'react';
 import { auth, functions, moralisAuth } from './firebase';
 import WalletConnectProvider from '@walletconnect/web3-provider';

diff --git a/demos/firebase-auth-ext/hosting/src/firebase.ts b/demos/firebase-auth-ext/hosting/src/firebase.ts
@@ -1,6 +1,6 @@
-import { initializeApp } from '@firebase/app';
-import { getAuth, browserSessionPersistence } from '@firebase/auth';
-import { connectFunctionsEmulator, getFunctions } from '@firebase/functions';
+import { initializeApp } from 'firebase/app';
+import { getAuth, browserSessionPersistence } from 'firebase/auth';
+import { connectFunctionsEmulator, getFunctions } from 'firebase/functions';
 import { getMoralisAuth } from '@moralisweb3/client-firebase-auth-utils';
 
 export const app = initializeApp({

diff --git a/demos/firebase-nextjs/hosting/components/Firebase.ts b/demos/firebase-nextjs/hosting/components/Firebase.ts
@@ -20,10 +20,10 @@ export async function initializeFirebase(): Promise<Firebase> {
     appId: String(process.env.NEXT_PUBLIC_FIREBASE_APP_ID),
   });
 
-  const auth = getAuth();
+  const auth = getAuth(app);
   await auth.setPersistence(browserSessionPersistence);
 
-  const functions = getFunctions();
+  const functions = getFunctions(app);
   if (window.location.hostname === 'localhost') {
     connectFunctionsEmulator(functions, 'localhost', 5001);
   }

diff --git a/packages/client/firebaseApiUtils/package.json b/packages/client/firebaseApiUtils/package.json
@@ -20,11 +20,8 @@
     "typescript": "^4.9.3"
   },
   "dependencies": {
-    "@firebase/app": "^0.8.4",
-    "@firebase/app-types": "^0.8.1",
-    "@firebase/functions": "^0.8.8",
     "@moralisweb3/client-api-utils": "^2.11.0",
     "@moralisweb3/common-core": "^2.11.0",
-    "firebase": "^9.13.0"
+    "firebase": "^9.15.0"
   }
 }
diff --git a/packages/client/firebaseApiUtils/src/FirebaseClientRequestHandler.ts b/packages/client/firebaseApiUtils/src/FirebaseClientRequestHandler.ts
@@ -10,7 +10,7 @@ import {
   PaginationReader,
   ResponseAdapter,
 } from '@moralisweb3/common-core';
-import { httpsCallable, Functions } from '@firebase/functions';
+import { httpsCallable, Functions } from 'firebase/functions';
 
 export class FirebaseClientRequestHandler implements ClientRequestHandler {
   private readonly functionName: string;

diff --git a/packages/client/firebaseAuthUtils/package.json b/packages/client/firebaseAuthUtils/package.json
@@ -19,10 +19,6 @@
     "typescript": "^4.9.3"
   },
   "dependencies": {
-    "@firebase/app": "^0.8.4",
-    "@firebase/app-types": "^0.8.1",
-    "@firebase/auth": "^0.20.11",
-    "@firebase/functions": "^0.8.8",
-    "firebase": "^9.13.0"
+    "firebase": "^9.15.0"
   }
 }
diff --git a/packages/client/firebaseAuthUtils/src/getMoralisAuth.ts b/packages/client/firebaseAuthUtils/src/getMoralisAuth.ts
@@ -1,6 +1,6 @@
-import { Functions, getFunctions } from '@firebase/functions';
-import { FirebaseApp } from '@firebase/app';
-import { Auth, getAuth } from '@firebase/auth';
+import { Functions, getFunctions } from 'firebase/functions';
+import { FirebaseApp } from 'firebase/app';
+import { Auth, getAuth } from 'firebase/auth';
 
 export interface MoralisAuth {
   auth: Auth;

diff --git a/packages/client/firebaseAuthUtils/src/issueToken.ts b/packages/client/firebaseAuthUtils/src/issueToken.ts
@@ -1,4 +1,4 @@
-import { httpsCallable } from '@firebase/functions';
+import { httpsCallable } from 'firebase/functions';
 import { MoralisAuth } from './getMoralisAuth';
 import { SignInContext } from './requestMessage';
 

diff --git a/packages/client/firebaseAuthUtils/src/requestMessage.ts b/packages/client/firebaseAuthUtils/src/requestMessage.ts
@@ -1,4 +1,4 @@
-import { httpsCallable } from '@firebase/functions';
+import { httpsCallable } from 'firebase/functions';
 import { MoralisAuth } from './getMoralisAuth';
 import { NetworkType } from './NetworkType';
 

diff --git a/packages/client/firebaseEvmApi/package.json b/packages/client/firebaseEvmApi/package.json
@@ -20,13 +20,10 @@
     "typescript": "^4.9.3"
   },
   "dependencies": {
-    "@firebase/app": "^0.8.4",
-    "@firebase/app-types": "^0.8.1",
-    "@firebase/functions": "^0.8.8",
     "@moralisweb3/client-evm-api": "^2.11.0",
     "@moralisweb3/client-firebase-api-utils": "^2.11.0",
     "@moralisweb3/common-core": "^2.11.0",
     "@moralisweb3/common-evm-utils": "^2.11.0",
-    "firebase": "^9.13.0"
+    "firebase": "^9.15.0"
   }
 }
diff --git a/packages/client/firebaseEvmApi/src/getMoralisEvmApi.ts b/packages/client/firebaseEvmApi/src/getMoralisEvmApi.ts
@@ -1,6 +1,6 @@
-import { FirebaseApp } from '@firebase/app';
+import { FirebaseApp } from 'firebase/app';
+import { Functions, getFunctions } from 'firebase/functions';
 import { ClientEvmApi } from '@moralisweb3/client-evm-api';
-import { Functions, getFunctions } from '@firebase/functions';
 import { CommonEvmUtils } from '@moralisweb3/common-evm-utils';
 import { Core } from '@moralisweb3/common-core';
 import { FirebaseClientRequestHandler } from '@moralisweb3/client-firebase-api-utils';

diff --git a/packages/client/firebaseEvmAuth/package.json b/packages/client/firebaseEvmAuth/package.json
@@ -20,10 +20,8 @@
   },
   "dependencies": {
     "@ethersproject/providers": "^5.7.1",
-    "@firebase/app": "^0.8.4",
-    "@firebase/auth": "^0.20.11",
     "@metamask/detect-provider": "^1.2.0",
     "@moralisweb3/client-firebase-auth-utils": "^2.11.0",
-    "firebase": "^9.10.0"
+    "firebase": "^9.15.0"
   }
 }
diff --git a/packages/client/firebaseEvmAuth/src/signInWithMoralis.ts b/packages/client/firebaseEvmAuth/src/signInWithMoralis.ts
@@ -1,4 +1,4 @@
-import { signInWithCustomToken, UserCredential } from '@firebase/auth';
+import { signInWithCustomToken, UserCredential } from 'firebase/auth';
 import { JsonRpcProvider, Web3Provider } from '@ethersproject/providers';
 import { MoralisAuth, requestMessage, issueToken } from '@moralisweb3/client-firebase-auth-utils';
 import detectEthereumProvider from '@metamask/detect-provider';

diff --git a/packages/client/firebaseSolApi/package.json b/packages/client/firebaseSolApi/package.json
@@ -20,13 +20,10 @@
     "typescript": "^4.9.3"
   },
   "dependencies": {
-    "@firebase/app": "^0.8.4",
-    "@firebase/app-types": "^0.8.1",
-    "@firebase/functions": "^0.8.8",
     "@moralisweb3/client-firebase-api-utils": "^2.11.0",
     "@moralisweb3/client-sol-api": "^2.11.0",
     "@moralisweb3/common-core": "^2.11.0",
     "@moralisweb3/common-sol-utils": "^2.11.0",
-    "firebase": "^9.10.0"
+    "firebase": "^9.15.0"
   }
 }
diff --git a/packages/client/firebaseSolApi/src/getMoralisSolApi.ts b/packages/client/firebaseSolApi/src/getMoralisSolApi.ts
@@ -1,6 +1,6 @@
-import { FirebaseApp } from '@firebase/app';
+import { FirebaseApp } from 'firebase/app';
+import { Functions, getFunctions } from 'firebase/functions';
 import { ClientSolApi } from '@moralisweb3/client-sol-api';
-import { Functions, getFunctions } from '@firebase/functions';
 import { CommonSolUtils } from '@moralisweb3/common-sol-utils';
 import { Core } from '@moralisweb3/common-core';
 import { FirebaseClientRequestHandler } from '@moralisweb3/client-firebase-api-utils';

diff --git a/packages/client/firebaseSolAuth/package.json b/packages/client/firebaseSolAuth/package.json
@@ -19,11 +19,8 @@
     "typescript": "^4.9.3"
   },
   "dependencies": {
-    "@firebase/app": "^0.8.4",
-    "@firebase/app-types": "^0.8.1",
-    "@firebase/auth": "^0.20.11",
     "@moralisweb3/client-firebase-auth-utils": "^2.11.0",
     "bs58": "^5.0.0",
-    "firebase": "^9.10.0"
+    "firebase": "^9.15.0"
   }
 }
diff --git a/packages/client/firebaseSolAuth/src/signInWithMoralis.ts b/packages/client/firebaseSolAuth/src/signInWithMoralis.ts
@@ -1,4 +1,4 @@
-import { signInWithCustomToken, UserCredential } from '@firebase/auth';
+import { signInWithCustomToken, UserCredential } from 'firebase/auth';
 import { MoralisAuth, requestMessage, issueToken, SolanaNetwork } from '@moralisweb3/client-firebase-auth-utils';
 import { encode } from 'bs58';
 import { SolanaProvider } from './SolanaProvider';

diff --git a/scripts/findMissingDependencies.js b/scripts/findMissingDependencies.js
@@ -8,6 +8,10 @@ const SKIP_DIRECTORIES = ['lib', 'integration', 'node_modules', 'template'];
 
 const IGNORE_DEPENDENCIES = ['path', 'lodash', 'child_process', 'fs'];
 
+const FORBIDDEN_DEPENDENCIES = [
+  /^@firebase\//, // Use root package instead (`import * from 'firebase'`, `import * from 'firebase/auth'`)
+];
+
 function findPackages(dirPath) {
   const result = [];
   fs.readdirSync(dirPath).forEach((fileName) => {
@@ -86,7 +90,10 @@ function findPackageMissingDependencies(packageDirPath) {
     }
     return result;
   }, []);
-  return { missing, total: imports.length };
+  const forbidden = FORBIDDEN_DEPENDENCIES.filter((regexp) => {
+    return imports.some((imp) => regexp.test(imp)) || dependenciesList.some((dep) => regexp.test(dep));
+  });
+  return { missing, forbidden, total: imports.length };
 }
 
 const repositoryPath = path.resolve(__dirname, '..');
@@ -101,8 +108,10 @@ for (const packagePath of allPackagePaths) {
   const result = findPackageMissingDependencies(packagePath);
   if (!result) {
     console.log(`⏩ Package ${packageName} is private`);
-  } else if (result.missing.length > 0) {
-    console.log(`❌ Package ${packageName} has missing dependencies:\n* ${result.missing.join('\n* ')}\n`);
+  } else if (result.missing.length > 0 || result.forbidden.length > 0) {
+    const missing = result.missing.map((d) => `* [missing] ${d}`).join('\n');
+    const forbidden = result.forbidden.map((d) => `* [forbidden] ${d}`).join('\n');
+    console.log(`❌ Package ${packageName} is invalid:\n${missing}\n${forbidden}`);
     exitCode = 1;
   } else {
     console.log(`✅ Package ${packageName} is valid (${result.total} dependencies)`);
Title	Statements	Branches	Functions
api-utils	26.34% (49/186)	19.14% (9/47)	22.85% (8/35)
auth	92.77% (77/83)	81.81% (18/22)	90% (18/20)
evm-api	100% (81/81)	66.66% (6/9)	100% (49/49)
common-evm-utils	64.67% (974/1506)	19.44% (127/653)	35.25% (208/590)
sol-api	96.66% (29/30)	66.66% (6/9)	91.66% (11/12)
common-sol-utils	73.77% (135/183)	60% (12/20)	65.67% (44/67)
common-streams-utils	94% (1066/1134)	81.42% (399/490)	86.74% (373/430)
streams	89.35% (512/573)	68.05% (49/72)	88.98% (105/118)