From 6f851ac548c050ffdee84f0e527eb6dd3e7e0c61 Mon Sep 17 00:00:00 2001 From: Chris Krycho Date: Mon, 19 Dec 2022 09:22:21 -0700 Subject: [PATCH] Use native types from `ember-resolver` Along with the native types published from `@ember/test-helpers`, this should allow users to use this package with Ember's own types (as well as being backwards-compatible with the `@types` packages). --- package.json | 3 +- yarn.lock | 200 ++------------------------------------------------- 2 files changed, 8 insertions(+), 195 deletions(-) diff --git a/package.json b/package.json index df379169..2e26d527 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,6 @@ "@glimmer/interfaces": "^0.84.2", "@glimmer/reference": "^0.84.2", "@tsconfig/ember": "^1.1.0", - "@types/ember-resolver": "^5.0.13", "@types/qunit": "^2.19.3", "@types/rsvp": "^4.0.4", "ember-angle-bracket-invocation-polyfill": "^3.0.2", @@ -66,7 +65,7 @@ "ember-cli-terser": "^4.0.2", "ember-disable-prototype-extensions": "^1.1.3", "ember-load-initializers": "^2.1.2", - "ember-resolver": "^8.0.3", + "ember-resolver": "^9.0.0", "ember-source": "~4.8.3", "ember-source-channel-url": "^3.0.0", "ember-try": "^2.0.0", diff --git a/yarn.lock b/yarn.lock index 62981687..c02cf34f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1060,20 +1060,6 @@ resolve "^1.20.0" semver "^7.3.2" -"@embroider/shared-internals@1.8.3", "@embroider/shared-internals@^1.0.0": - version "1.8.3" - resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-1.8.3.tgz#52d868dc80016e9fe983552c0e516f437bf9b9f9" - integrity sha512-N5Gho6Qk8z5u+mxLCcMYAoQMbN4MmH+z2jXwQHVs859bxuZTxwF6kKtsybDAASCtd2YGxEmzcc1Ja/wM28824w== - dependencies: - babel-import-util "^1.1.0" - ember-rfc176-data "^0.3.17" - fs-extra "^9.1.0" - js-string-escape "^1.0.1" - lodash "^4.17.21" - resolve-package-path "^4.0.1" - semver "^7.3.5" - typescript-memoize "^1.0.1" - "@embroider/shared-internals@2.0.0", "@embroider/shared-internals@^2.0.0": version "2.0.0" resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-2.0.0.tgz#d8205ec6944362aeecfbb51143db352430ced316" @@ -1125,7 +1111,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== @@ -1541,168 +1527,6 @@ dependencies: "@types/ms" "*" -"@types/ember-resolver@^5.0.13": - version "5.0.13" - resolved "https://registry.yarnpkg.com/@types/ember-resolver/-/ember-resolver-5.0.13.tgz#db66678076ca625ed80b629c09619ae85c1c1f7a" - integrity sha512-pO964cAPhAaFJoS28M8+b5MzAhQ/tVuNM4GDUIAexheQat36axG2WTG8LQ5ea07MSFPesrRFk2T3z88pfvdYKA== - dependencies: - "@types/ember__object" "*" - "@types/ember__owner" "*" - -"@types/ember@*": - 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@*": - 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@*": - 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@*": - 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@*": - 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@*": - 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__engine@*": - 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@*": - 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@*": - 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@*": - 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@*": - 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@*": - 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@*": - 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@*": - 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@*": - version "3.0.10" - resolved "https://registry.yarnpkg.com/@types/ember__string/-/ember__string-3.0.10.tgz#17f93520c09426fe16519af86c9a1ea4e1ebdb91" - integrity sha512-dxbW06IqPdieA4SEyUfyCUnL8iqUnzdcLUtrfkf8g+DSP2K/RGiexfG6w2NOyOetq8gw8F/WUpNYfMmBcB6Smw== - -"@types/ember__template@*": - 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@*": - 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@*": - 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" @@ -1778,11 +1602,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" @@ -1853,7 +1672,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== @@ -4435,17 +4254,12 @@ ember-load-initializers@^2.1.2: ember-cli-babel "^7.13.0" ember-cli-typescript "^2.0.2" -ember-resolver@^8.0.3: - version "8.0.3" - resolved "https://registry.yarnpkg.com/ember-resolver/-/ember-resolver-8.0.3.tgz#40f243aa58281bf195c695fe84a6b291e204690a" - integrity sha512-fA53fxfG821BRqNiB9mQDuzZpzSRcSAYZTYBlRQOHsJwoYdjyE7idz4YcytbSsa409G5J2kP6B+PiKOBh0odlw== +ember-resolver@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/ember-resolver/-/ember-resolver-9.0.0.tgz#8438d94f26a127b76f38bccc8ac01eecc92d8b38" + integrity sha512-oC8HzL6XyfnLFZfyMgc1gDif5s1IOKLCGesvRO57tZoA92QzXW8eD8WNVMT9reoJPKRhymTFlWnwBmq7iQE3wg== dependencies: - babel-plugin-debug-macros "^0.3.4" - broccoli-funnel "^3.0.8" - broccoli-merge-trees "^4.2.0" - ember-cli-babel "^7.26.6" - ember-cli-version-checker "^5.1.2" - resolve "^1.20.0" + ember-cli-babel "^7.26.11" ember-rfc176-data@^0.3.17: version "0.3.17"