textbrowser 0.39.0 → 0.40.3

package/sw-sample.js

@@ -1,22 +1,11 @@
-/* eslint-env browser, serviceworker */
-
-'use strict';
-
-/* globals getJSON, activateCallback, WorkInfo */
-// Todo: Replace with ES6 modules (and remove Rollup routines) once browsers
-//    support:
-//    https://stackoverflow.com/a/45578811/271577
-//    https://bugs.chromium.org/p/chromium/issues/detail?id=824647
-// import getJSON from './node_modules/simple-get-json/dist/index-es.js';
-// import activateCallback from 'node_modules/textbrowser/resources/activateCallback.js';
-// import {getWorkFiles} from './WorkInfo.js';
-importScripts('node_modules/simple-get-json/dist/index.js');
-importScripts('node_modules/textbrowser/dist/WorkInfo-umd.js');
-importScripts('node_modules/textbrowser/dist/activateCallback-umd.js');
-
-const CACHE_VERSION = '0.34.0';
+/* eslint-env browser, serviceworker -- Service worker */
+
+import {getJSON} from './node_modules/simple-get-json/dist/index-es.js';
+import activateCallback from './node_modules/textbrowser/dist/activateCallback-es.js';
+import {getWorkFiles} from './node_modules/textbrowser/dist/WorkInfo-es.js';
+
 const CURRENT_CACHES = {
-  prefetch: 'prefetch-cache-v' + CACHE_VERSION
+  prefetch: 'prefetch-cache-v'
 };
 const minutes = 60 * 1000;
 
@@ -41,6 +30,7 @@ async function post ({type, message = type}) {
   clients.forEach((client) => {
     // Although we only need one client to which to send
     //   arguments, we want to signal phase complete to all
+    // eslint-disable-next-line unicorn/require-post-message-target-origin -- In worker
     client.postMessage({message, type});
   });
 }
@@ -60,7 +50,7 @@ function log (...messages) {
  *
  * @param {Error} error
  * @param {string[]} messages
-* @returns {Promise<void>}
+ * @returns {Promise<void>}
  */
 function logError (error, ...messages) {
   const message = messages.join(' ');
@@ -192,14 +182,16 @@ async function install (time) {
     namespace, languages, files, userStaticFiles
   } = getConfigDefaults(json);
 
-  console.log('opening cache', namespace + CURRENT_CACHES.prefetch);
+  const {version} = await getJSON('./package.json');
+
+  console.log('opening cache', namespace + CURRENT_CACHES.prefetch + version);
   const [
     cache,
     userDataFiles,
     {languages: langs}
   ] = await Promise.all([
-    caches.open(namespace + CURRENT_CACHES.prefetch),
-    WorkInfo.getWorkFiles(files),
+    caches.open(namespace + CURRENT_CACHES.prefetch + version),
+    getWorkFiles(files),
     getJSON(languages)
   ]);
   log('Install: Retrieved dependency values');
@@ -240,7 +232,7 @@ async function install (time) {
         return cache.put(urlToPrefetch, response);
       } catch (error) {
         logError(error, 'Not caching ' + urlToPrefetch + ' due to ' + error);
-        return Promise.reject(error);
+        throw error;
       }
     });
     await Promise.all(cachePromises);
@@ -273,8 +265,9 @@ async function activate (time) {
     caches.keys()
   ]);
   const {namespace, files, basePath} = getConfigDefaults(json);
+  const {version} = await getJSON('./package.json');
 
-  const expectedCacheNames = Object.values(CURRENT_CACHES).map((n) => namespace + n);
+  const expectedCacheNames = Object.values(CURRENT_CACHES).map((n) => namespace + n + version);
   cacheNames.map(async (cacheName) => {
     if (!expectedCacheNames.includes(cacheName)) {
       log('Activate: Deleting out of date cache:', cacheName);

package/.remarkrc

@@ -1,11 +0,0 @@
-{
-  "plugins": {
-    "lint": {
-        "no-multiple-toplevel-headings": false,
-        "ordered-list-marker-value": "one",
-        "no-missing-blank-lines": false,
-        "list-item-spacing": false,
-        "list-item-indent": false
-    }
-  }
-}