Skip to content
Merged
Changes from 2 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: 4 additions & 1 deletion ts/blueprints/ember-cli-typescript/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ const path = require('path');
const APP_DECLARATIONS = `import Ember from 'ember';

declare global {
// 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<T> extends Ember.ArrayPrototypeExtensions<T> {}
// interface Function extends Ember.FunctionPrototypeExtensions {}
}
Expand Down Expand Up @@ -233,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;
}
Expand Down