Skip to content

Replace ember-cli-meta-tags with ember-cli-head #4064

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 25, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 7 additions & 17 deletions app/routes/crate.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import Route from '@ember/routing/route';
import { inject as service } from '@ember/service';

export default class CrateRoute extends Route {
@service headData;
@service notifications;
@service store;

Expand All @@ -19,24 +20,13 @@ export default class CrateRoute extends Route {
}
}

afterModel(model) {
if (model && typeof model.get === 'function') {
this.setHeadTags(model);
}
setupController(controller, model) {
super.setupController(...arguments);
this.headData.crate = model;
}

setHeadTags(model) {
let headTags = [
{
type: 'meta',
tagId: 'meta-description-tag',
attrs: {
name: 'description',
content: model.get('description') || 'A package for Rust.',
},
},
];

this.set('headTags', headTags);
resetController() {
super.resetController(...arguments);
this.headData.crate = null;
}
}
12 changes: 0 additions & 12 deletions app/routes/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,6 @@ import { inject as service } from '@ember/service';
export default class IndexRoute extends Route {
@service fastboot;

headTags() {
return [
{
type: 'meta',
attrs: {
name: 'description',
content: 'cargo is the package manager and crate host for rust',
},
},
];
}

setupController(controller) {
if (!controller.hasData) {
let promise = controller.fetchData();
Expand Down
13 changes: 13 additions & 0 deletions app/services/head-data.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import Service from '@ember/service';
import { tracked } from '@glimmer/tracking';

const DEFAULT_DESCRIPTION = 'cargo is the package manager and crate host for rust';
const DEFAULT_CRATE_DESCRIPTION = 'A package for Rust.';

export default class HeadDataService extends Service {
@tracked crate;

get description() {
return !this.crate ? DEFAULT_DESCRIPTION : this.crate.description || DEFAULT_CRATE_DESCRIPTION;
}
}
2 changes: 1 addition & 1 deletion app/templates/head.hbs
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<HeadTags @headTags={{this.model.headTags}} />
<meta name="description" content={{this.model.description}}>
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@
"ember-cli-dependency-checker": "3.2.0",
"ember-cli-dependency-lint": "2.0.1",
"ember-cli-fastboot": "2.2.3",
"ember-cli-head": "2.0.0",
"ember-cli-htmlbars": "6.0.0",
"ember-cli-inject-live-reload": "2.1.0",
"ember-cli-meta-tags": "6.2.0",
"ember-cli-mirage": "2.2.0",
"ember-cli-notifications": "7.0.0",
"ember-cli-terser": "4.0.2",
Expand Down
24 changes: 7 additions & 17 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6291,13 +6291,13 @@ ember-cli-get-component-path-option@^1.0.0:
resolved "https://registry.yarnpkg.com/ember-cli-get-component-path-option/-/ember-cli-get-component-path-option-1.0.0.tgz#0d7b595559e2f9050abed804f1d8eff1b08bc771"
integrity sha1-DXtZVVni+QUKvtgE8djv8bCLx3E=

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

[email protected]:
Expand Down Expand Up @@ -6331,7 +6331,7 @@ ember-cli-htmlbars@^3.0.0:
json-stable-stringify "^1.0.1"
strip-bom "^3.0.0"

ember-cli-htmlbars@^4.2.0, ember-cli-htmlbars@^4.2.2, ember-cli-htmlbars@^4.2.3, ember-cli-htmlbars@^4.3.1:
ember-cli-htmlbars@^4.2.0, ember-cli-htmlbars@^4.2.3:
version "4.5.0"
resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-4.5.0.tgz#d299e4f7eba6f30dc723ee086906cc550beb252e"
integrity sha512-bYJpK1pqFu9AadDAGTw05g2LMNzY8xTCIqQm7dMJmKEoUpLRFbPf4SfHXrktzDh7Q5iggl6Skzf1M0bPlIxARw==
Expand Down Expand Up @@ -6391,16 +6391,6 @@ [email protected], ember-cli-lodash-subset@^2.0.1:
resolved "https://registry.yarnpkg.com/ember-cli-lodash-subset/-/ember-cli-lodash-subset-2.0.1.tgz#20cb68a790fe0fde2488ddfd8efbb7df6fe766f2"
integrity sha1-IMtop5D+D94kiN39jvu332/nZvI=

[email protected]:
version "6.2.0"
resolved "https://registry.yarnpkg.com/ember-cli-meta-tags/-/ember-cli-meta-tags-6.2.0.tgz#e7a56326a2ad0ffc6f1174c8bb15394d2b98f6ec"
integrity sha512-bWznJttpkyscpM1MolVBdxvBsKSNOAYO4t6rN4huBl4WWup74spOpO+O/3T+qdgWTQ4UEyNaQMZK5EeFT+hScg==
dependencies:
ember-cli-babel "^7.26.6"
ember-cli-head "^1.0.0"
ember-cli-htmlbars "^4.2.2"
ember-compatibility-helpers "^1.1.2"

[email protected]:
version "2.2.0"
resolved "https://registry.yarnpkg.com/ember-cli-mirage/-/ember-cli-mirage-2.2.0.tgz#38f4ec02536dd50ecdb265da2abbf7986d66b091"
Expand Down