From 4c5a98b930dbf4bca1ac901dd6da8a9b1632f1d0 Mon Sep 17 00:00:00 2001 From: Charles Fries Date: Tue, 23 Apr 2024 13:25:35 -0700 Subject: [PATCH 1/2] Remove eslint file-specific rules --- .eslintrc.js | 2 +- addon/adapters/cloud-firestore-modular.ts | 6 ------ addon/serializers/cloud-firestore-modular.ts | 14 +++++++++----- addon/services/-firestore-data-manager.ts | 5 ----- tests/dummy/app/models/group.ts | 3 --- tests/dummy/app/models/post.ts | 3 --- tests/dummy/app/models/user.ts | 1 - .../unit/services/-firestore-data-manager-test.ts | 1 - 8 files changed, 10 insertions(+), 25 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 1f199ad7..7c41dde7 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -52,6 +52,7 @@ module.exports = { }], 'class-methods-use-this': 'off', 'no-underscore-dangle': 'off', + 'ember/use-ember-data-rfc-395-imports': 'off', }, overrides: [ // node files @@ -77,7 +78,6 @@ module.exports = { plugins: ['node'], extends: ['plugin:node/recommended'] }, - // test files { // test files files: ['tests/**/*-test.{js,ts}'], diff --git a/addon/adapters/cloud-firestore-modular.ts b/addon/adapters/cloud-firestore-modular.ts index 416625b9..f6d89de6 100644 --- a/addon/adapters/cloud-firestore-modular.ts +++ b/addon/adapters/cloud-firestore-modular.ts @@ -1,9 +1,3 @@ -/* - eslint - ember/use-ember-data-rfc-395-imports: off, - ember/no-ember-super-in-es-classes: off -*/ - import { getOwner } from '@ember/application'; import { inject as service } from '@ember/service'; import Adapter from '@ember-data/adapter'; diff --git a/addon/serializers/cloud-firestore-modular.ts b/addon/serializers/cloud-firestore-modular.ts index 7754449b..97c34f4c 100644 --- a/addon/serializers/cloud-firestore-modular.ts +++ b/addon/serializers/cloud-firestore-modular.ts @@ -1,7 +1,5 @@ /* eslint - @typescript-eslint/ban-types: off, - ember/use-ember-data-rfc-395-imports: off, no-param-reassign: off, */ @@ -41,7 +39,7 @@ export default class CloudFirestoreSerializer extends JSONSerializer { public extractRelationship( relationshipModelName: string, relationshipHash: DocumentReference, - ): { id: string, type: string } | {} { + ): { id: string, type: string } | Record { if (isNone(relationshipHash)) { return super.extractRelationship(relationshipModelName, relationshipHash); } @@ -52,7 +50,10 @@ export default class CloudFirestoreSerializer extends JSONSerializer { return { id: belongsToId, type: relationshipModelName }; } - public extractRelationships(modelClass: ModelClass, resourceHash: ResourceHash): {} { + public extractRelationships( + modelClass: ModelClass, + resourceHash: ResourceHash, + ): Record { const newResourceHash = { ...resourceHash }; const links: { [key: string]: string } = {}; @@ -110,7 +111,10 @@ export default class CloudFirestoreSerializer extends JSONSerializer { } } - public serialize(snapshot: DS.Snapshot, options: {}): {} { + public serialize( + snapshot: DS.Snapshot, + options: Record, + ): Record { const json: { [key: string]: unknown } = { ...super.serialize(snapshot, options) }; snapshot.eachRelationship((name: string, relationship) => { diff --git a/addon/services/-firestore-data-manager.ts b/addon/services/-firestore-data-manager.ts index 2c722fcd..e34cf634 100644 --- a/addon/services/-firestore-data-manager.ts +++ b/addon/services/-firestore-data-manager.ts @@ -1,8 +1,3 @@ -/* - eslint - ember/use-ember-data-rfc-395-imports: off -*/ - import { next } from '@ember/runloop'; import DS from 'ember-data'; import ModelRegistry from 'ember-data/types/registries/model'; diff --git a/tests/dummy/app/models/group.ts b/tests/dummy/app/models/group.ts index 2417e5b4..5a3c65af 100644 --- a/tests/dummy/app/models/group.ts +++ b/tests/dummy/app/models/group.ts @@ -1,8 +1,6 @@ /* eslint import/no-cycle: off, - @typescript-eslint/ban-ts-comment: off, - ember/use-ember-data-rfc-395-imports: off, */ import DS from 'ember-data'; @@ -22,7 +20,6 @@ export default class GroupModel extends Model { declare public members: DS.PromiseManyArray; @hasMany('post', { - // @ts-ignore: TODO - find a way to set custom property in RelationshipOptions interface isRealtime: true, filter(reference: Query) { diff --git a/tests/dummy/app/models/post.ts b/tests/dummy/app/models/post.ts index 52a7432e..99fcefc7 100644 --- a/tests/dummy/app/models/post.ts +++ b/tests/dummy/app/models/post.ts @@ -1,8 +1,6 @@ /* eslint import/no-cycle: off, - @typescript-eslint/ban-ts-comment: off, - ember/use-ember-data-rfc-395-imports: off, */ import DS from 'ember-data'; @@ -31,7 +29,6 @@ export default class PostModel extends Model { @belongsTo('user', { inverse: null, - // @ts-ignore: TODO - find a way to set custom property in RelationshipOptions interface buildReference(db: Firestore) { return collection(db, 'publishers'); }, diff --git a/tests/dummy/app/models/user.ts b/tests/dummy/app/models/user.ts index 3fd908d7..fdca9071 100644 --- a/tests/dummy/app/models/user.ts +++ b/tests/dummy/app/models/user.ts @@ -1,7 +1,6 @@ /* eslint import/no-cycle: off, - ember/use-ember-data-rfc-395-imports: off, */ import DS from 'ember-data'; diff --git a/tests/unit/services/-firestore-data-manager-test.ts b/tests/unit/services/-firestore-data-manager-test.ts index 6a56cf10..90b5f974 100644 --- a/tests/unit/services/-firestore-data-manager-test.ts +++ b/tests/unit/services/-firestore-data-manager-test.ts @@ -1,7 +1,6 @@ import { module, test } from 'qunit'; import { setupTest } from 'ember-qunit'; import { waitUntil } from '@ember/test-helpers'; -// eslint-disable-next-line ember/use-ember-data-rfc-395-imports import DS from 'ember-data'; import RSVP from 'rsvp'; import Store from '@ember-data/store'; From b8b482d0d6a359535cd9454800e6a5245b8a1547 Mon Sep 17 00:00:00 2001 From: Charles Fries Date: Tue, 23 Apr 2024 13:58:33 -0700 Subject: [PATCH 2/2] Rename --- addon/adapters/cloud-firestore-modular.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addon/adapters/cloud-firestore-modular.ts b/addon/adapters/cloud-firestore-modular.ts index f6d89de6..6ce54801 100644 --- a/addon/adapters/cloud-firestore-modular.ts +++ b/addon/adapters/cloud-firestore-modular.ts @@ -64,7 +64,7 @@ interface HasManyRelationshipMeta { }; } -export default class CloudFirestoreModularAdapter extends Adapter { +export default class CloudFirestoreAdapter extends Adapter { @service('-firestore-data-manager') protected declare firestoreDataManager: FirestoreDataManager; @@ -347,6 +347,6 @@ export default class CloudFirestoreModularAdapter extends Adapter { declare module 'ember-data/types/registries/adapter' { export default interface AdapterRegistry { - 'cloud-firestore-modular': CloudFirestoreModularAdapter; + 'cloud-firestore-modular': CloudFirestoreAdapter; } }