Skip to content

Commit

Permalink
Update @metalsmith/permalinks to 2.5.1 (#522)
Browse files Browse the repository at this point in the history
* Update @metalsmith/permalinks

        "@metalsmith/permalinks": "2.5.1",
        "node-fetch": "^3.3.2",

* Update build.mjs

Adjust plugin order.  Add error checking.

See #521

* Update head.hbs

Use permalink property which replaces path.

see: #521

* Update build.mjs

Remove commented code.
  • Loading branch information
epreston committed Sep 27, 2023
1 parent 6bdf197 commit 797201a
Show file tree
Hide file tree
Showing 4 changed files with 438 additions and 830 deletions.
13 changes: 9 additions & 4 deletions build.mjs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import fs from 'fs';
import path from 'path';
import fs from 'node:fs';
import path from 'node:path';
import { fileURLToPath } from 'url';
import handlebars from 'handlebars';
import { marked } from 'marked';
Expand Down Expand Up @@ -61,6 +61,11 @@ handlebars.registerHelper('lang-selector-close', (lang) => {
// Convert relativeURL with a locale like en/manual to a full url with the
// desired locale e.g. https://developer.playcanvas.com/ja/user-manual
handlebars.registerHelper('locale-url', (locale, relativeUrl) => {
if (!relativeUrl) {
console.warn(`build.mjs : undefined relativeUrl passed to helper.`);
return '';
}

relativeUrl = path.join(locale, relativeUrl.substring(2));
const url = new URL(relativeUrl, 'https://developer.playcanvas.com/');
return url.href;
Expand Down Expand Up @@ -132,8 +137,9 @@ Metalsmith(__dirname)
renderer: renderer
}))
.use(contents())
.use(tutorials('tutorials')())
.use(permalinks({
pattern: ':filename'
duplicates: 'error'
}))
.use(i18n()({
locales: [{
Expand All @@ -157,7 +163,6 @@ Metalsmith(__dirname)
contentPath: 'content/_shadereditor_contents.json',
partialName: 'shader-editor-navigation'
}))
.use(tutorials('tutorials')())
.use(layouts({
pattern: '**/*.html'
}))
Expand Down
10 changes: 5 additions & 5 deletions layouts/partials/head.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@

<link rel="stylesheet" href="/css/styles.css">
<link rel="stylesheet" href="/css/playcanvas-theme.css">
<link rel="alternate" href="{{{locale-url 'en' path}}}" hreflang="x-default">
<link rel="alternate" href="{{{locale-url 'en' path}}}" hreflang="en">
<link rel="alternate" href="{{{locale-url 'ja' path}}}" hreflang="ja">
<link rel="alternate" href="{{{locale-url 'zh' path}}}" hreflang="zh">
<link rel="alternate" href="{{{locale-url 'ru' path}}}" hreflang="ru">
<link rel="alternate" href="{{{locale-url 'en' permalink}}}" hreflang="x-default">
<link rel="alternate" href="{{{locale-url 'en' permalink}}}" hreflang="en">
<link rel="alternate" href="{{{locale-url 'ja' permalink}}}" hreflang="ja">
<link rel="alternate" href="{{{locale-url 'zh' permalink}}}" hreflang="zh">
<link rel="alternate" href="{{{locale-url 'ru' permalink}}}" hreflang="ru">

<link rel="icon" type="image/png" href="//s3-eu-west-1.amazonaws.com/static.playcanvas.com/images/icons/favicon_docs.png">

Expand Down
Loading

0 comments on commit 797201a

Please sign in to comment.