Merge branch 'master' into patch-1

.eslintrc.js

@@ -120,5 +120,9 @@ module.exports = {
   // don't want Typescript to turn the imports into requires. Ignoring as eslint
   // is complaining it doesn't belong to a project.
   // TODO(jamesdaniels): add this to overrides instead
-  ignorePatterns: ["src/dynamicImport.js"],
+  ignorePatterns: [
+    "src/dynamicImport.js",
+    "scripts/webframeworks-deploy-tests/hosting/**",
+    "scripts/frameworks-tests/vite-project/**",
+  ],
 };

.github/workflows/node-test.yml

@@ -81,16 +81,17 @@ jobs:
         node-version:
           - "16"
         script:
-          - npm run test:hosting
-          # - npm run test:hosting-rewrites # Long-running test that might conflict across test runs. Run this manually.
           - npm run test:client-integration
           - npm run test:emulator
-          - npm run test:import-export
           - npm run test:extensions-emulator
-          - npm run test:triggers-end-to-end
-          - npm run test:triggers-end-to-end:inspect
+          - npm run test:frameworks
+          - npm run test:hosting
+          # - npm run test:hosting-rewrites # Long-running test that might conflict across test runs. Run this manually.
+          - npm run test:import-export
           - npm run test:storage-deploy
           - npm run test:storage-emulator-integration
+          - npm run test:triggers-end-to-end
+          - npm run test:triggers-end-to-end:inspect
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3

.prettierignore

@@ -2,3 +2,4 @@
 /node_modules
 /lib/**/*
 /CONTRIBUTING.md
+/scripts/frameworks-tests/vite-project/**

CHANGELOG.md

@@ -0,0 +1,6 @@
+- Add support for Firestore TTL (#5267)
+- Fix bug where secrets were not loaded when emulating functions with `--inpsect-functions`. (#4605)
+- Handle Next.js rewrites/redirects/headers incompatible with `firebase.json` in Cloud Functions (#5212)
+- Filter out Next.js prerendered routes that matches rewrites/redirects/headers rules from SSG content directory (#5212)
+- Warn if a web framework's package.json contains anything other than the framework default build command.
+- Add support for nodejs18 for Cloud Functions for Firebase (#5319)

package.json

@@ -1,13 +1,14 @@
 {
   "name": "firebase-tools",
-  "version": "11.13.0",
+  "version": "11.17.0",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {
     "firebase": "./lib/bin/firebase.js"
   },
   "scripts": {
     "build": "tsc && npm run copyfiles",
+    "build:publish": "tsc --build tsconfig.publish.json && npm run copyfiles",
     "build:watch": "npm run build && tsc --watch",
     "clean": "rimraf lib dev",
     "copyfiles": "node -e \"const fs = require('fs'); fs.mkdirSync('./lib', {recursive:true}); fs.copyFileSync('./src/dynamicImport.js', './lib/dynamicImport.js')\"",
@@ -22,21 +23,23 @@
     "lint:quiet": "npm run lint:ts -- --quiet && npm run lint:other",
     "lint:ts": "eslint --config .eslintrc.js --ext .ts,.js .",
     "mocha": "nyc mocha 'src/test/**/*.{ts,js}'",
-    "prepare": "npm run clean && npm run build -- --build tsconfig.publish.json",
+    "prepare": "npm run clean && npm run build:publish",
     "test": "npm run lint:quiet && npm run test:compile && npm run mocha",
     "test:client-integration": "bash ./scripts/client-integration-tests/run.sh",
     "test:compile": "tsc --project tsconfig.compile.json",
     "test:emulator": "bash ./scripts/emulator-tests/run.sh",
     "test:extensions-deploy": "bash ./scripts/extensions-deploy-tests/run.sh",
     "test:extensions-emulator": "bash ./scripts/extensions-emulator-tests/run.sh",
+    "test:frameworks": "bash ./scripts/frameworks-tests/run.sh",
     "test:functions-deploy": "bash ./scripts/functions-deploy-tests/run.sh",
     "test:hosting": "bash ./scripts/hosting-tests/run.sh",
     "test:hosting-rewrites": "bash ./scripts/hosting-tests/rewrites-tests/run.sh",
     "test:import-export": "bash ./scripts/emulator-import-export-tests/run.sh",
     "test:triggers-end-to-end": "bash ./scripts/triggers-end-to-end-tests/run.sh",
     "test:triggers-end-to-end:inspect": "bash ./scripts/triggers-end-to-end-tests/run.sh inspect",
     "test:storage-deploy": "bash ./scripts/storage-deploy-tests/run.sh",
-    "test:storage-emulator-integration": "bash ./scripts/storage-emulator-integration/run.sh"
+    "test:storage-emulator-integration": "bash ./scripts/storage-emulator-integration/run.sh",
+    "test:webframeworks-deploy": "bash ./scripts/webframeworks-deploy-tests/run.sh"
   },
   "files": [
     "lib",
@@ -168,6 +171,7 @@
     "@types/cross-spawn": "^6.0.1",
     "@types/express": "^4.17.0",
     "@types/express-serve-static-core": "^4.17.8",
+    "@types/firebase": "^3.2.1",
     "@types/fs-extra": "^9.0.13",
     "@types/glob": "^7.1.1",
     "@types/inquirer": "^8.1.3",
@@ -212,8 +216,8 @@
     "eslint-plugin-jsdoc": "^39.2.9",
     "eslint-plugin-prettier": "^4.0.0",
     "firebase": "^7.24.0",
-    "firebase-admin": "^9.4.2",
-    "firebase-functions": "^3.23.0",
+    "firebase-admin": "^10.0.0",
+    "firebase-functions": "^4.1.0",
     "google-discovery-to-swagger": "^2.1.0",
     "googleapis": "^105.0.0",
     "mocha": "^9.1.3",
@@ -224,7 +228,7 @@
     "openapi-merge": "^1.0.23",
     "prettier": "^2.5.1",
     "proxy": "^1.0.2",
-    "puppeteer": "^9.0.0",
+    "puppeteer": "^19.0.0",
     "sinon": "^9.2.3",
     "sinon-chai": "^3.6.0",
     "source-map-support": "^0.5.9",