Skip to content

Fix sw.js overwrite #19

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix sw.js overwrite #19

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
04e0e63
Fixed workbox option tree
luisjoserivera Oct 17, 2020
8f5f889
sw.js should be imported in both scripts
luisjoserivera Oct 17, 2020
212b56a
Missed adding pwa in option check.
luisjoserivera Oct 17, 2020
653df8f
options.manifest should be options.pwa.manifest
luisjoserivera Oct 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions lib/module.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,17 +71,21 @@ function addOneSignal (oneSignalOptions) {
})
}

if (!this.options.pwa) {
this.options.pwa = {}
}

// Adjust manifest for oneSignal
if (!this.options.manifest) {
this.options.manifest = {}
if (!this.options.pwa.manifest) {
this.options.pwa.manifest = {}
}
this.options.manifest.gcm_sender_id = options.GcmSenderId
this.options.pwa.manifest.gcm_sender_id = options.GcmSenderId

// Adjust swURL option of Workbox for oneSignal
if (!this.options.workbox) {
this.options.workbox = {}
if (!this.options.pwa.workbox) {
this.options.pwa.workbox = {}
}
this.options.workbox.swURL = 'OneSignalSDKWorker.js'
this.options.pwa.workbox.swURL = 'OneSignalSDKWorker.js'

// Provide OneSignalSDKWorker.js and OneSignalSDKUpdaterWorker.js
const makeSW = (name, scripts) => {
Expand All @@ -90,7 +94,7 @@ function addOneSignal (oneSignalOptions) {
}

makeSW('OneSignalSDKWorker.js', [].concat(options.importScripts || []).concat(options.OneSignalSDK))
makeSW('OneSignalSDKUpdaterWorker.js', [options.OneSignalSDK])
makeSW('OneSignalSDKUpdaterWorker.js', [].concat(options.importScripts || []).concat(options.OneSignalSDK))

// Add OneSignal plugin
this.addPlugin({
Expand Down