Upstream

.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

@@ -1,100 +1,53 @@
-/* jshint ignore:start */
 module.exports = {
   root: true,
   parserOptions: {
-    ecmaVersion: 6
+    ecmaVersion: 2017,
+    sourceType: 'module'
   },
-  extends: 'eslint:recommended',
+  plugins: [
+    'ember'
+  ],
+  extends: [
+    'eslint:recommended',
+    'plugin:ember/recommended'
+  ],
   env: {
-    browser: true,
-    node: true
+    browser: true
   },
   rules: {
-    // JSHint "expr"
-    'no-unused-expressions': [2, {
-      allowShortCircuit: true,
-      allowTernary: true,
-    }],
-
-    // JSHint "proto", disabled due to warnings
-    'no-proto': 0,
-
-    // JSHint "strict"
-    'strict': [2, 'global'],
-
-    // JSHint "indent", disabled due to warnings
-    'indent': [2, 2, {
-      'SwitchCase': 1,
-      'VariableDeclarator': { 'var': 2, 'let': 2, 'const': 3 }
-    }],
-
-    // JSHint "camelcase"
-    camelcase: 2,
-
-    // JSHint "boss"
-    'no-cond-assign': [2, 'except-parens'],
-
-    // JSHint "curly"
-    curly: 2,
-
-    // JSHint "latedef"
-    'no-use-before-define': [2, 'nofunc'],
-
-    // JSHint "debug", disabled already in .jshintrc
-    'no-debugger': 0,
-
-    // JSHint "eqeqeq"
-    eqeqeq: 2,
-
-    // JSHint "evil"
-    'no-eval': 2,
-
-    // JSHint "forin", disabled already in .jshintrc
-    'guard-for-in': 0,
-
-    // JSHint "immed", disabled already in .jshintrc
-    'wrap-iife': 0,
-
-    // JSHint "laxbreak"
-    'linebreak-style': [2, 'unix'],
-
-    // JSHint "newcap
-    'new-cap': [2, {
-      properties: false,
-    }],
-
-    // JSHint "noarg"
-    'no-caller': 2,
-
-    // JSHint "noempty", JSCS "disallowEmptyBlocks"
-    'no-empty': 2,
-
-    // JSHint "quotmark", disabled due to warnings
-    quotes: [0, 'single'],
-
-    // JSHint "nonew", disabled already in .jshintrc
-    'no-new': 0,
-
-    // JSHint "plusplus", disabled already in .jshintrc
-    'no-plusplus': 0,
-
-    // JSHint "undef"
-    'no-undef': 2,
-
-    // JSHint "unused"
-    'no-unused-vars': 2,
-
-    // JSHint "sub", disabled due to warnings
-    'dot-notation': 0,
-
-    // JSHint "trailing"
-    'no-trailing-spaces': 2,
-
-    // JSHint "eqnull"
-    'no-eq-null': 2,
-
-    'no-console': 0,
-    'comma-dangle': 0,
   },
+  overrides: [
+    // node files
+    {
+      files: [
+        'index.js',
+        'testem.js',
+        'ember-cli-build.js',
+        'config/**/*.js',
+        'lib/**',
+        'test/**',
+        'tests/dummy/config/**/*.js'
+      ],
+      excludedFiles: [
+        'app/**',
+        'addon/**',
+        'test/fixtures/**',
+        '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, {
+        'no-console': 'off',
+        'no-useless-escape': 'off',
+        'node/no-unpublished-require': 'off'
+      })
+    }
+  ]
 };
-/* jshint ignore:end */

.gitignore

@@ -1,4 +1,4 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
+# See https://help.github.com/ignore-files/ for more about ignoring files.
 
 # compiled output
 /dist
@@ -13,5 +13,11 @@
 /connect.lock
 /coverage/*
 /libpeerconnection.log
-npm-debug.log
+npm-debug.log*
+yarn-error.log
 testem.log
+
+# ember-try
+.node_modules.ember-try/
+bower.json.ember-try
+package.json.ember-try

.npmignore

@@ -7,10 +7,15 @@
 .bowerrc
 .editorconfig
 .ember-cli
+.eslintrc.js
 .gitignore
-.jshintrc
 .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

.npmrc

@@ -0,0 +1 @@
+registry=https://registry.npmjs.org/

.travis.yml

@@ -1,43 +1,49 @@
 ---
 language: node_js
 node_js:
-  - "0.12"
-  - "4.2"
   - "6"
+  - "8"
 
+sudo: false
 dist: trusty
-sudo: required
 
-branches:
-  only:
-    - master
-    - auto
-    - /^greenkeeper.*$/
+addons:
+  chrome: stable
 
 cache:
-  directories:
-    - node_modules
+  yarn: true
 
-env:
-  - NPM_SCRIPT=node-test
+stages:
+  - lint
+  - test
+  - deploy
+
+jobs:
+  fail_fast: true
 
-matrix:
-  fast_finish: true
   include:
-  - node_js: "6"
-    env: NPM_SCRIPT=lint
+    - stage: lint
+      script: npm run-script lint:js
+    - stage: deploy
+      if: tag IS present
+      node_js: "6"
+      install: yarn global add [email protected]
+      script: auto-dist-tag --write
+      deploy:
+        provider: npm
+        email: [email protected]
+        api_key:
+          secure: 1lwhuEjgX41j06ObP6VNIFXSWzTPylvG/iOa5BYdCmazFS5ry9d5CYBpTsGB6GhPfhPVYbrefwQSMerK7vzls6PfIxnSpGudIb48PGlHxZOlb5SQ/FOclWzwOylrCBSDWv0YRjlIkLkGf9VTo9zVBLvUWQs22ec40dVqcovj4Yy5YKRa2t3vLvOqV8KNx4n6AYmbSljZoJ6OePhSaYIwMYq56eBaphjumj7/cBShQ594azf0RBnvb2ILC2SixreiFTakThHAlNTbkIbMRdByzygZDTeZVLHoDaY5ZDmwBGP+SW25Qz6o2dLDAA5Xv4yhIGX4Zulai3nfhap0Jf65u/bGIK+4auZg1x0usjkewIqc8R7f+GKMjkhXCTA7bDtRmrkHA/WjdNiAXBaqRdFUwBaIJisL9RPpffgkgelMWHYwAH4R871pA0q8ebGsIY8KDsS0v6MeQT/jwCM4yVnNSYyJpLwIoZy0pLBII9rtdugEYL5wzBAfmmlBenyj5cYx/94bWw6R3aeZSEOTke8/JzzsH6dbjQEsPj21sHNS+DUCEdX5pX8xBWWDMsO/WBrzJptSXtyKdabnrpt2muF6VPUqHFGIlu/cS4RMswebJF160g3OhcFgSpbaXH60tKP2xIRzQx7KczL5+CM3E61XPsEyCfZ79KyUcr4zWJoS96Y=
+        on:
+          tags: true
+          repo: kategengler/ember-cli-code-coverage
 
 before_install:
-  - export CHROME_BIN=chromium-browser
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
-  - npm config set spin false
-  - npm install -g npm@^2
+  - curl -o- -L https://yarnpkg.com/install.sh | bash
+  - export PATH=$HOME/.yarn/bin:$PATH
 
 install:
-  - npm install -g bower
-  - npm install
-  - bower install
+  - yarn install --no-lockfile --non-interactive
 
 script:
-  - npm run-script $NPM_SCRIPT
+  - npm run-script node-test