Skip to content

Commit 507a795

Browse files
committed
Replace ember-cli-head and correct generation of canonical URL
1 parent a94b7e5 commit 507a795

4 files changed

Lines changed: 48 additions & 24 deletions

File tree

app/components/in-head.gjs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
function getHead() {
2+
return document.head;
3+
}
4+
5+
<template>
6+
{{#in-element (getHead) insertBefore=null}}
7+
{{yield}}
8+
{{/in-element}}
9+
</template>

app/services/head-data.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ export default class HeadDataService extends Service {
55
@tracked title;
66
@tracked isRelease;
77
@tracked compactVersion;
8-
@tracked urlVersion;
98
@tracked canonicalUrl;
109
@tracked description;
1110
@tracked cdnDomain;

app/templates/application.gjs

Lines changed: 39 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,48 @@
11
import pageTitle from 'ember-page-title/helpers/page-title';
2-
import HeadLayout from 'ember-cli-head/components/head-layout';
2+
import InHead from 'ember-api-docs/components/in-head';
33
import EsHeader from 'ember-styleguide/components/es-header';
44
import ApiSearch from 'ember-api-docs/components/api-search';
55
import EsFooter from 'ember-styleguide/components/es-footer';
6+
import Component from '@glimmer/component';
7+
import { service } from '@ember/service';
68
import BasicDropdownWormhole from 'ember-basic-dropdown/components/basic-dropdown-wormhole';
7-
<template>
8-
{{pageTitle "Ember API Documentation"}}
9+
import config from 'ember-api-docs/config/environment';
910

10-
<HeadLayout />
11+
export default class Application extends Component {
12+
@service headData;
13+
@service router;
1114

12-
<EsHeader>
13-
<ApiSearch />
14-
</EsHeader>
15+
get canonicalUrl() {
16+
let path = this.router.currentURL;
17+
let version = new RegExp(this.headData.compactVersion, 'g');
18+
return `${config.APP.domain}/${path.replace(version, 'release')}`;
19+
}
1520

16-
<main>
17-
{{outlet}}
18-
</main>
21+
<template>
22+
{{pageTitle "Ember API Documentation"}}
1923

20-
<EsFooter />
21-
<BasicDropdownWormhole />
22-
</template>
24+
<InHead>
25+
<link rel="dns-prefetch" href="{{this.headData.cdnDomain}}" />
26+
27+
{{#if this.headData.description}}
28+
<meta name="description" content={{this.headData.description}} />
29+
<meta property="og:description" content={{this.headData.description}} />
30+
{{/if}}
31+
32+
{{#unless this.headData.isRelease}}
33+
<link rel="canonical" href={{this.canonicalUrl}} />
34+
{{/unless}}
35+
</InHead>
36+
37+
<EsHeader>
38+
<ApiSearch />
39+
</EsHeader>
40+
41+
<main>
42+
{{outlet}}
43+
</main>
44+
45+
<EsFooter />
46+
<BasicDropdownWormhole />
47+
</template>
48+
}

app/templates/head.hbs

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)