Kick off 2.0-beta

html-next · Aug 11, 2020 · 1f15dc0 · 1f15dc0
1 parent 4c787b2
commit 1f15dc0
Show file tree

Hide file tree

Showing 7 changed files with 279 additions and 44 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,10 +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
-  - "8"
+  - "10"
 
-sudo: false
-dist: trusty
+dist: xenial
 
 addons:
   chrome: stable
@@ -22,34 +21,38 @@ env:
 branches:
   only:
     - master
+    - 2.0-beta
     # npm version tags
     - /^v\d+\.\d+\.\d+/
 
 jobs:
-  fail_fast: true
+  fast_finish: true
   allow_failures:
     - env: EMBER_TRY_SCENARIO=ember-canary
 
   include:
-    # runs linting and tests with current locked deps
-
+    # runs linting and tests with locked deps
     - stage: "Tests"
       name: "Tests"
-      install:
-        - travis_retry yarn install --non-interactive
       script:
-        - yarn lint:hbs
-        - yarn lint:js
-        - travis_retry yarn test
+        - yarn lint
+        - yarn test:ember
 
-    - name: "Floating Dependencies"
+    - stage: "Additional Tests"
+      name: "Floating Dependencies"
+      install:
+        - yarn install --no-lockfile --non-interactive
       script:
-        - travis_retry yarn test
+        - yarn test:ember
 
     # we recommend new addons test the current and previous LTS
     # as well as latest stable release (bonus points to beta/canary)
     - stage: "Additional Tests"
-      env: EMBER_TRY_SCENARIO=ember-lts-3.4
+      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.18
+    - env: EMBER_TRY_SCENARIO=ember-lts-3.4
     - env: EMBER_TRY_SCENARIO=ember-lts-3.8
     - env: EMBER_TRY_SCENARIO=ember-release
     - env: EMBER_TRY_SCENARIO=ember-beta
@@ -62,13 +65,14 @@ before_install:
   - yarn global add greenkeeper-lockfile@1
 
 install:
-  - travis_retry yarn install --no-lockfile --non-interactive
+  - yarn install --non-interactive
 
 before_script:
   - greenkeeper-lockfile-update
 
 script:
-  - travis_retry node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO
+  - yarn lint
+  - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO
 
 after_script:
   - greenkeeper-lockfile-upload
diff --git a/README.md b/README.md
@@ -65,7 +65,7 @@ ember install @html-next/vertical-collection
 | `vertical-collection` version | Supported Ember versions |
 | ----------------------------- | ------------------------ |
 | `^v1.0.0`                     | `v1.12.0 - v3.8.0`       |
-| `^v2.0.0`                     | `v3.8.0+`                |
+| `^v2.0.0`                     | `v2.4.0+`                |
 
 ## Support, Questions, Collaboration
 

diff --git a/app/initializers/vertical-collection-legacy-compat.js b/app/initializers/vertical-collection-legacy-compat.js
diff --git a/config/ember-try.js b/config/ember-try.js
@@ -6,6 +6,54 @@ module.exports = async function() {
   return {
     useYarn: true,
     scenarios: [
+      {
+        name: 'ember-lts-2.4',
+        bower: {
+          dependencies: {
+            ember: 'components/ember#lts-2-4',
+          },
+          resolutions: {
+            ember: 'lts-2-4',
+          },
+        },
+        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: {
+          devDependencies: {
+            'ember-source': '~2.12.0'
+          },
+        },
+      },
+      {
+        name: 'ember-lts-2.18',
+        npm: {
+          devDependencies: {
+            'ember-source': '~2.18.0'
+          },
+        },
+      },
       {
         name: 'ember-lts-3.4',
         npm: {

diff --git a/index.js b/index.js
@@ -139,10 +139,6 @@ module.exports = {
       exclude.push('initializers/debug.js');
     }
 
-    if (this.checker.forEmber().isAbove('1.13.0')) {
-      exclude.push('initializers/vertical-collection-legacy-compat.js');
-    }
-
     return new Funnel(tree, { exclude });
   }
 };

diff --git a/package.json b/package.json
@@ -41,19 +41,21 @@
   "bugs": "https://github.com/html-next/vertical-collection/issues",
   "scripts": {
     "build": "ember build",
+    "lint": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*",
     "lint:hbs": "ember-template-lint .",
     "lint:js": "eslint .",
     "start": "ember serve",
-    "test": "ember test",
-    "test:all": "ember try:each"
+    "test": "npm-run-all lint:* test:*",
+    "test:ember": "ember test",
+    "test:ember-compatibility": "ember try:each"
   },
   "dependencies": {
     "babel6-plugin-strip-class-callcheck": "^6.0.0",
     "broccoli-funnel": "^2.0.2",
     "broccoli-merge-trees": "^3.0.1",
     "broccoli-rollup": "^4.1.1",
     "ember-cli-babel": "^7.7.3",
-    "ember-cli-htmlbars": "^3.0.0",
+    "ember-cli-htmlbars": "^3.0.1",
     "ember-cli-version-checker": "^3.1.3",
     "ember-raf-scheduler": "0.1.0"
   },
@@ -88,10 +90,11 @@
     "eslint-plugin-ember": "^6.7.1",
     "eslint-plugin-node": "^9.1.0",
     "loader.js": "^4.7.0",
+    "npm-run-all": "^4.1.5",
     "qunit-dom": "^0.9.0"
   },
   "engines": {
-    "node": "8.* || >= 10.*"
+    "node": ">= 10.*"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config"