Skip to content

Commit 43e4b6c

Browse files
authored
Merge pull request #2893 from firebase/master
sync next with master
2 parents 3c04e6e + 9c2842f commit 43e4b6c

8 files changed

Lines changed: 745 additions & 2071 deletions

File tree

firestore-bigquery-export/firestore-bigquery-change-tracker/package-lock.json

Lines changed: 497 additions & 613 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

firestore-bigquery-export/firestore-bigquery-change-tracker/package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"main": "./lib/index.js",
1111
"scripts": {
1212
"build": "npm run clean && npm run compile",
13-
"clean": "rimraf lib",
13+
"clean": "node -e \"require('fs').rmSync('lib', { recursive: true, force: true })\"",
1414
"compile": "tsc",
1515
"test:local": "jest",
1616
"prepare": "npm run build",
@@ -27,7 +27,6 @@
2727
"@google-cloud/resource-manager": "^5.1.0",
2828
"firebase-admin": "^13.2.0",
2929
"firebase-functions": "^6.3.2",
30-
"node-fetch": "^2.6.1",
3130
"sql-formatter": "^2.3.3",
3231
"traverse": "^0.6.6"
3332
},
@@ -43,7 +42,6 @@
4342
"jest-summarizing-reporter": "^1.1.4",
4443
"mocked-env": "^1.3.2",
4544
"nyc": "^17.1.0",
46-
"rimraf": "^2.6.3",
4745
"ts-jest": "29.4.9",
4846
"typescript": "^4.9.4",
4947
"wait-for-expect": "^3.0.2"

firestore-bigquery-export/firestore-bigquery-change-tracker/src/bigquery/index.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import * as bigquery from "@google-cloud/bigquery";
1717
import { DocumentReference } from "firebase-admin/firestore";
1818
import * as traverse from "traverse";
19-
import fetch from "node-fetch";
2019
import {
2120
RawChangelogSchema,
2221
documentIdField,
@@ -125,7 +124,7 @@ export class FirestoreBigQueryEventHistoryTracker
125124
body: JSON.stringify({ data: rows }),
126125
headers: { "Content-Type": "application/json" },
127126
});
128-
const responseJson = await response.json();
127+
const responseJson: any = await response.json();
129128
// To support callable functions, first check result.data
130129
return responseJson?.result?.data ?? responseJson.data;
131130
}

firestore-bigquery-export/functions/package-lock.json

Lines changed: 240 additions & 1446 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

firestore-bigquery-export/functions/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"scripts": {
66
"build": "npm run clean && npm run compile",
77
"prepare": "npm run build",
8-
"clean": "rimraf lib",
8+
"clean": "node -e \"require('fs').rmSync('lib', { recursive: true, force: true })\"",
99
"compile": "tsc -p tsconfig.build.json",
1010
"test": "jest",
1111
"generate-readme": "firebase ext:info .. --markdown > ../README.md"
@@ -20,7 +20,6 @@
2020
"firebase-functions": "^6.3.2",
2121
"generate-schema": "^2.6.0",
2222
"lodash": "^4.17.14",
23-
"rimraf": "^6.1.3",
2423
"sql-formatter": "^2.3.3",
2524
"typescript": "^4.8.4"
2625
},

firestore-bigquery-export/scripts/gen-schema-view/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"scripts": {
1212
"build": "npm run clean && npm run compile",
13-
"clean": "rimraf ./lib",
13+
"clean": "node -e \"require('fs').rmSync('lib', { recursive: true, force: true })\"",
1414
"compile": "tsc && copyfiles \"src/__tests__/fixtures/**/*\" lib/__tests__",
1515
"gen-schema-views": "node ./lib/index.js",
1616
"prepare": "npm run build",
@@ -31,7 +31,7 @@
3131
"author": "Jan Wyszynski <wyszynski@google.com>",
3232
"license": "Apache-2.0",
3333
"dependencies": {
34-
"@firebaseextensions/firestore-bigquery-change-tracker": "^2.0.2",
34+
"@firebaseextensions/firestore-bigquery-change-tracker": "^2.0.3",
3535
"@genkit-ai/googleai": "^1.14.1",
3636
"@google-cloud/bigquery": "^8.1.1",
3737
"commander": "5.1.0",

firestore-bigquery-export/scripts/import/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"scripts": {
1212
"build": "npm run clean && npm run compile",
1313
"build-watch": "npm run clean && tsc --watch",
14-
"clean": "rimraf ./lib",
14+
"clean": "node -e \"require('fs').rmSync('lib', { recursive: true, force: true })\"",
1515
"compile": "tsc",
1616
"import": "node ./lib/index.js",
1717
"prepare": "npm run build",
@@ -28,7 +28,7 @@
2828
"author": "Jan Wyszynski <wyszynski@google.com>",
2929
"license": "Apache-2.0",
3030
"dependencies": {
31-
"@firebaseextensions/firestore-bigquery-change-tracker": "^2.0.2",
31+
"@firebaseextensions/firestore-bigquery-change-tracker": "^2.0.3",
3232
"@google-cloud/bigquery": "^5.6.0",
3333
"commander": "5.1.0",
3434
"filenamify": "^4.2.0",

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"format": "prettier --write \"**/*.{js,md,yml,ts,json,yaml}\"",
88
"lint": "prettier --list-different \"**/*.{js,md,yml,ts,json,yaml}\"",
99
"clean": "lerna run --parallel clean && lerna clean",
10-
"build": "lerna run build",
10+
"build": "lerna run --sort build",
1111
"local:emulator": "cd _emulator && firebase emulators:start -P demo-test",
1212
"test": "cd _emulator && firebase emulators:exec jest -P demo-test",
1313
"test:ci": "cd _emulator && firebase emulators:exec \"CI_TEST=true jest --detectOpenHandles --verbose --forceExit\" -P demo-test",

0 commit comments

Comments
 (0)