Upgraded packages and fixed tests.

.eslintrc.js

@@ -4,10 +4,54 @@ module.exports = {
     ecmaVersion: 2017,
     sourceType: 'module'
   },
-  extends: 'eslint:recommended',
+  plugins: [
+    'ember'
+  ],
+  extends: [
+    'eslint: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/**',
+        'tests/dummy/app/**'
+      ],
+      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
+      }
+    }
+  ]
 };

.npmignore

@@ -7,10 +7,15 @@
 .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

.travis.yml

@@ -21,9 +21,8 @@ env:
   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-1.13
-    - EMBER_TRY_SCENARIO=ember-lts-2.8
     - 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
@@ -42,6 +41,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".
   - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup

addon/mixins/style-namespacing-extras.js

@@ -1,9 +1,5 @@
-import Ember from 'ember';
-
-const {
-  computed,
-  Mixin,
-} = Ember;
+import Mixin from '@ember/object/mixin';
+import { computed } from '@ember/object';
 
 export default Mixin.create({
   _componentIdentifier: computed({

app/initializers/component-styles.js

@@ -1,16 +1,14 @@
-import Ember from 'ember';
+import Ember from "ember";
+import Component from '@ember/component';
+import { computed } from '@ember/object';
+import { alias } from '@ember/object/computed';
+import { getOwner } from '@ember/application';
+
 import podNames from 'ember-component-css/pod-names';
 import StyleNamespacingExtras from '../mixins/style-namespacing-extras';
 
 const {
-  Component,
   ComponentLookup,
-  computed,
-  computed: {
-    // deprecatingAlias,
-    alias,
-  },
-  getOwner
 } = Ember;
 
 ComponentLookup.reopen({

app/initializers/route-styles.js

@@ -4,8 +4,6 @@ import podNames from 'ember-component-css/pod-names';
 
 Router.reopen({
   didTransition(routes) {
-    this._super(...arguments);
-
     const classes = [];
     for (let route of routes) {
       let currentPath = route.name.replace(/\./g, '/');

bin/install-test-addons.js

@@ -0,0 +1,13 @@
+/* eslint-env node */
+'use strict';
+
+const fs = require('fs-extra');
+
+fs.removeSync('node_modules/test-addon');
+fs.symlinkSync('../tests/dummy/lib/test-addon', 'node_modules/test-addon');
+
+fs.removeSync('node_modules/second-test-addon');
+fs.symlinkSync('../tests/dummy/lib/second-test-addon', 'node_modules/second-test-addon');
+
+fs.removeSync('node_modules/no-style-files-yet');
+fs.symlinkSync('../tests/dummy/lib/no-style-files-yet', 'node_modules/no-style-files-yet');

config/ember-try.js

@@ -1,44 +1,19 @@
-/* eslint-env node */
 module.exports = {
   useYarn: true,
   scenarios: [
     {
-      name: 'ember-1.13',
-      bower: {
-        dependencies: {
-          'ember': 'components/ember#release-1-13'
-        },
-        resolutions: {
-          'ember': 'release-1-13'
-        }
-      },
-      npm: {
-        devDependencies: {
-          'ember-source': null
-        }
-      }
-    },
-    {
-      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'
         }
       }
     },

config/environment.js

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

ember-cli-build.js

@@ -1,4 +1,3 @@
-/* eslint-env node */
 'use strict';
 
 const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');

index.js

@@ -1,4 +1,3 @@
-/* eslint-env node */
 'use strict';
 
 var Funnel = require('broccoli-funnel');

package.json

@@ -16,11 +16,12 @@
     "url": "https://github.com/ebryn/ember-component-css.git"
   },
   "scripts": {
+    "prepublish": "node ./bin/install-test-addons.js",
+    "release": "standard-version",
     "build": "ember build",
-    "start": "ember server",
-    "test": "ember try:each",
-    "prepublish": "./bin/install-test-addons.sh",
-    "release": "standard-version"
+    "lint:js": "eslint ./*.js addon addon-test-support app config lib server test-support tests",
+    "start": "ember serve",
+    "test": "ember try:each"
   },
   "dependencies": {
     "broccoli-concat": "^3.2.2",
@@ -29,52 +30,55 @@
     "broccoli-persistent-filter": "^1.4.2",
     "broccoli-plugin": "^1.3.0",
     "broccoli-style-manifest": "^1.4.0",
-    "ember-cli-babel": "^6.6.0",
-    "ember-getowner-polyfill": "^2.0.1",
+    "ember-cli-babel": "^6.11.0",
+    "ember-getowner-polyfill": "^2.2.0",
     "fs-tree-diff": "^0.5.6",
     "md5": "^2.2.1",
-    "postcss": "^6.0.8",
-    "postcss-less": "^1.1.0",
-    "postcss-scss": "^1.0.2",
-    "postcss-selector-namespace": "^1.4.1",
-    "rsvp": "^4.0.1",
+    "postcss": "^6.0.16",
+    "postcss-less": "^1.1.3",
+    "postcss-scss": "^1.0.3",
+    "postcss-selector-namespace": "^1.5.0",
+    "rsvp": "^4.8.1",
     "walk-sync": "^0.3.2"
   },
   "devDependencies": {
     "broccoli-asset-rev": "^2.5.0",
-    "ember-cli": "^2.16.2",
-    "ember-cli-dependency-checker": "^2.0.1",
-    "ember-cli-eslint": "^4.2.0",
+    "ember-cli": "^2.18.1",
+    "ember-cli-dependency-checker": "^2.1.0",
+    "ember-cli-eslint": "^4.2.3",
     "ember-cli-htmlbars": "^2.0.3",
     "ember-cli-htmlbars-inline-precompile": "^1.0.0",
     "ember-cli-inject-live-reload": "^1.7.0",
-    "ember-cli-qunit": "^4.0.0",
-    "ember-cli-shims": "^1.1.0",
+    "ember-cli-qunit": "^4.3.0",
+    "ember-cli-shims": "^1.2.0",
     "ember-cli-sri": "^2.1.1",
-    "ember-cli-styles-preprocessor": "^0.0.8",
+    "ember-cli-styles-preprocessor": "^0.1.1",
     "ember-cli-uglify": "^2.0.0",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-export-application-global": "^2.0.0",
     "ember-load-initializers": "^1.0.0",
     "ember-resolver": "^4.3.0",
-    "ember-source": "~2.16.0",
+    "ember-source": "~2.18.0",
+    "eslint-plugin-ember": "^5.0.0",
+    "eslint-plugin-node": "^5.2.1",
+    "fs-extra": "^5.0.0",
     "loader.js": "^4.6.0",
     "no-style-files-yet": "file:./tests/dummy/lib/no-style-files-yet",
     "second-test-addon": "file:./tests/dummy/lib/second-test-addon",
-    "standard-version": "^4.2.0",
+    "standard-version": "^4.3.0",
     "test-addon": "file:./tests/dummy/lib/test-addon"
   },
   "engines": {
     "node": "^4.5 || 6.* || >= 7.*"
   },
   "ember-addon": {
-    "configPath": "tests/dummy/config",
     "before": [
       "ember-cli-styles-preprocessor",
       "ember-cli-less",
       "ember-cli-sass",
       "ember-cli-stylus",
       "ember-cli-postcss"
-    ]
+    ],
+    "configPath": "tests/dummy/config"
   }
 }

testem.js

@@ -1,4 +1,3 @@
-/* eslint-env node */
 module.exports = {
   test_page: 'tests/index.html?hidepassed',
   disable_watching: true,
@@ -12,11 +11,14 @@ module.exports = {
     Chrome: {
       mode: 'ci',
       args: [
+        // --no-sandbox is needed when running Chrome inside a container
+        process.env.TRAVIS ? '--no-sandbox' : null,
+
         '--disable-gpu',
         '--headless',
-        '--remote-debugging-port=9222',
+        '--remote-debugging-port=0',
         '--window-size=1440,900'
-      ]
-    },
+      ].filter(Boolean)
+    }
   }
 };

tests/dummy/app/components/base-rules/component.js

@@ -1,10 +1,7 @@
-import Ember from 'ember';
-import layout from './template';
+import Component from '@ember/component';
 
-const {
-  Component,
-} = Ember;
+import layout from './template';
 
 export default Component.extend({
-  layout,
+  layout
 });

tests/dummy/app/components/scss/for-loop/component.js

@@ -1,9 +1,10 @@
-import Ember from 'ember';
-
-const {
-  Component,
-} = Ember;
+import Component from '@ember/component';
+import { computed } from '@ember/object';
 
 export default Component.extend({
-  items: [...Array(10).keys()],
+  items: computed({
+    get() {
+      return [...Array(10).keys()];
+    },
+  }),
 });

tests/dummy/config/environment.js

@@ -1,4 +1,3 @@
-/* eslint-env node */
 'use strict';
 
 module.exports = function(environment) {
@@ -42,6 +41,7 @@ module.exports = function(environment) {
     ENV.APP.LOG_VIEW_LOOKUPS = false;
 
     ENV.APP.rootElement = '#ember-testing';
+    ENV.APP.autoboot = false;
   }
 
   return ENV;

tests/dummy/config/targets.js

@@ -1,4 +1,3 @@
-/* eslint-env node */
 module.exports = {
   browsers: [
     'ie 9',

tests/dummy/lib/no-style-files-yet/addon/components/no-style/component.js

@@ -1,6 +1,7 @@
-import Ember from 'ember';
+import Component from '@ember/component';
+
 import layout from './template';
 
-export default Ember.Component.extend({
+export default Component.extend({
   layout
 });