From fb87713ced3896a4a92bb65b9f712d316bc8f45a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moacir=20P=2E=20de=20Sa=CC=81=20Pereira?= Date: Tue, 22 Feb 2022 12:46:36 -0500 Subject: [PATCH 1/3] lint: Add an eslint-ignore line allowing for empty interfaces just this once. --- ts/blueprints/ember-cli-typescript/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ts/blueprints/ember-cli-typescript/index.js b/ts/blueprints/ember-cli-typescript/index.js index b6b442724..cabdc7850 100644 --- a/ts/blueprints/ember-cli-typescript/index.js +++ b/ts/blueprints/ember-cli-typescript/index.js @@ -6,7 +6,7 @@ const path = require('path'); const APP_DECLARATIONS = `import Ember from 'ember'; declare global { - interface Array extends Ember.ArrayPrototypeExtensions {} + interface Array extends Ember.ArrayPrototypeExtensions {} // eslint-disable-line @typescript-eslint/no-empty-interface // interface Function extends Ember.FunctionPrototypeExtensions {} } @@ -233,7 +233,7 @@ module.exports = { if (scripts[type] && scripts[type] !== script) { this.ui.writeWarnLine( `Found a pre-existing \`${type}\` script in your package.json. ` + - `By default, ember-cli-typescript expects to run \`${script}\` in this hook.` + `By default, ember-cli-typescript expects to run \`${script}\` in this hook.` ); return; } From 1c4ef95d89cd9a7cacfa109d8359c8fe277c97f5 Mon Sep 17 00:00:00 2001 From: Chris Krycho Date: Tue, 22 Feb 2022 14:48:46 -0700 Subject: [PATCH 2/3] add an explanation to eslint-disable --- ts/blueprints/ember-cli-typescript/index.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ts/blueprints/ember-cli-typescript/index.js b/ts/blueprints/ember-cli-typescript/index.js index cabdc7850..6c2369c2d 100644 --- a/ts/blueprints/ember-cli-typescript/index.js +++ b/ts/blueprints/ember-cli-typescript/index.js @@ -6,7 +6,10 @@ const path = require('path'); const APP_DECLARATIONS = `import Ember from 'ember'; declare global { - interface Array extends Ember.ArrayPrototypeExtensions {} // eslint-disable-line @typescript-eslint/no-empty-interface + // Prevents ESLint from "fixing" this via its auto-fix to turn it into a type + // alias (e.g. after running any Ember CLI generator) + // eslint-disable-next-line @typescript-eslint/no-empty-interface + interface Array extends Ember.ArrayPrototypeExtensions {} // interface Function extends Ember.FunctionPrototypeExtensions {} } From 1b06a1866ebaadd819112aca66a77c9545ecb5b9 Mon Sep 17 00:00:00 2001 From: Chris Krycho Date: Tue, 22 Feb 2022 14:53:26 -0700 Subject: [PATCH 3/3] Prettier-ify the blueprint index --- ts/blueprints/ember-cli-typescript/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts/blueprints/ember-cli-typescript/index.js b/ts/blueprints/ember-cli-typescript/index.js index 6c2369c2d..dccd9005c 100644 --- a/ts/blueprints/ember-cli-typescript/index.js +++ b/ts/blueprints/ember-cli-typescript/index.js @@ -236,7 +236,7 @@ module.exports = { if (scripts[type] && scripts[type] !== script) { this.ui.writeWarnLine( `Found a pre-existing \`${type}\` script in your package.json. ` + - `By default, ember-cli-typescript expects to run \`${script}\` in this hook.` + `By default, ember-cli-typescript expects to run \`${script}\` in this hook.` ); return; }