Skip to content
This repository was archived by the owner on Sep 13, 2024. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions fireway.d.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
export interface MigrateOptions {
app: import("firebase-admin").app.App;
firestore: import("@google-cloud/firestore").Firestore;
FieldValue: typeof import("@google-cloud/firestore").FieldValue;
FieldPath: typeof import("@google-cloud/firestore").FieldPath;
Timestamp: typeof import("@google-cloud/firestore").Timestamp;
app: import("firebase-admin/app").App;
firestore: import("firebase-admin/firestore").Firestore;
FieldValue: typeof import("firebase-admin/firestore").FieldValue;
FieldPath: typeof import("firebase-admin/firestore").FieldPath;
Timestamp: typeof import("firebase-admin/firestore").Timestamp;
dryrun: boolean;
}
13 changes: 8 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,23 +33,26 @@
"pre-push": "yarn test"
}
},
"peerDependencies": {
"firebase-admin": ">=10"
},
"dependencies": {
"@google-cloud/firestore": "^5.0.2",
"callsites": "^3.1.0",
"firebase-admin": "^10.1.0",
"md5": "^2.2.1",
"sade": "^1.6.1",
"semver": "^7.3.7"
},
"devDependencies": {
"@firebase/rules-unit-testing": "^1.0.4",
"@firebase/rules-unit-testing": "^2.0.7",
"@types/node": "^14.18.16",
"capture-console": "^1.0.1",
"firebase-tools": "^10.7.2",
"firebase": "^9.21.0",
"firebase-admin": "^11.7.0",
"firebase-tools": "^11.29.1",
"husky": "^4.2.5",
"start-server-and-test": "^1.14.0",
"tape": "^4.13.2",
"ts-node": "^10.7.0",
"@types/node": "^14.18.16",
"typescript": "^4.6.4"
}
}
6 changes: 3 additions & 3 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ const util = require('util');
const os = require('os');
const fs = require('fs');
const md5 = require('md5');
const admin = require('firebase-admin');
const {Firestore, WriteBatch, CollectionReference, FieldValue, FieldPath, Timestamp} = require('@google-cloud/firestore');
const { initializeApp } = require('firebase-admin/app');
const {Firestore, WriteBatch, CollectionReference, FieldValue, FieldPath, Timestamp} = require('firebase-admin/firestore');
const semver = require('semver');
const asyncHooks = require('async_hooks');
const callsites = require('callsites');
Expand Down Expand Up @@ -289,7 +289,7 @@ async function migrate({path: dir, projectId, storageBucket, dryrun, app, debug

const providedApp = app;
if (!app) {
app = admin.initializeApp({
app = initializeApp({
projectId,
storageBucket
});
Expand Down
8 changes: 4 additions & 4 deletions tests/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const test = require('tape');
const firebase = require('@firebase/rules-unit-testing');
const { initializeTestEnvironment } = require('@firebase/rules-unit-testing');
const terminal = require('./console-tester');
let fireway = require('../');

Expand Down Expand Up @@ -30,9 +30,9 @@ async function setup() {
terminal.reset();

const projectId = `fireway-test-${Date.now()}`;
const app = await firebase.initializeAdminApp({projectId});
const firestore = app.firestore();
return {projectId, firestore, app};
const testEnv = await initializeTestEnvironment({projectId});
const firestore = testEnv.unauthenticatedContext().firestore();
return {projectId, firestore, app: null};
}

async function assertData(t, firestore, path, value) {
Expand Down
Loading