Merge branch 'NullVoxPopuli-upgrade-ember'

Author: krausest

frameworks/keyed/ember/.eslintignore

@@ -13,9 +13,13 @@
 # misc
 /coverage/
 !.*
+.*/
 .eslintcache
 
 # ember-try
 /.node_modules.ember-try/
 /bower.json.ember-try
+/npm-shrinkwrap.json.ember-try
 /package.json.ember-try
+/package-lock.json.ember-try
+/yarn.lock.ember-try

frameworks/keyed/ember/.eslintrc.js

@@ -24,15 +24,15 @@ module.exports = {
     // node files
     {
       files: [
-        '.eslintrc.js',
-        '.prettierrc.js',
-        '.template-lintrc.js',
-        'ember-cli-build.js',
-        'testem.js',
-        'blueprints/*/index.js',
-        'config/**/*.js',
-        'lib/*/index.js',
-        'server/**/*.js',
+        './.eslintrc.js',
+        './.prettierrc.js',
+        './.template-lintrc.js',
+        './ember-cli-build.js',
+        './testem.js',
+        './blueprints/*/index.js',
+        './config/**/*.js',
+        './lib/*/index.js',
+        './server/**/*.js',
       ],
       parserOptions: {
         sourceType: 'script',
@@ -49,5 +49,10 @@ module.exports = {
         'node/no-unpublished-require': 'off',
       },
     },
+    {
+      // test files
+      files: ['tests/**/*-test.{js,ts}'],
+      extends: ['plugin:qunit/recommended'],
+    },
   ],
 };

frameworks/keyed/ember/.gitignore

@@ -23,4 +23,7 @@
 # ember-try
 /.node_modules.ember-try/
 /bower.json.ember-try
+/npm-shrinkwrap.json.ember-try
 /package.json.ember-try
+/package-lock.json.ember-try
+/yarn.lock.ember-try

frameworks/keyed/ember/.prettierignore

@@ -14,8 +14,12 @@
 /coverage/
 !.*
 .eslintcache
+.lint-todo/
 
 # ember-try
 /.node_modules.ember-try/
 /bower.json.ember-try
+/npm-shrinkwrap.json.ember-try
 /package.json.ember-try
+/package-lock.json.ember-try
+/yarn.lock.ember-try

frameworks/keyed/ember/.template-lintrc.js

@@ -1,5 +1,5 @@
 'use strict';
 
 module.exports = {
-  extends: 'octane',
+  extends: 'recommended',
 };

frameworks/keyed/ember/.travis.yml

@@ -1,9 +1,10 @@
-<table {{did-insert this.createRef}} ...attributes>
+<table {{this.createRef}} ...attributes>
 </table>
+
 {{#if this.fragment}}
-  {{#-in-element this.fragment}}
+  {{#in-element this.fragment}}
     <tbody>
-    {{#each @items key="id" as |item|}}{{yield item}}{{/each}}
+      {{#each @items key="id" as |item|}}{{yield item}}{{/each}}
     </tbody>
-  {{/-in-element}}
+  {{/in-element}}
 {{/if}}

frameworks/keyed/ember/app/templates/components/bs-button.hbs renamed to frameworks/keyed/ember/app/components/bs-button.hbs

@@ -10,8 +10,10 @@ import {
 export default class MyTable extends Component {
   @tracked
   id = 1;
+
   @tracked
   data = [];
+
   @tracked
   _selected = undefined;