Drop TS 3.6 and bump @types/ember

machty · Jun 11, 2020 · 33cc029 · 33cc029
1 parent 186952a
commit 33cc029
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 16 deletions.
diff --git a/config/ember-try.js b/config/ember-try.js
@@ -148,15 +148,6 @@ module.exports = async function() {
           }
         }
       },
-      {
-        name: 'typescript-3.6',
-        npm: {
-          devDependencies: {
-            'typescript': '~3.6.0'
-          }
-        },
-        command: 'tsc'
-      },
       {
         name: 'typescript-3.7',
         npm: {

diff --git a/package.json b/package.json
@@ -20,7 +20,7 @@
     "@ember/optional-features": "^0.7.0",
     "@embroider/macros": "^0.10.0",
     "@glimmer/component": "^1.0.0",
-    "@types/ember": "^3.1.2",
+    "@types/ember": "^3.16.0",
     "babel-eslint": "^10.0.3",
     "broccoli-asset-rev": "^3.0.0",
     "broccoli-clean-css": "^1.1.0",

diff --git a/tests/dummy/app/docs/typescript/template.hbs b/tests/dummy/app/docs/typescript/template.hbs
@@ -4,8 +4,9 @@
   As of version 1.2, ember-concurrency comes bundled with its own
   <a href="https://github.com/machty/ember-concurrency/blob/master/addon/index.d.ts">
     type definitions
-  </a>. TypeScript should automatically pick them up to provide
-  type checking and completion.
+  </a>. On compatiable verions of TypeScript – currently 3.7 and 3.9,
+  it should automatically pick them up to provide type checking and
+  completion.
 </p>
 
 <p>

diff --git a/yarn.lock b/yarn.lock
@@ -2775,10 +2775,10 @@
   resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz#8da5c6530915653f3a1f38fd5f101d8c3f8079c5"
   integrity sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==
 
-"@types/ember@^3.1.2":
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/@types/ember/-/ember-3.1.2.tgz#b795e41f4a5569447c006e293195e62dc139cced"
-  integrity sha512-Z4jxklUlnoWEkenLaMDDmzguL3UUcAIaCiu28nNYlIovWTGmvKuJgUKSqd+03j4jjzaz+yz0fepM408XULew/A==
+"@types/ember@^3.16.0":
+  version "3.16.0"
+  resolved "https://registry.yarnpkg.com/@types/ember/-/ember-3.16.0.tgz#1627b42087556ee366258e37b31ae81571e6e0ca"
+  integrity sha512-9TBWidO/9ydThgh0Fy7y2DNX7Pb8REoV7tYK+HBFZ2iyc1TwXTNt15gVz0cCyorvsve2OS+vt5wzYvlqgSGlwg==
   dependencies:
     "@types/ember__application" "*"
     "@types/ember__array" "*"