Skip to content

Commit

Permalink
Merge branch 'master' into jh-catch-arch
Browse files Browse the repository at this point in the history
  • Loading branch information
joehan authored Dec 4, 2024
2 parents 2636226 + 9ad8df3 commit 19b5177
Show file tree
Hide file tree
Showing 6 changed files with 59 additions and 20 deletions.
13 changes: 11 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,16 @@ module.exports = {
"require-atomic-updates": "off", // This rule is so noisy and isn't useful: https://github.com/eslint/eslint/issues/11899
"require-jsdoc": "off", // This rule is deprecated and superseded by jsdoc/require-jsdoc.
"valid-jsdoc": "off", // This is deprecated but included in recommended configs.

"brikke/no-undeclared-imports": [
"error",
{
excludedFilePatterns: ["**/scripts/**/*", `update-notifier-cjs.d.ts`],
excludedModules: [
/node:/,
"express-serve-static-core", // We rely on just the types, and the package breaks our build.
],
},
],
"no-prototype-builtins": "warn", // TODO(bkendall): remove, allow to error.
"no-useless-escape": "warn", // TODO(bkendall): remove, allow to error.
"prefer-promise-reject-errors": "warn", // TODO(bkendall): remove, allow to error.
Expand Down Expand Up @@ -107,7 +116,7 @@ module.exports = {
sourceType: "module",
warnOnUnsupportedTypeScriptVersion: false,
},
plugins: ["prettier", "@typescript-eslint", "jsdoc"],
plugins: ["prettier", "@typescript-eslint", "jsdoc", "brikke"],
settings: {
jsdoc: {
tagNamePreference: {
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@
- Fixed an issue where `firebase init genkit` would error on Windows machines.
- Fixed an issue where emulator returned error when emulating alerts functions written in python (#8019)
- Better error message for emulator binary architecture incompatibility on MacOS (#7995).
- Deprecated `emulators.apphosting.startCommandOverride`. Please use `emulators.apphosting.startCommand` instead.
- Updated `superstatic` to `9.1.0` in package.json.
- Updated the Firebase Data Connect local toolkit to v1.7.4, which includes a fix for an issue that caused duplicate installations of the Firebase JS SDK. (#8028)
39 changes: 32 additions & 7 deletions npm-shrinkwrap.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
"sql-formatter": "^15.3.0",
"stream-chain": "^2.2.4",
"stream-json": "^1.7.3",
"superstatic": "^9.0.3",
"superstatic": "^9.1.0",
"tar": "^6.1.11",
"tcp-port-used": "^1.0.2",
"tmp": "^0.2.3",
Expand Down Expand Up @@ -225,6 +225,7 @@
"eslint": "^8.56.0",
"eslint-config-google": "^0.14.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-brikke": "^2.2.2",
"eslint-plugin-jsdoc": "^48.0.1",
"eslint-plugin-prettier": "^5.1.3",
"firebase": "^9.16.0",
Expand All @@ -240,6 +241,7 @@
"nyc": "^15.1.0",
"openapi-merge": "^1.0.23",
"openapi-typescript": "^4.5.0",
"openapi3-ts": "^3.2.0",
"prettier": "^3.2.4",
"proxy": "^1.0.2",
"puppeteer": "^19.0.0",
Expand Down
18 changes: 9 additions & 9 deletions src/emulator/downloadableEmulators.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,20 +59,20 @@ const EMULATOR_UPDATE_DETAILS: { [s in DownloadableEmulators]: EmulatorUpdateDet
dataconnect:
process.platform === "darwin"
? {
version: "1.7.3",
expectedSize: 25211648,
expectedChecksum: "8410794304b2ae340c3facf07d7edc16",
version: "1.7.4",
expectedSize: 25277184,
expectedChecksum: "74f6b66c79a8a903132c7ab26c644593",
}
: process.platform === "win32"
? {
version: "1.7.3",
expectedSize: 25641984,
expectedChecksum: "a4bd0f9d9d884528fa4494e4d7918c08",
version: "1.7.4",
expectedSize: 25707520,
expectedChecksum: "66eec92e2d57ae42a8b58f33b65b4184",
}
: {
version: "1.7.3",
expectedSize: 25125016,
expectedChecksum: "48660e6370aeed973f33c3420c3255fb",
version: "1.7.4",
expectedSize: 25190552,
expectedChecksum: "acb7be487020afa6e1a597ceb8c6e862",
},
};

Expand Down
2 changes: 1 addition & 1 deletion src/emulator/storage/apis/gcloud.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { parseObjectUploadMultipartRequest } from "../multipart";
import { Upload, UploadNotActiveError } from "../upload";
import { ForbiddenError, NotFoundError } from "../errors";
import { reqBodyToBuffer } from "../../shared/request";
import { Query } from "express-serve-static-core";
import type { Query } from "express-serve-static-core";

export function createCloudEndpoints(emulator: StorageEmulator): Router {
// eslint-disable-next-line new-cap
Expand Down

0 comments on commit 19b5177

Please sign in to comment.