From 46d8462caab99ad0a678345fd847b9fc3aea570b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=B8=85?= Date: Fri, 26 Apr 2019 14:47:03 +0800 Subject: [PATCH] rm pwa (#4090) --- src/defaultSettings.js | 2 +- src/global.js | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/defaultSettings.js b/src/defaultSettings.js index 4e7e8018..25887b8b 100644 --- a/src/defaultSettings.js +++ b/src/defaultSettings.js @@ -10,7 +10,7 @@ module.exports = { disableLocal: false, }, title: 'Ant Design Pro', - pwa: true, + pwa: false, // Your custom iconfont Symbol script Url // eg://at.alicdn.com/t/font_1039637_btcrd5co4w.js // 注意:如果需要图标多色,Iconfont 图标项目里要进行批量去色处理 diff --git a/src/global.js b/src/global.js index a0ecf97a..55bea308 100644 --- a/src/global.js +++ b/src/global.js @@ -3,8 +3,6 @@ import { notification, Button, message } from 'antd'; import { formatMessage } from 'umi-plugin-react/locale'; import defaultSettings from './defaultSettings'; -window.React = React; - const { pwa } = defaultSettings; // if pwa is true if (pwa) { @@ -58,4 +56,9 @@ if (pwa) { onClose: async () => {}, }); }); +} else if ('serviceWorker' in navigator) { + // eslint-disable-next-line compat/compat + navigator.serviceWorker.ready.then(registration => { + registration.unregister(); + }); }