Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix: fix several bugs in the PWA plugin UI, make it usable again #4974

Merged
merged 1 commit into from Dec 28, 2019
Merged

fix: fix several bugs in the PWA plugin UI, make it usable again #4974

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
68 changes: 43 additions & 25 deletions packages/@vue/cli-plugin-pwa/ui.js
View file
Open in desktop
Expand Up @@ -15,7 +15,13 @@ module.exports = api => {
json: ['public/manifest.json']
}
},
onRead: ({ data, cwd }) => {
onRead: ({ data }) => {
// Dirty hack here: only in onRead can we delete files from the original data.
// Remove (or, don't create the file) manifest.json if no actual content in it.
if (!data.manifest || !Object.keys(data.manifest).length) {
delete data.manifest
}

return {
prompts: [
{
Expand Down Expand Up @@ -58,7 +64,12 @@ module.exports = api => {
message: 'org.vue.pwa.config.pwa.backgroundColor.message',
description: 'org.vue.pwa.config.pwa.backgroundColor.description',
default: '#000000',
value: data.manifest && data.manifest.background_color,
value:
(data.vue &&
data.vue.pwa &&
data.vue.pwa.manifestOptions &&
data.vue.pwa.manifestOptions.background_color) ||
(data.manifest && data.manifest.background_color),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We really need optional chaining 😅

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👀Time to use TypeScript for every project!

skipSave: true
},
{
Expand All @@ -82,12 +93,12 @@ module.exports = api => {
type: 'list',
message: 'org.vue.pwa.config.pwa.manifestCrossorigin.message',
description: 'org.vue.pwa.config.pwa.manifestCrossorigin.description',
default: undefined,
default: null,
value: data.vue && data.vue.pwa && data.vue.pwa.manifestCrossorigin,
choices: [
{
name: 'none',
value: undefined
value: null
},
{
name: 'anonymous',
Expand All @@ -102,35 +113,42 @@ module.exports = api => {
]
}
},
onWrite: async ({ onWriteApi, prompts, cwd }) => {
onWrite: async ({ api: onWriteApi, data, prompts }) => {
const result = {}
for (const prompt of prompts.filter(p => !p.raw.skipSave)) {
result[`pwa.${prompt.id}`] = await onWriteApi.getAnswer(prompt.id)
}
onWriteApi.setData('vue', result)

// Update app manifest

const name = result['name']
if (name) {
onWriteApi.setData('manifest', {
name,
short_name: name
})
const backgroundColor = await onWriteApi.getAnswer('backgroundColor')
if (!data.manifest && backgroundColor) {
result['pwa.manifestOptions.background_color'] = backgroundColor
}

const themeColor = result['themeColor']
if (themeColor) {
onWriteApi.setData('manifest', {
theme_color: themeColor
})
}
onWriteApi.setData('vue', result)

const backgroundColor = await onWriteApi.getAnswer('backgroundColor')
if (backgroundColor) {
onWriteApi.setData('manifest', {
background_color: backgroundColor
})
// Update app manifest (only when there's a manifest.json file,
// otherwise it will be inferred from options in vue.config.js)
if (data.manifest) {
const name = result['name']
if (name) {
onWriteApi.setData('manifest', {
name,
short_name: name
})
}

const themeColor = result['themeColor']
if (themeColor) {
onWriteApi.setData('manifest', {
theme_color: themeColor
})
}

if (backgroundColor) {
onWriteApi.setData('manifest', {
background_color: backgroundColor
})
}
}
}
})
Expand Down