Housekeeping (#155)

* Bumping to ember-cli@2.12.2

* Bumping to ember-css-modules@0.7.0-beta.1

* Remove Stylelint configuration

* Fix Bower dependencies

* Remove JSHint configuration

* Fix nested CSS selector

.editorconfig

@@ -13,22 +13,8 @@ insert_final_newline = true
 indent_style = space
 indent_size = 2
 
-[*.js]
-indent_style = space
-indent_size = 2
-
 [*.hbs]
 insert_final_newline = false
-indent_style = space
-indent_size = 2
-
-[*.css]
-indent_style = space
-indent_size = 2
-
-[*.html]
-indent_style = space
-indent_size = 2
 
 [*.{diff,md}]
 trim_trailing_whitespace = false

.eslintrc.js

@@ -0,0 +1,13 @@
+module.exports = {
+  root: true,
+  parserOptions: {
+    ecmaVersion: 6,
+    sourceType: 'module'
+  },
+  extends: 'eslint:recommended',
+  env: {
+    browser: true
+  },
+  rules: {
+  }
+};

.npmignore

@@ -8,7 +8,7 @@
 .editorconfig
 .ember-cli
 .gitignore
-.jshintrc
+.eslintrc.js
 .watchmanconfig
 .travis.yml
 bower.json

.travis.yml

@@ -1,7 +1,7 @@
 ---
 language: node_js
 node_js:
-  - "4"
+  - "6"
 
 sudo: false
 
@@ -17,6 +17,7 @@ env:
   - EMBER_TRY_SCENARIO=ember-release
   - EMBER_TRY_SCENARIO=ember-beta
   - EMBER_TRY_SCENARIO=ember-canary
+  - EMBER_TRY_SCENARIO=ember-default
 
 matrix:
   fast_finish: true
@@ -25,10 +26,9 @@ matrix:
 
 before_install:
   - npm config set spin false
-  - npm install -g bower
+  - npm install -g bower phantomjs-prebuilt
   - bower --version
-  - npm install phantomjs-prebuilt
-  - node_modules/phantomjs-prebuilt/bin/phantomjs --version
+  - phantomjs --version
 
 install:
   - npm install
@@ -37,4 +37,4 @@ install:
 script:
   # Usually, it's ok to finish the test scenario without reverting
   #  to the addon's original dependency state, skipping "cleanup".
-  - ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup
+  - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup

addon/styles/components/notification-message.css

@@ -49,7 +49,7 @@
   padding: --spacing-1 --spacing-2;
   word-break: break-word;
 
-  a {
+  & a {
     color: #fff;
     text-decoration: underline;
   }

bower.json

@@ -1,14 +1,10 @@
 {
   "name": "ember-cli-notifications",
-  "dependencies": {
-    "ember-qunit-notifications": "0.1.0",
-    "highlightjs": "^9.4.0",
-    "code-highlight-linenums": "^0.2.0"
-  },
+  "dependencies": {},
   "devDependencies": {
+    "code-highlight-linenums": "^0.2.0",
     "font-awesome": "~4.5.0",
-    "hljs-themes": "^0.0.7",
-    "ember": "~2.10.0",
-    "ember-cli-shims": "0.1.3"
+    "highlightjs": "^9.4.0",
+    "hljs-themes": "^0.0.7"
   }
 }

config/ember-try.js

@@ -1,4 +1,4 @@
-/*jshint node:true*/
+/* eslint-env node */
 module.exports = {
   scenarios: [
     {
@@ -10,6 +10,11 @@ module.exports = {
         resolutions: {
           'ember': 'lts-2-4'
         }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
+        }
       }
     },
     {
@@ -21,6 +26,11 @@ module.exports = {
         resolutions: {
           'ember': 'lts-2-8'
         }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
+        }
       }
     },
     {
@@ -32,6 +42,11 @@ module.exports = {
         resolutions: {
           'ember': 'release'
         }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
+        }
       }
     },
     {
@@ -43,6 +58,11 @@ module.exports = {
         resolutions: {
           'ember': 'beta'
         }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
+        }
       }
     },
     {
@@ -54,6 +74,17 @@ module.exports = {
         resolutions: {
           'ember': 'canary'
         }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
+        }
+      }
+    },
+    {
+      name: 'ember-default',
+      npm: {
+        devDependencies: {}
       }
     }
   ]

config/environment.js

@@ -1,4 +1,4 @@
-/*jshint node:true*/
+/* eslint-env node */
 'use strict';
 
 module.exports = function(/* environment, appConfig */) {

ember-cli-build.js

@@ -1,6 +1,5 @@
-/*jshint node:true*/
-/* global require, module */
-var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
+/* eslint-env node */
+const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 
 module.exports = function(defaults) {
   var app = new EmberAddon(defaults, {

index.js

@@ -1,4 +1,4 @@
-/* jshint node: true */
+/* eslint-env node */
 'use strict';
 
 module.exports = {

package.json

@@ -2,25 +2,36 @@
   "name": "ember-cli-notifications",
   "version": "4.1.6",
   "description": "Atom inspired notification messages for ember-cli",
+  "keywords": [
+    "ember-addon",
+    "ember",
+    "ember-cli",
+    "notifications",
+    "alerts"
+  ],
+  "license": "MIT",
+  "author": "Jonathan Steele",
   "directories": {
     "doc": "doc",
     "test": "tests"
   },
-  "scripts": {
-    "build": "ember build",
-    "start": "ember server",
-    "test": "ember try:each",
-    "deploy": "ember github-pages:commit --message \"Deploy gh-pages from commit $(git rev-parse HEAD)\"; git push; git checkout -"
-  },
   "repository": {
     "type": "git",
     "url": "https://github.com/stonecircle/ember-cli-notifications"
   },
-  "engines": {
-    "node": ">= 0.12.0"
+  "scripts": {
+    "build": "ember build",
+    "deploy": "ember github-pages:commit --message \"Deploy gh-pages from commit $(git rev-parse HEAD)\"; git push; git checkout -",
+    "start": "ember server",
+    "test": "ember try:each"
+  },
+  "dependencies": {
+    "ember-cli-babel": "^5.1.7",
+    "ember-cli-htmlbars": "^1.1.1",
+    "ember-css-modules": "0.7.0-beta.1",
+    "ember-runtime-enumerable-includes-polyfill": "^2.0.0",
+    "postcss-cssnext": "^2.6.0"
   },
-  "author": "Jonathan Steele",
-  "license": "MIT",
   "devDependencies": {
     "basscss": "^8.0.1",
     "basscss-background-colors": "^2.1.0",
@@ -33,52 +44,31 @@
     "basscss-forms": "^1.0.0",
     "broccoli-asset-rev": "^2.4.5",
     "ember-ajax": "^2.4.1",
-    "ember-cli": "2.10.0",
-    "ember-cli-app-version": "^2.0.0",
+    "ember-cli": "2.12.2",
     "ember-cli-dependency-checker": "^1.3.0",
+    "ember-cli-eslint": "^3.0.0",
     "ember-cli-github-pages": "0.0.8",
-    "ember-cli-htmlbars-inline-precompile": "^0.3.3",
+    "ember-cli-htmlbars-inline-precompile": "^0.3.6",
     "ember-cli-inject-live-reload": "^1.4.1",
-    "ember-cli-jshint": "^2.0.1",
-    "ember-cli-qunit": "^3.0.1",
-    "ember-cli-release": "^0.2.9",
+    "ember-cli-qunit": "^3.1.0",
+    "ember-cli-shims": "^1.0.2",
     "ember-cli-sri": "^2.1.0",
-    "ember-cli-test-loader": "^1.1.0",
     "ember-cli-uglify": "^1.2.0",
-    "ember-data": "^2.10.0",
     "ember-disable-prototype-extensions": "^1.1.0",
     "ember-export-application-global": "^1.0.5",
-    "ember-load-initializers": "^0.5.1",
+    "ember-load-initializers": "^0.6.0",
     "ember-radio-button": "1.0.7",
     "ember-resolver": "^2.0.3",
-    "ember-themed-syntax": "0.0.6",
-    "loader.js": "^4.0.10",
-    "postcss-import": "^8.1.2",
-    "postcss-reporter": "^1.4.1",
-    "stylelint": "^7.1.0",
-    "stylelint-config-standard": "^12.0.0"
+    "ember-source": "~2.12.0",
+    "ember-themed-syntax": "0.0.7",
+    "loader.js": "^4.2.3",
+    "postcss-import": "^8.1.2"
   },
-  "keywords": [
-    "ember-addon",
-    "ember",
-    "ember-cli",
-    "notifications",
-    "alerts"
-  ],
-  "dependencies": {
-    "ember-cli-babel": "^5.1.7",
-    "ember-cli-htmlbars": "^1.0.10",
-    "ember-css-modules": "^0.6.4",
-    "ember-runtime-enumerable-includes-polyfill": "^1.0.1",
-    "postcss-cssnext": "^2.6.0"
+  "engines": {
+    "node": ">= 4"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config",
-    "demoURL": "http://stonecircle.github.io/ember-cli-notifications/"
-  },
-  "bugs": {
-    "url": "https://github.com/stonecircle/ember-cli-notifications/issues"
-  },
-  "homepage": "https://github.com/stonecircle/ember-cli-notifications",
-  "main": "index.js"
+    "demoURL": "http://stonecircle.github.io/ember-cli-notifications"
+  }
 }

testem.js

@@ -1,6 +1,5 @@
-/*jshint node:true*/
+/* eslint-env node */
 module.exports = {
-  "framework": "qunit",
   "test_page": "tests/index.html?hidepassed",
   "disable_watching": true,
   "launch_in_ci": [

tests/.eslintrc.js

@@ -0,0 +1,5 @@
+module.exports = {
+  env: {
+    embertest: true
+  }
+};

tests/helpers/start-app.js

@@ -3,16 +3,13 @@ import Application from '../../app';
 import config from '../../config/environment';
 
 export default function startApp(attrs) {
-  let application;
+  let attributes = Ember.merge({}, config.APP);
+  attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
 
-  // use defaults, but you can override
-  let attributes = Ember.assign({}, config.APP, attrs);
-
-  Ember.run(() => {
-    application = Application.create(attributes);
+  return Ember.run(() => {
+    let application = Application.create(attributes);
     application.setupForTesting();
     application.injectTestHelpers();
+    return application;
   });
-
-  return application;
 }