Fixup eslint setup for typescript conversion. (#159)

Fixup eslint setup for typescript conversion.

.eslintrc.js

@@ -1,20 +1,26 @@
 module.exports = {
   root: true,
+  parser: '@typescript-eslint/parser',
   parserOptions: {
     ecmaVersion: 2017,
     sourceType: 'module'
   },
   plugins: [
-    'ember'
+    '@typescript-eslint',
+    'ember',
+    'prettier',
   ],
   extends: [
     'eslint:recommended',
-    'plugin:ember/recommended'
+    'plugin:ember/recommended',
+    'plugin:@typescript-eslint/eslint-recommended',
+    'prettier',
   ],
   env: {
     browser: true
   },
   rules: {
+    'prettier/prettier': 'error',
   },
   overrides: [
     // node files

.gitignore

@@ -3,6 +3,7 @@
 # compiled output
 /dist/
 /tmp/
+/.eslintcache
 
 # dependencies
 /bower_components/

.prettierrc.js

@@ -0,0 +1,5 @@
+module.exports = {
+  singleQuote: true,
+  trailingComma: 'es5',
+  printWidth: 100,
+};

.travis.yml

@@ -9,8 +9,7 @@ addons:
   chrome: stable
 
 cache:
-  directories:
-    - $HOME/.npm
+  yarn: true
 
 env:
   global:
@@ -25,11 +24,16 @@ jobs:
   include:
     # runs linting and tests with current locked deps
 
+    - stage: "Tests"
+      name: "Linting"
+      node_js: 8
+      script:
+        - yarn lint:js
+
     - stage: "Tests"
       name: "Tests"
       script:
-        - npm run lint:js
-        - npm test
+        - yarn test
 
     # we recommend new addons test the current and previous LTS
     # as well as latest stable release (bonus points to beta/canary)
@@ -41,10 +45,8 @@ jobs:
     - env: EMBER_TRY_SCENARIO=ember-canary
     - env: EMBER_TRY_SCENARIO=ember-default-with-jquery
 
-before_install:
-  - npm config set spin false
-  - npm install -g npm@4
-  - npm --version
+install:
+  - yarn install --ignore-engines
 
 script:
   - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO

addon/index.ts

@@ -33,8 +33,8 @@ function _endsWith(str: string, suffix: string): boolean {
  * Configure your application as it boots
  */
 export default function loadInitializers(app: typeof Engine, prefix: string): void {
-  var initializerPrefix =  prefix + '/initializers/';
-  var instanceInitializerPrefix =  prefix + '/instance-initializers/';
+  var initializerPrefix = prefix + '/initializers/';
+  var instanceInitializerPrefix = prefix + '/instance-initializers/';
   var initializers = [];
   var instanceInitializers = [];
   // this is 2 pass because generally the first pass is the problem

config/ember-try.js

@@ -7,7 +7,7 @@ module.exports = function() {
     getChannelURL('release'),
     getChannelURL('beta'),
     getChannelURL('canary'),
-  ]).then((urls) => {
+  ]).then(urls => {
     return {
       useYarn: true,
       scenarios: [
@@ -19,9 +19,9 @@ module.exports = function() {
           npm: {
             devDependencies: {
               '@ember/jquery': '^0.5.1',
-              'ember-source': '~2.16.0'
-            }
-          }
+              'ember-source': '~2.16.0',
+            },
+          },
         },
         {
           name: 'ember-lts-2.18',
@@ -31,54 +31,54 @@ module.exports = function() {
           npm: {
             devDependencies: {
               '@ember/jquery': '^0.5.1',
-              'ember-source': '~2.18.0'
-            }
-          }
+              'ember-source': '~2.18.0',
+            },
+          },
         },
         {
           name: 'ember-release',
           npm: {
             devDependencies: {
-              'ember-source': urls[0]
-            }
-          }
+              'ember-source': urls[0],
+            },
+          },
         },
         {
           name: 'ember-beta',
           npm: {
             devDependencies: {
-              'ember-source': urls[1]
-            }
-          }
+              'ember-source': urls[1],
+            },
+          },
         },
         {
           name: 'ember-canary',
           npm: {
             devDependencies: {
-              'ember-source': urls[2]
-            }
-          }
+              'ember-source': urls[2],
+            },
+          },
         },
         {
           name: 'ember-default',
           npm: {
-            devDependencies: {}
-          }
+            devDependencies: {},
+          },
         },
         {
           name: 'ember-default-with-jquery',
           env: {
             EMBER_OPTIONAL_FEATURES: JSON.stringify({
-              'jquery-integration': true
-            })
+              'jquery-integration': true,
+            }),
           },
           npm: {
             devDependencies: {
-              '@ember/jquery': '^0.5.1'
-            }
-          }
-        }
-      ]
+              '@ember/jquery': '^0.5.1',
+            },
+          },
+        },
+      ],
     };
   });
 };

config/environment.js

@@ -1,5 +1,5 @@
 'use strict';
 
 module.exports = function(/* environment, appConfig */) {
-  return { };
+  return {};
 };

index.js

@@ -1,5 +1,5 @@
 'use strict';
 
 module.exports = {
-  name: require('./package').name
+  name: require('./package').name,
 };

package.json

@@ -27,7 +27,7 @@
   },
   "scripts": {
     "build": "ember build",
-    "lint:js": "eslint .",
+    "lint:js": "eslint --cache --ext js,ts .",
     "prepublishOnly": "ember ts:precompile",
     "postpublish": "ember ts:clean",
     "start": "ember serve",
@@ -49,9 +49,10 @@
     "@types/ember__test-helpers": "^0.7.8",
     "@types/qunit": "^2.5.4",
     "@types/rsvp": "^4.0.2",
+    "@typescript-eslint/eslint-plugin": "^2.0.0",
+    "@typescript-eslint/parser": "^2.0.0",
     "ember-cli": "~3.9.0",
     "ember-cli-dependency-checker": "^3.2.0",
-    "ember-cli-eslint": "^4.2.3",
     "ember-cli-htmlbars": "^3.1.0",
     "ember-cli-htmlbars-inline-precompile": "^2.0.0",
     "ember-cli-inject-live-reload": "^2.0.1",
@@ -63,10 +64,14 @@
     "ember-source": "~3.11.1",
     "ember-source-channel-url": "^1.1.0",
     "ember-try": "^1.2.1",
+    "eslint": "5",
+    "eslint-config-prettier": "^6.1.0",
     "eslint-plugin-ember": "^6.10.0",
     "eslint-plugin-node": "^8.0.0",
+    "eslint-plugin-prettier": "^3.1.0",
     "lerna-changelog": "^0.8.2",
     "loader.js": "^4.7.0",
+    "prettier": "^1.18.2",
     "release-it": "^12.2.1",
     "release-it-lerna-changelog": "^1.0.3",
     "typescript": "^3.3.3333"

testem.js

@@ -1,12 +1,8 @@
 module.exports = {
   test_page: 'tests/index.html?hidepassed',
   disable_watching: true,
-  launch_in_ci: [
-    'Chrome'
-  ],
-  launch_in_dev: [
-    'Chrome'
-  ],
+  launch_in_ci: ['Chrome'],
+  launch_in_dev: ['Chrome'],
   browser_args: {
     Chrome: {
       ci: [
@@ -18,8 +14,8 @@ module.exports = {
         '--disable-software-rasterizer',
         '--mute-audio',
         '--remote-debugging-port=0',
-        '--window-size=1440,900'
-      ].filter(Boolean)
-    }
-  }
+        '--window-size=1440,900',
+      ].filter(Boolean),
+    },
+  },
 };

tests/acceptance/initializers-test.js

@@ -4,8 +4,16 @@ import { setupApplicationTest } from 'ember-qunit';
 
 module('Acceptance | before test', function() {
   test('initializers', function(assert) {
-    assert.equal(self.fooInitializeWasCalled, undefined, 'initializer:foo should not yet be called');
-    assert.equal(self.barInitializeWasCalled, undefined, 'instance-initializer:bar should not yet be called');
+    assert.equal(
+      self.fooInitializeWasCalled,
+      undefined,
+      'initializer:foo should not yet be called'
+    );
+    assert.equal(
+      self.barInitializeWasCalled,
+      undefined,
+      'instance-initializer:bar should not yet be called'
+    );
   });
 });
 
@@ -15,7 +23,11 @@ module('Acceptance | initializers', function(hooks) {
     await visit('/');
 
     assert.equal(self.fooInitializeWasCalled, true, 'initializer:foo should have been called');
-    assert.equal(self.barInitializeWasCalled, true, 'instance-initializer:boo should have been called');
+    assert.equal(
+      self.barInitializeWasCalled,
+      true,
+      'instance-initializer:boo should have been called'
+    );
     assert.equal(currentURL(), '/');
   });
 });

tests/dummy/app/app.ts

@@ -19,7 +19,7 @@ const App = Application.extend({
 
     delete self.fooInitializeWasCalled;
     delete self.barInitializeWasCalled;
-  }
+  },
 });
 
 loadInitializers(App, config.modulePrefix);

tests/dummy/app/initializers/foo.js

@@ -5,5 +5,5 @@ export function initialize(/* application */) {
 
 export default {
   name: 'foo',
-  initialize
+  initialize,
 };

tests/dummy/app/instance-initializers/bar.js

@@ -5,5 +5,5 @@ export function initialize(/* appInstance */) {
 
 export default {
   name: 'bar',
-  initialize
+  initialize,
 };

tests/dummy/app/router.js

@@ -3,10 +3,9 @@ import config from './config/environment';
 
 const Router = EmberRouter.extend({
   location: config.locationType,
-  rootURL: config.rootURL
+  rootURL: config.rootURL,
 });
 
-Router.map(function() {
-});
+Router.map(function() {});
 
 export default Router;

tests/dummy/config/environment.js

@@ -13,14 +13,14 @@ module.exports = function(environment) {
       },
       EXTEND_PROTOTYPES: {
         // Prevent Ember Data from overriding Date.parse.
-        Date: false
-      }
+        Date: false,
+      },
     },
 
     APP: {
       // Here you can pass flags/options to your application instance
       // when it is created
-    }
+    },
   };
 
   if (environment === 'development') {
@@ -45,7 +45,6 @@ module.exports = function(environment) {
 
   // eslint-disable-next-line no-empty
   if (environment === 'production') {
-
   }
 
   return ENV;

tests/dummy/config/targets.js

@@ -1,10 +1,6 @@
 'use strict';
 
-const browsers = [
-  'last 1 Chrome versions',
-  'last 1 Firefox versions',
-  'last 1 Safari versions'
-];
+const browsers = ['last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions'];
 
 const isCI = !!process.env.CI;
 const isProduction = process.env.EMBER_ENV === 'production';
@@ -14,5 +10,5 @@ if (isCI || isProduction) {
 }
 
 module.exports = {
-  browsers
+  browsers,
 };

tests/helpers/resolver.js

@@ -5,7 +5,7 @@ const resolver = Resolver.create();
 
 resolver.namespace = {
   modulePrefix: config.modulePrefix,
-  podModulePrefix: config.podModulePrefix
+  podModulePrefix: config.podModulePrefix,
 };
 
 export default resolver;

types/dummy/index.d.ts

@@ -1 +0,0 @@
-