Skip to content

Commit

Permalink
Use the types published from Ember itself
Browse files Browse the repository at this point in the history 
- Specify a `peerDependencies` requirement of Ember 4.8.
- Drop the corresponding `@types` packages.
  • Loading branch information
@chriskrycho
chriskrycho committed Dec 22, 2022
1 parent 575a73f commit fe32c46
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 215 deletions.
21 changes: 3 additions & 18 deletions ember-async-data/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,24 +56,6 @@
"@glint/core": "^0.9.7",
"@glint/environment-ember-loose": "^0.9.7",
"@tsconfig/ember": "^1.1.0",
"@types/ember": "^4.0.3",
"@types/ember__application": "^4.0.5",
"@types/ember__array": "^4.0.3",
"@types/ember__component": "^4.0.0",
"@types/ember__controller": "^4.0.4",
"@types/ember__debug": "^4.0.3",
"@types/ember__engine": "^4.0.4",
"@types/ember__error": "^4.0.2",
"@types/ember__object": "^4.0.0",
"@types/ember__owner": "^4.0.2",
"@types/ember__polyfills": "^4.0.0",
"@types/ember__routing": "^4.0.0",
"@types/ember__runloop": "^4.0.0",
"@types/ember__service": "^4.0.0",
"@types/ember__string": "^3.16.0",
"@types/ember__template": "^4.0.0",
"@types/ember__test": "^4.0.0",
"@types/ember__utils": "^4.0.0",
"@typescript-eslint/eslint-plugin": "^5.46.1",
"@typescript-eslint/parser": "^5.47.0",
"concurrently": "^7.6.0",
Expand All @@ -89,6 +71,9 @@
"rollup-plugin-ts": "^3.0.2",
"typescript": "~4.9.4"
},
"peerDependencies": {
"ember-source": "^4.8.4"
},
"engines": {
"node": "14.* || 16.* || >= 18"
},
Expand Down
3 changes: 3 additions & 0 deletions ember-async-data/unpublished-development-types/index.d.ts
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Add any types here that you need for local development only.
// These will *not* be published as part of your addon, so be careful that your published code does not rely on them!

import 'ember-source/types';
import 'ember-source/types/preview';

import '@glint/environment-ember-loose';

declare module '@glint/environment-ember-loose/registry' {
Expand Down
18 changes: 0 additions & 18 deletions test-app/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,24 +31,6 @@
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"@tsconfig/ember": "^1.1.0",
"@types/ember": "^4.0.3",
"@types/ember__application": "^4.0.5",
"@types/ember__array": "^4.0.3",
"@types/ember__component": "^4.0.11",
"@types/ember__controller": "^4.0.4",
"@types/ember__debug": "^4.0.3",
"@types/ember__destroyable": "^4.0.1",
"@types/ember__engine": "^4.0.4",
"@types/ember__error": "^4.0.2",
"@types/ember__object": "^4.0.5",
"@types/ember__polyfills": "^4.0.1",
"@types/ember__routing": "^4.0.12",
"@types/ember__runloop": "^4.0.2",
"@types/ember__service": "^4.0.1",
"@types/ember__string": "^3.0.10",
"@types/ember__template": "^4.0.1",
"@types/ember__test": "^4.0.1",
"@types/ember__utils": "^4.0.2",
"@types/qunit": "^2.19.3",
"@types/rsvp": "^4.0.4",
"@typescript-eslint/eslint-plugin": "^5.46.1",
Expand Down
13 changes: 2 additions & 11 deletions test-app/types/test-app/index.d.ts
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,2 @@
import Ember from 'ember';

declare global {
// Prevents ESLint from "fixing" this via its auto-fix to turn it into a type
// alias (e.g. after running any Ember CLI generator)
// eslint-disable-next-line @typescript-eslint/no-empty-interface
interface Array<T> extends Ember.ArrayPrototypeExtensions<T> {}
// interface Function extends Ember.FunctionPrototypeExtensions {}
}

export {};
import 'ember-source/types';
import 'ember-source/types/preview';
170 changes: 2 additions & 168 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1170,7 +1170,7 @@
resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==

"@glimmer/component@^1.1.0", "@glimmer/component@^1.1.2":
"@glimmer/component@^1.1.2":
version "1.1.2"
resolved "https://registry.yarnpkg.com/@glimmer/component/-/component-1.1.2.tgz#892ec0c9f0b6b3e41c112be502fde073cf24d17c"
integrity sha512-XyAsEEa4kWOPy+gIdMjJ8XlzA3qrGH55ZDv6nA16ibalCR17k74BI0CztxuRds+Rm6CtbUVgheCVlcCULuqD7A==
Expand Down Expand Up @@ -1718,167 +1718,6 @@
dependencies:
"@types/ms" "*"

"@types/ember@*", "@types/ember@^4.0.3":
version "4.0.3"
resolved "https://registry.yarnpkg.com/@types/ember/-/ember-4.0.3.tgz#dde52a88e3b41eb73c80063ddfad35f751893e32"
integrity sha512-lRhIsa05KxPctv2mhVS/3lOwM8xnppEDsZu595Y+lE3IJhmhnXTjl3Ek+HMOPf53We2DFps+YeXSLm/UFiCILQ==
dependencies:
"@types/ember__application" "*"
"@types/ember__array" "*"
"@types/ember__component" "*"
"@types/ember__controller" "*"
"@types/ember__debug" "*"
"@types/ember__engine" "*"
"@types/ember__error" "*"
"@types/ember__object" "*"
"@types/ember__polyfills" "*"
"@types/ember__routing" "*"
"@types/ember__runloop" "*"
"@types/ember__service" "*"
"@types/ember__string" "*"
"@types/ember__template" "*"
"@types/ember__test" "*"
"@types/ember__utils" "*"
"@types/htmlbars-inline-precompile" "*"
"@types/rsvp" "*"

"@types/ember__application@*", "@types/ember__application@^4.0.5":
version "4.0.5"
resolved "https://registry.yarnpkg.com/@types/ember__application/-/ember__application-4.0.5.tgz#6ebaf1bd886231ee150fa9c7f27ad46621ce6577"
integrity sha512-qnU1RFZ3oIfw7ncLSjYqe1p236SU5OMQQVPaXISpNcVr4IEAl6yZ6Txm8pxI7DKo7isHV8sHssPBara9oqccVA==
dependencies:
"@glimmer/component" "^1.1.0"
"@types/ember" "*"
"@types/ember__application" "*"
"@types/ember__engine" "*"
"@types/ember__object" "*"
"@types/ember__owner" "*"
"@types/ember__routing" "*"

"@types/ember__array@*", "@types/ember__array@^4.0.3":
version "4.0.3"
resolved "https://registry.yarnpkg.com/@types/ember__array/-/ember__array-4.0.3.tgz#3683041a632ad2c697af5371f1d5b58945c6736b"
integrity sha512-G6kbLaS3ke4QspHkgLlGY0t1v0G22hGavyphezZucj7LLk1N+r11w913CYkBg3cJsJD+TG2Wo4eVbgRcotvuvQ==
dependencies:
"@types/ember" "*"
"@types/ember__array" "*"
"@types/ember__object" "*"

"@types/ember__component@*", "@types/ember__component@^4.0.0", "@types/ember__component@^4.0.11":
version "4.0.11"
resolved "https://registry.yarnpkg.com/@types/ember__component/-/ember__component-4.0.11.tgz#4f703ce3e60ec1063f178de62e0d15ee949b32fe"
integrity sha512-iwFf+qYBsGp9SycIb0lxGkdZPYpKxMcBoV5kCJbWyC6azuX2xPDXHx8n2lm8O9GrEFVJXfYC5bSXf33rdpy5Sw==
dependencies:
"@types/ember" "*"
"@types/ember__component" "*"
"@types/ember__object" "*"

"@types/ember__controller@*", "@types/ember__controller@^4.0.4":
version "4.0.4"
resolved "https://registry.yarnpkg.com/@types/ember__controller/-/ember__controller-4.0.4.tgz#8b46d811804ea8420dea8ae15744cd649f6cdb12"
integrity sha512-+f0knTIJJkRX5xijeSI/n4FvLfhMFFxIxODyFFFFB483EryYuts3QzpTwU5D66WQ5rAbZvpPRXRMPTTCNJoUhg==
dependencies:
"@types/ember__object" "*"

"@types/ember__debug@*", "@types/ember__debug@^4.0.3":
version "4.0.3"
resolved "https://registry.yarnpkg.com/@types/ember__debug/-/ember__debug-4.0.3.tgz#87a45e2a62bd453c732ee0c9e647f9c186f3691d"
integrity sha512-LvSLFgNlzpbsdb479ohS2szCFwkAsaqPnTjyPML7xFF3r3VGFMQjVNTXQpFYQCKTMAC1FYRX1N6hw/8lpXWHKA==
dependencies:
"@types/ember__debug" "*"
"@types/ember__object" "*"
"@types/ember__owner" "*"

"@types/ember__destroyable@^4.0.1":
version "4.0.1"
resolved "https://registry.yarnpkg.com/@types/ember__destroyable/-/ember__destroyable-4.0.1.tgz#6b5d5cd52a6a38ec74ea6b19804a8b4618c8810f"
integrity sha512-U497H5zW2bfdwmX1rktaSe+IsOrcqLn7jtrHI2dNnf9le38e1Wcnes8amA9PCv4lOhH+Mc3nkNIdQx38DwflXA==

"@types/ember__engine@*", "@types/ember__engine@^4.0.4":
version "4.0.4"
resolved "https://registry.yarnpkg.com/@types/ember__engine/-/ember__engine-4.0.4.tgz#dfa6cda972b1813ab3f012c09e15436c36d1ba2c"
integrity sha512-dxQf3ESRjTJtCHbd42/ReUpQUAUsn/VtI6+S07jrsgCbAQEr8Qkh/dJpd9Cta8N+DpbY1CUH58D4HxdOC4Ip3A==
dependencies:
"@types/ember__engine" "*"
"@types/ember__object" "*"
"@types/ember__owner" "*"

"@types/ember__error@*", "@types/ember__error@^4.0.2":
version "4.0.2"
resolved "https://registry.yarnpkg.com/@types/ember__error/-/ember__error-4.0.2.tgz#8a44035478853f9371262c4b9cac43af0792523b"
integrity sha512-0KVIvGrpyYzO4dmBm04ovJ/Fd7DjiXABxkKX42O8U01OL6O+Q+m3euQuJbB5wkYVANnvBHpcHlxRUI2y9KmzYg==

"@types/ember__object@*", "@types/ember__object@^4.0.0", "@types/ember__object@^4.0.5":
version "4.0.5"
resolved "https://registry.yarnpkg.com/@types/ember__object/-/ember__object-4.0.5.tgz#65def564b7d383e521f0ecd7c101881c99f22179"
integrity sha512-gXrywWBwoW7J9y9yJqoZ0m1qtiyMdrEi29cJdF1xI2qOnMqaZeuSCMYaPQMsyq52/YnVIG2EnGzo6eUD57J4Nw==
dependencies:
"@types/ember" "*"
"@types/ember__object" "*"
"@types/rsvp" "*"

"@types/ember__owner@*", "@types/ember__owner@^4.0.2":
version "4.0.2"
resolved "https://registry.yarnpkg.com/@types/ember__owner/-/ember__owner-4.0.2.tgz#ecad24830ad3f624da402dd6f56ed8881c94a473"
integrity sha512-o68xsw62HA269AWebw8VcrPKDDfoNqU+F06hwpIy5vZ5bJY1RAdOp+IFRVaKK+DqpkwQCIpDZVUta5f5QE6jrw==

"@types/ember__polyfills@*", "@types/ember__polyfills@^4.0.0", "@types/ember__polyfills@^4.0.1":
version "4.0.1"
resolved "https://registry.yarnpkg.com/@types/ember__polyfills/-/ember__polyfills-4.0.1.tgz#99671d8a29d30e21c0ef64004e918b3d6704c8ae"
integrity sha512-IT3oovEPxLiaNCcPqY5hdVlgiRaMT8gIIrJodFt5MDEashCZDYJMn2XlqUtTXcYIFaume32PbbTBCxuhd3rhHA==

"@types/ember__routing@*", "@types/ember__routing@^4.0.0", "@types/ember__routing@^4.0.12":
version "4.0.12"
resolved "https://registry.yarnpkg.com/@types/ember__routing/-/ember__routing-4.0.12.tgz#618c91bb72f9f8ab3621357f0679f360158bba46"
integrity sha512-zxPS43JP8/dEmNrSucN5KzTvOm+JUrbFGWsJ1m5a395FwxYbpgs7JujV0JWl+eVhnCh/PmsNcCdJT16+jouktQ==
dependencies:
"@types/ember" "*"
"@types/ember__controller" "*"
"@types/ember__object" "*"
"@types/ember__routing" "*"
"@types/ember__service" "*"

"@types/ember__runloop@*", "@types/ember__runloop@^4.0.0", "@types/ember__runloop@^4.0.2":
version "4.0.2"
resolved "https://registry.yarnpkg.com/@types/ember__runloop/-/ember__runloop-4.0.2.tgz#33b4d4e8b4fb89f3b510330adf54a8238ee1c81c"
integrity sha512-E0/n/O/JnPQpMrabsDKtVOXX4tbCrOA116HjmD+eorgsPFLm8tAUwl3wQGroeJt8BSE7uHjsQdDA7JUkbsT3IQ==
dependencies:
"@types/ember" "*"
"@types/ember__runloop" "*"

"@types/ember__service@*", "@types/ember__service@^4.0.0", "@types/ember__service@^4.0.1":
version "4.0.1"
resolved "https://registry.yarnpkg.com/@types/ember__service/-/ember__service-4.0.1.tgz#0a1de9071c8908035325b4c21990942e8262ff30"
integrity sha512-3/dLdvnXTsFAsr9u4icPXYM0jq336sw8/P5kQIt3xanNFoKuNq+u/dv4sLrSuy/4COPMP8gDlSNO6mS6OJSGfA==
dependencies:
"@types/ember__object" "*"

"@types/ember__string@*", "@types/ember__string@^3.0.10", "@types/ember__string@^3.16.0":
version "3.16.3"
resolved "https://registry.yarnpkg.com/@types/ember__string/-/ember__string-3.16.3.tgz#6c474d422dfae5c382a3c52bd3c994048d04b72e"
integrity sha512-0T9ofzm9LL/bSG5u1SxKx/j2h/bHKkl5NKjGCNbFQxEKBw4f2cs6+AMDgWke9z+qrRRIz9vGEtMXnA3yJrO2xA==
dependencies:
"@types/ember__template" "*"

"@types/ember__template@*", "@types/ember__template@^4.0.0", "@types/ember__template@^4.0.1":
version "4.0.1"
resolved "https://registry.yarnpkg.com/@types/ember__template/-/ember__template-4.0.1.tgz#aba59c22fbd1fcfc731eaf97ee8ee784e8c5e9db"
integrity sha512-hAxzdJa0zNvZSoHoCbtd0KGt6Dls4Aph9EwdtbUcdnlMiSUtEDUdKTtDbUrysqJjxGBr4vWIdJEqWtZ0/Y8KBw==

"@types/ember__test@*", "@types/ember__test@^4.0.0", "@types/ember__test@^4.0.1":
version "4.0.1"
resolved "https://registry.yarnpkg.com/@types/ember__test/-/ember__test-4.0.1.tgz#9ef25c8ebda6921daa3a16b7265be025eadfaa7b"
integrity sha512-EXFbZcROB9mUNHiDRyhyoJGXRIzxgo++smS3/kmmDlhM8/pIdULLKJSelTcFOy3e/VuZhf8y8ZCJLXKP74oCBQ==
dependencies:
"@types/ember__application" "*"

"@types/ember__utils@*", "@types/ember__utils@^4.0.0", "@types/ember__utils@^4.0.2":
version "4.0.2"
resolved "https://registry.yarnpkg.com/@types/ember__utils/-/ember__utils-4.0.2.tgz#97fcdf05032df68ef07b9ae82e08fe0c51c73cf9"
integrity sha512-LWkLgf09/GqyrUuoKtAB6qP7n36yAzc2yOh1L5fVpZGCBv5KQiGWUQv5uBoo4c1mllD+IBOMxei3bR4cx6SwZA==
dependencies:
"@types/ember" "*"

"@types/eslint-scope@^3.7.3":
version "3.7.4"
resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz#37fc1223f0786c39627068a12e94d6e6fc61de16"
Expand Down Expand Up @@ -1962,11 +1801,6 @@
"@types/minimatch" "*"
"@types/node" "*"

"@types/htmlbars-inline-precompile@*":
version "3.0.0"
resolved "https://registry.yarnpkg.com/@types/htmlbars-inline-precompile/-/htmlbars-inline-precompile-3.0.0.tgz#4d3f19eeb2af9f4605620e13a566dae3952a4f68"
integrity sha512-n1YwM/Q937KmS9W4Ytran71nzhhcT2FDQI00eRGBNUyeErLZspBdDBewEe1F8tcRlUdsCVo2AZBLJsRjEceTRg==

"@types/http-cache-semantics@^4.0.1":
version "4.0.1"
resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz#0ea7b61496902b95890dc4c3a116b60cb8dae812"
Expand Down Expand Up @@ -2042,7 +1876,7 @@
"@types/glob" "*"
"@types/node" "*"

"@types/rsvp@*", "@types/rsvp@^4.0.4":
"@types/rsvp@^4.0.4":
version "4.0.4"
resolved "https://registry.yarnpkg.com/@types/rsvp/-/rsvp-4.0.4.tgz#55e93e7054027f1ad4b4ebc1e60e59eb091e2d32"
integrity sha512-J3Ol++HCC7/hwZhanDvggFYU/GtxHxE/e7cGRWxR04BF7Tt3TqJZ84BkzQgDxmX0uu8IagiyfmfoUlBACh2Ilg==
Expand Down

0 comments on commit fe32c46

Please sign in to comment.