Skip to content

Commit

Permalink
Move ember-debug to @ember/debug.
Browse files Browse the repository at this point in the history
  • Loading branch information
rwjblue committed Apr 18, 2018
1 parent 541b9ac commit 169ad48
Show file tree
Hide file tree
Showing 121 changed files with 132 additions and 1,609 deletions.
2 changes: 1 addition & 1 deletion RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ end
1. Any feature that has been GOed gets changed to true
1. Run `ember s -prod`
1. Run tests at `http://localhost:4200/tests/index.html`
1. Run production tests `http://localhost:4200/tests/index.htmlskipPackage=container,ember-testing,ember-debug&dist=prod&prod=true`
1. Run production tests `http://localhost:4200/tests/index.htmlskipPackage=container,ember-testing,@ember/debug&dist=prod&prod=true`
1. In `.travis.yml`, remove `branches:` section e.g. [this commit](https://github.com/emberjs/ember.js/commit/e38ec5d910721a9e02a819b4105a4875723f4b1b).
1. Now we have to look at the commit just prior to branching 2.4.0.beta-1. Then find the commit after that to start the new branch at.

Expand Down
4 changes: 2 additions & 2 deletions bin/run-tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,8 @@ function generateEachPackageTests() {

function generateBuiltTests() {
// Container isn't publicly available.
// ember-testing/ember-debug are stripped from prod/min.
var common = 'skipPackage=container,ember-testing,ember-debug';
// ember-testing and @ember/debug are stripped from prod/min.
var common = 'skipPackage=container,ember-testing,@ember/debug';
testFunctions.push(function() {
return run(common + '&nolint=true');
});
Expand Down
2 changes: 1 addition & 1 deletion broccoli/to-es5.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ module.exports = function toES5(tree, _options) {
'debug-macros',
{
debugTools: {
source: 'ember-debug',
source: '@ember/debug',
assertPredicateIndex: 1,
},
envFlags: {
Expand Down
10 changes: 8 additions & 2 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,13 @@ module.exports = function() {

let emberTestingBundle = new MergeTrees([
new Funnel(packagesES5, {
include: ['ember-debug/**', 'ember-testing/**', 'license.js'],
include: [
'@ember/debug/lib/**',
'@ember/debug/index.js',
'ember-testing/index.js',
'ember-testing/lib/**',
'license.js',
],
}),
loader,
license,
Expand All @@ -181,10 +187,10 @@ module.exports = function() {
include: [
'@ember/error/index.js',
'@ember/debug/index.js',
'@ember/debug/lib/**',
'@ember/polyfills/index.js',
'@ember/polyfills/lib/**',
'ember/version.js',
'ember-debug/**',
'ember-environment.js',
'ember-browser-environment.js',
'ember-template-compiler/**',
Expand Down
2 changes: 1 addition & 1 deletion packages/@ember/application/globals-resolver.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import { dictionary } from 'ember-utils';
import { get, findNamespace } from 'ember-metal';
import { assert, info } from 'ember-debug';
import { assert, info } from '@ember/debug';
import { capitalize, classify, dasherize, decamelize } from '@ember/string';
import { Object as EmberObject } from 'ember-runtime';
import validateType from './lib/validate-type';
Expand Down
2 changes: 1 addition & 1 deletion packages/@ember/application/lib/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import { dictionary } from 'ember-utils';
import { ENV } from 'ember-environment';
import { hasDOM } from 'ember-browser-environment';
import { assert, isTesting } from 'ember-debug';
import { assert, isTesting } from '@ember/debug';
import { DEBUG } from '@glimmer/env';
import { bind, join, once, run, schedule } from '@ember/runloop';
import { libraries, processAllNamespaces, setNamespaceSearchDisabled } from 'ember-metal';
Expand Down
2 changes: 1 addition & 1 deletion packages/@ember/application/lib/validate-type.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { assert } from 'ember-debug';
import { assert } from '@ember/debug';

const VALIDATED_TYPES = {
route: ['assert', 'isRouteFactory', 'Ember.Route'],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { privatize as P } from 'container';
import { factory } from 'internal-test-helpers';
import { Object as EmberObject } from 'ember-runtime';
import { moduleFor, AbstractTestCase as TestCase } from 'internal-test-helpers';
import { getDebugFunction, setDebugFunction } from 'ember-debug';
import { getDebugFunction, setDebugFunction } from '@ember/debug';

const originalDebug = getDebugFunction('debug');
const noop = function() {};
Expand Down
2 changes: 1 addition & 1 deletion packages/@ember/application/tests/application_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import VERSION from 'ember/version';
import { ENV, context } from 'ember-environment';
import { libraries, setNamespaceSearchDisabled } from 'ember-metal';
import { getDebugFunction, setDebugFunction } from 'ember-debug';
import { getDebugFunction, setDebugFunction } from '@ember/debug';
import Application from '..';
import { Router, NoneLocation, Route as EmberRoute } from 'ember-routing';
import { jQuery } from 'ember-views';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import Service from '@ember/service';
import { Object as EmberObject, Namespace } from 'ember-runtime';
import { Route } from 'ember-routing';
import { Component, Helper, helper as makeHelper } from 'ember-glimmer';
import { getDebugFunction, setDebugFunction } from 'ember-debug';
import { getDebugFunction, setDebugFunction } from '@ember/debug';

moduleFor(
'Application Dependency Injection - Integration - default resolver',
Expand Down
2 changes: 1 addition & 1 deletion packages/@ember/engine/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import Controller from '@ember/controller';
import { Namespace, RegistryProxyMixin } from 'ember-runtime';
import { Registry, privatize as P } from 'container';
import DAG from 'dag-map';
import { assert } from 'ember-debug';
import { assert } from '@ember/debug';
import { get, set } from 'ember-metal';
import DefaultResolver from '@ember/application/globals-resolver';
import EngineInstance from '@ember/engine/instance';
Expand Down
2 changes: 1 addition & 1 deletion packages/@ember/engine/instance.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
RegistryProxyMixin,
RSVP,
} from 'ember-runtime';
import { assert } from 'ember-debug';
import { assert } from '@ember/debug';
import EmberError from '@ember/error';
import { Registry, privatize as P } from 'container';
import { getEngineParent, setEngineParent } from '@ember/engine';
Expand Down
2 changes: 1 addition & 1 deletion packages/@ember/map/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { assert } from 'ember-debug';
import { assert } from '@ember/debug';
import { guidFor } from 'ember-utils';
import OrderedSet from './lib/ordered-set';
import { copyMap } from './lib/utils';
Expand Down
2 changes: 1 addition & 1 deletion packages/@ember/map/lib/ordered-set.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { assert } from 'ember-debug';
import { assert } from '@ember/debug';
import { guidFor } from 'ember-utils';
import { copyNull } from './utils';

Expand Down
2 changes: 1 addition & 1 deletion packages/@ember/runloop/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { assert, deprecate, isTesting } from 'ember-debug';
import { assert, deprecate, isTesting } from '@ember/debug';
import { onErrorTarget } from 'ember-error-handling';
import { beginPropertyChanges, endPropertyChanges } from 'ember-metal';
import Backburner from 'backburner';
Expand Down
2 changes: 1 addition & 1 deletion packages/@ember/runloop/tests/onerror_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
setDispatchOverride,
setOnerror,
} from 'ember-error-handling';
import { isTesting, setTesting } from 'ember-debug';
import { isTesting, setTesting } from '@ember/debug';
import { moduleFor, AbstractTestCase } from 'internal-test-helpers';

moduleFor(
Expand Down
2 changes: 1 addition & 1 deletion packages/container/lib/container.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* globals Proxy */
import { assert } from 'ember-debug';
import { assert } from '@ember/debug';
import { EMBER_MODULE_UNIFICATION } from 'ember/features';
import { DEBUG } from '@glimmer/env';
import { OWNER, setOwner } from 'ember-owner';
Expand Down
2 changes: 1 addition & 1 deletion packages/container/lib/registry.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { assign } from '@ember/polyfills';
import { dictionary, intern } from 'ember-utils';
import { assert, deprecate } from 'ember-debug';
import { assert, deprecate } from '@ember/debug';
import Container from './container';
import { DEBUG } from '@glimmer/env';
import { ENV } from 'ember-environment';
Expand Down
2 changes: 1 addition & 1 deletion packages/ember-console/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { deprecate } from 'ember-debug';
import { deprecate } from '@ember/debug';

// Deliver message that the function is deprecated

Expand Down
5 changes: 0 additions & 5 deletions packages/ember-debug/index.d.ts

This file was deleted.

Loading

0 comments on commit 169ad48

Please sign in to comment.