Merge tag 'v4.5.5'

# Conflicts:
#	app/_locales/ja/messages.json
#	package-lock.json

messages.jsonのローカライズ

1 files changed, 7 insertions, 7 deletions

diff --git a/mascara/src/proxy.js b/mascara/src/proxy.js
index 54c5d5cf4..80b4dc516 100644
--- a/mascara/src/proxy.js
+++ b/mascara/src/proxy.js
@@ -1,13 +1,13 @@
 const createParentStream = require('iframe-stream').ParentStream
-const SWcontroller = require('client-sw-ready-event/lib/sw-client.js')
+const SwController = require('sw-controller')
 const SwStream = require('sw-stream/lib/sw-stream.js')
 
-const intervalDelay = Math.floor(Math.random() * (30000 - 1000)) + 1000
-const background = new SWcontroller({
-  fileName: '/background.js',
-  letBeIdle: false,
-  wakeUpInterval: 30000,
-  intervalDelay,
+const keepAliveDelay = Math.floor(Math.random() * (30000 - 1000)) + 1000
+const background = new SwController({
+  fileName: './scripts/background.js',
+  keepAlive: true,
+  keepAliveInterval: 30000,
+  keepAliveDelay,
 })
 
 const pageStream = createParentStream()