Ember 3.0 beta

RobbieTheWagner · RobbieTheWagner · commit 35a287d414e3 · 2018-01-08T21:05:02.000-05:00
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -4,13 +4,53 @@ module.exports = {
     ecmaVersion: 2017,
     sourceType: 'module'
   },
+  plugins: [
+    'ember'
+  ],
   extends: [
     'eslint:recommended',
-    'plugin:ember-suave/recommended'
+    'plugin:ember/recommended'
   ],
   env: {
     browser: true
   },
   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/.npmignore b/.npmignore
@@ -3,15 +3,21 @@
 /dist
 /tests
 /tmp
-.idea/
 **/.gitkeep
 .bowerrc
 .editorconfig
 .ember-cli
-.gitignore
 .eslintrc.js
+.gitignore
 .watchmanconfig
 .travis.yml
 bower.json
 ember-cli-build.js
 testem.js
+
+# ember-try
+.node_modules.ember-try/
+bower.json.ember-try
+package.json.ember-try
+
+.idea/
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ language: node_js
 node_js:
   # we recommend testing addons with the same minimum supported node version as Ember CLI
   # so that your addon works for all apps
-  - "6"
+  - "4"
 
 sudo: false
 dist: trusty
@@ -18,14 +18,18 @@ cache:
   yarn: true
 
 env:
-  # we recommend new addons test the current and previous LTS
-  # as well as latest stable release (bonus points to beta/canary)
-  - EMBER_TRY_SCENARIO=ember-lts-2.8
-  - EMBER_TRY_SCENARIO=ember-lts-2.12
-  - 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:
+    # we recommend new addons test the current and previous LTS
+    # as well as latest stable release (bonus points to beta/canary)
+    - 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
@@ -40,6 +44,7 @@ install:
   - yarn install --no-lockfile --non-interactive
 
 script:
+  - yarn lint:js
   # Usually, it's ok to finish the test scenario without reverting
   #  to the addon's original dependency state, skipping "cleanup".
   - COVERAGE=true node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup
diff --git a/addon/components/ember-drop.js b/addon/components/ember-drop.js
@@ -1,15 +1,25 @@
 /* globals Drop */
-import Ember from 'ember';
-const { Component, observer, run } = Ember;
+import Component from '@ember/component';
+import { observer } from '@ember/object';
+import { run } from '@ember/runloop';
 
 export default Component.extend({
   tagName: '',
-  didInsertElement() {
-    this.initialize();
-  },
+
   contentChanged: observer('content', function() {
     this.initialize();
   }),
+
+  didInsertElement() {
+    this.initialize();
+  },
+
+  willDestroyElement() {
+    if (this.get('drop')) {
+      this.get('drop').destroy();
+    }
+  },
+
   initialize() {
     run.scheduleOnce('afterRender', this, function() {
       let content = document.createElement('div');
@@ -48,11 +58,5 @@ export default Component.extend({
       });
       this.set('drop', drop);
     });
-  },
-
-  willDestroyElement() {
-    if (this.get('drop')) {
-      this.get('drop').destroy();
-    }
   }
 });
diff --git a/config/ember-try.js b/config/ember-try.js
@@ -1,27 +1,19 @@
-/* eslint-env node */
 module.exports = {
+  useYarn: true,
   scenarios: [
     {
-      name: 'ember-lts-2.8',
-      bower: {
-        dependencies: {
-          'ember': 'components/ember#lts-2-8'
-        },
-        resolutions: {
-          'ember': 'lts-2-8'
-        }
-      },
+      name: 'ember-lts-2.12',
       npm: {
         devDependencies: {
-          'ember-source': null
+          'ember-source': '~2.12.0'
         }
       }
     },
     {
-      name: 'ember-lts-2.12',
+      name: 'ember-lts-2.16',
       npm: {
         devDependencies: {
-          'ember-source': '~2.12.0'
+          'ember-source': '~2.16.0'
         }
       }
     },
diff --git a/config/environment.js b/config/environment.js
@@ -1,4 +1,3 @@
-/* eslint-env node */
 'use strict';
 
 module.exports = function(/* environment, appConfig */) {
diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -1,4 +1,3 @@
-/* eslint-env node */
 'use strict';
 
 const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
diff --git a/package.json b/package.json
@@ -23,11 +23,12 @@
   "repository": "https://github.com/shipshapecode/ember-drop",
   "scripts": {
     "build": "ember build",
-    "start": "ember server",
+    "lint:js": "eslint ./*.js addon addon-test-support app config lib server test-support tests",
+    "start": "ember serve",
     "test": "ember try:each"
   },
   "dependencies": {
-    "ember-cli-babel": "^6.8.2",
+    "ember-cli-babel": "^6.6.0",
     "ember-cli-node-assets": "0.2.2",
     "ember-tether": "1.0.0-beta.0",
     "fastboot-transform": "^0.1.2",
@@ -40,29 +41,31 @@
     "@html-next/flexi-layouts": "^2.0.1",
     "broccoli-asset-rev": "^2.4.5",
     "codeclimate-test-reporter": "^0.5.0",
-    "ember-cli": "~2.16.0-beta.1",
+    "ember-cli": "~3.0.0-beta.1",
     "ember-cli-dependency-checker": "^2.0.0",
     "ember-cli-deploy": "^1.0.0",
     "ember-cli-deploy-build": "^1.1.0",
     "ember-cli-deploy-ghpages": "^0.2.0",
-    "ember-cli-eslint": "^4.0.0",
+    "ember-cli-eslint": "^4.2.1",
     "ember-cli-htmlbars": "^2.0.1",
     "ember-cli-htmlbars-inline-precompile": "^1.0.0",
     "ember-cli-inject-live-reload": "^1.4.1",
-    "ember-cli-qunit": "^4.0.0",
+    "ember-cli-qunit": "^4.1.1",
     "ember-cli-sass": "^7.0.0",
-    "ember-cli-shims": "^1.1.0",
+    "ember-cli-shims": "^1.2.0",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-uglify": "^2.0.0",
     "ember-disable-prototype-extensions": "^1.1.2",
     "ember-export-application-global": "^2.0.0",
     "ember-getowner-polyfill": "2.2.0",
     "ember-load-initializers": "^1.0.0",
+    "ember-maybe-import-regenerator": "^0.1.6",
+    "ember-native-dom-helpers": "^0.5.10",
     "ember-prism": "^0.2.0",
     "ember-resolver": "^4.0.0",
-    "ember-source": "~2.16.0-beta.1",
-    "ember-truth-helpers": "2.0.0",
-    "eslint-plugin-ember-suave": "^1.0.0",
+    "ember-source": "~3.0.0-beta.1",
+    "eslint-plugin-ember": "^5.0.0",
+    "eslint-plugin-node": "^5.2.1",
     "flexi": "^2.0.1",
     "loader.js": "^4.2.3"
   },
diff --git a/testem.js b/testem.js
@@ -1,4 +1,3 @@
-/* eslint-env node */
 module.exports = {
   test_page: 'tests/index.html?hidepassed',
   disable_watching: true,
@@ -9,11 +8,14 @@ module.exports = {
     'Chrome'
   ],
   browser_args: {
-    Chrome: [
-      '--disable-gpu',
-      '--headless',
-      '--remote-debugging-port=9222',
-      '--window-size=1440,900'
-    ]
+    Chrome: {
+      mode: 'ci',
+      args: [
+        '--disable-gpu',
+        '--headless',
+        '--remote-debugging-port=0',
+        '--window-size=1440,900'
+      ]
+    }
   }
 };
diff --git a/tests/dummy/app/controllers/application.js b/tests/dummy/app/controllers/application.js
@@ -1,5 +1,4 @@
-import Ember from 'ember';
-const { Controller } = Ember;
+import Controller from '@ember/controller';
 
 export default Controller.extend({
   name: 'George Washington'
diff --git a/tests/dummy/app/routes/application.js b/tests/dummy/app/routes/application.js
@@ -1,5 +1,4 @@
-import Ember from 'ember';
-const { Route } = Ember;
+import Route from '@ember/routing/route';
 
 export default Route.extend({
   setupController(controller) {
diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js
@@ -1,7 +1,7 @@
-/* eslint-env node */
+'use strict';
 
 module.exports = function(environment) {
-  const ENV = {
+  let ENV = {
     modulePrefix: 'dummy',
     environment,
     rootURL: '/',
@@ -40,6 +40,7 @@ module.exports = function(environment) {
     ENV.APP.LOG_VIEW_LOOKUPS = false;
 
     ENV.APP.rootElement = '#ember-testing';
+    ENV.APP.autoboot = false;
   }
 
   if (environment === 'production') {
diff --git a/tests/dummy/config/targets.js b/tests/dummy/config/targets.js
@@ -1,4 +1,3 @@
-/* eslint-env node */
 module.exports = {
   browsers: [
     'ie 9',
diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js
@@ -5,6 +5,7 @@ import { run } from '@ember/runloop';
 
 export default function startApp(attrs) {
   let attributes = merge({}, config.APP);
+  attributes.autoboot = true;
   attributes = merge(attributes, attrs); // use defaults, but you can override;
 
   return run(() => {
diff --git a/tests/integration/components/ember-drop-test.js b/tests/integration/components/ember-drop-test.js
@@ -1,14 +1,12 @@
-import $ from 'jquery';
+import { click, find, triggerEvent } from 'ember-native-dom-helpers';
 import { moduleForComponent, test } from 'ember-qunit';
 import hbs from 'htmlbars-inline-precompile';
-import Ember from 'ember';
-const { run } = Ember;
 
 moduleForComponent('ember-drop', 'Integration | Component | ember drop', {
   integration: true
 });
 
-test('open on click', function(assert) {
+test('open on click', async function(assert) {
   let clickContent = [
     {
       classes: 'click-drop',
@@ -35,12 +33,12 @@ test('open on click', function(assert) {
       {{/ember-drop}}`
   );
 
-  assert.equal($('.click-drop').length, 0, 'drop not showing before click');
-  this.$('.click-element').first().click();
-  assert.equal($('.click-drop').length, 1, 'drop showing after click');
+  assert.notOk(find('.click-drop', document.body), 'drop not showing before click');
+  await click('.click-element');
+  assert.ok(find('.click-drop', document.body), 'drop showing after click');
 });
 
-test('open on hover', function(assert) {
+test('open on hover', async function(assert) {
   let hoverContent = [
     {
       classes: 'hover-drop',
@@ -68,9 +66,7 @@ test('open on hover', function(assert) {
     {{/ember-drop}}`
   );
 
-  assert.equal($('.hover-drop').length, 0, 'drop not showing before hover');
-  this.$('.hover-element').first().mouseover();
-  run.later(this, function() {
-    assert.equal($('.hover-drop').length, 1, 'drop showing on hover');
-  }, 200);
+  assert.notOk(find('.hover-drop', document.body), 'drop not showing before hover');
+  await triggerEvent(find('.hover-element', document.body), 'mouseover');
+  assert.ok(find('.hover-drop', document.body), 'drop showing on hover');
 });
diff --git a/tests/test-helper.js b/tests/test-helper.js
@@ -1,8 +1,8 @@
-import resolver from './helpers/resolver';
-import {
-  setResolver
-} from 'ember-qunit';
-import { start } from 'ember-cli-qunit';
+import Application from '../app';
+import config from '../config/environment';
+import { setApplication } from '@ember/test-helpers';
+import { start } from 'ember-qunit';
+
+setApplication(Application.create(config.APP));
 
-setResolver(resolver);
 start();
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,27 +1,19 @@`
`1`		`-/* eslint-env node */`
`2`	`1`	`module.exports = {`
	`2`	`+ useYarn: true,`
`3`	`3`	`scenarios: [`
`4`	`4`	`{`
`5`		`- name: 'ember-lts-2.8',`
`6`		`- bower: {`
`7`		`- dependencies: {`
`8`		`- 'ember': 'components/ember#lts-2-8'`
`9`		`- },`
`10`		`- resolutions: {`
`11`		`- 'ember': 'lts-2-8'`
`12`		`- }`
`13`		`- },`
	`5`	`+ name: 'ember-lts-2.12',`
`14`	`6`	`npm: {`
`15`	`7`	`devDependencies: {`
`16`		`- 'ember-source': null`
	`8`	`+ 'ember-source': '~2.12.0'`
`17`	`9`	`}`
`18`	`10`	`}`
`19`	`11`	`},`
`20`	`12`	`{`
`21`		`- name: 'ember-lts-2.12',`
	`13`	`+ name: 'ember-lts-2.16',`
`22`	`14`	`npm: {`
`23`	`15`	`devDependencies: {`
`24`		`- 'ember-source': '~2.12.0'`
	`16`	`+ 'ember-source': '~2.16.0'`
`25`	`17`	`}`
`26`	`18`	`}`
`27`	`19`	`},`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-/* eslint-env node */`
`2`	`1`	`'use strict';`
`3`	`2`
`4`	`3`	`module.exports = function(/* environment, appConfig */) {`