diff --git a/addon/-private/global-options.js b/addon/-private/global-options.js index 4d33cde4..3bbec819 100644 --- a/addon/-private/global-options.js +++ b/addon/-private/global-options.js @@ -1,12 +1,11 @@ -import Ember from 'ember'; +import { merge } from '@ember/polyfills'; import config from 'ember-get-config'; // eslint-disable-next-line ember-suave/no-direct-property-access -const assign = Ember.assign || Ember.merge; const globalOptions = config['ember-light-table'] || {}; export default globalOptions; export function mergeOptionsWithGlobals(options) { - return assign(assign({}, globalOptions), options); + return merge(merge({}, globalOptions), options); } diff --git a/addon/-private/sync-array-proxy.js b/addon/-private/sync-array-proxy.js index 8bc81477..5dc4d55e 100644 --- a/addon/-private/sync-array-proxy.js +++ b/addon/-private/sync-array-proxy.js @@ -1,10 +1,6 @@ -import Ember from 'ember'; - -const { - ArrayProxy, - assert, - isArray -} = Ember; +import ArrayProxy from '@ember/array/proxy'; +import { assert } from '@ember/debug'; +import { isArray } from '@ember/array'; const EMPTY_ARRAY = []; diff --git a/addon/classes/Column.js b/addon/classes/Column.js index 9514944b..c12c9c2a 100644 --- a/addon/classes/Column.js +++ b/addon/classes/Column.js @@ -1,15 +1,9 @@ -import Ember from 'ember'; +import { A as emberArray, makeArray } from '@ember/array'; +import EmberObject, { computed } from '@ember/object'; +import { isEmpty } from '@ember/utils'; +import { guidFor } from '@ember/object/internals'; import fixProto from 'ember-light-table/utils/fix-proto'; -const { - guidFor, - isEmpty, - makeArray, - computed, - A: emberArray, - Object: EmberObject -} = Ember; - /** * @module Table * @class Column diff --git a/addon/classes/Row.js b/addon/classes/Row.js index 95847cce..49921f23 100644 --- a/addon/classes/Row.js +++ b/addon/classes/Row.js @@ -1,12 +1,8 @@ -import Ember from 'ember'; +import ObjectProxy from '@ember/object/proxy'; +import { computed } from '@ember/object'; +import { guidFor } from '@ember/object/internals'; import fixProto from 'ember-light-table/utils/fix-proto'; -const { - computed, - guidFor, - ObjectProxy -} = Ember; - /** * @module Table * @extends Ember.ObjectProxy diff --git a/addon/classes/Table.js b/addon/classes/Table.js index 345f644d..faba9ef0 100644 --- a/addon/classes/Table.js +++ b/addon/classes/Table.js @@ -1,17 +1,11 @@ -import Ember from 'ember'; +import { A as emberArray } from '@ember/array'; +import EmberObject, { computed, get } from '@ember/object'; import Row from 'ember-light-table/classes/Row'; import Column from 'ember-light-table/classes/Column'; import SyncArrayProxy from 'ember-light-table/-private/sync-array-proxy'; import { mergeOptionsWithGlobals } from 'ember-light-table/-private/global-options'; import fixProto from 'ember-light-table/utils/fix-proto'; - -const { - get, - computed, - isNone, - A: emberArray, - Object: EmberObject -} = Ember; +import { isNone } from '@ember/utils'; const RowSyncArrayProxy = SyncArrayProxy.extend({ serializeContentObjects(objects) { diff --git a/addon/components/cells/base.js b/addon/components/cells/base.js index 2e3ebfd9..713556df 100644 --- a/addon/components/cells/base.js +++ b/addon/components/cells/base.js @@ -1,12 +1,8 @@ -import Ember from 'ember'; +import Component from '@ember/component'; +import { computed } from '@ember/object'; import layout from 'ember-light-table/templates/components/cells/base'; import cssStyleify from 'ember-light-table/utils/css-styleify'; -const { - Component, - computed -} = Ember; - /** * @module Light Table * @submodule Cell Types diff --git a/addon/components/columns/base.js b/addon/components/columns/base.js index c6dbfde6..84c1a3a4 100644 --- a/addon/components/columns/base.js +++ b/addon/components/columns/base.js @@ -1,14 +1,10 @@ -import Ember from 'ember'; +import Component from '@ember/component'; +import { computed } from '@ember/object'; +import { isEmpty } from '@ember/utils'; import layout from 'ember-light-table/templates/components/columns/base'; import DraggableColumnMixin from 'ember-light-table/mixins/draggable-column'; import cssStyleify from 'ember-light-table/utils/css-styleify'; -const { - Component, - computed, - isEmpty -} = Ember; - /** * @module Light Table * @submodule Column Types diff --git a/addon/components/light-table.js b/addon/components/light-table.js index 35a96ef4..3d87fcd6 100644 --- a/addon/components/light-table.js +++ b/addon/components/light-table.js @@ -1,20 +1,14 @@ -import Ember from 'ember'; +import { A as emberArray } from '@ember/array'; +import Component from '@ember/component'; +import { computed, observer } from '@ember/object'; +import { isEmpty, isNone } from '@ember/utils'; +import { assert } from '@ember/debug'; +import { on } from '@ember/object/evented'; +import { inject as service } from '@ember/service'; import layout from 'ember-light-table/templates/components/light-table'; import Table from 'ember-light-table/classes/Table'; import cssStyleify from 'ember-light-table/utils/css-styleify'; -const { - assert, - Component, - computed, - inject, - observer, - on, - isNone, - isEmpty, - A: emberArray -} = Ember; - function intersections(array1, array2) { return array1.filter((n) => { return array2.indexOf(n) > -1; @@ -47,7 +41,7 @@ const LightTable = Component.extend({ classNameBindings: [':ember-light-table'], attributeBindings: ['style'], - media: inject.service(), + media: service(), /** * @property table @@ -208,8 +202,8 @@ const LightTable = Component.extend({ unit = unit[0]; /* - 1. Check if all widths are present - 2. Check if all widths are the same unit + 1. Check if all widths are present + 2. Check if all widths are the same unit */ for (let i = 0; i < widths.length; i++) { let width = widths[i]; diff --git a/addon/components/lt-body.js b/addon/components/lt-body.js index dc6044b9..9aca7050 100644 --- a/addon/components/lt-body.js +++ b/addon/components/lt-body.js @@ -1,14 +1,9 @@ -import Ember from 'ember'; +import Component from '@ember/component'; +import { computed, observer } from '@ember/object'; import layout from 'ember-light-table/templates/components/lt-body'; +import { run } from '@ember/runloop'; import Row from 'ember-light-table/classes/Row'; -const { - Component, - computed, - run, - observer -} = Ember; - /** * @module Light Table */ diff --git a/addon/components/lt-column-resizer.js b/addon/components/lt-column-resizer.js index ca196dd1..c5b780a3 100644 --- a/addon/components/lt-column-resizer.js +++ b/addon/components/lt-column-resizer.js @@ -1,12 +1,8 @@ -import Ember from 'ember'; +import $ from 'jquery'; +import Component from '@ember/component'; +import { computed } from '@ember/object'; import layout from '../templates/components/lt-column-resizer'; -const { - $, - Component, - computed -} = Ember; - const TOP_LEVEL_CLASS = '.ember-light-table'; export default Component.extend({ diff --git a/addon/components/lt-foot.js b/addon/components/lt-foot.js index 2e1b90e1..58c1160c 100644 --- a/addon/components/lt-foot.js +++ b/addon/components/lt-foot.js @@ -1,13 +1,8 @@ -import Ember from 'ember'; +import Component from '@ember/component'; +import { get, trySet } from '@ember/object'; import layout from 'ember-light-table/templates/components/lt-foot'; import TableHeaderMixin from 'ember-light-table/mixins/table-header'; -const { - Component, - get, - trySet -} = Ember; - /** * @module Light Table */ diff --git a/addon/components/lt-head.js b/addon/components/lt-head.js index 20f69338..dc03bc7d 100644 --- a/addon/components/lt-head.js +++ b/addon/components/lt-head.js @@ -1,13 +1,8 @@ -import Ember from 'ember'; +import Component from '@ember/component'; +import { get, trySet } from '@ember/object'; import layout from 'ember-light-table/templates/components/lt-head'; import TableHeaderMixin from 'ember-light-table/mixins/table-header'; -const { - Component, - get, - trySet -} = Ember; - /** * @module Light Table */ diff --git a/addon/components/lt-infinity.js b/addon/components/lt-infinity.js index 354de5c2..c19c55d0 100644 --- a/addon/components/lt-infinity.js +++ b/addon/components/lt-infinity.js @@ -1,13 +1,9 @@ -import Ember from 'ember'; +import Component from '@ember/component'; +import { observer } from '@ember/object'; +import { run } from '@ember/runloop'; import layout from '../templates/components/lt-infinity'; import InViewportMixin from 'ember-in-viewport'; -const { - Component, - observer, - run -} = Ember; - export default Component.extend(InViewportMixin, { classNames: ['lt-infinity'], classNameBindings: ['viewportEntered:in-viewport'], @@ -49,7 +45,7 @@ export default Component.extend(InViewportMixin, { scheduleScrolledToBottom: observer('rows.[]', 'viewportEntered', function() { if (this.get('viewportEntered')) { /* - Continue scheduling onScrolledToBottom until no longer in viewport + Continue scheduling onScrolledToBottom until no longer in viewport */ this._scheduleScrolledToBottom(); } @@ -61,8 +57,8 @@ export default Component.extend(InViewportMixin, { _debounceScrolledToBottom(delay = 100) { /* - This debounce is needed when there is not enough delay between onScrolledToBottom calls. - Without this debounce, all rows will be rendered causing immense performance problems + This debounce is needed when there is not enough delay between onScrolledToBottom calls. + Without this debounce, all rows will be rendered causing immense performance problems */ this._debounceTimer = run.debounce(this, this.sendAction, 'onScrolledToBottom', delay); }, diff --git a/addon/components/lt-row.js b/addon/components/lt-row.js index a0c38931..2558b99b 100644 --- a/addon/components/lt-row.js +++ b/addon/components/lt-row.js @@ -1,11 +1,7 @@ -import Ember from 'ember'; +import Component from '@ember/component'; +import { computed } from '@ember/object'; import layout from 'ember-light-table/templates/components/lt-row'; -const { - Component, - computed -} = Ember; - const Row = Component.extend({ layout, tagName: 'tr', diff --git a/addon/components/lt-scrollable.js b/addon/components/lt-scrollable.js index 9f98b5dc..4d7bd00f 100644 --- a/addon/components/lt-scrollable.js +++ b/addon/components/lt-scrollable.js @@ -1,10 +1,6 @@ -import Ember from 'ember'; +import Component from '@ember/component'; import layout from '../templates/components/lt-scrollable'; -const { - Component -} = Ember; - export default Component.extend({ layout, tagName: '', diff --git a/addon/components/lt-spanned-row.js b/addon/components/lt-spanned-row.js index 203a4207..f7b0cb91 100644 --- a/addon/components/lt-spanned-row.js +++ b/addon/components/lt-spanned-row.js @@ -1,10 +1,6 @@ -import Ember from 'ember'; +import Component from '@ember/component'; import layout from 'ember-light-table/templates/components/lt-spanned-row'; -const { - Component -} = Ember; - export default Component.extend({ layout, colspan: 1, diff --git a/addon/index.js b/addon/index.js index 4b52eb05..ee860610 100644 --- a/addon/index.js +++ b/addon/index.js @@ -34,11 +34,9 @@ import Row from './classes/Row'; * * ```javascript * // components/my-table.js - * import Ember from 'ember'; + * import { computed } from '@ember/object'; * import Table from 'ember-light-table'; * - * const { computed } = Ember; - * * export default Ember.Component.extend({ * model: null, * diff --git a/addon/mixins/draggable-column.js b/addon/mixins/draggable-column.js index 688d0321..97aa9992 100644 --- a/addon/mixins/draggable-column.js +++ b/addon/mixins/draggable-column.js @@ -1,10 +1,6 @@ -import Ember from 'ember'; - -const { - run, - computed, - Mixin -} = Ember; +import Mixin from '@ember/object/mixin'; +import { computed } from '@ember/object'; +import { run } from '@ember/runloop'; let sourceColumn; @@ -43,7 +39,7 @@ export default Mixin.create({ isDropTarget: computed(function() { let column = this.get('column'); /* - A column is a valid drop target only if its in the same group + A column is a valid drop target only if its in the same group */ return column.get('droppable') && column.get('parent') === sourceColumn.get('parent'); }).volatile().readOnly(), @@ -54,7 +50,7 @@ export default Mixin.create({ let column = this.get('column'); /* - NOTE: IE requires setData type to be 'text' + NOTE: IE requires setData type to be 'text' */ e.dataTransfer.setData('text', column.get('columnId')); e.dataTransfer.effectAllowed = 'move'; @@ -64,8 +60,8 @@ export default Mixin.create({ this.sendAction('onColumnDrag', sourceColumn, ...arguments); /* - NOTE: This is a fix for Firefox to prevent the click event - from being triggered after a drop. + NOTE: This is a fix for Firefox to prevent the click event + from being triggered after a drop. */ this.__click__ = this.click; this.click = undefined; @@ -99,8 +95,8 @@ export default Mixin.create({ this.setProperties({ isDragTarget: false, isDragging: false }); /* - If sourceColumn still references a column, it means that a successful - drop did not happen. + If sourceColumn still references a column, it means that a successful + drop did not happen. */ if (sourceColumn) { this.sendAction('onColumnDrop', sourceColumn, false, ...arguments); @@ -108,7 +104,7 @@ export default Mixin.create({ } /* - Restore click event + Restore click event */ this._clickResetTimer = run.next(this, () => this.click = this.__click__); }, diff --git a/addon/mixins/table-header.js b/addon/mixins/table-header.js index bb90dc0b..450b1514 100644 --- a/addon/mixins/table-header.js +++ b/addon/mixins/table-header.js @@ -1,11 +1,7 @@ -import Ember from 'ember'; - -const { - computed, - isEmpty, - Mixin, - warn -} = Ember; +import Mixin from '@ember/object/mixin'; +import { computed } from '@ember/object'; +import { isEmpty } from '@ember/utils'; +import { warn } from '@ember/debug'; /** * @module Light Table diff --git a/addon/utils/css-styleify.js b/addon/utils/css-styleify.js index 6c144607..60818922 100644 --- a/addon/utils/css-styleify.js +++ b/addon/utils/css-styleify.js @@ -1,12 +1,5 @@ -import Ember from 'ember'; - -const { - isPresent, - String: { - dasherize, - htmlSafe - } -} = Ember; +import { dasherize, htmlSafe } from '@ember/string'; +import { isPresent } from '@ember/utils'; export default function cssStyleify(hash = {}) { let styles = []; diff --git a/blueprints/cell-type-test/files/tests/integration/components/light-table/cells/__name__-test.js b/blueprints/cell-type-test/files/tests/integration/components/light-table/cells/__name__-test.js index b2a67032..0eaf60bb 100644 --- a/blueprints/cell-type-test/files/tests/integration/components/light-table/cells/__name__-test.js +++ b/blueprints/cell-type-test/files/tests/integration/components/light-table/cells/__name__-test.js @@ -1,4 +1,3 @@ -import Ember from 'ember'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; import { Row, Column } from 'ember-light-table'; diff --git a/blueprints/column-type-test/files/tests/integration/components/light-table/columns/__name__-test.js b/blueprints/column-type-test/files/tests/integration/components/light-table/columns/__name__-test.js index a5227413..8501ed73 100644 --- a/blueprints/column-type-test/files/tests/integration/components/light-table/columns/__name__-test.js +++ b/blueprints/column-type-test/files/tests/integration/components/light-table/columns/__name__-test.js @@ -1,4 +1,3 @@ -import Ember from 'ember'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; import { Column } from 'ember-light-table'; diff --git a/package.json b/package.json index 32e62ab2..1eecb817 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "test": "ember try:each" }, "dependencies": { - "ember-cli-babel": "^6.0.0", + "ember-cli-babel": "^6.6.0", "ember-cli-htmlbars": "^2.0.2", "ember-cli-string-helpers": "^1.3.0", "ember-composable-helpers": "^2.0.1", diff --git a/tests/dummy/app/app.js b/tests/dummy/app/app.js index 4372a448..b3b2bd67 100644 --- a/tests/dummy/app/app.js +++ b/tests/dummy/app/app.js @@ -1,12 +1,8 @@ -import Ember from 'ember'; +import Application from '@ember/application'; import Resolver from './resolver'; import loadInitializers from 'ember-load-initializers'; import config from './config/environment'; -const { - Application -} = Ember; - const App = Application.extend({ modulePrefix: config.modulePrefix, podModulePrefix: config.podModulePrefix, diff --git a/tests/dummy/app/components/code-panel.js b/tests/dummy/app/components/code-panel.js index 2322af1f..dec83030 100644 --- a/tests/dummy/app/components/code-panel.js +++ b/tests/dummy/app/components/code-panel.js @@ -1,8 +1,6 @@ -import Ember from 'ember'; +import Component from '@ember/component'; import layout from '../templates/components/code-panel'; -const { Component } = Ember; - export default Component.extend({ layout, collapse: true, diff --git a/tests/dummy/app/components/colored-row.js b/tests/dummy/app/components/colored-row.js index 5b36d5fc..fa87d4a2 100644 --- a/tests/dummy/app/components/colored-row.js +++ b/tests/dummy/app/components/colored-row.js @@ -1,12 +1,8 @@ // BEGIN-SNIPPET colored-row -import Ember from 'ember'; +import { computed } from '@ember/computed'; +import { htmlSafe } from '@ember/string'; import Row from 'ember-light-table/components/lt-row'; -const { - computed, - String: { htmlSafe } -} = Ember; - export default Row.extend({ classNames: ['colored-row'], attributeBindings: ['style'], diff --git a/tests/dummy/app/components/columns/draggable-table.js b/tests/dummy/app/components/columns/draggable-table.js index f3dc9556..e7611133 100644 --- a/tests/dummy/app/components/columns/draggable-table.js +++ b/tests/dummy/app/components/columns/draggable-table.js @@ -1,11 +1,7 @@ // BEGIN-SNIPPET draggable-table -import Ember from 'ember'; +import Component from '@ember/component'; import TableCommon from '../../mixins/table-common'; - -const { - Component, - computed -} = Ember; +import { computed } from '@ember/object'; export default Component.extend(TableCommon, { columns: computed(function() { diff --git a/tests/dummy/app/components/columns/grouped-table.js b/tests/dummy/app/components/columns/grouped-table.js index 6c2d5b05..3f1f0d1e 100644 --- a/tests/dummy/app/components/columns/grouped-table.js +++ b/tests/dummy/app/components/columns/grouped-table.js @@ -1,11 +1,7 @@ // BEGIN-SNIPPET grouped-table -import Ember from 'ember'; +import Component from '@ember/component'; import TableCommon from '../../mixins/table-common'; - -const { - Component, - computed -} = Ember; +import { computed } from '@ember/object'; export default Component.extend(TableCommon, { columns: computed(function() { diff --git a/tests/dummy/app/components/columns/resizable-table.js b/tests/dummy/app/components/columns/resizable-table.js index 02ff6951..f0bcd592 100644 --- a/tests/dummy/app/components/columns/resizable-table.js +++ b/tests/dummy/app/components/columns/resizable-table.js @@ -1,11 +1,7 @@ // BEGIN-SNIPPET resizable-table -import Ember from 'ember'; +import Component from '@ember/component'; import TableCommon from '../../mixins/table-common'; - -const { - Component, - computed -} = Ember; +import { computed } from '@ember/object'; export default Component.extend(TableCommon, { columns: computed(function() { diff --git a/tests/dummy/app/components/cookbook/client-side-table.js b/tests/dummy/app/components/cookbook/client-side-table.js index 6b62b36c..5aa45399 100644 --- a/tests/dummy/app/components/cookbook/client-side-table.js +++ b/tests/dummy/app/components/cookbook/client-side-table.js @@ -1,13 +1,9 @@ // BEGIN-SNIPPET client-side-table -import Ember from 'ember'; +import Component from '@ember/component'; import TableCommon from '../../mixins/table-common'; +import { computed } from '@ember/object'; import { task, timeout } from 'ember-concurrency'; -const { - Component, - computed -} = Ember; - export default Component.extend(TableCommon, { query: '', diff --git a/tests/dummy/app/components/cookbook/custom-row-table.js b/tests/dummy/app/components/cookbook/custom-row-table.js index 6b864f2e..e91a7b8c 100644 --- a/tests/dummy/app/components/cookbook/custom-row-table.js +++ b/tests/dummy/app/components/cookbook/custom-row-table.js @@ -1,11 +1,7 @@ // BEGIN-SNIPPET custom-row-table -import Ember from 'ember'; +import Component from '@ember/component'; import TableCommon from '../../mixins/table-common'; - -const { - Component, - computed -} = Ember; +import { computed } from '@ember/object'; export default Component.extend(TableCommon, { columns: computed(function() { diff --git a/tests/dummy/app/components/cookbook/horizontal-scrolling-table.js b/tests/dummy/app/components/cookbook/horizontal-scrolling-table.js index 434e43c1..3e8abff1 100644 --- a/tests/dummy/app/components/cookbook/horizontal-scrolling-table.js +++ b/tests/dummy/app/components/cookbook/horizontal-scrolling-table.js @@ -1,11 +1,7 @@ // BEGIN-SNIPPET horizontal-scrolling-table -import Ember from 'ember'; +import Component from '@ember/component'; import TableCommon from '../../mixins/table-common'; - -const { - Component, - computed -} = Ember; +import { computed } from '@ember/object'; export default Component.extend(TableCommon, { columns: computed(function() { diff --git a/tests/dummy/app/components/cookbook/paginated-table.js b/tests/dummy/app/components/cookbook/paginated-table.js index 20ec93af..a2eb29b7 100644 --- a/tests/dummy/app/components/cookbook/paginated-table.js +++ b/tests/dummy/app/components/cookbook/paginated-table.js @@ -1,11 +1,7 @@ // BEGIN-SNIPPET paginated-table -import Ember from 'ember'; +import Component from '@ember/component'; import TableCommon from '../../mixins/table-common'; - -const { - Component, - computed -} = Ember; +import { computed } from '@ember/object'; export default Component.extend(TableCommon, { columns: computed(function() { diff --git a/tests/dummy/app/components/cookbook/table-actions-table.js b/tests/dummy/app/components/cookbook/table-actions-table.js index abab8540..2c0c315c 100644 --- a/tests/dummy/app/components/cookbook/table-actions-table.js +++ b/tests/dummy/app/components/cookbook/table-actions-table.js @@ -1,11 +1,7 @@ // BEGIN-SNIPPET table-actions-table -import Ember from 'ember'; +import Component from '@ember/component'; import TableCommon from '../../mixins/table-common'; - -const { - Component, - computed -} = Ember; +import { computed } from '@ember/object'; export default Component.extend(TableCommon, { columns: computed(function() { diff --git a/tests/dummy/app/components/responsive-table.js b/tests/dummy/app/components/responsive-table.js index d442a541..87f1bddd 100644 --- a/tests/dummy/app/components/responsive-table.js +++ b/tests/dummy/app/components/responsive-table.js @@ -1,11 +1,7 @@ // BEGIN-SNIPPET responsive-table -import Ember from 'ember'; +import Component from '@ember/component'; import TableCommon from '../mixins/table-common'; - -const { - Component, - computed -} = Ember; +import { computed } from '@ember/object'; export default Component.extend(TableCommon, { columns: computed(function() { diff --git a/tests/dummy/app/components/rows/expandable-table.js b/tests/dummy/app/components/rows/expandable-table.js index ddfda502..f1f2a216 100644 --- a/tests/dummy/app/components/rows/expandable-table.js +++ b/tests/dummy/app/components/rows/expandable-table.js @@ -1,11 +1,7 @@ // BEGIN-SNIPPET expandable-table -import Ember from 'ember'; +import Component from '@ember/component'; import TableCommon from '../../mixins/table-common'; - -const { - Component, - computed -} = Ember; +import { computed } from '@ember/object'; export default Component.extend(TableCommon, { columns: computed(function() { diff --git a/tests/dummy/app/components/rows/selectable-table.js b/tests/dummy/app/components/rows/selectable-table.js index a7aaca5e..63af08d7 100644 --- a/tests/dummy/app/components/rows/selectable-table.js +++ b/tests/dummy/app/components/rows/selectable-table.js @@ -1,11 +1,7 @@ // BEGIN-SNIPPET selectable-table -import Ember from 'ember'; +import Component from '@ember/component'; import TableCommon from '../../mixins/table-common'; - -const { - Component, - computed -} = Ember; +import { computed } from '@ember/object'; export default Component.extend(TableCommon, { hasSelection: computed.notEmpty('table.selectedRows'), diff --git a/tests/dummy/app/components/scrolling-table.js b/tests/dummy/app/components/scrolling-table.js index 2a82dc93..1d839ac2 100644 --- a/tests/dummy/app/components/scrolling-table.js +++ b/tests/dummy/app/components/scrolling-table.js @@ -1,11 +1,7 @@ // BEGIN-SNIPPET scrolling-table -import Ember from 'ember'; +import Component from '@ember/component'; import TableCommon from '../mixins/table-common'; - -const { - Component, - computed -} = Ember; +import { computed } from '@ember/object'; export default Component.extend(TableCommon, { currentScrollOffset: 0, diff --git a/tests/dummy/app/components/simple-table.js b/tests/dummy/app/components/simple-table.js index 15ad89e9..5f12acbb 100644 --- a/tests/dummy/app/components/simple-table.js +++ b/tests/dummy/app/components/simple-table.js @@ -1,11 +1,7 @@ // BEGIN-SNIPPET simple-table -import Ember from 'ember'; +import Component from '@ember/component'; import TableCommon from '../mixins/table-common'; - -const { - Component, - computed -} = Ember; +import { computed } from '@ember/object'; export default Component.extend(TableCommon, { columns: computed(function() { diff --git a/tests/dummy/app/mixins/table-common.js b/tests/dummy/app/mixins/table-common.js index 2a411c0b..99ab911b 100644 --- a/tests/dummy/app/mixins/table-common.js +++ b/tests/dummy/app/mixins/table-common.js @@ -1,17 +1,13 @@ // BEGIN-SNIPPET table-common -import Ember from 'ember'; +import Mixin from '@ember/object/mixin'; +import { computed } from '@ember/object'; +import { isEmpty } from '@ember/utils'; +import { inject as service } from '@ember/service'; import Table from 'ember-light-table'; import { task } from 'ember-concurrency'; -const { - inject, - isEmpty, - computed, - Mixin -} = Ember; - export default Mixin.create({ - store: inject.service(), + store: service(), page: 0, limit: 10, diff --git a/tests/dummy/app/router.js b/tests/dummy/app/router.js index 8be38e04..93afae07 100644 --- a/tests/dummy/app/router.js +++ b/tests/dummy/app/router.js @@ -1,8 +1,8 @@ -import Ember from 'ember'; +import EmberRouter from '@ember/routing/router'; import config from './config/environment'; // eslint-disable-next-line ember-suave/no-direct-property-access -const Router = Ember.Router.extend({ +const Router = EmberRouter.extend({ location: config.locationType, rootURL: config.rootURL }); diff --git a/tests/dummy/app/routes/table-route.js b/tests/dummy/app/routes/table-route.js index 58637e11..c8f62fea 100644 --- a/tests/dummy/app/routes/table-route.js +++ b/tests/dummy/app/routes/table-route.js @@ -1,9 +1,5 @@ -import Ember from 'ember'; - -const { - A, - Route -} = Ember; +import { A } from '@ember/array'; +import Route from '@ember/routing/route'; export default Route.extend({ model() { diff --git a/tests/dummy/mirage/config.js b/tests/dummy/mirage/config.js index c1fd6fb4..1d37a333 100644 --- a/tests/dummy/mirage/config.js +++ b/tests/dummy/mirage/config.js @@ -1,10 +1,6 @@ -import Ember from 'ember'; +import { A as emberArray } from '@ember/array'; import ENV from '../config/environment'; -const { - A: emberArray -} = Ember; - export default function() { // These comments are here to help you get started. Feel free to delete them. diff --git a/tests/helpers/destroy-app.js b/tests/helpers/destroy-app.js index 3a0114aa..ac074c62 100644 --- a/tests/helpers/destroy-app.js +++ b/tests/helpers/destroy-app.js @@ -1,6 +1,6 @@ -import Ember from 'ember'; +import { run } from '@ember/runloop'; export default function destroyApp(application) { - Ember.run(application, 'destroy'); + run(application, 'destroy'); server.shutdown(); } diff --git a/tests/helpers/module-for-acceptance.js b/tests/helpers/module-for-acceptance.js index 76996fd0..196f61ce 100644 --- a/tests/helpers/module-for-acceptance.js +++ b/tests/helpers/module-for-acceptance.js @@ -1,10 +1,8 @@ import { module } from 'qunit'; -import Ember from 'ember'; +import { Promise } from 'rsvp'; import startApp from '../helpers/start-app'; import destroyApp from '../helpers/destroy-app'; -const { RSVP: { Promise } } = Ember; - export default function(name, options = {}) { module(name, { beforeEach() { diff --git a/tests/helpers/responsive.js b/tests/helpers/responsive.js index 6a652f40..b2a3260d 100644 --- a/tests/helpers/responsive.js +++ b/tests/helpers/responsive.js @@ -1,18 +1,17 @@ // jscs: disable -import Ember from 'ember'; +import { A } from '@ember/array'; +import { classify } from '@ember/string'; +import { computed } from '@ember/object'; +import { getOwner } from '@ember/application'; +import { registerAsyncHelper } from '@ember/test'; import MediaService from 'ember-responsive/media'; -const { - getOwner -} = Ember; -const { classify } = Ember.String; - MediaService.reopen({ // Change this if you want a different default breakpoint in tests. _defaultBreakpoint: 'desktop', - _breakpointArr: Ember.computed('breakpoints', function() { - return Object.keys(this.get('breakpoints')) || Ember.A([]); + _breakpointArr: computed('breakpoints', function() { + return Object.keys(this.get('breakpoints')) || A([]); }), _forceSetBreakpoint(breakpoint) { @@ -46,7 +45,7 @@ MediaService.reopen({ } }); -export default Ember.Test.registerAsyncHelper('setBreakpoint', function(app, breakpoint) { +export default registerAsyncHelper('setBreakpoint', function(app, breakpoint) { // this should use getOwner once that's supported const mediaService = app.__deprecatedInstance__.lookup('service:media'); mediaService._forceSetBreakpoint(breakpoint); diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js index 9a605eb8..681aa01a 100644 --- a/tests/helpers/start-app.js +++ b/tests/helpers/start-app.js @@ -1,12 +1,13 @@ -import Ember from 'ember'; import Application from '../../app'; import config from '../../config/environment'; +import { merge } from '@ember/polyfills'; +import { run } from '@ember/runloop'; export default function startApp(attrs) { - let attributes = Ember.merge({}, config.APP); - attributes = Ember.merge(attributes, attrs); // use defaults, but you can override; + let attributes = merge({}, config.APP); + attributes = merge(attributes, attrs); // use defaults, but you can override; - return Ember.run(() => { + return run(() => { let application = Application.create(attributes); application.setupForTesting(); application.injectTestHelpers(); diff --git a/tests/integration/components/light-table-test.js b/tests/integration/components/light-table-test.js index e8b64a5b..04493420 100644 --- a/tests/integration/components/light-table-test.js +++ b/tests/integration/components/light-table-test.js @@ -8,9 +8,8 @@ import Columns from '../../helpers/table-columns'; import hasClass from '../../helpers/has-class'; import RowComponent from 'ember-light-table/components/lt-row'; import { register } from 'ember-owner-test-utils/test-support/register'; -import Ember from 'ember'; - -const { Component, get } = Ember; +import Component from '@ember/component'; +import { get, computed } from '@ember/object'; moduleForComponent('light-table', 'Integration | Component | light table', { integration: true, @@ -156,7 +155,7 @@ test('passed in components can have computed properties', function(assert) { register(this, 'component:custom-row', RowComponent.extend({ classNameBindings: ['isActive'], current: null, - isActive: Ember.computed('row.content', 'current', function() { + isActive: computed('row.content', 'current', function() { return this.get('row.content') === this.get('current'); }) })); diff --git a/tests/integration/components/light-table/cells/base-test.js b/tests/integration/components/light-table/cells/base-test.js index e9e1ef6d..2abe37f0 100644 --- a/tests/integration/components/light-table/cells/base-test.js +++ b/tests/integration/components/light-table/cells/base-test.js @@ -1,7 +1,7 @@ import { find } from 'ember-native-dom-helpers'; -import Ember from 'ember'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; +import { run } from '@ember/runloop'; import { Row, Column } from 'ember-light-table'; moduleForComponent('light-table/cells/base', 'Integration | Component | Cells | base', { @@ -66,7 +66,7 @@ test('cell with nested valuePath', function(assert) { assert.equal(find('*').textContent.trim(), '4'); - Ember.run(() => this.get('row').set(this.get('column.valuePath'), 4)); + run(() => this.get('row').set(this.get('column.valuePath'), 4)); assert.equal(find('*').textContent.trim(), '8'); }); diff --git a/tests/integration/components/lt-body-test.js b/tests/integration/components/lt-body-test.js index c17e1c1b..f15613ee 100644 --- a/tests/integration/components/lt-body-test.js +++ b/tests/integration/components/lt-body-test.js @@ -1,15 +1,11 @@ import { click, findAll, find, triggerEvent } from 'ember-native-dom-helpers'; -import Ember from 'ember'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; import startMirage, { createUsers } from '../../helpers/setup-mirage-for-integration'; import Table from 'ember-light-table'; import hasClass from '../../helpers/has-class'; import Columns from '../../helpers/table-columns'; - -const { - run -} = Ember; +import { run } from '@ember/runloop'; moduleForComponent('lt-body', 'Integration | Component | lt body', { integration: true, diff --git a/tests/unit/classes/table-test.js b/tests/unit/classes/table-test.js index 820a6021..f23c8e9d 100644 --- a/tests/unit/classes/table-test.js +++ b/tests/unit/classes/table-test.js @@ -1,11 +1,7 @@ -import Ember from 'ember'; +import { A as emberArray } from '@ember/array'; import { Table, Column, Row } from 'ember-light-table'; import { module, test } from 'qunit'; -const { - A: emberArray -} = Ember; - module('Unit | Classes | Table'); test('create table - default options', function(assert) { diff --git a/tests/unit/mixins/table-header-test.js b/tests/unit/mixins/table-header-test.js index f89b6b34..b5d24032 100644 --- a/tests/unit/mixins/table-header-test.js +++ b/tests/unit/mixins/table-header-test.js @@ -1,4 +1,4 @@ -import Ember from 'ember'; +import EmberObject from '@ember/object'; import TableHeaderMixin from 'ember-light-table/mixins/table-header'; import { module, test } from 'qunit'; @@ -6,7 +6,7 @@ module('Unit | Mixin | table header'); // Replace this with your real tests. test('it works', function(assert) { - let TableHeaderObject = Ember.Object.extend(TableHeaderMixin); + let TableHeaderObject = EmberObject.extend(TableHeaderMixin); let subject = TableHeaderObject.create(); assert.ok(subject); }); diff --git a/tests/unit/utils/fix-proto-test.js b/tests/unit/utils/fix-proto-test.js index fe187467..3f03951a 100644 --- a/tests/unit/utils/fix-proto-test.js +++ b/tests/unit/utils/fix-proto-test.js @@ -1,11 +1,7 @@ -import Ember from 'ember'; +import EmberObject from '@ember/object'; import fixProto from 'ember-light-table/utils/fix-proto'; import { module, test } from 'qunit'; -const { - Object: EmberObject -} = Ember; - module('Unit | Utility | fix proto'); /* diff --git a/yarn.lock b/yarn.lock index 6f830751..c1a6d32a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -384,6 +384,13 @@ async-each@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d" +async-promise-queue@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/async-promise-queue/-/async-promise-queue-1.0.4.tgz#308baafbc74aff66a0bb6e7f4a18d4fe8434440c" + dependencies: + async "^2.4.1" + debug "^2.6.8" + async-some@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/async-some/-/async-some-1.0.2.tgz#4d8a81620d5958791b5b98f802d3207776e95509" @@ -404,6 +411,12 @@ async@^2.0.1: dependencies: lodash "^4.14.0" +async@^2.4.1: + version "2.5.0" + resolved "https://registry.yarnpkg.com/async/-/async-2.5.0.tgz#843190fd6b7357a0b9e1c956edddd5ec8462b54d" + dependencies: + lodash "^4.14.0" + async@~0.9.0: version "0.9.2" resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d" @@ -658,6 +671,18 @@ babel-plugin-debug-macros@^0.1.1, babel-plugin-debug-macros@^0.1.10, babel-plugi dependencies: semver "^5.3.0" +babel-plugin-debug-macros@^0.1.11: + version "0.1.11" + resolved "https://registry.yarnpkg.com/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.1.11.tgz#6c562bf561fccd406ce14ab04f42c218cf956605" + dependencies: + semver "^5.3.0" + +babel-plugin-ember-modules-api-polyfill@^1.4.1: + version "1.4.2" + resolved "https://registry.yarnpkg.com/babel-plugin-ember-modules-api-polyfill/-/babel-plugin-ember-modules-api-polyfill-1.4.2.tgz#e254f8ed0ba7cf32ea6a71c4770b3568a8577402" + dependencies: + ember-rfc176-data "^0.2.0" + babel-plugin-eval@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/babel-plugin-eval/-/babel-plugin-eval-1.0.1.tgz#a2faed25ce6be69ade4bfec263f70169195950da" @@ -1250,6 +1275,21 @@ broccoli-babel-transpiler@^6.0.0: hash-for-dep "^1.0.2" json-stable-stringify "^1.0.0" +broccoli-babel-transpiler@^6.1.2: + version "6.1.2" + resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-6.1.2.tgz#26019c045b5ea3e44cfef62821302f9bd483cabd" + dependencies: + babel-core "^6.14.0" + broccoli-funnel "^1.0.0" + broccoli-merge-trees "^1.0.0" + broccoli-persistent-filter "^1.4.0" + clone "^2.0.0" + hash-for-dep "^1.0.2" + heimdalljs-logger "^0.1.7" + json-stable-stringify "^1.0.0" + rsvp "^3.5.0" + workerpool "^2.2.1" + broccoli-brocfile-loader@^0.18.0: version "0.18.0" resolved "https://registry.yarnpkg.com/broccoli-brocfile-loader/-/broccoli-brocfile-loader-0.18.0.tgz#2e86021c805c34ffc8d29a2fb721cf273e819e4b" @@ -1520,6 +1560,25 @@ broccoli-persistent-filter@^1.0.1, broccoli-persistent-filter@^1.0.3, broccoli-p symlink-or-copy "^1.0.1" walk-sync "^0.3.1" +broccoli-persistent-filter@^1.4.0: + version "1.4.2" + resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-1.4.2.tgz#17af1278a25ff2556f9d7d23e115accfad3a7ce7" + dependencies: + async-disk-cache "^1.2.1" + async-promise-queue "^1.0.3" + broccoli-plugin "^1.0.0" + crypto "0.0.3" + fs-tree-diff "^0.5.2" + hash-for-dep "^1.0.2" + heimdalljs "^0.2.1" + heimdalljs-logger "^0.1.7" + mkdirp "^0.5.1" + promise-map-series "^0.2.1" + rimraf "^2.6.1" + rsvp "^3.0.18" + symlink-or-copy "^1.0.1" + walk-sync "^0.3.1" + broccoli-plugin@1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-1.1.0.tgz#73e2cfa05f8ea1e3fc1420c40c3d9e7dc724bf02" @@ -2213,6 +2272,10 @@ crypto-random-string@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e" +crypto@0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/crypto/-/crypto-0.0.3.tgz#470a81b86be4c5ee17acc8207a1f5315ae20dbb0" + ctype@0.5.3: version "0.5.3" resolved "https://registry.yarnpkg.com/ctype/-/ctype-0.5.3.tgz#82c18c2461f74114ef16c135224ad0b9144ca12f" @@ -2520,6 +2583,23 @@ ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-be clone "^2.0.0" ember-cli-version-checker "^2.0.0" +ember-cli-babel@^6.6.0: + version "6.7.1" + resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.7.1.tgz#98de75cb3eaf3198a80aac36ae82d8ea48c9d91f" + dependencies: + amd-name-resolver "0.0.6" + babel-plugin-debug-macros "^0.1.11" + babel-plugin-ember-modules-api-polyfill "^1.4.1" + babel-plugin-transform-es2015-modules-amd "^6.24.0" + babel-polyfill "^6.16.0" + babel-preset-env "^1.5.1" + broccoli-babel-transpiler "^6.1.2" + broccoli-debug "^0.6.2" + broccoli-funnel "^1.0.0" + broccoli-source "^1.1.0" + clone "^2.0.0" + ember-cli-version-checker "^2.0.0" + ember-cli-broccoli-sane-watcher@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/ember-cli-broccoli-sane-watcher/-/ember-cli-broccoli-sane-watcher-2.0.4.tgz#f43f42f75b7509c212fb926cd9aea86ae19264c6" @@ -3149,6 +3229,10 @@ ember-responsive@^2.0.4: ember-cli-babel "^6.4.1" ember-getowner-polyfill "^1.1.1" +ember-rfc176-data@^0.2.0: + version "0.2.7" + resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.2.7.tgz#bd355bc9b473e08096b518784170a23388bc973b" + ember-router-generator@^1.0.0: version "1.2.3" resolved "https://registry.yarnpkg.com/ember-router-generator/-/ember-router-generator-1.2.3.tgz#8ed2ca86ff323363120fc14278191e9e8f1315ee" @@ -5872,7 +5956,7 @@ object-assign@4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0" -object-assign@^4.0.1, object-assign@^4.1.0: +object-assign@4.1.1, object-assign@^4.0.1, object-assign@^4.1.0: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" @@ -6779,6 +6863,10 @@ rsvp@^3.0.14, rsvp@^3.0.16, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.21, rsvp@^3.0. version "3.5.0" resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.5.0.tgz#a62c573a4ae4e1dfd0697ebc6242e79c681eaa34" +rsvp@^3.5.0: + version "3.6.2" + resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a" + rsvp@~3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.2.1.tgz#07cb4a5df25add9e826ebc67dcc9fd89db27d84a" @@ -7788,6 +7876,12 @@ wordwrap@~0.0.2: version "0.0.3" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107" +workerpool@^2.2.1: + version "2.2.2" + resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-2.2.2.tgz#1cf53bacafd98ca5d808ff54cc72f3fecb5e1d56" + dependencies: + object-assign "4.1.1" + wrappy@1, wrappy@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"