Skip to content

Commit

Permalink
Fixup linting issues.
Browse files Browse the repository at this point in the history
  • Loading branch information
rwjblue committed May 17, 2018
1 parent efcc8e9 commit 4d5a19f
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 17 deletions.
3 changes: 2 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ module.exports = {
'addon/**',
'addon-test-support/**',
'app/**',
'tests/dummy/app/**'
'tests/dummy/app/**',
'mu-trees/**',
],
parserOptions: {
sourceType: 'script',
Expand Down
4 changes: 2 additions & 2 deletions addon/resolvers/classic/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -373,9 +373,9 @@ const Resolver = DefaultResolver.extend({
description = this.lookupDescription(parsedName);
}

/* eslint-disable no-console */
if (console && console.info) {
// eslint-disable-next-line no-console
console.info(symbol, parsedName.fullName, padding, description);
console.info(symbol, parsedName.fullName, padding, description);
}
},

Expand Down
3 changes: 0 additions & 3 deletions mu-trees/addon/module-registries/requirejs.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* global require, requirejs */
import {
deserializeSpecifier
} from '@glimmer/di';
Expand Down Expand Up @@ -83,8 +82,6 @@ export default class RequireJSRegistry {
get(specifierString) {
let specifier = deserializeSpecifier(specifierString);

let useDefaultType = this._checkDefaultType(specifier);

/* return an export */
let moduleExport = this._detectModule(specifier, path => {
return (path in this._require.entries) && this._require(path).default;
Expand Down
2 changes: 1 addition & 1 deletion mu-trees/addon/resolvers/glimmer-wrapper/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ const Resolver = DefaultResolver.extend({
if (source || namespace) {
let rootName = namespace || this._configRootName;

let [type, name] = specifier.split(':');
let [type] = specifier.split(':');

/*
* Ember components require their lookupString to be massaged. Make this
Expand Down
5 changes: 0 additions & 5 deletions tests/.eslintrc.js

This file was deleted.

7 changes: 2 additions & 5 deletions tests/unit/resolvers/classic/basic-test.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
/* globals requirejs, define */

/* eslint-disable no-console */

import Ember from 'ember';
import require from 'require';
import { module, test } from 'qunit';
Expand Down Expand Up @@ -499,9 +501,6 @@ module("Logging", {
beforeEach: function() {
originalConsoleInfo = console ? console.info : null;
logCalls = [];
if (!console) {
console = {info: null};
}
console.info = function(arg) {
logCalls.push(arg);
};
Expand All @@ -511,8 +510,6 @@ module("Logging", {
afterEach: function() {
if (originalConsoleInfo) {
console.info = originalConsoleInfo;
} else {
console = undefined;
}
}
});
Expand Down

0 comments on commit 4d5a19f

Please sign in to comment.