chore(dependencies): Bump deps, with associated changes for Ember eco…

…system (Had to add `bower` as `devDependency` in order for `ember try` to pass)
bustle · Jan 18, 2018 · 3d15c82 · 3d15c82
1 parent 1bfd8ca
commit 3d15c82
Show file tree

Hide file tree

Showing 31 changed files with 2,005 additions and 1,101 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,13 +1,51 @@
 module.exports = {
   root: true,
   parserOptions: {
-    ecmaVersion: 6,
+    ecmaVersion: 2017,
     sourceType: 'module'
   },
-  extends: 'eslint:recommended',
+  plugins: ['ember'],
+  extends: ['eslint:recommended', 'plugin:ember/recommended'],
   env: {
     browser: true
   },
-  rules: {
-  }
-};
+  rules: {},
+  overrides: [
+    // node files
+    {
+      files: [
+        'index.js',
+        'testem.js',
+        'ember-cli-build.js',
+        'config/**/*.js',
+        'tests/dummy/config/**/*.js'
+      ],
+      excludedFiles: ['app/**', 'addon/**'],
+      parserOptions: {
+        sourceType: 'script',
+        ecmaVersion: 2015
+      },
+      env: {
+        browser: false,
+        node: true
+      },
+      plugins: ['node'],
+      rules: Object.assign(
+        {},
+        require('eslint-plugin-node').configs.recommended.rules,
+        {
+          // add your custom rules and overrides for node files here
+        }
+      )
+    },
+
+    // test files
+    {
+      files: ['tests/**/*.js'],
+      excludedFiles: ['tests/dummy/**/*.js'],
+      env: {
+        embertest: true
+      }
+    }
+  ]
+}
diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,8 @@
 /libpeerconnection.log
 npm-debug.log*
 testem.log
+
+# ember-try
+.node_modules.ember-try/
+bower.json.ember-try
+package.json.ember-try
diff --git a/.travis.yml b/.travis.yml
@@ -4,35 +4,35 @@ node_js:
   - "6"
 
 sudo: false
+dist: trusty
+
+addons:
+  chrome: stable
 
 cache:
   yarn: true
 
 env:
-  # we recommend testing LTS's and latest stable release (bonus points to beta/canary)
-  - EMBER_TRY_SCENARIO=ember-1.13
-  - EMBER_TRY_SCENARIO=ember-lts-2.4
-  - EMBER_TRY_SCENARIO=ember-lts-2.8
-  - EMBER_TRY_SCENARIO=ember-release
-  - EMBER_TRY_SCENARIO=ember-beta
-  - EMBER_TRY_SCENARIO=ember-canary
-  - EMBER_TRY_SCENARIO=ember-default
+  global:
+    # See https://git.io/vdao3 for details.
+    - JOBS=1
+  matrix:
+    - EMBER_TRY_SCENARIO=ember-1.13
+    - EMBER_TRY_SCENARIO=ember-lts-2.4
+    - EMBER_TRY_SCENARIO=ember-lts-2.8
+    - EMBER_TRY_SCENARIO=ember-lts-2.12
+    - EMBER_TRY_SCENARIO=ember-lts-2.16
+    - EMBER_TRY_SCENARIO=ember-release
+    - EMBER_TRY_SCENARIO=ember-beta
+    - EMBER_TRY_SCENARIO=ember-canary
+    - EMBER_TRY_SCENARIO=ember-default
 
 matrix:
   fast_finish: true
   allow_failures:
     - env: EMBER_TRY_SCENARIO=ember-canary
 
-before_install:
-  - npm config set spin false
-  - npm install -g bower phantomjs-prebuilt
-  - bower --version
-  - phantomjs --version
-
-install:
-  - yarn install
-
 script:
   # 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 test --skip-cleanup
+  - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup
diff --git a/addon/components/mobiledoc-editor/component.js b/addon/components/mobiledoc-editor/component.js
@@ -1,12 +1,15 @@
+import { schedule, run, begin, end, join } from '@ember/runloop';
+import { copy } from '@ember/object/internals';
+import { A } from '@ember/array';
+import { camelize, capitalize } from '@ember/string';
+import EmberObject, { computed } from '@ember/object';
+import Component from '@ember/component';
 import Ember from 'ember';
 import layout from './template';
 import Editor from 'mobiledoc-kit/editor/editor';
 import { MOBILEDOC_VERSION } from 'mobiledoc-kit/renderers/mobiledoc';
 import assign from 'ember-mobiledoc-editor/utils/polyfill-assign';
 
-let { computed, Component } = Ember;
-let { capitalize, camelize } = Ember.String;
-
 export const ADD_CARD_HOOK = 'addComponent';
 export const REMOVE_CARD_HOOK = 'removeComponent';
 export const ADD_ATOM_HOOK = 'addAtomComponent';
@@ -46,11 +49,11 @@ export default Component.extend({
   autofocus: true,
   serializeVersion: MOBILEDOC_VERSION,
 
-  options: {},
+  options: null,
 
   // merge in named options with the `options` property data-bag
   editorOptions: computed(function() {
-    let options = this.get('options');
+    let options = this.get('options') || {};
 
     return assign({
       placeholder: this.get('placeholder'),
@@ -69,8 +72,8 @@ export default Component.extend({
       mobiledoc = EMPTY_MOBILEDOC;
       this.set('mobiledoc', mobiledoc);
     }
-    this.set('componentCards', Ember.A([]));
-    this.set('componentAtoms', Ember.A([]));
+    this.set('componentCards', A([]));
+    this.set('componentAtoms', A([]));
     this.set('linkOffsets', null);
     this.set('activeMarkupTagNames', {});
     this.set('activeSectionTagNames', {});
@@ -127,7 +130,7 @@ export default Component.extend({
   },
 
   editingContexts: computed(function() {
-    return Ember.A([]);
+    return A([]);
   }),
 
   willRender() {
@@ -170,9 +173,9 @@ export default Component.extend({
         element.id = destinationElementId;
 
         // The data must be copied to avoid sharing the reference
-        payload = Ember.copy(payload, true);
+        payload = copy(payload, true);
 
-        let card = Ember.Object.create({
+        let card = EmberObject.create({
           destinationElementId,
           cardName,
           payload,
@@ -181,7 +184,7 @@ export default Component.extend({
           editor,
           postModel: env.postModel
         });
-        Ember.run.schedule('afterRender', () => {
+        schedule('afterRender', () => {
           this.get('componentCards').pushObject(card);
         });
         return { card, element };
@@ -194,9 +197,9 @@ export default Component.extend({
         element.id = destinationElementId;
 
         // The data must be copied to avoid sharing the reference
-        payload = Ember.copy(payload, true);
+        payload = copy(payload, true);
 
-        let atom = Ember.Object.create({
+        let atom = EmberObject.create({
           destinationElementId,
           atomName,
           payload,
@@ -206,7 +209,7 @@ export default Component.extend({
           editor,
           postModel: env.postModel
         });
-        Ember.run.schedule('afterRender', () => {
+        schedule('afterRender', () => {
           this.get('componentAtoms').pushObject(atom);
         });
         return { atom, element };
@@ -231,27 +234,27 @@ export default Component.extend({
       // When pasting text that gets turned into a card, for example,
       // the add card hook would run outside the runloop if we didn't begin a new
       // one now.
-      if (!Ember.run.currentRunLoop) {
+      if (!run.currentRunLoop) {
         this._startedRunLoop = true;
-        Ember.run.begin();
+        begin();
       }
     });
     editor.didRender(() => {
       // If we had explicitly started a run loop in `editor.willRender`,
       // we must explicitly end it here.
       if (this._startedRunLoop) {
         this._startedRunLoop = false;
-        Ember.run.end();
+        end();
       }
     });
     editor.postDidChange(() => {
-      Ember.run.join(() => {
+      join(() => {
         this.postDidChange(editor);
       });
     });
     editor.inputModeDidChange(() => {
       if (this.isDestroyed) { return; }
-      Ember.run.join(() => {
+      join(() => {
         this.inputModeDidChange(editor);
       });
     });
@@ -282,7 +285,7 @@ export default Component.extend({
     let serializeVersion = this.get('serializeVersion');
     let updatedMobileDoc = editor.serialize(serializeVersion);
     this._localMobiledoc = updatedMobileDoc;
-    this.sendAction('on-change', updatedMobileDoc);
+    this.sendAction('on-change', updatedMobileDoc); // eslint-disable-line ember/closure-actions
   },
 
   inputModeDidChange(editor) {
@@ -299,7 +302,7 @@ export default Component.extend({
     // rendering the editor (after rendering the component) because it
     // causes Ember to display deprecation warnings
     if (this._isRenderingEditor) {
-      Ember.run.schedule('afterRender', () => {
+      schedule('afterRender', () => {
         this.set('activeMarkupTagNames', markupTags);
         this.set('activeSectionTagNames', sectionTags);
       });
@@ -310,11 +313,11 @@ export default Component.extend({
   },
 
   willCreateEditor() {
-    this.sendAction(WILL_CREATE_EDITOR_ACTION);
+    this.sendAction(WILL_CREATE_EDITOR_ACTION); // eslint-disable-line ember/closure-actions
   },
 
   didCreateEditor(editor) {
-    this.sendAction(DID_CREATE_EDITOR_ACTION, editor);
+    this.sendAction(DID_CREATE_EDITOR_ACTION, editor); // eslint-disable-line ember/closure-actions
   },
 
   _addAtom(atomName, text, payload) {

diff --git a/addon/components/mobiledoc-link-button/component.js b/addon/components/mobiledoc-link-button/component.js
@@ -1,15 +1,14 @@
-import Ember from 'ember';
+import { bool } from '@ember/object/computed';
+import Component from '@ember/component';
 import layout from './template';
 
-let { computed, Component } = Ember;
-
 export default Component.extend({
   tagName: 'button',
   layout,
   attributeBindings: ['type', 'title'],
   classNameBindings: ['isActive:active'],
   type: 'button',
-  isActive: computed.bool('editor.activeMarkupTagNames.isA'),
+  isActive: bool('editor.activeMarkupTagNames.isA'),
   click() {
     let editor = this.get('editor');
     editor.toggleLink();

diff --git a/addon/components/mobiledoc-link-prompt/component.js b/addon/components/mobiledoc-link-prompt/component.js
@@ -1,8 +1,6 @@
-import Ember from 'ember';
+import Component from '@ember/component';
 import layout from './template';
 
-let { Component } = Ember;
-
 export default Component.extend({
   layout,
 

diff --git a/addon/components/mobiledoc-markup-button/component.js b/addon/components/mobiledoc-markup-button/component.js
@@ -1,9 +1,8 @@
-import Ember from 'ember';
+import { defineProperty, observer, computed } from '@ember/object';
+import Component from '@ember/component';
 import layout from './template';
 import titleize from '../../utils/titleize';
 
-let { computed, observer, defineProperty, Component } = Ember;
-
 export default Component.extend({
   tagName: 'button',
   layout,

diff --git a/addon/components/mobiledoc-section-button/component.js b/addon/components/mobiledoc-section-button/component.js
@@ -1,9 +1,8 @@
-import Ember from 'ember';
+import { defineProperty, observer, computed } from '@ember/object';
+import Component from '@ember/component';
 import layout from './template';
 import titleize from '../../utils/titleize';
 
-let { computed, observer, defineProperty, Component } = Ember;
-
 export default Component.extend({
   tagName: 'button',
   layout,

diff --git a/addon/components/mobiledoc-toolbar/component.js b/addon/components/mobiledoc-toolbar/component.js
@@ -1,8 +1,6 @@
-import Ember from 'ember';
+import Component from '@ember/component';
 import layout from './template';
 
-let { Component } = Ember;
-
 export default Component.extend({
   layout,
   tagName: 'ul',

diff --git a/addon/components/tether-to-selection/component.js b/addon/components/tether-to-selection/component.js
@@ -1,8 +1,8 @@
-import Ember from 'ember';
+import { schedule } from '@ember/runloop';
+import { assert } from '@ember/debug';
+import Component from '@ember/component';
 import layout from './template';
 
-let { Component } = Ember;
-
 const LEFT_PADDING = 0;
 const TOP_PADDING = 10;
 
@@ -16,7 +16,7 @@ export default Component.extend({
     let selection = window.getSelection();
     let range = selection && selection.rangeCount && selection.getRangeAt(0);
 
-    Ember.assert('Should not render {{#tether-to-selection}} when there is no selection', !!range);
+    assert('Should not render {{#tether-to-selection}} when there is no selection', !!range);
 
     if (range) {
       let rect = range.getBoundingClientRect();
@@ -28,7 +28,7 @@ export default Component.extend({
   },
 
   didInsertElement() {
-    Ember.run.schedule('afterRender', () => {
+    schedule('afterRender', () => {
       let myHeight = this.$().height();
       let left = this.get('left') - LEFT_PADDING;
       let top = this.get('top') - TOP_PADDING - myHeight;

diff --git a/addon/helpers/hash.js b/addon/helpers/hash.js
@@ -1,7 +1,7 @@
-import Ember from 'ember';
+import { helper } from '@ember/component/helper';
 
 export function hash(params, attributeHash) {
   return attributeHash;
 }
 
-export default Ember.Helper.helper(hash);
+export default helper(hash);
diff --git a/addon/helpers/mobiledoc-titleize.js b/addon/helpers/mobiledoc-titleize.js
@@ -1,8 +1,8 @@
-import Ember from 'ember';
+import { helper } from '@ember/component/helper';
 import titleize from '../utils/titleize';
 
 export function mobiledocTitleize([string]) {
   return titleize(string);
 }
 
-export default Ember.Helper.helper(mobiledocTitleize);
+export default helper(mobiledocTitleize);