Skip to content

Commit 61e2040

Browse files
authored
Merge branch 'main' into leoortizz_nextjsintegrationtests
2 parents 0f1015c + 567b537 commit 61e2040

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+1089
-192
lines changed

.eslintignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ templates
88
scripts/agent-evals/output
99
scripts/agent-evals/node_modules
1010
scripts/agent-evals/lib
11-
scripts/agent-evals/templates
11+
scripts/agent-evals/templates
12+
julesbot

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Run `npm test` to make sure your changes compile properly and the tests all pass
1414

1515
### Scenarios Tested
1616

17-
<!-- Write a list of all the user journeys and edge cases you've tested. Instructions for manual testing can be found at https://github.com/firebase/firebase-tools/blob/master/.github/CONTRIBUTING.md#development-setup -->
17+
<!-- Write a list of all the user journeys and edge cases you've tested. Instructions for manual testing can be found at https://github.com/firebase/firebase-tools/blob/main/.github/CONTRIBUTING.md#development-setup -->
1818

1919
### Sample Commands
2020

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Jules Bot Action
2+
3+
on:
4+
issues:
5+
types: [opened]
6+
7+
jobs:
8+
run_agent:
9+
if: github.event.action == 'opened'
10+
runs-on: ubuntu-latest
11+
permissions:
12+
issues: write
13+
steps:
14+
- name: Checkout repository
15+
uses: actions/checkout@v3
16+
17+
- name: Set up Python
18+
uses: actions/setup-python@v4
19+
with:
20+
python-version: "3.14"
21+
22+
- name: Install dependencies
23+
run: |
24+
python -m pip install --upgrade pip
25+
pip install google-adk requests
26+
27+
- name: Run root agent
28+
env:
29+
JULES_KEY: ${{ secrets.JULES_KEY }}
30+
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
31+
GOOGLE_API_KEY: ${{ secrets.GEMINI_API_KEY }}
32+
ISSUE_TITLE: ${{ github.event.issue.title }}
33+
ISSUE_NUMBER: ${{ github.event.issue.number }}
34+
ISSUE_BODY: ${{ github.event.issue.body }}
35+
ISSUE_URL: ${{ github.event.issue.html_url }}
36+
run: |
37+
python julesbot/issues_call.py --prompt "Triage this new issue: $ISSUE_TITLE $ISSUE_NUMBER $ISSUE_BODY $ISSUE_URL"

CHANGELOG.md

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +0,0 @@
1-
- [BREAKING] Changed `firestore:backups:list --json` to return a `listBackupsResponse` object instead of a raw array of backups.
2-
- [BREAKING] Removed support for '.bolt' rules files.
3-
- [BREAKING] Removed support for running emulators with Java versions prior to 21.
4-
- [BREAKING] Removed deprecated `firebase --open-sesame` and `firebase --close-sesame` commands. Use `firebase experiments:enable` and `firebase experiments:disable` instead.
5-
- [BREAKING] Enforce strict timeout validation for functions. (#9540)
6-
- [BREAKING] Update `dataconnect:\*` commands to use flags instead of positional arguments for `--service` & `--location`. Changed output type of `dataconnect:sql:migrate --json` (#9312)
7-
- [BREAKING] When using 'firebase-tools' as a Node module, `cli.auth.upload` has been renamed to `cli.auth.import` and `cli.appdistribution.testers.delete` has been renamed to `cli.appdistribution.testers.remove`.
8-
- [BREAKING] Updated Firebase Data Connect emulator version to v3.0.0
9-
- [BREAKING] Fixed generated code character case when letters follow numbers (https://github.com/firebase/firebase-tools/issues/9567).
10-
- [BREAKING] Dart codegen: Int64 types are now serialized and deserialized using BigInt.
11-
- [BREAKING] Kotlin codegen: Removed magic "convenience renames" of keys and counts in selection sets (https://github.com/firebase/firebase-tools/issues/9571).
12-
- Eagerly load config upon any requests from VS Code Extensions or Firebase CLI. This ensures the emulator always serve the latest local configs.
13-
- Kotlin codegen: Removed vestigial FIREBASE_DATA_CONNECT_GENERATED_FILE section at the bottom of each generated file.
14-
- Updated Firestore Emulator to v1.20.2, which includes minor bug fixes for Datastore Mode.
15-
- Improved command loading performance by implementing lazy loading.
16-
- Add a confirmation in `firebase init dataconnect` before asking for app idea description. (#9282)

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ If you're interested in contributing code, get started by
2626

2727
The preferred means of contribution to the CLI is by creating a branch in your
2828
own fork, pushing your changes there, and submitting a Pull Request to the
29-
`master` branch of `firebase/firebase-tools`.
29+
`main` branch of `firebase/firebase-tools`.
3030

3131
If you believe that your change should be noted in the
3232
[changelog](https://github.com/firebase/firebase-tools/releases), please also
@@ -112,8 +112,8 @@ the following commands:
112112

113113
* Run `npm run lint` to view all warnings in your codebase.
114114
* Run `npm run lint:changed-files` to view only the warnings of files changed
115-
between your working branch and your copy of master. For this reason, it’s
116-
important to keep your master up-to-date; otherwise, you might see
115+
between your working branch and your copy of main. For this reason, it’s
116+
important to keep your main up-to-date; otherwise, you might see
117117
unnecessary warnings.
118118

119119
We also support an ongoing effort to convert existing JavaScript into

firebase-vscode/CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
## NEXT
22

3-
- Fixed common code lens rendering issue.
3+
## 2.0.0
4+
5+
- Update internal `firebase-tools` dependency to 15.0.0
6+
- [Fixed] common code lens rendering issue.
47
- Don't show "Generate query" in schema file.
58
- Don't show "Generate query" for comments within an operation.
69
- Show "Add Data" for @table type only.
710
- Show "View Data" for @table and @view type.
11+
- [Fixed] Integration test for recent variables panel changes
812

913
## 1.10.2
1014

firebase-vscode/package-lock.json

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

firebase-vscode/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"publisher": "GoogleCloudTools",
55
"icon": "./resources/firebase_dataconnect_logo.png",
66
"description": "Firebase Data Connect for VSCode",
7-
"version": "1.10.2",
7+
"version": "2.0.0",
88
"engines": {
99
"vscode": "^1.69.0"
1010
},
@@ -185,13 +185,13 @@
185185
"jsonValidation": [
186186
{
187187
"fileMatch": "firebase.json",
188-
"url": "https://raw.githubusercontent.com/firebase/firebase-tools/master/schema/firebase-config.json"
188+
"url": "https://raw.githubusercontent.com/firebase/firebase-tools/main/schema/firebase-config.json"
189189
}
190190
],
191191
"yamlValidation": [
192192
{
193193
"fileMatch": "extension.yaml",
194-
"url": "https://raw.githubusercontent.com/firebase/firebase-tools/master/schema/extension-yaml.json"
194+
"url": "https://raw.githubusercontent.com/firebase/firebase-tools/main/schema/extension-yaml.json"
195195
},
196196
{
197197
"fileMatch": "dataconnect.yaml",

firebase-vscode/src/test/integration/fishfood/exeuction-missing-variables.ts

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { mockUser } from "../../utils/user";
1212
import { Notifications } from "../../utils/page_objects/notifications";
1313

1414
firebaseSuite("Execution", async function () {
15-
firebaseTest("should ask user to add missing variables", async function () {
15+
firebaseTest("should auto add missing variables", async function () {
1616
const workbench = await browser.getWorkbench();
1717

1818
const sidebar = new FirebaseSidebar(workbench);
@@ -40,18 +40,8 @@ firebaseSuite("Execution", async function () {
4040
await editor.openFile(mutationsPath);
4141
await editor.runLocalButton.waitForDisplayed();
4242
await editor.runLocalButton.click();
43-
44-
const editVariablesNotif = await notification.getEditVariablesNotification();
4543

46-
if (!editVariablesNotif) {
47-
throw(new Error("Edit Variables Notification not found"));
48-
}
49-
await notification.editVariablesFromNotification(editVariablesNotif);
50-
51-
expect(await execution.getVariables()).toEqual(`{"id":"42","content":""}`);
52-
53-
// click re-run button to continue
54-
await execution.clickRerun();
44+
expect(JSON.parse((await execution.getVariables()))).toEqual({"id":"42","content":""});
5545

5646
async function getExecutionStatus() {
5747
let item = await execution.history.getSelectedItem();

firebase-vscode/src/test/utils/page_objects/execution.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export class ExecutionPanel {
4040
async runInConfigurationContext<R>(
4141
cb: (configs: ConfigurationView) => Promise<R>,
4242
): Promise<R> {
43-
const [a, b] = await findWebviewWithTitle("Configuration");
43+
const [a, b] = await findWebviewWithTitle("Parameters");
4444

4545
return runInFrame(a, () =>
4646
runInFrame(b, () => cb(new ConfigurationView(this.workbench))),

0 commit comments

Comments
 (0)