Skip to content

Commit

Permalink
Merge pull request #13417 from kiwiupover/global-logger-cleanup
Browse files Browse the repository at this point in the history
Global logger cleanup
  • Loading branch information
krisselden committed Apr 28, 2016
2 parents 701c180 + 98c30cb commit 006dbf0
Show file tree
Hide file tree
Showing 17 changed files with 28 additions and 20 deletions.
5 changes: 3 additions & 2 deletions lib/packages.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@ var features = JSON.parse(featuresJson).features;
var packages = {
'container': {trees: null, requirements: []},
'ember-environment': {trees: null, requirements: [], skipTests: true},
'ember-console': {trees: null, requirements: [], skipTests: true},
'ember-metal': {trees: null, requirements: ['ember-environment'], vendorRequirements: ['backburner']},
'ember-metal-views': {trees: null, vendorRequirements: ['dom-helper', 'morph-range', 'morph-attr']},
'ember-debug': {trees: null, requirements: ['ember-metal'], testing: true},
'ember-runtime': {trees: null, vendorRequirements: ['rsvp'], requirements: ['container', 'ember-environment', 'ember-metal']},
'ember-runtime': {trees: null, vendorRequirements: ['rsvp'], requirements: ['container', 'ember-environment', 'ember-console', 'ember-metal']},
'ember-views': {trees: null, requirements: ['ember-runtime', 'ember-metal-views']},
'ember-extension-support': {trees: null, requirements: ['ember-application']},
'ember-testing': {trees: null, requirements: ['ember-application', 'ember-routing'], testing: true},
'ember-template-compiler': {trees: null, requirements: ['ember-metal', 'ember-environment'], vendorRequirements: ['htmlbars-runtime'], templateCompilerVendor: ['simple-html-tokenizer', 'morph-range', 'htmlbars-runtime', 'htmlbars-util', 'htmlbars-compiler', 'htmlbars-syntax', 'htmlbars-test-helpers', 'backburner']},
'ember-template-compiler': {trees: null, requirements: ['ember-metal', 'ember-environment', 'ember-console'], vendorRequirements: ['htmlbars-runtime'], templateCompilerVendor: ['simple-html-tokenizer', 'morph-range', 'htmlbars-runtime', 'htmlbars-util', 'htmlbars-compiler', 'htmlbars-syntax', 'htmlbars-test-helpers', 'backburner']},
'ember-htmlbars': {trees: null, vendorRequirements: ['htmlbars-util', 'htmlbars-runtime'], requirements: ['ember-metal-views'], testingVendorRequirements: [ 'htmlbars-test-helpers'], hasTemplates: true},
'ember-routing': {trees: null, vendorRequirements: ['router', 'route-recognizer'],
requirements: ['ember-runtime', 'ember-views']},
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"ember-cli-sauce": "^1.4.2",
"ember-cli-yuidoc": "0.8.3",
"ember-publisher": "0.0.7",
"emberjs-build": "0.7.0",
"emberjs-build": "0.8.0",
"express": "^4.5.0",
"finalhandler": "^0.4.0",
"github": "^0.2.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/ember-application/tests/system/logging_test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*globals EmberDev */

import Logger from 'ember-metal/logger';
import Logger from 'ember-console';
import run from 'ember-metal/run_loop';
import Application from 'ember-application/system/application';
import View from 'ember-views/views/view';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ import { context } from 'ember-environment';
function K() { return this; }

function consoleMethod(name) {
var consoleObj, logToConsole;
let consoleObj, logToConsole;
if (context.imports.console) {
consoleObj = context.imports.console;
} else if (typeof console !== 'undefined') {
consoleObj = console;
}

var method = typeof consoleObj === 'object' ? consoleObj[name] : null;
let method = typeof consoleObj === 'object' ? consoleObj[name] : null;

if (method) {
// Older IE doesn't support bind, but Chrome needs it
Expand All @@ -28,7 +28,7 @@ function consoleMethod(name) {
return logToConsole;
} else {
return function() {
var message = Array.prototype.join.call(arguments, ', ');
let message = Array.prototype.join.call(arguments, ', ');
method(message);
};
}
Expand Down
3 changes: 2 additions & 1 deletion packages/ember-debug/lib/deprecate.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
/*global __fail__*/

import EmberError from 'ember-metal/error';
import Logger from 'ember-metal/logger';
import Logger from 'ember-console';

import { ENV } from 'ember-environment';

import { registerHandler as genericRegisterHandler, invoke } from 'ember-debug/handlers';
Expand Down
3 changes: 2 additions & 1 deletion packages/ember-debug/lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ import {
} from 'ember-metal/debug';
import isEnabled, { FEATURES, KNOWN_FEATURES } from 'ember-metal/features';
import EmberError from 'ember-metal/error';
import Logger from 'ember-metal/logger';
import Logger from 'ember-console';

import { environment } from 'ember-environment';
import _deprecate, {
registerHandler as registerDeprecationHandler
Expand Down
2 changes: 1 addition & 1 deletion packages/ember-debug/lib/warn.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Logger from 'ember-metal/logger';
import Logger from 'ember-console';
import { deprecate } from 'ember-metal/debug';
import { registerHandler as genericRegisterHandler, invoke } from 'ember-debug/handlers';

Expand Down
2 changes: 1 addition & 1 deletion packages/ember-glimmer/lib/helpers/log.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { helper } from '../helper';
@submodule ember-templates
*/

import Logger from 'ember-metal/logger';
import Logger from 'ember-console';

/**
`log` allows you to output the value of variables in the current rendering
Expand Down
3 changes: 2 additions & 1 deletion packages/ember-glimmer/tests/integration/helpers/log-test.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { RenderingTest, moduleFor } from '../../utils/test-case';
import Logger from 'ember-metal/logger';
import Logger from 'ember-console';


moduleFor('Helpers test: {{log}}', class extends RenderingTest {

Expand Down
2 changes: 1 addition & 1 deletion packages/ember-htmlbars/lib/helpers/log.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@submodule ember-templates
*/

import Logger from 'ember-metal/logger';
import Logger from 'ember-console';

/**
`log` allows you to output the value of variables in the current rendering
Expand Down
2 changes: 1 addition & 1 deletion packages/ember-metal/lib/binding.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Logger from 'ember-metal/logger';
import Logger from 'ember-console';
import { context, ENV } from 'ember-environment';
import run from 'ember-metal/run_loop';
import { assert } from 'ember-metal/debug';
Expand Down
2 changes: 1 addition & 1 deletion packages/ember-metal/lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import {
} from 'ember-metal/meta';
import EmberError from 'ember-metal/error';
import Cache from 'ember-metal/cache';
import Logger from 'ember-metal/logger';
import Logger from 'ember-console';

import {
_getPath,
Expand Down
3 changes: 2 additions & 1 deletion packages/ember-routing-views/lib/components/link-to.js
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,8 @@
*/

import isEnabled from 'ember-metal/features';
import Logger from 'ember-metal/logger';
import Logger from 'ember-console';

import { assert, deprecate } from 'ember-metal/debug';
import { get } from 'ember-metal/property_get';
import { computed } from 'ember-metal/computed';
Expand Down
2 changes: 1 addition & 1 deletion packages/ember-routing/lib/system/router.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Logger from 'ember-metal/logger';
import Logger from 'ember-console';
import { assert, info, deprecate } from 'ember-metal/debug';
import EmberError from 'ember-metal/error';
import isEnabled from 'ember-metal/features';
Expand Down
3 changes: 2 additions & 1 deletion packages/ember-runtime/lib/ext/rsvp.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import Ember from 'ember-metal/core'; // Ember.testing, Ember.onerror
import require, { has } from 'require';
import { assert } from 'ember-metal/debug';
import Logger from 'ember-metal/logger';
import Logger from 'ember-console';

import run from 'ember-metal/run_loop';
import * as RSVP from 'rsvp';

Expand Down
3 changes: 2 additions & 1 deletion packages/ember/tests/helpers/link_to_test.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import Logger from 'ember-metal/logger';
import Logger from 'ember-console';

import Controller from 'ember-runtime/controllers/controller';
import { set } from 'ember-metal/property_set';
import Route from 'ember-routing/system/route';
Expand Down
3 changes: 2 additions & 1 deletion packages/ember/tests/routing/basic_test.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import Logger from 'ember-metal/logger';
import Logger from 'ember-console';

import Controller from 'ember-runtime/controllers/controller';
import Route from 'ember-routing/system/route';
import run from 'ember-metal/run_loop';
Expand Down

0 comments on commit 006dbf0

Please sign in to comment.