Merge pull request #244 from ember-cli/chores

Chores

.eslintignore

@@ -1,3 +1,16 @@
-/blueprints/*/files/**/*.js
-/dist
-/vendor
+# unconventional js
+/blueprints/*/files/
+/vendor/
+
+# compiled output
+/dist/
+/tmp/
+
+# dependencies
+/bower_components/
+
+# misc
+/coverage/
+
+# ember-try
+/.node_modules.ember-try/

.eslintrc.js

@@ -4,8 +4,12 @@ module.exports = {
     ecmaVersion: 2017,
     sourceType: 'module'
   },
+  plugins: [
+    'ember'
+  ],
   extends: [
-    'eslint:recommended'
+    'eslint:recommended',
+    'plugin:ember/recommended'
   ],
   env: {
     browser: true
@@ -24,11 +28,11 @@ module.exports = {
         'tests/dummy/config/**/*.js'
       ],
       excludedFiles: [
+        'mu-trees/**',
         'addon/**',
         'addon-test-support/**',
         'app/**',
-        'tests/dummy/app/**',
-        'mu-trees/**',
+        'tests/dummy/app/**'
       ],
       parserOptions: {
         sourceType: 'script',

.gitignore

@@ -1,23 +1,23 @@
 # See https://help.github.com/ignore-files/ for more about ignoring files.
 
 # compiled output
-/dist
-/tmp
+/dist/
+/tmp/
 
 # dependencies
-/node_modules
-/bower_components
+/bower_components/
+/node_modules/
 
 # misc
 /.sass-cache
 /connect.lock
-/coverage/*
+/coverage/
 /libpeerconnection.log
-npm-debug.log*
-yarn-error.log
-testem.log
+/npm-debug.log*
+/testem.log
+/yarn-error.log
 
 # ember-try
-.node_modules.ember-try/
-bower.json.ember-try
-package.json.ember-try
+/.node_modules.ember-try/
+/bower.json.ember-try
+/package.json.ember-try

.npmignore

@@ -14,6 +14,7 @@
 bower.json
 ember-cli-build.js
 testem.js
+yarn.lock
 
 # ember-try
 .node_modules.ember-try/

.travis.yml

@@ -3,9 +3,9 @@ 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
-  - "4"
+  - "6"
 
-sudo: required
+sudo: false
 dist: trusty
 
 addons:
@@ -14,50 +14,35 @@ addons:
 cache:
   yarn: true
 
+env:
+  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-lts-2.18
+    - EMBER_TRY_SCENARIO=ember-release
+    - EMBER_TRY_SCENARIO=ember-beta
+    - EMBER_TRY_SCENARIO=ember-canary
+    - EMBER_TRY_SCENARIO=ember-default
+
+matrix:
+  fast_finish: true
+  allow_failures:
+    - env: EMBER_TRY_SCENARIO=ember-canary
+
 before_install:
   - curl -o- -L https://yarnpkg.com/install.sh | bash
   - export PATH=$HOME/.yarn/bin:$PATH
 
 install:
-  - yarn 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".
+  #  to the addon's original dependency state, skipping "cleanup".
   - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup
-
-env:
-  global:
-    # See https://git.io/vdao3 for details.
-    - JOBS=1
-
-jobs:
-  fail_fast: true
-
-  include:
-    # runs tests in chrome with current locked deps and linting
-
-    - env: NAME=test # used only to make Travis UI show description
-      script:
-        - yarn lint:js
-        - yarn test
-
-    # If that passes:
-    # - run tests without pinned dependencies to catch issues with new versions
-    # - run tests in each supported ember version
-    - stage: additional tests
-      env: NAME=floating dependencies
-      install: yarn install --no-lockfile --non-interactive
-      script:
-        - yarn test
-
-    - env: EMBER_TRY_SCENARIO=ember-1.13
-    - env: EMBER_TRY_SCENARIO=ember-lts-2.4
-    - env: EMBER_TRY_SCENARIO=ember-lts-2.8
-    - env: EMBER_TRY_SCENARIO=ember-lts-2.12
-    - env: EMBER_TRY_SCENARIO=ember-lts-2.16
-    - env: EMBER_TRY_SCENARIO=ember-lts-2.18
-    - env: EMBER_TRY_SCENARIO=ember-release
-    - env: EMBER_TRY_SCENARIO=ember-beta
-    - env: EMBER_TRY_SCENARIO=ember-canary
-    - env: EMBER_TRY_SCENARIO=module-unification

config/ember-try.js

@@ -3,74 +3,14 @@
 const getChannelURL = require('ember-source-channel-url');
 
 module.exports = function() {
-  // eslint-disable-next-line no-undef
   return Promise.all([
     getChannelURL('release'),
     getChannelURL('beta'),
-    getChannelURL('canary'),
+    getChannelURL('canary')
   ]).then((urls) => {
     return {
       useYarn: true,
       scenarios: [
-        {
-          name: 'module-unification',
-          command: 'EMBER_CLI_MODULE_UNIFICATION=true ember test'
-        },
-        {
-          name: 'ember-default',
-          npm: {
-            devDependencies: {}
-          }
-        },
-        {
-          name: 'ember-1.13',
-          bower: {
-            dependencies: {
-              'ember': '~1.13.0'
-            },
-            resolutions: {
-              'ember': '~1.13.0'
-            }
-          },
-          npm: {
-            devDependencies: {
-              "ember-debug-handlers-polyfill": "^1.1.1",
-              'ember-source': null
-            }
-          }
-        },
-        {
-          name: 'ember-lts-2.4',
-          bower: {
-            dependencies: {
-              'ember': '~2.4.0'
-            },
-            resolutions: {
-              'ember': '~2.4.0'
-            }
-          },
-          npm: {
-            devDependencies: {
-              'ember-source': null
-            }
-          }
-        },
-        {
-          name: 'ember-lts-2.8',
-          bower: {
-            dependencies: {
-              'ember': 'components/ember#lts-2-8'
-            },
-            resolutions: {
-              'ember': 'lts-2-8'
-            }
-          },
-          npm: {
-            devDependencies: {
-              'ember-source': null
-            }
-          }
-        },
         {
           name: 'ember-lts-2.12',
           npm: {
@@ -118,6 +58,12 @@ module.exports = function() {
               'ember-source': urls[2]
             }
           }
+        },
+        {
+          name: 'ember-default',
+          npm: {
+            devDependencies: {}
+          }
         }
       ]
     };

mu-trees/addon/resolvers/fallback/index.js

@@ -1,11 +1,11 @@
 import ClassicResolver from 'ember-resolver';
 import Resolver from 'ember-resolver/resolvers/glimmer-wrapper';
-import Ember from 'ember';
+import { assign } from '@ember/polyfills';
 
 export default Resolver.extend({
   init(options) {
     this._super(options);
-    this._fallback = ClassicResolver.create(Ember.assign({
+    this._fallback = ClassicResolver.create(assign({
       namespace: { modulePrefix: this.config.app.name }
     }, options));
   },

mu-trees/addon/resolvers/glimmer-wrapper/index.js

@@ -1,8 +1,7 @@
-import Ember from 'ember';
 import GlimmerResolver from '@glimmer/resolver/resolver';
 import RequireJSRegistry from '../../module-registries/requirejs';
-
-const { DefaultResolver, String: { dasherize } } = Ember;
+import GlobalsResolver from '@ember/application/globals-resolver';
+import { dasherize } from '@ember/string';
 
 function slasherize(dotted) {
   return dotted.replace(/\./g, '/');
@@ -69,7 +68,7 @@ function cleanupEmberSpecifier(specifier, source, _namespace) {
  * this code extends from the DefaultResolver, it should never
  * call `_super` or call into that code.
  */
-const Resolver = DefaultResolver.extend({
+const Resolver = GlobalsResolver.extend({
   init() {
     this._super(...arguments);
 

package.json

@@ -25,17 +25,17 @@
   "dependencies": {
     "@glimmer/resolver": "^0.4.1",
     "babel-plugin-debug-macros": "^0.1.10",
-    "broccoli-funnel": "^1.1.0",
-    "broccoli-merge-trees": "^2.0.0",
+    "broccoli-funnel": "^2.0.1",
+    "broccoli-merge-trees": "^3.0.0",
     "ember-cli-babel": "^6.8.1",
     "ember-cli-version-checker": "^2.0.0",
     "resolve": "^1.3.3"
   },
   "devDependencies": {
     "broccoli-asset-rev": "^2.4.5",
-    "ember-cli": "~3.1.4",
-    "ember-cli-app-version": "^2.0.1",
-    "ember-cli-dependency-checker": "^2.0.0",
+    "ember-cli": "~3.3.0",
+    "ember-cli-app-version": "^3.2.0",
+    "ember-cli-dependency-checker": "^3.0.0",
     "ember-cli-htmlbars": "^2.0.1",
     "ember-cli-htmlbars-inline-precompile": "^1.0.0",
     "ember-cli-inject-live-reload": "^1.4.1",
@@ -47,15 +47,17 @@
     "ember-load-initializers": "^1.0.0",
     "ember-maybe-import-regenerator": "^0.1.6",
     "ember-qunit-assert-helpers": "^0.2.1",
-    "ember-source": "~3.1.0",
+    "ember-source": "~3.3.0",
     "ember-source-channel-url": "^1.0.1",
     "ember-try": "^0.2.23",
-    "eslint": "^4.19.1",
-    "eslint-plugin-node": "^6.0.1",
-    "loader.js": "^4.2.3"
+    "eslint": "^5.2.0",
+    "eslint-plugin-ember": "^5.2.0",
+    "eslint-plugin-node": "^7.0.1",
+    "loader.js": "^4.2.3",
+    "qunit-dom": "^0.7.1"
   },
   "engines": {
-    "node": "^4.5 || 6.* || >= 7.*"
+    "node": "6.* || 8.* || >= 10.*"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config"

testem.js

@@ -9,13 +9,14 @@ module.exports = {
   ],
   browser_args: {
     Chrome: {
-      mode: 'ci',
-      args: [
+      ci: [
         // --no-sandbox is needed when running Chrome inside a container
-        process.env.TRAVIS ? '--no-sandbox' : null,
-
-        '--disable-gpu',
+        process.env.CI ? '--no-sandbox' : null,
         '--headless',
+        '--disable-gpu',
+        '--disable-dev-shm-usage',
+        '--disable-software-rasterizer',
+        '--mute-audio',
         '--remote-debugging-port=0',
         '--window-size=1440,900'
       ].filter(Boolean)

tests/dummy/config/environment.js

@@ -34,12 +34,13 @@ module.exports = function(environment) {
   if (environment === 'test') {
     // Testem prefers this...
     ENV.locationType = 'none';
-    ENV.APP.autoboot = false;
 
     // keep test console output quieter
     ENV.APP.LOG_ACTIVE_GENERATION = false;
+    ENV.APP.LOG_VIEW_LOOKUPS = false;
 
     ENV.APP.rootElement = '#ember-testing';
+    ENV.APP.autoboot = false;
   }
 
   if (environment === 'production') {