Skip to content
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
5 changes: 5 additions & 0 deletions .changeset/beige-months-allow.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@tanstack-query-firebase/angular": minor
---

feat: add support for Angular v20
66 changes: 33 additions & 33 deletions dataconnect-sdk/js/default-connector/esm/index.esm.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,39 @@ export const connectorConfig = {
location: 'us-central1'
};

export const listMoviesRef = (dc) => {
const { dc: dcInstance} = validateArgs(connectorConfig, dc, undefined);
dcInstance._useGeneratedSdk();
return queryRef(dcInstance, 'ListMovies');
}
listMoviesRef.operationName = 'ListMovies';

export function listMovies(dc) {
return executeQuery(listMoviesRef(dc));
}

export const getMovieByIdRef = (dcOrVars, vars) => {
const { dc: dcInstance, vars: inputVars} = validateArgs(connectorConfig, dcOrVars, vars, true);
dcInstance._useGeneratedSdk();
return queryRef(dcInstance, 'GetMovieById', inputVars);
}
getMovieByIdRef.operationName = 'GetMovieById';

export function getMovieById(dcOrVars, vars) {
return executeQuery(getMovieByIdRef(dcOrVars, vars));
}

export const getMetaRef = (dc) => {
const { dc: dcInstance} = validateArgs(connectorConfig, dc, undefined);
dcInstance._useGeneratedSdk();
return queryRef(dcInstance, 'GetMeta');
}
getMetaRef.operationName = 'GetMeta';

export function getMeta(dc) {
return executeQuery(getMetaRef(dc));
}

export const createMovieRef = (dcOrVars, vars) => {
const { dc: dcInstance, vars: inputVars} = validateArgs(connectorConfig, dcOrVars, vars, true);
dcInstance._useGeneratedSdk();
Expand Down Expand Up @@ -61,36 +94,3 @@ export function deleteMeta(dcOrVars, vars) {
return executeMutation(deleteMetaRef(dcOrVars, vars));
}

export const listMoviesRef = (dc) => {
const { dc: dcInstance} = validateArgs(connectorConfig, dc, undefined);
dcInstance._useGeneratedSdk();
return queryRef(dcInstance, 'ListMovies');
}
listMoviesRef.operationName = 'ListMovies';

export function listMovies(dc) {
return executeQuery(listMoviesRef(dc));
}

export const getMovieByIdRef = (dcOrVars, vars) => {
const { dc: dcInstance, vars: inputVars} = validateArgs(connectorConfig, dcOrVars, vars, true);
dcInstance._useGeneratedSdk();
return queryRef(dcInstance, 'GetMovieById', inputVars);
}
getMovieByIdRef.operationName = 'GetMovieById';

export function getMovieById(dcOrVars, vars) {
return executeQuery(getMovieByIdRef(dcOrVars, vars));
}

export const getMetaRef = (dc) => {
const { dc: dcInstance} = validateArgs(connectorConfig, dc, undefined);
dcInstance._useGeneratedSdk();
return queryRef(dcInstance, 'GetMeta');
}
getMetaRef.operationName = 'GetMeta';

export function getMeta(dc) {
return executeQuery(getMetaRef(dc));
}

72 changes: 36 additions & 36 deletions dataconnect-sdk/js/default-connector/index.cjs.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,42 @@ const connectorConfig = {
};
exports.connectorConfig = connectorConfig;

const listMoviesRef = (dc) => {
const { dc: dcInstance} = validateArgs(connectorConfig, dc, undefined);
dcInstance._useGeneratedSdk();
return queryRef(dcInstance, 'ListMovies');
}
listMoviesRef.operationName = 'ListMovies';
exports.listMoviesRef = listMoviesRef;

exports.listMovies = function listMovies(dc) {
return executeQuery(listMoviesRef(dc));
};

const getMovieByIdRef = (dcOrVars, vars) => {
const { dc: dcInstance, vars: inputVars} = validateArgs(connectorConfig, dcOrVars, vars, true);
dcInstance._useGeneratedSdk();
return queryRef(dcInstance, 'GetMovieById', inputVars);
}
getMovieByIdRef.operationName = 'GetMovieById';
exports.getMovieByIdRef = getMovieByIdRef;

exports.getMovieById = function getMovieById(dcOrVars, vars) {
return executeQuery(getMovieByIdRef(dcOrVars, vars));
};

const getMetaRef = (dc) => {
const { dc: dcInstance} = validateArgs(connectorConfig, dc, undefined);
dcInstance._useGeneratedSdk();
return queryRef(dcInstance, 'GetMeta');
}
getMetaRef.operationName = 'GetMeta';
exports.getMetaRef = getMetaRef;

exports.getMeta = function getMeta(dc) {
return executeQuery(getMetaRef(dc));
};

const createMovieRef = (dcOrVars, vars) => {
const { dc: dcInstance, vars: inputVars} = validateArgs(connectorConfig, dcOrVars, vars, true);
dcInstance._useGeneratedSdk();
Expand Down Expand Up @@ -66,39 +102,3 @@ exports.deleteMetaRef = deleteMetaRef;
exports.deleteMeta = function deleteMeta(dcOrVars, vars) {
return executeMutation(deleteMetaRef(dcOrVars, vars));
};

const listMoviesRef = (dc) => {
const { dc: dcInstance} = validateArgs(connectorConfig, dc, undefined);
dcInstance._useGeneratedSdk();
return queryRef(dcInstance, 'ListMovies');
}
listMoviesRef.operationName = 'ListMovies';
exports.listMoviesRef = listMoviesRef;

exports.listMovies = function listMovies(dc) {
return executeQuery(listMoviesRef(dc));
};

const getMovieByIdRef = (dcOrVars, vars) => {
const { dc: dcInstance, vars: inputVars} = validateArgs(connectorConfig, dcOrVars, vars, true);
dcInstance._useGeneratedSdk();
return queryRef(dcInstance, 'GetMovieById', inputVars);
}
getMovieByIdRef.operationName = 'GetMovieById';
exports.getMovieByIdRef = getMovieByIdRef;

exports.getMovieById = function getMovieById(dcOrVars, vars) {
return executeQuery(getMovieByIdRef(dcOrVars, vars));
};

const getMetaRef = (dc) => {
const { dc: dcInstance} = validateArgs(connectorConfig, dc, undefined);
dcInstance._useGeneratedSdk();
return queryRef(dcInstance, 'GetMeta');
}
getMetaRef.operationName = 'GetMeta';
exports.getMetaRef = getMetaRef;

exports.getMeta = function getMeta(dc) {
return executeQuery(getMetaRef(dc));
};
72 changes: 36 additions & 36 deletions dataconnect-sdk/js/default-connector/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,42 @@ export interface UpsertMovieVariables {
imageUrl: string;
}

interface ListMoviesRef {
/* Allow users to create refs without passing in DataConnect */
(): QueryRef<ListMoviesData, undefined>;
/* Allow users to pass in custom DataConnect instances */
(dc: DataConnect): QueryRef<ListMoviesData, undefined>;
operationName: string;
}
export const listMoviesRef: ListMoviesRef;

export function listMovies(): QueryPromise<ListMoviesData, undefined>;
export function listMovies(dc: DataConnect): QueryPromise<ListMoviesData, undefined>;

interface GetMovieByIdRef {
/* Allow users to create refs without passing in DataConnect */
(vars: GetMovieByIdVariables): QueryRef<GetMovieByIdData, GetMovieByIdVariables>;
/* Allow users to pass in custom DataConnect instances */
(dc: DataConnect, vars: GetMovieByIdVariables): QueryRef<GetMovieByIdData, GetMovieByIdVariables>;
operationName: string;
}
export const getMovieByIdRef: GetMovieByIdRef;

export function getMovieById(vars: GetMovieByIdVariables): QueryPromise<GetMovieByIdData, GetMovieByIdVariables>;
export function getMovieById(dc: DataConnect, vars: GetMovieByIdVariables): QueryPromise<GetMovieByIdData, GetMovieByIdVariables>;

interface GetMetaRef {
/* Allow users to create refs without passing in DataConnect */
(): QueryRef<GetMetaData, undefined>;
/* Allow users to pass in custom DataConnect instances */
(dc: DataConnect): QueryRef<GetMetaData, undefined>;
operationName: string;
}
export const getMetaRef: GetMetaRef;

export function getMeta(): QueryPromise<GetMetaData, undefined>;
export function getMeta(dc: DataConnect): QueryPromise<GetMetaData, undefined>;

interface CreateMovieRef {
/* Allow users to create refs without passing in DataConnect */
(vars: CreateMovieVariables): MutationRef<CreateMovieData, CreateMovieVariables>;
Expand Down Expand Up @@ -153,39 +189,3 @@ export const deleteMetaRef: DeleteMetaRef;
export function deleteMeta(vars: DeleteMetaVariables): MutationPromise<DeleteMetaData, DeleteMetaVariables>;
export function deleteMeta(dc: DataConnect, vars: DeleteMetaVariables): MutationPromise<DeleteMetaData, DeleteMetaVariables>;

interface ListMoviesRef {
/* Allow users to create refs without passing in DataConnect */
(): QueryRef<ListMoviesData, undefined>;
/* Allow users to pass in custom DataConnect instances */
(dc: DataConnect): QueryRef<ListMoviesData, undefined>;
operationName: string;
}
export const listMoviesRef: ListMoviesRef;

export function listMovies(): QueryPromise<ListMoviesData, undefined>;
export function listMovies(dc: DataConnect): QueryPromise<ListMoviesData, undefined>;

interface GetMovieByIdRef {
/* Allow users to create refs without passing in DataConnect */
(vars: GetMovieByIdVariables): QueryRef<GetMovieByIdData, GetMovieByIdVariables>;
/* Allow users to pass in custom DataConnect instances */
(dc: DataConnect, vars: GetMovieByIdVariables): QueryRef<GetMovieByIdData, GetMovieByIdVariables>;
operationName: string;
}
export const getMovieByIdRef: GetMovieByIdRef;

export function getMovieById(vars: GetMovieByIdVariables): QueryPromise<GetMovieByIdData, GetMovieByIdVariables>;
export function getMovieById(dc: DataConnect, vars: GetMovieByIdVariables): QueryPromise<GetMovieByIdData, GetMovieByIdVariables>;

interface GetMetaRef {
/* Allow users to create refs without passing in DataConnect */
(): QueryRef<GetMetaData, undefined>;
/* Allow users to pass in custom DataConnect instances */
(dc: DataConnect): QueryRef<GetMetaData, undefined>;
operationName: string;
}
export const getMetaRef: GetMetaRef;

export function getMeta(): QueryPromise<GetMetaData, undefined>;
export function getMeta(dc: DataConnect): QueryPromise<GetMetaData, undefined>;

2 changes: 1 addition & 1 deletion dataconnect-sdk/js/default-connector/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
"./package.json": "./package.json"
},
"peerDependencies": {
"firebase": "^10.14.0 || ^11.3.0"
"firebase": "^10.14.0 || ^11.3.0 || ^12.0.0"
}
}
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
"build": "turbo build"
},
"devDependencies": {
"@angular/core": "^19.1.8",
"@angular/core": "^20.0.0",
"@biomejs/biome": "2.1.1",
"@changesets/cli": "^2.29.4",
"@tanstack/angular-query-experimental": "5.66.4",
"@tanstack/angular-query-experimental": "^5.66.4",
"@tanstack/react-query": "^5.55.4",
"@types/jsonwebtoken": "^9.0.7",
"@vitest/coverage-istanbul": "^2.0.5",
Expand All @@ -33,6 +33,6 @@
"vitest": "^2.0.5"
},
"dependencies": {
"@angular/fire": "^19.0.0"
"@angular/fire": "^20.0.0"
}
}
14 changes: 6 additions & 8 deletions packages/angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,15 @@
"license": "Apache-2.0",
"devDependencies": {
"@dataconnect/default-connector": "file:../../dataconnect-sdk/js/default-connector",
"@analogjs/vite-plugin-angular": "^1.13.0",
"@angular/animations": "^19.0.0",
"@testing-library/angular": "^17.3.5",
"@testing-library/angular": "^18.0.0",
"@testing-library/dom": "^10.4.0",
"tsup": "^8.4.0"
},
"peerDependencies": {
"@tanstack/angular-query-experimental": "5.66.4",
"@angular/core": "^19.0.0",
"@angular/fire": "^19.0.0",
"@angular/common": "^19.0.0",
"@angular/platform-browser-dynamic": "^19.0.0"
"@angular/common": "^20.0.0 || ^19.0.0",
"@angular/core": "^20.0.0 || ^19.0.0",
"@angular/fire": "^20.0.0 || ^19.0.0",
"@angular/platform-browser-dynamic": "^20.0.0 || ^19.0.0",
"@tanstack/angular-query-experimental": "^5.66.4"
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { provideHttpClient } from "@angular/common/http";
import { provideExperimentalZonelessChangeDetection } from "@angular/core";
import { provideZonelessChangeDetection } from "@angular/core";
import { TestBed } from "@angular/core/testing";
import { initializeApp, provideFirebaseApp } from "@angular/fire/app";
import {
Expand Down Expand Up @@ -44,7 +44,7 @@ describe("injectDataConnectMutation", () => {
invalidateQueriesSpy = vi.spyOn(queryClient, "invalidateQueries");
TestBed.configureTestingModule({
providers: [
provideExperimentalZonelessChangeDetection(), // Required as angularfire's ZoneScheduler breaks tests.
provideZonelessChangeDetection(), // Required as angularfire's ZoneScheduler breaks tests.
provideFirebaseApp(() => initializeApp({ projectId: "p" })),
provideDataConnect(() => {
const dc = getDataConnect(connectorConfig);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
import { provideHttpClient } from "@angular/common/http";
import {
inject,
provideExperimentalZonelessChangeDetection,
} from "@angular/core";
import { inject, provideZonelessChangeDetection } from "@angular/core";
import { TestBed } from "@angular/core/testing";
import { initializeApp, provideFirebaseApp } from "@angular/fire/app";
import {
Expand Down Expand Up @@ -35,7 +32,7 @@ describe("injectDataConnectQuery", () => {
queryClient.clear();
TestBed.configureTestingModule({
providers: [
provideExperimentalZonelessChangeDetection(), // Required as angularfire's ZoneScheduler breaks tests.
provideZonelessChangeDetection(), // Required as angularfire's ZoneScheduler breaks tests.
provideFirebaseApp(() => initializeApp({ projectId: "p" })),
provideDataConnect(() => {
const dc = getDataConnect(connectorConfig);
Expand Down
3 changes: 1 addition & 2 deletions packages/react/package-lock.json

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

Loading