Skip to content

Fix usingFirebaseJsSdk #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 24, 2023
Merged

Fix usingFirebaseJsSdk #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@ type Server = typeof import('./angular/index.js') |
import type { Request } from 'firebase-functions/v2/https';
import type { Response } from 'express';

import { isUsingFirebaseJsSdk } from './utils.js'

const dirname = process.env.__FIREBASE_FRAMEWORKS_ENTRY__;
const usingFirebaseJsSdk = !!process.env.__FIREBASE_DEFAULTS__;
const usingFirebaseJsSdk = await isUsingFirebaseJsSdk();
const basename = usingFirebaseJsSdk ? 'firebase-aware' : 'index';

// .env isn't parsed for Cloud Functions discovery during deploy, handle undefined
Expand Down
11 changes: 11 additions & 0 deletions src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
export async function isUsingFirebaseJsSdk() {
if(!process.env.__FIREBASE_DEFAULTS__) return false;

try {
await import('firebase/app');

return true
} catch (e) {
return false;
}
}
Copy link
Collaborator

@alexastrum alexastrum Jun 24, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: line break at end of files.

Copy link
Contributor Author

@leoortizz leoortizz Jun 25, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see, there's no prettier config in this repo though, we should add it, probably use the same config as the CLI