Merge 636257a into 5aec9e3

ember-cli · Nov 15, 2019 · 19a77a8 · 19a77a8
2 parents 5aec9e3 + 636257a
commit 19a77a8
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -50,6 +50,9 @@ jobs:
       after_success:
         - .travis/codecoverage.sh
 
+    - name: Node.js 13
+      node_js: 13
+
     - env: EMBER_CLI_ENABLE_ALL_EXPERIMENTS=true
     - env: EMBER_CLI_PACKAGER=true
     - env: EMBER_CLI_MODULE_UNIFICATION=true

diff --git a/appveyor.yml b/appveyor.yml
@@ -9,6 +9,7 @@ environment:
     - nodejs_version: "8"
     - nodejs_version: "10"
     - nodejs_version: "12"
+    - nodejs_version: "13"
 
 matrix:
   fast_finish: true

diff --git a/docs/node-support.md b/docs/node-support.md
@@ -8,11 +8,14 @@
 | 0.12.x           | 0.0.0 - 2.11.x               |
 | 4.x              | 1.13.9 - 3.1.x               |
 | 5.x              | 1.13.9 - 2.6.3               |
-| 6.x              | 2.9.0 - Current              |
+| 6.x              | 2.9.0 - 3.9.x                |
 | 7.x              | 2.10.0 - 2.16.x              |
 | 8.x              | 2.13.3 - Current             |
-| 9.x              | 2.16.2 - Current             |
+| 9.x              | 2.16.2 - 3.2.x               |
 | 10.x             | 3.1.3 - Current              |
+| 11.x             | 3.9.0 - 3.13.0               |
+| 12.x             | 3.10.0 - Current             |
+| 13.x             | 3.15.0 - Current             |
 
 
 ## Design
@@ -26,14 +29,14 @@ Node.js](https://github.com/nodejs/LTS#lts_schedule).
 
 ## Current support:
 
-* v6: Released as stable version then converted to LTS. 
-  * Supported by ember-cli/ember-cli#master until: 2019-04-30.
 * v8: Released as stable version then converted to LTS.
-  * Supported by ember-cli/ember-cli#master until: 2019-12-31
-* v9: Released as stable (not an LTS)
-  * Supported by ember-cli/ember-cli#master until: 2018-07-01.
+  * Supported by ember-cli/ember-cli#master until: 2019-12-31.
 * v10: Released as stable version then converted to LTS.
   * Supported by ember-cli/ember-cli#master until: 2021-04-30.
+* v12: Released as stable version then converted to LTS.
+  * Supported by ember-cli/ember-cli#master until: 2022-04-30.
+* v13: Released as stable (not an LTS)
+  * Supported by ember-cli/ember-cli#master until: 2020-06-30.
 
 ## Release Process and Support Policy
 

diff --git a/package.json b/package.json
@@ -162,7 +162,7 @@
     "yuidocjs": "0.10.2"
   },
   "engines": {
-    "node": "8.* || >= 10.*"
+    "node": "8.* || 10.* || >= 12"
   },
   "trackingCode": "UA-49225444-1",
   "greenkeeper": {