3pp-mirror/docusaurus
1
0
Fork 0
mirror of https://github.com/facebook/docusaurus.git synced 2025-06-08 22:03:01 +02:00
Code Issues Projects Releases Packages Wiki Activity

refactor(v2): automatically add base URL to PWA head tags (#5169)

Browse source 
* refactor(v2): automatically add base URL to PWA head tags

* Add baseUrl only if necessary
This commit is contained in:
Alexey Pyltsyn 2021-07-15 16:38:14 +03:00 • committed by GitHub
parent 81170a79f4
commit f7b5e90390
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
packages/docusaurus-plugin-pwa/package.json
View file

@ -18,6 +18,7 @@
"@babel/preset-env": "^7.12.16", "@babel/preset-env": "^7.12.16",
"@docusaurus/core": "2.0.0-beta.3", "@docusaurus/core": "2.0.0-beta.3",
"@docusaurus/theme-common": "2.0.0-beta.3", "@docusaurus/theme-common": "2.0.0-beta.3",
"@docusaurus/utils": "2.0.0-beta.3",
"@docusaurus/utils-validation": "2.0.0-beta.3", "@docusaurus/utils-validation": "2.0.0-beta.3",
"babel-loader": "^8.2.2", "babel-loader": "^8.2.2",
"clsx": "^1.1.1", "clsx": "^1.1.1",

12
packages/docusaurus-plugin-pwa/src/index.js
View file

@ -8,6 +8,7 @@
const LogPlugin = require('@docusaurus/core/lib/webpack/plugins/LogPlugin') const LogPlugin = require('@docusaurus/core/lib/webpack/plugins/LogPlugin')
.default; .default;
const {compile} = require('@docusaurus/core/lib/webpack/utils'); const {compile} = require('@docusaurus/core/lib/webpack/utils');
const {normalizeUrl} = require('@docusaurus/utils');
const path = require('path'); const path = require('path');
const webpack = require('webpack'); const webpack = require('webpack');
const {injectManifest} = require('workbox-build'); const {injectManifest} = require('workbox-build');
@ -88,12 +89,15 @@ function plugin(context, options) {
injectHtmlTags() { injectHtmlTags() {
const headTags = []; const headTags = [];
if (isProd && pwaHead) { if (isProd && pwaHead) {
pwaHead.forEach(({tagName, ...attributes}) => pwaHead.forEach(({tagName, ...attributes}) => {
headTags.push({ if (attributes.href && !attributes.href.startsWith(baseUrl)) {
attributes.href = normalizeUrl([baseUrl, attributes.href]);
}
return headTags.push({
tagName, tagName,
attributes, attributes,
}), });
); });
} }
return {headTags}; return {headTags};
}, },

10
website/docusaurus.config.js
View file

@ -196,12 +196,12 @@ const isVersioningDisabled = !!process.env.DISABLE_VERSIONING || isI18nStaging;
{ {
tagName: 'link', tagName: 'link',
rel: 'icon', rel: 'icon',
href: `${baseUrl}img/docusaurus.png`, href: 'img/docusaurus.png',
}, },
{ {
tagName: 'link', tagName: 'link',
rel: 'manifest', rel: 'manifest',
href: `${baseUrl}manifest.json`, href: 'manifest.json',
}, },
{ {
tagName: 'meta', tagName: 'meta',
@ -221,18 +221,18 @@ const isVersioningDisabled = !!process.env.DISABLE_VERSIONING || isI18nStaging;
{ {
tagName: 'link', tagName: 'link',
rel: 'apple-touch-icon', rel: 'apple-touch-icon',
href: `${baseUrl}img/docusaurus.png`, href: 'img/docusaurus.png',
}, },
{ {
tagName: 'link', tagName: 'link',
rel: 'mask-icon', rel: 'mask-icon',
href: `${baseUrl}img/docusaurus.png`, href: 'img/docusaurus.png',
color: 'rgb(62, 204, 94)', color: 'rgb(62, 204, 94)',
}, },
{ {
tagName: 'meta', tagName: 'meta',
name: 'msapplication-TileImage', name: 'msapplication-TileImage',
href: `${baseUrl}img/docusaurus.png`, href: 'img/docusaurus.png',
}, },
{ {
tagName: 'meta', tagName: 'meta',