Skip to content

Commit

Permalink
fix: lint:ts script for tslint
Browse files Browse the repository at this point in the history
  • Loading branch information
mike-north committed Nov 1, 2018
1 parent 4ff798c commit 1a92733
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -42,7 +42,7 @@ install:
- yarn install --no-lockfile --non-interactive --skip-optional

script:
- yarn lint:js
- yarn lint:ts
# Usually, it's ok to finish the test scenario without reverting
# to the addon's original dependency state, skipping "cleanup".
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO
Expand Down
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -8,7 +8,7 @@
},
"scripts": {
"build": "ember build",
"lint:js": "eslint ./*.js addon addon-test-support app config lib server test-support tests",
"lint:ts": "tslint --project .",
"start": "ember server",
"test": "ember try:each",
"travis-deploy-once": "travis-deploy-once",
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/app/app.js
@@ -1,7 +1,7 @@
import Application from '@ember/application';
import Resolver from './resolver';
import loadInitializers from 'ember-load-initializers';
import config from './config/environment';
import Resolver from './resolver';

const App = Application.extend({
modulePrefix: config.modulePrefix,
Expand Down
4 changes: 3 additions & 1 deletion tests/dummy/app/router.js
Expand Up @@ -6,6 +6,8 @@ const Router = EmberRouter.extend({
rootURL: config.rootURL
});

Router.map(function() {});
Router.map(function() {
// foo
});

export default Router;
12 changes: 6 additions & 6 deletions tests/dummy/config/environment.js
Expand Up @@ -2,18 +2,18 @@
// eslint-disable-next-line
module.exports = function(environment) {
let ENV = {
modulePrefix: 'dummy',
environment,
rootURL: '/',
locationType: 'auto',
modulePrefix: 'dummy',
rootURL: '/',
EmberENV: {
FEATURES: {
// Here you can enable experimental features on an ember canary build
// e.g. 'with-controller': true
},
EXTEND_PROTOTYPES: {
// Prevent Ember Data from overriding Date.parse.
Date: false
},
FEATURES: {
// Here you can enable experimental features on an ember canary build
// e.g. 'with-controller': true
}
},

Expand Down
5 changes: 4 additions & 1 deletion tslint.json
@@ -1,7 +1,10 @@
{
"defaultSeverity": "error",
"extends": ["tslint:recommended", "tslint-config-prettier"],
"jsRules": {},
"jsRules": {
"interface-name": false,
"object-literal-sort-keys": false
},
"rules": {
"interface-name": false,
"object-literal-sort-keys": false
Expand Down

0 comments on commit 1a92733

Please sign in to comment.