update: bump ember to 3.12

Author: therealbobo

.eslintignore

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

.eslintrc.js

@@ -1,34 +1,49 @@
 module.exports = {
-    env: {
-        browser: true,
-        node: true,
-        es6: true
-    },
-    root: true,
-    parserOptions: {
-        ecmaVersion: 2017,
-        sourceType: 'module'
-    },
-    extends: [
-        'eslint:recommended',
-        'plugin:ember-suave/recommended'
-    ],
-    rules: {
-        'indent': [2, 4],
-        'no-console': 'off',
-        'object-curly-spacing': ['off'],
-        'ember-suave/no-direct-property-access': 'off',
-        'ember-suave/no-const-outside-module-scope': 'off',
-        'one-var': ['error', 'never'],
-        'comma-dangle': ['error', { 'arrays': 'never', 'objects': 'always-multiline' }],
-        'no-implicit-coercion': ['error'],
-        'no-extra-boolean-cast': ['error'],
-        'indent': ['error', 4, { 'SwitchCase': 1 }],
-        'operator-linebreak': ["error", "after"]
-    },
-    globals: {
-        module: true,
-        process: false,
-        requireNode: false
+  root: true,
+  parserOptions: {
+    ecmaVersion: 2018,
+    sourceType: 'module'
+  },
+  plugins: [
+    'ember'
+  ],
+  extends: [
+    'eslint:recommended',
+    'plugin:ember/recommended'
+  ],
+  env: {
+    browser: true
+  },
+  rules: {
+  },
+  overrides: [
+    // node files
+    {
+      files: [
+        '.eslintrc.js',
+        '.template-lintrc.js',
+        'ember-cli-build.js',
+        'testem.js',
+        'blueprints/*/index.js',
+        'config/**/*.js',
+        'lib/*/index.js',
+        'server/**/*.js'
+      ],
+      parserOptions: {
+        sourceType: 'script'
+      },
+      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
+
+        // this can be removed once the following is fixed
+        // https://github.com/mysticatea/eslint-plugin-node/issues/77
+        'node/no-unpublished-require': 'off'
+      })
     }
+  ]
 };

.gitignore

@@ -25,4 +25,4 @@ ember-electron/resources*/sysdig/
 ember-electron/resources/capture-samples/
 
 # virtualenv
-/venv
+/venv

.travis.yml

@@ -14,20 +14,22 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import Ember from 'ember';
+import Component from '@ember/component';
+
+import Application from '@ember/application';
 import Resolver from './resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
 
-const App = Ember.Application.extend({
+const App = Application.extend({
     modulePrefix: config.modulePrefix,
     podModulePrefix: config.podModulePrefix,
     Resolver,
 });
 
 loadInitializers(App, config.modulePrefix);
 
-Ember.Component.reopen({
+Component.reopen({
     attributeBindings: ['data-ref'],
 });
 

app/app.js

@@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import Ember from 'ember';
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({
+export default Controller.extend({
 });

app/controllers/application.js

@@ -14,28 +14,32 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import Ember from 'ember';
+import { isNone } from '@ember/utils';
+
+import { computed } from '@ember/object';
+import { inject as service } from '@ember/service';
+import Controller, { inject as controller } from '@ember/controller';
 import electronUtils from 'wsd-core/utils/electron';
 
-export default Ember.Controller.extend({
+export default Controller.extend({
     queryParams: {
         drilldownInfoParam: 'dd',
         metricTimelinesParam: 'tl',
         timeFrom: 'f',
         timeTo: 't',
     },
 
-    application: Ember.inject.controller('application'),
-    captureTimelines: Ember.inject.service('capture-timelines'),
+    application: controller('application'),
+    captureTimelines: service('capture-timelines'),
 
     selectedViewId: null,
 
     filter: null,
 
     drilldownInfoParam: null,
     metricTimelinesParam: null,
-    timeWindow: Ember.computed('model.queryParams.timeFrom', 'model.queryParams.timeTo', function() {
-        if (Ember.isNone(this.get('model.queryParams.timeFrom')) === false && Ember.isNone(this.get('model.queryParams.timeTo')) === false) {
+    timeWindow: computed('model.queryParams.timeFrom', 'model.queryParams.timeTo', function() {
+        if (isNone(this.get('model.queryParams.timeFrom')) === false && isNone(this.get('model.queryParams.timeTo')) === false) {
             return {
                 from: this.get('model.queryParams.timeFrom'),
                 to: this.get('model.queryParams.timeTo'),
@@ -48,12 +52,12 @@ export default Ember.Controller.extend({
     actions: {
         openFileBrowser() {
             if (electronUtils.isElectron()) {
-                this.get('application').send('openFileBrowser');
+                this.application.send('openFileBrowser');
             }
         },
 
         openFile(value) {
-            this.get('application').send('openFile', value);
+            this.application.send('openFile', value);
         },
     },
 });

app/controllers/capture.js

@@ -14,20 +14,22 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import Ember from 'ember';
+import { computed } from '@ember/object';
+
+import Controller, { inject as controller } from '@ember/controller';
 import electronUtils from 'wsd-core/utils/electron';
 
-export default Ember.Controller.extend({
+export default Controller.extend({
     queryParams: ['port'],
-    application: Ember.inject.controller('application'),
+    application: controller('application'),
 
-    isElectron: Ember.computed(function() {
+    isElectron: computed(function() {
         return electronUtils.isElectron();
     }),
 
     actions: {
         openFileBrowser() {
-            this.get('application').send('openFileBrowser');
+            this.application.send('openFileBrowser');
         },
     },
 });

app/controllers/index.js

@@ -1,6 +1,6 @@
-import Ember from 'ember';
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({
+export default Controller.extend({
     queryParams: {
         filter: 'filter',
         searchPattern: 'search',

app/controllers/views/view.js

@@ -1,7 +1,7 @@
-import Ember from 'ember';
+import EmberRouter from '@ember/routing/router';
 import config from './config/environment';
 
-const Router = Ember.Router.extend({
+const Router = EmberRouter.extend({
     location: config.locationType,
     rootURL: config.rootURL,
 });