Merge pull request #97 from bustle/ember-update

Upgrade to ember 3.28

Author: lukemelia

.eslintignore

@@ -13,6 +13,8 @@
 # misc
 /coverage/
 !.*
+.*/
+.eslintcache
 
 # ember-try
 /.node_modules.ember-try/

.eslintrc.js

@@ -7,58 +7,54 @@ module.exports = {
     ecmaVersion: 2018,
     sourceType: 'module',
     ecmaFeatures: {
-      legacyDecorators: true
-    }
+      legacyDecorators: true,
+    },
   },
-  plugins: [
-    "ember"
-  ],
+  plugins: ['ember'],
   extends: [
-    "eslint:recommended",
-    "plugin:ember/recommended"
+    'eslint:recommended',
+    'plugin:ember/recommended',
+    'plugin:prettier/recommended',
   ],
   env: {
-    browser: true
-  },
-  rules: {
-    'ember/no-jquery': 'error'
+    browser: true,
   },
+  rules: {},
   overrides: [
     // node files
     {
       files: [
-        ".eslintrc.js",
-        ".template-lintrc.js",
-        "ember-cli-build.js",
-        "./index.js",
-        "testem.js",
-        "blueprints/*/index.js",
-        "config/**/*.js",
-        "tests/dummy/config/**/*.js",
-        "fastboot-tests/index-test.js"
+        '.eslintrc.js',
+        '.prettierrc.js',
+        '.template-lintrc.js',
+        'ember-cli-build.js',
+        './index.js',
+        'testem.js',
+        'blueprints/*/index.js',
+        'config/**/*.js',
+        'tests/dummy/config/**/*.js',
+        'fastboot-tests/index-test.js',
       ],
       excludedFiles: [
-        "addon/**",
-        "addon-test-support/**",
-        "app/**",
-        "tests/dummy/app/**"
+        'addon/**',
+        'addon-test-support/**',
+        'app/**',
+        'tests/dummy/app/**',
       ],
       parserOptions: {
-        sourceType: "script"
+        sourceType: 'script',
       },
       env: {
         browser: false,
         node: true,
-        mocha: true
       },
-      plugins: ["node"],
-      rules: Object.assign(
-        {},
-        require("eslint-plugin-node").configs.recommended.rules,
-        {
-          // add your custom rules and overrides for node files here
-        }
-      )
-    }
-  ]
+      plugins: ['node'],
+      extends: ['plugin:node/recommended'],
+    },
+    {
+      // Test files:
+      files: ['tests/**/*-test.{js,ts}'],
+      extends: ['plugin:qunit/recommended'],
+    },
+  ],
 };

.gitignore

@@ -12,6 +12,7 @@
 /.env*
 /.pnp*
 /.sass-cache
+/.eslintcache
 /connect.lock
 /coverage/
 /libpeerconnection.log

.npmignore

@@ -10,10 +10,13 @@
 /.editorconfig
 /.ember-cli
 /.env*
+/.eslintcache
 /.eslintignore
 /.eslintrc.js
 /.git/
 /.gitignore
+/.prettierignore
+/.prettierrc.js
 /.template-lintrc.js
 /.travis.yml
 /.watchmanconfig
@@ -23,6 +26,7 @@
 /ember-cli-build.js
 /testem.js
 /tests/
+/yarn-error.log
 /yarn.lock
 .gitkeep
 /fastboot-tests/

.prettierignore

@@ -0,0 +1,21 @@
+# unconventional js
+/blueprints/*/files/
+/vendor/
+
+# compiled output
+/dist/
+/tmp/
+
+# dependencies
+/bower_components/
+/node_modules/
+
+# misc
+/coverage/
+!.*
+.eslintcache
+
+# ember-try
+/.node_modules.ember-try/
+/bower.json.ember-try
+/package.json.ember-try

.prettierrc.js

@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = {
+  singleQuote: true,
+};

.template-lintrc.js

@@ -1,12 +1,10 @@
 'use strict';
 
 module.exports = {
-  extends: 'octane',
+  extends: 'recommended',
   rules: {
     'no-curly-component-invocation': {
-      allow: [
-        'ember-wormhole'
-      ]
-    }
-  }
+      allow: ['ember-wormhole'],
+    },
+  },
 };

CONTRIBUTING.md

@@ -8,9 +8,8 @@
 
 ## Linting
 
-* `npm run lint:hbs`
-* `npm run lint:js`
-* `npm run lint:js -- --fix`
+* `npm run lint`
+* `npm run lint:fix`
 
 ## Running tests
 

addon/components/render-mobiledoc/component.js

@@ -7,28 +7,26 @@ import { RENDER_TYPE } from 'ember-mobiledoc-dom-renderer';
 import { getDocument } from 'ember-mobiledoc-dom-renderer/utils/document';
 import assign from 'ember-mobiledoc-dom-renderer/utils/polyfilled-assign';
 
-const {
-  uuid
-} = Ember;
-
-const ADD_CARD_HOOK             = 'addComponentCard';
-const REMOVE_CARD_HOOK          = 'removeComponentCard';
-const ADD_ATOM_HOOK             = 'addComponentAtom';
-const REMOVE_ATOM_HOOK          = 'removeComponentAtom';
-const CARD_TAG_NAME             = 'div';
-const ATOM_TAG_NAME             = 'span';
-const UUID_PREFIX               = '__rendered-mobiledoc-entity-';
+const { uuid } = Ember;
+
+const ADD_CARD_HOOK = 'addComponentCard';
+const REMOVE_CARD_HOOK = 'removeComponentCard';
+const ADD_ATOM_HOOK = 'addComponentAtom';
+const REMOVE_ATOM_HOOK = 'removeComponentAtom';
+const CARD_TAG_NAME = 'div';
+const ATOM_TAG_NAME = 'span';
+const UUID_PREFIX = '__rendered-mobiledoc-entity-';
 export const CARD_ELEMENT_CLASS = '__rendered-mobiledoc-card';
 export const ATOM_ELEMENT_CLASS = '__rendered-mobiledoc-atom';
 
 const CARD_HOOKS = {
-  ADD:    ADD_CARD_HOOK,
-  REMOVE: REMOVE_CARD_HOOK
+  ADD: ADD_CARD_HOOK,
+  REMOVE: REMOVE_CARD_HOOK,
 };
 
 const ATOM_HOOKS = {
-  ADD:    ADD_ATOM_HOOK,
-  REMOVE: REMOVE_ATOM_HOOK
+  ADD: ADD_ATOM_HOOK,
+  REMOVE: REMOVE_ATOM_HOOK,
 };
 
 function rendererFor(type) {
@@ -40,9 +38,9 @@ function rendererFor(type) {
     hookNames = ATOM_HOOKS;
   }
 
-  return function({env, options}) {
+  return function ({ env, options }) {
     let { onTeardown } = env;
-    let addHook    = options[hookNames.ADD];
+    let addHook = options[hookNames.ADD];
     let removeHook = options[hookNames.REMOVE];
 
     let { entity, element } = addHook(...arguments);
@@ -56,15 +54,15 @@ function createComponentCard(name) {
   return {
     name,
     type: RENDER_TYPE,
-    render: rendererFor('card')
+    render: rendererFor('card'),
   };
 }
 
 function createComponentAtom(name) {
   return {
     name,
     type: RENDER_TYPE,
-    render: rendererFor('atom')
+    render: rendererFor('atom'),
   };
 }
 
@@ -94,6 +92,7 @@ export default class extends Component {
   get renderedMobiledoc() {
     if (this._teardownRender) {
       this._teardownRender();
+      // eslint-disable-next-line ember/no-side-effects
       this._teardownRender = null;
     }
 
@@ -109,6 +108,7 @@ export default class extends Component {
     let wrapper = this._createElement(dom, 'div');
     wrapper.appendChild(result);
 
+    // eslint-disable-next-line ember/no-side-effects
     this._teardownRender = teardown;
     return wrapper;
   }
@@ -120,9 +120,12 @@ export default class extends Component {
       atoms: this.mdcAtoms,
     };
     [
-      'mobiledoc', 'sectionElementRenderer', 'markupElementRenderer',
-       'unknownCardHandler', 'unknownAtomHandler'
-    ].forEach(option => {
+      'mobiledoc',
+      'sectionElementRenderer',
+      'markupElementRenderer',
+      'unknownCardHandler',
+      'unknownAtomHandler',
+    ].forEach((option) => {
       let value = this.args[option];
       if (value) {
         options[option] = value;
@@ -131,31 +134,39 @@ export default class extends Component {
 
     let passedOptions = this.args.cardOptions;
     let cardOptions = this._cardOptions;
-    cardOptions = passedOptions ? assign(passedOptions, cardOptions) : cardOptions;
+    cardOptions = passedOptions
+      ? assign(passedOptions, cardOptions)
+      : cardOptions;
     options.cardOptions = cardOptions;
     return options;
   }
 
   get _cardOptions() {
     return {
-      [ADD_CARD_HOOK]: ({env, options, payload}) => {
+      [ADD_CARD_HOOK]: ({ env, options, payload }) => {
         let { name: cardName, dom } = env;
-        let classNames = [CARD_ELEMENT_CLASS, `${CARD_ELEMENT_CLASS}-${cardName}`];
+        let classNames = [
+          CARD_ELEMENT_CLASS,
+          `${CARD_ELEMENT_CLASS}-${cardName}`,
+        ];
         let element = this._createElement(dom, CARD_TAG_NAME, classNames);
         let componentName = this.cardNameToComponentName(cardName);
 
         let card = {
           componentName,
           destinationElement: element,
           payload,
-          options
+          options,
         };
         this.addCard(card);
         return { entity: card, element };
       },
-      [ADD_ATOM_HOOK]: ({env, options, value, payload}) => {
+      [ADD_ATOM_HOOK]: ({ env, options, value, payload }) => {
         let { name: atomName, dom } = env;
-        let classNames = [ATOM_ELEMENT_CLASS, `${ATOM_ELEMENT_CLASS}-${atomName}`];
+        let classNames = [
+          ATOM_ELEMENT_CLASS,
+          `${ATOM_ELEMENT_CLASS}-${atomName}`,
+        ];
         let element = this._createElement(dom, ATOM_TAG_NAME, classNames);
         let componentName = this.atomNameToComponentName(atomName);
 
@@ -164,13 +175,13 @@ export default class extends Component {
           destinationElement: element,
           payload,
           value,
-          options
+          options,
         };
         this.addAtom(atom);
         return { entity: atom, element };
       },
       [REMOVE_CARD_HOOK]: (card) => this.removeCard(card),
-      [REMOVE_ATOM_HOOK]: (atom) => this.removeAtom(atom)
+      [REMOVE_ATOM_HOOK]: (atom) => this.removeAtom(atom),
     };
   }
 
@@ -193,7 +204,7 @@ export default class extends Component {
 
   // @private
 
-  _componentCards =  A();
+  _componentCards = A();
   _componentAtoms = A();
 
   addCard(card) {
@@ -220,7 +231,7 @@ export default class extends Component {
     return `${UUID_PREFIX}${uuid()}`;
   }
 
-  _createElement(dom, tagName, classNames=[]) {
+  _createElement(dom, tagName, classNames = []) {
     let el = dom.createElement(tagName);
     el.setAttribute('id', this.generateUuid());
     el.setAttribute('class', classNames.join(' '));