Skip to content

Commit ae24ba4

Browse files
committed
feat(app-vite): PWA mode - ability to directly reference the manifest json content in index.html
1 parent e7ca345 commit ae24ba4

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

app-vite/lib/modes/pwa/pwa-builder.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class PwaBuilder extends AppBuilder {
1717
writeFileSync(
1818
join(this.quasarConf.build.distDir, this.quasarConf.pwa.manifestFilename),
1919
JSON.stringify(
20-
this.quasarConf.metaConf.pwaManifest,
20+
this.quasarConf.htmlVariables.pwaManifest,
2121
null,
2222
this.quasarConf.build.minify !== false ? void 0 : 2
2323
),

app-vite/lib/modes/pwa/utils.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const workboxBuild = getPackage('workbox-build')
1010

1111
module.exports.createHeadTags = function createHeadTags (quasarConf) {
1212
const { publicPath } = quasarConf.build
13-
const { pwaManifest } = quasarConf.metaConf
13+
const { pwaManifest } = quasarConf.htmlVariables
1414
const { useCredentialsForManifestTag, injectPwaMetaTags, manifestFilename } = quasarConf.pwa
1515

1616
let headTags =
@@ -40,7 +40,7 @@ module.exports.createHeadTags = function createHeadTags (quasarConf) {
4040
}
4141

4242
module.exports.injectPwaManifest = function injectPwaManifest (quasarConf, ifNotAlreadyGenerated) {
43-
if (ifNotAlreadyGenerated === true && quasarConf.metaConf.pwaManifest !== void 0) {
43+
if (ifNotAlreadyGenerated === true && quasarConf.htmlVariables.pwaManifest !== void 0) {
4444
return
4545
}
4646

@@ -59,7 +59,7 @@ module.exports.injectPwaManifest = function injectPwaManifest (quasarConf, ifNot
5959
quasarConf.pwa.extendManifestJson(pwaManifest)
6060
}
6161

62-
quasarConf.metaConf.pwaManifest = pwaManifest
62+
quasarConf.htmlVariables.pwaManifest = pwaManifest
6363
}
6464

6565
module.exports.buildPwaServiceWorker = async function buildPwaServiceWorker (workboxMode, workboxConfig) {

app-vite/lib/modes/pwa/vite-plugin.pwa-resources.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ module.exports = quasarConf => {
99
let manifestContent
1010

1111
function updateCache () {
12-
if (quasarConf.metaConf.pwaManifest === pwaManifest) {
12+
if (quasarConf.htmlVariables.pwaManifest === pwaManifest) {
1313
return
1414
}
1515

16-
pwaManifest = quasarConf.metaConf.pwaManifest
16+
pwaManifest = quasarConf.htmlVariables.pwaManifest
1717
headTags = createHeadTags(quasarConf)
1818
manifestContent = JSON.stringify(pwaManifest)
1919
}

app-vite/lib/modes/ssr/ssr-builder.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class SsrBuilder extends AppBuilder {
4040
writeFileSync(
4141
join(this.quasarConf.build.distDir, this.quasarConf.pwa.manifestFilename),
4242
JSON.stringify(
43-
this.quasarConf.metaConf.pwaManifest,
43+
this.quasarConf.htmlVariables.pwaManifest,
4444
null,
4545
this.quasarConf.build.minify !== false ? void 0 : 2
4646
),

0 commit comments

Comments
 (0)