Skip to content

Commit 2257cad

Browse files
authored
Merge pull request #824 from ember-learn/deprecations2
Fix deprecations by upgrading two more deps
2 parents 65b1a43 + 67ee1fd commit 2257cad

File tree

2 files changed

+48
-46
lines changed

2 files changed

+48
-46
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"ember-cli-fastboot": "^3.3.2",
5959
"ember-cli-htmlbars": "^6.1.1",
6060
"ember-cli-inject-live-reload": "^2.0.2",
61-
"ember-cli-meta-tags": "^5.1.0",
61+
"ember-cli-meta-tags": "^7.0.0",
6262
"ember-cli-sass": "^10.0.1",
6363
"ember-cli-terser": "^4.0.1",
6464
"ember-composable-helpers": "^3.1.1",
@@ -71,7 +71,7 @@
7171
"ember-inflector": "^3.0.0",
7272
"ember-load-initializers": "^2.1.2",
7373
"ember-maybe-import-regenerator": "^0.1.6",
74-
"ember-metrics": "^0.14.0",
74+
"ember-metrics": "^1.5.2",
7575
"ember-page-title": "^6.2.1",
7676
"ember-power-select": "^4.1.6",
7777
"ember-qunit": "^5.1.4",

yarn.lock

Lines changed: 46 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1382,6 +1382,15 @@
13821382
broccoli-funnel "^3.0.5"
13831383
ember-cli-babel "^7.23.1"
13841384

1385+
"@embroider/util@^0.39.1 || ^0.40.0 || ^0.41.0 || ^1.0.0", "@embroider/util@^1.6.0":
1386+
version "1.9.0"
1387+
resolved "https://registry.yarnpkg.com/@embroider/util/-/util-1.9.0.tgz#331c46bdf106c44cb1dd6baaa9030d322c13cfca"
1388+
integrity sha512-9I63iJK6N01OHJafmS/BX0msUkTlmhFMIEmDl/SRNACVi0nS6QfNyTgTTeji1P/DALf6eobg/9t/N4VhS9G9QA==
1389+
dependencies:
1390+
"@embroider/macros" "^1.9.0"
1391+
broccoli-funnel "^3.0.5"
1392+
ember-cli-babel "^7.23.1"
1393+
13851394
"@embroider/util@^0.47.2":
13861395
version "0.47.2"
13871396
resolved "https://registry.yarnpkg.com/@embroider/util/-/util-0.47.2.tgz#d06497b4b84c07ed9c7b628293bb019c533f4556"
@@ -1391,15 +1400,6 @@
13911400
broccoli-funnel "^3.0.5"
13921401
ember-cli-babel "^7.23.1"
13931402

1394-
"@embroider/util@^1.6.0":
1395-
version "1.9.0"
1396-
resolved "https://registry.yarnpkg.com/@embroider/util/-/util-1.9.0.tgz#331c46bdf106c44cb1dd6baaa9030d322c13cfca"
1397-
integrity sha512-9I63iJK6N01OHJafmS/BX0msUkTlmhFMIEmDl/SRNACVi0nS6QfNyTgTTeji1P/DALf6eobg/9t/N4VhS9G9QA==
1398-
dependencies:
1399-
"@embroider/macros" "^1.9.0"
1400-
broccoli-funnel "^3.0.5"
1401-
ember-cli-babel "^7.23.1"
1402-
14031403
"@eslint/eslintrc@^0.4.3":
14041404
version "0.4.3"
14051405
resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c"
@@ -1415,7 +1415,7 @@
14151415
minimatch "^3.0.4"
14161416
strip-json-comments "^3.1.1"
14171417

1418-
"@glimmer/component@^1.0.0", "@glimmer/component@^1.0.4":
1418+
"@glimmer/component@^1.0.0", "@glimmer/component@^1.0.4", "@glimmer/component@^1.1.2":
14191419
version "1.1.2"
14201420
resolved "https://registry.yarnpkg.com/@glimmer/component/-/component-1.1.2.tgz#892ec0c9f0b6b3e41c112be502fde073cf24d17c"
14211421
integrity sha512-XyAsEEa4kWOPy+gIdMjJ8XlzA3qrGH55ZDv6nA16ibalCR17k74BI0CztxuRds+Rm6CtbUVgheCVlcCULuqD7A==
@@ -6120,7 +6120,7 @@ ember-cli-babel-plugin-helpers@^1.0.0, ember-cli-babel-plugin-helpers@^1.1.0, em
61206120
resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.1.tgz#5016b80cdef37036c4282eef2d863e1d73576879"
61216121
integrity sha512-sKvOiPNHr5F/60NLd7SFzMpYPte/nnGkq/tMIfXejfKHIhaiIkYFqX8Z9UFTKWLLn+V7NOaby6niNPZUdvKCRw==
61226122

6123-
ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.11.0, ember-cli-babel@^6.3.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.8.0, ember-cli-babel@^6.8.1, ember-cli-babel@^6.8.2, ember-cli-babel@^6.9.0:
6123+
ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.3.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.8.0, ember-cli-babel@^6.8.1, ember-cli-babel@^6.8.2:
61246124
version "6.18.0"
61256125
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.18.0.tgz#3f6435fd275172edeff2b634ee7b29ce74318957"
61266126
integrity sha512-7ceC8joNYxY2wES16iIBlbPSxwKDBhYwC8drU3ZEvuPDMwVv1KzxCNu1fvxyFEBWhwaRNTUxSCsEVoTd9nosGA==
@@ -6139,7 +6139,7 @@ ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.11.0, ember-cli-babel@^6.3.0,
61396139
ember-cli-version-checker "^2.1.2"
61406140
semver "^5.5.0"
61416141

6142-
ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.0, ember-cli-babel@^7.1.2, ember-cli-babel@^7.1.3, ember-cli-babel@^7.10.0, ember-cli-babel@^7.11.1, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.17.2, ember-cli-babel@^7.19.0, ember-cli-babel@^7.20.5, ember-cli-babel@^7.21.0, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.23.1, ember-cli-babel@^7.26.0, ember-cli-babel@^7.26.11, ember-cli-babel@^7.26.3, ember-cli-babel@^7.26.4, ember-cli-babel@^7.26.5, ember-cli-babel@^7.26.6, ember-cli-babel@^7.4.0, ember-cli-babel@^7.7.3:
6142+
ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.0, ember-cli-babel@^7.1.3, ember-cli-babel@^7.10.0, ember-cli-babel@^7.11.1, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.17.2, ember-cli-babel@^7.19.0, ember-cli-babel@^7.20.5, ember-cli-babel@^7.21.0, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.23.1, ember-cli-babel@^7.26.0, ember-cli-babel@^7.26.11, ember-cli-babel@^7.26.3, ember-cli-babel@^7.26.4, ember-cli-babel@^7.26.5, ember-cli-babel@^7.26.6, ember-cli-babel@^7.4.0, ember-cli-babel@^7.7.3:
61436143
version "7.26.11"
61446144
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.26.11.tgz#50da0fe4dcd99aada499843940fec75076249a9f"
61456145
integrity sha512-JJYeYjiz/JTn34q7F5DSOjkkZqy8qwFOOxXfE6pe9yEJqWGu4qErKxlz8I22JoVEQ/aBUO+OcKTpmctvykM9YA==
@@ -6326,15 +6326,16 @@ ember-cli-google-fonts@^2.16.2:
63266326
dependencies:
63276327
ember-cli-babel "^6.6.0"
63286328

6329-
ember-cli-head@^0.4.1:
6330-
version "0.4.1"
6331-
resolved "https://registry.yarnpkg.com/ember-cli-head/-/ember-cli-head-0.4.1.tgz#28b7ee86439746640834b232a3b34ab1329f3cf3"
6332-
integrity sha512-MIgshw5nGil7Q/TU4SDRCsgsiA3wPC9WqOig/g1LlHTNXjR4vH7s/ddG7GTfK5Kt4ZQHJEUDXpd/lIbdBkIQ/Q==
6329+
ember-cli-head@^2.0.0:
6330+
version "2.0.0"
6331+
resolved "https://registry.yarnpkg.com/ember-cli-head/-/ember-cli-head-2.0.0.tgz#ce294341026fd643067712a438008d6139f5208d"
6332+
integrity sha512-i9qwljBlpzU/ei0xN+FiCHUvU1ZdjVXk0OzRKoeMZJK3m4p29CvB095klT0q+PigvYFYHIyTaeSWmbgjP8CZiw==
63336333
dependencies:
6334-
ember-cli-babel "^6.11.0"
6335-
ember-cli-htmlbars "^2.0.3"
6334+
ember-cli-babel "^7.26.3"
6335+
ember-cli-htmlbars "^5.7.1"
6336+
ember-in-element-polyfill "^1.0.0"
63366337

6337-
ember-cli-htmlbars@^2.0.2, ember-cli-htmlbars@^2.0.3:
6338+
ember-cli-htmlbars@^2.0.2:
63386339
version "2.0.5"
63396340
resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-2.0.5.tgz#b5a105429a6bce4f7c9c97b667e3b8926e31397f"
63406341
integrity sha512-3f3PAxdnQ/fhQa8XP/3z4RLRgLHxV8j4Ln75aHbRdemOCjBa048KxL9l+acRLhCulbGQCMnLiIUIC89PAzLrcA==
@@ -6396,7 +6397,7 @@ ember-cli-htmlbars@^5.0.0, ember-cli-htmlbars@^5.1.0, ember-cli-htmlbars@^5.2.0,
63966397
strip-bom "^4.0.0"
63976398
walk-sync "^2.2.0"
63986399

6399-
ember-cli-htmlbars@^6.0.0, ember-cli-htmlbars@^6.1.1:
6400+
ember-cli-htmlbars@^6.0.0, ember-cli-htmlbars@^6.0.1, ember-cli-htmlbars@^6.1.1:
64006401
version "6.1.1"
64016402
resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-6.1.1.tgz#f5b588572a5d18ad087560122b8dabc90145173d"
64026403
integrity sha512-DKf2rjzIVw9zWCuFsBGJScrgf5Mz7dSg08Cq+FWFYIxnpssINUbNUoB0NHWnUJK4QqCvaExOyOmjm0kO455CPg==
@@ -6434,15 +6435,16 @@ ember-cli-lodash-subset@^2.0.1:
64346435
resolved "https://registry.yarnpkg.com/ember-cli-lodash-subset/-/ember-cli-lodash-subset-2.0.1.tgz#20cb68a790fe0fde2488ddfd8efbb7df6fe766f2"
64356436
integrity sha512-QkLGcYv1WRK35g4MWu/uIeJ5Suk2eJXKtZ+8s+qE7C9INmpCPyPxzaqZABquYzcWNzIdw6kYwz3NWAFdKYFxwg==
64366437

6437-
ember-cli-meta-tags@^5.1.0:
6438-
version "5.3.0"
6439-
resolved "https://registry.yarnpkg.com/ember-cli-meta-tags/-/ember-cli-meta-tags-5.3.0.tgz#252f9ae415b4d864a8a72b2efe6eca3d61135415"
6440-
integrity sha512-sGH/oSTFoveRAqBuYY1NCq5M0KAdi7Ey442y+QccrZ/5yHgSabBYRWn4L/rwf7D0P45kVMSRNC5D6AEZzM720g==
6438+
ember-cli-meta-tags@^7.0.0:
6439+
version "7.0.0"
6440+
resolved "https://registry.yarnpkg.com/ember-cli-meta-tags/-/ember-cli-meta-tags-7.0.0.tgz#26e2f8f524a5c90b0092746d731c1367ce04e481"
6441+
integrity sha512-fvfNB3TNVwNQOHWJ0vd+I1kFiRHcamEDJ9iNTtU9oxX1JIusSrp7JPb/t3DojMQUfEze/eiWQ98VE/zsFar31g==
64416442
dependencies:
6442-
ember-cli-babel "^7.1.2"
6443-
ember-cli-head "^0.4.1"
6444-
ember-cli-htmlbars "^3.0.0"
6445-
ember-compatibility-helpers "^1.1.2"
6443+
"@glimmer/component" "^1.1.2"
6444+
ember-cli-babel "^7.26.11"
6445+
ember-cli-head "^2.0.0"
6446+
ember-cli-htmlbars "^6.0.1"
6447+
ember-element-helper "^0.6.1"
64466448

64476449
ember-cli-node-assets@^0.2.2:
64486450
version "0.2.2"
@@ -6847,6 +6849,15 @@ ember-element-helper@^0.5.0, ember-element-helper@^0.5.5:
68476849
ember-cli-babel "^7.17.2"
68486850
ember-cli-htmlbars "^5.1.0"
68496851

6852+
ember-element-helper@^0.6.1:
6853+
version "0.6.1"
6854+
resolved "https://registry.yarnpkg.com/ember-element-helper/-/ember-element-helper-0.6.1.tgz#a6fbc5be5f875b5c864ae61bf5c5f81d6de6d936"
6855+
integrity sha512-YiOdAMlzYul4ulkIoNp8z7iHDfbT1fbut/9xGFRfxDwU/FmF8HtAUB2f1veu/w50HTeZNopa1OV2PCloZ76XlQ==
6856+
dependencies:
6857+
"@embroider/util" "^0.39.1 || ^0.40.0 || ^0.41.0 || ^1.0.0"
6858+
ember-cli-babel "^7.26.11"
6859+
ember-cli-htmlbars "^6.0.1"
6860+
68506861
ember-exam@^1.0.0:
68516862
version "1.0.0"
68526863
resolved "https://registry.yarnpkg.com/ember-exam/-/ember-exam-1.0.0.tgz#dd750ea407c05b01e74ee27ba42edb58585ae06b"
@@ -6970,15 +6981,14 @@ ember-maybe-in-element@^2.0.3:
69706981
ember-cli-version-checker "^5.1.1"
69716982
ember-in-element-polyfill "^1.0.1"
69726983

6973-
ember-metrics@^0.14.0:
6974-
version "0.14.0"
6975-
resolved "https://registry.yarnpkg.com/ember-metrics/-/ember-metrics-0.14.0.tgz#e582b39821cbd03f2d6ff21c8caf8ca2eb1e121f"
6976-
integrity sha512-YuwRBAaZmHhIxrdAWlFzw3ifWwNhKtTKa9Tb1nMGBxzCD6noQlNoLDRIm7vOQlXQfM5C1Nc5c5GOvd5jbl84LA==
6984+
ember-metrics@^1.5.2:
6985+
version "1.5.2"
6986+
resolved "https://registry.yarnpkg.com/ember-metrics/-/ember-metrics-1.5.2.tgz#4090720f5391026ae6a0cc94c83861e92841f186"
6987+
integrity sha512-6QUg3XcGQ/wnMHxT4T+QXQs9NlojJ+ai/055sQWdmLrxep4w2fyy/spn9wxAkokdwEjj0nV5MPfTOTq5OS748w==
69776988
dependencies:
6978-
broccoli-funnel "^1.0.1"
6979-
ember-cli-babel "^6.6.0"
6980-
ember-getowner-polyfill "^2.0.0"
6981-
ember-runtime-enumerable-includes-polyfill "^2.0.0"
6989+
broccoli-funnel "^3.0.2"
6990+
ember-cli-babel "^7.26.6"
6991+
ember-cli-typescript "^4.2.1"
69826992

69836993
ember-modifier-manager-polyfill@^1.1.0, ember-modifier-manager-polyfill@^1.2.0:
69846994
version "1.2.0"
@@ -7140,14 +7150,6 @@ ember-router-generator@^2.0.0:
71407150
"@babel/traverse" "^7.4.5"
71417151
recast "^0.18.1"
71427152

7143-
ember-runtime-enumerable-includes-polyfill@^2.0.0:
7144-
version "2.1.0"
7145-
resolved "https://registry.yarnpkg.com/ember-runtime-enumerable-includes-polyfill/-/ember-runtime-enumerable-includes-polyfill-2.1.0.tgz#dc6d4a028471e4acc350dfd2a149874fb20913f5"
7146-
integrity sha512-au18iI8VbEDYn3jLFZzETnKN5ciPgCUxMRucEP3jkq7qZ6sE0FVKpWMPY/h9tTND3VOBJt6fgPpEBJoJVCUudg==
7147-
dependencies:
7148-
ember-cli-babel "^6.9.0"
7149-
ember-cli-version-checker "^2.1.0"
7150-
71517153
ember-sinon@^4.1.1:
71527154
version "4.1.1"
71537155
resolved "https://registry.yarnpkg.com/ember-sinon/-/ember-sinon-4.1.1.tgz#ff6db9e3b9548e269386d9efe1c381e165f03ba5"

0 commit comments

Comments
 (0)