Merge pull request #219 from ember-cli/ember-3.0

Upgrade to Ember CLI 2.18, Re-enable beta testing
ember-cli · Jan 20, 2018 · 1228d7d · 1228d7d
2 parents ec94b6c + d3d9764
commit 1228d7d
Show file tree

Hide file tree

Showing 24 changed files with 2,399 additions and 1,344 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -4,10 +4,49 @@ module.exports = {
     ecmaVersion: 2017,
     sourceType: 'module'
   },
-  extends: 'eslint:recommended',
+  extends: [
+    'eslint: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
@@ -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
diff --git a/.travis.yml b/.travis.yml
@@ -5,42 +5,45 @@ node_js:
   # so that your addon works for all apps
   - "4"
 
-sudo: false
+sudo: required
+dist: trusty
+
+addons:
+  chrome: stable
 
 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-1.13
-  - EMBER_TRY_SCENARIO=ember-lts-2.4
-  - 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=module-unification
+  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-1.13
+    - EMBER_TRY_SCENARIO=ember-lts-2.4
+    - 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
+    - EMBER_TRY_SCENARIO=module-unification
 
 matrix:
   fast_finish: true
   allow_failures:
-    - env: EMBER_TRY_SCENARIO=ember-beta
     - env: EMBER_TRY_SCENARIO=ember-canary
 
 before_install:
-  - npm config set spin false
-  - npm install -g npm
   - curl -o- -L https://yarnpkg.com/install.sh | bash
   - export PATH=$HOME/.yarn/bin:$PATH
-  - yarn global add phantomjs-prebuilt bower
-  - bower --version
-  - phantomjs --version
 
 install:
   - yarn install --no-lockfile --non-interactive
 
 script:
   # 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 test --skip-cleanup
+  - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup
diff --git a/README.md b/README.md
@@ -24,8 +24,6 @@ flag settings change how `ember-resolver` compiles into an ember-cli's
 Feature flags are set in an application's `config/environment.js`:
 
 ```js
-/* eslint-env node */
-
 module.exports = function(environment) {
   var ENV = {
     'ember-resolver': {

diff --git a/addon/resolvers/classic/index.js b/addon/resolvers/classic/index.js
@@ -47,8 +47,6 @@ const {
 } = Ember;
 
 function parseName(fullName) {
-  /*jshint validthis:true */
-
   if (fullName.parsedName === true) { return fullName; }
 
   let prefix, type, name;
@@ -100,8 +98,6 @@ function parseName(fullName) {
 }
 
 function resolveOther(parsedName) {
-  /*jshint validthis:true */
-
   Ember.assert('`modulePrefix` must be defined', this.namespace.modulePrefix);
 
   let normalizedModuleName = this.findModuleName(parsedName);
@@ -317,7 +313,7 @@ const Resolver = DefaultResolver.extend({
     }
     // workaround for dasherized partials:
     // something/something/-something => something/something/_something
-    let partializedModuleName = moduleName.replace(/\/-([^\/]*)$/, '/_$1');
+    let partializedModuleName = moduleName.replace(/\/-([^/]*)$/, '/_$1');
 
     if (this._moduleRegistry.has(partializedModuleName)) {
       Ember.deprecate('Modules should not contain underscores. ' +