Merge branch 'gray' into 'master'

Gray



See merge request !1493

@@ -13,7 +13,7 @@ module.exports = {
     target: 'webworker',
     target: 'webworker',
     module: {
     module: {
         rules: [{
         rules: [{
-            test: /\.(js|mjs)$/,
+            test: /\.js$/,
             include: [path.join(__dirname, '../../node_modules/workbox-sw'), path.join(__dirname, '../js')],
             include: [path.join(__dirname, '../../node_modules/workbox-sw'), path.join(__dirname, '../js')],
             use: 'babel-loader'
             use: 'babel-loader'
         }]
         }]

@@ -69,7 +69,7 @@ const precacheFile = [{
     };
     };
 })).concat(config.precachePage.map(page => {
 })).concat(config.precachePage.map(page => {
     return {
     return {
-        url: page
+        url: page + '?t=' + qs.t
     };
     };
 })).concat(config.precacheCdnStaticFile.map(file => {
 })).concat(config.precacheCdnStaticFile.map(file => {
     return {
     return {
@@ -116,7 +116,7 @@ workboxSW.router.registerRoute(args => {
         }
         }
 
 
         // navigate 请求失败后，返回网络异常页面
         // navigate 请求失败后，返回网络异常页面
-        return caches.match('offline.html');
+        return caches.match('offline.html?t=' + qs.t);
     });
     });
 });
 });