Skip to content

Commit 7479f59

Browse files
committed
Auto merge of #4064 - Turbo87:meta-tags, r=locks
Replace `ember-cli-meta-tags` with `ember-cli-head` `ember-cli-meta-tags` is almost unmaintained and causing several deprecation warnings. We can easily implement this ourselves on top of `ember-cli-head` instead.
2 parents 6d68794 + e15be7e commit 7479f59

File tree

6 files changed

+29
-48
lines changed

6 files changed

+29
-48
lines changed

app/routes/crate.js

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import Route from '@ember/routing/route';
22
import { inject as service } from '@ember/service';
33

44
export default class CrateRoute extends Route {
5+
@service headData;
56
@service notifications;
67
@service store;
78

@@ -19,24 +20,13 @@ export default class CrateRoute extends Route {
1920
}
2021
}
2122

22-
afterModel(model) {
23-
if (model && typeof model.get === 'function') {
24-
this.setHeadTags(model);
25-
}
23+
setupController(controller, model) {
24+
super.setupController(...arguments);
25+
this.headData.crate = model;
2626
}
2727

28-
setHeadTags(model) {
29-
let headTags = [
30-
{
31-
type: 'meta',
32-
tagId: 'meta-description-tag',
33-
attrs: {
34-
name: 'description',
35-
content: model.get('description') || 'A package for Rust.',
36-
},
37-
},
38-
];
39-
40-
this.set('headTags', headTags);
28+
resetController() {
29+
super.resetController(...arguments);
30+
this.headData.crate = null;
4131
}
4232
}

app/routes/index.js

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,6 @@ import { inject as service } from '@ember/service';
44
export default class IndexRoute extends Route {
55
@service fastboot;
66

7-
headTags() {
8-
return [
9-
{
10-
type: 'meta',
11-
attrs: {
12-
name: 'description',
13-
content: 'cargo is the package manager and crate host for rust',
14-
},
15-
},
16-
];
17-
}
18-
197
setupController(controller) {
208
if (!controller.hasData) {
219
let promise = controller.fetchData();

app/services/head-data.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import Service from '@ember/service';
2+
import { tracked } from '@glimmer/tracking';
3+
4+
const DEFAULT_DESCRIPTION = 'cargo is the package manager and crate host for rust';
5+
const DEFAULT_CRATE_DESCRIPTION = 'A package for Rust.';
6+
7+
export default class HeadDataService extends Service {
8+
@tracked crate;
9+
10+
get description() {
11+
return !this.crate ? DEFAULT_DESCRIPTION : this.crate.description || DEFAULT_CRATE_DESCRIPTION;
12+
}
13+
}

app/templates/head.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<HeadTags @headTags={{this.model.headTags}} />
1+
<meta name="description" content={{this.model.description}}>

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@
7676
"ember-cli-dependency-checker": "3.2.0",
7777
"ember-cli-dependency-lint": "2.0.1",
7878
"ember-cli-fastboot": "2.2.3",
79+
"ember-cli-head": "2.0.0",
7980
"ember-cli-htmlbars": "6.0.0",
8081
"ember-cli-inject-live-reload": "2.1.0",
81-
"ember-cli-meta-tags": "6.2.0",
8282
"ember-cli-mirage": "2.2.0",
8383
"ember-cli-notifications": "7.0.0",
8484
"ember-cli-terser": "4.0.2",

yarn.lock

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6296,13 +6296,13 @@ ember-cli-get-component-path-option@^1.0.0:
62966296
resolved "https://registry.yarnpkg.com/ember-cli-get-component-path-option/-/ember-cli-get-component-path-option-1.0.0.tgz#0d7b595559e2f9050abed804f1d8eff1b08bc771"
62976297
integrity sha1-DXtZVVni+QUKvtgE8djv8bCLx3E=
62986298

6299-
ember-cli-head@^1.0.0:
6300-
version "1.0.0"
6301-
resolved "https://registry.yarnpkg.com/ember-cli-head/-/ember-cli-head-1.0.0.tgz#72a71b3db2039b66585c754fd33bc3c36ff86fc1"
6302-
integrity sha512-7gj8H/KSF+e4pxSKxj9F8hq9PUt2vOjCaOvRdxdmyoHnko4QbiUnv8ASpXuop+m15eNIUGOlaLrJJ3jM8oQEUw==
6299+
ember-cli-head@2.0.0:
6300+
version "2.0.0"
6301+
resolved "https://registry.yarnpkg.com/ember-cli-head/-/ember-cli-head-2.0.0.tgz#ce294341026fd643067712a438008d6139f5208d"
6302+
integrity sha512-i9qwljBlpzU/ei0xN+FiCHUvU1ZdjVXk0OzRKoeMZJK3m4p29CvB095klT0q+PigvYFYHIyTaeSWmbgjP8CZiw==
63036303
dependencies:
6304-
ember-cli-babel "^7.19.0"
6305-
ember-cli-htmlbars "^4.3.1"
6304+
ember-cli-babel "^7.26.3"
6305+
ember-cli-htmlbars "^5.7.1"
63066306
ember-in-element-polyfill "^1.0.0"
63076307

63086308
@@ -6336,7 +6336,7 @@ ember-cli-htmlbars@^3.0.0:
63366336
json-stable-stringify "^1.0.1"
63376337
strip-bom "^3.0.0"
63386338

6339-
ember-cli-htmlbars@^4.2.0, ember-cli-htmlbars@^4.2.2, ember-cli-htmlbars@^4.2.3, ember-cli-htmlbars@^4.3.1:
6339+
ember-cli-htmlbars@^4.2.0, ember-cli-htmlbars@^4.2.3:
63406340
version "4.5.0"
63416341
resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-4.5.0.tgz#d299e4f7eba6f30dc723ee086906cc550beb252e"
63426342
integrity sha512-bYJpK1pqFu9AadDAGTw05g2LMNzY8xTCIqQm7dMJmKEoUpLRFbPf4SfHXrktzDh7Q5iggl6Skzf1M0bPlIxARw==
@@ -6396,16 +6396,6 @@ [email protected], ember-cli-lodash-subset@^2.0.1:
63966396
resolved "https://registry.yarnpkg.com/ember-cli-lodash-subset/-/ember-cli-lodash-subset-2.0.1.tgz#20cb68a790fe0fde2488ddfd8efbb7df6fe766f2"
63976397
integrity sha1-IMtop5D+D94kiN39jvu332/nZvI=
63986398

6399-
6400-
version "6.2.0"
6401-
resolved "https://registry.yarnpkg.com/ember-cli-meta-tags/-/ember-cli-meta-tags-6.2.0.tgz#e7a56326a2ad0ffc6f1174c8bb15394d2b98f6ec"
6402-
integrity sha512-bWznJttpkyscpM1MolVBdxvBsKSNOAYO4t6rN4huBl4WWup74spOpO+O/3T+qdgWTQ4UEyNaQMZK5EeFT+hScg==
6403-
dependencies:
6404-
ember-cli-babel "^7.26.6"
6405-
ember-cli-head "^1.0.0"
6406-
ember-cli-htmlbars "^4.2.2"
6407-
ember-compatibility-helpers "^1.1.2"
6408-
64096399
64106400
version "2.2.0"
64116401
resolved "https://registry.yarnpkg.com/ember-cli-mirage/-/ember-cli-mirage-2.2.0.tgz#38f4ec02536dd50ecdb265da2abbf7986d66b091"

0 commit comments

Comments
 (0)