From 6b049d954ba6db72059b18fa8c6be1cc39e60077 Mon Sep 17 00:00:00 2001 From: coderiaser Date: Tue, 27 Jan 2026 13:41:21 +0200 Subject: [PATCH] feature: client: sw: register: migrate to ESM --- client/client.mjs | 2 +- client/cloudcmd.mjs | 2 +- client/listeners/get-index.mjs | 1 - client/listeners/get-index.spec.mjs | 1 - client/listeners/get-range.spec.mjs | 1 - client/sw/{register.js => register.mjs} | 13 ++++--------- .../sw/{register.spec.js => register.spec.mjs} | 16 ++++++---------- 7 files changed, 12 insertions(+), 24 deletions(-) rename client/sw/{register.js => register.mjs} (68%) rename client/sw/{register.spec.js => register.spec.mjs} (91%) diff --git a/client/client.mjs b/client/client.mjs index b6c3a436..b2f55b36 100644 --- a/client/client.mjs +++ b/client/client.mjs @@ -10,7 +10,7 @@ import {addSlashToEnd} from 'format-io'; import pascalCase from 'just-pascal-case'; import currify from 'currify'; import * as Images from './dom/images.mjs'; -import {unregisterSW} from './sw/register.js'; +import {unregisterSW} from './sw/register.mjs'; import {getJsonFromFileTable} from './get-json-from-file-table.mjs'; import {Key} from './key/index.mjs'; import { diff --git a/client/cloudcmd.mjs b/client/cloudcmd.mjs index ae0b5e11..4174466b 100644 --- a/client/cloudcmd.mjs +++ b/client/cloudcmd.mjs @@ -2,7 +2,7 @@ import process from 'node:process'; import wraptile from 'wraptile'; import load from 'load.js'; import '../css/main.css'; -import {registerSW, listenSW} from './sw/register.js'; +import {registerSW, listenSW} from './sw/register.mjs'; import {initSortPanel, sortPanel} from './sort.mjs'; import Util from '../common/util.js'; import * as CloudFunc from '../common/cloudfunc.mjs'; diff --git a/client/listeners/get-index.mjs b/client/listeners/get-index.mjs index a1a2cfe1..45ce85e8 100644 --- a/client/listeners/get-index.mjs +++ b/client/listeners/get-index.mjs @@ -8,4 +8,3 @@ export const getIndex = currify((array, item) => { return index; }); - diff --git a/client/listeners/get-index.spec.mjs b/client/listeners/get-index.spec.mjs index 51f9eaeb..ae05159f 100644 --- a/client/listeners/get-index.spec.mjs +++ b/client/listeners/get-index.spec.mjs @@ -17,4 +17,3 @@ test('cloudcmd: client: listeners: getIndex: found', (t) => { t.equal(getIndex(array, 'world'), 1, 'should return index'); t.end(); }); - diff --git a/client/listeners/get-range.spec.mjs b/client/listeners/get-range.spec.mjs index dbb1c883..38b8ab32 100644 --- a/client/listeners/get-range.spec.mjs +++ b/client/listeners/get-range.spec.mjs @@ -50,4 +50,3 @@ test('cloudcmd: client: listeners: getRange: one', (t) => { t.deepEqual(result, expected, 'should return range'); t.end(); }); - diff --git a/client/sw/register.js b/client/sw/register.mjs similarity index 68% rename from client/sw/register.js rename to client/sw/register.mjs index 0e6db472..928d63c9 100644 --- a/client/sw/register.js +++ b/client/sw/register.mjs @@ -1,15 +1,10 @@ -'use strict'; +import {tryToCatch} from 'try-to-catch'; -const {tryToCatch} = require('try-to-catch'); - -module.exports.registerSW = registerSW; -module.exports.unregisterSW = unregisterSW; - -module.exports.listenSW = (sw, ...args) => { +export const listenSW = (sw, ...args) => { sw?.addEventListener(...args); }; -async function registerSW(prefix) { +export async function registerSW(prefix) { if (!navigator.serviceWorker) return; @@ -29,7 +24,7 @@ async function registerSW(prefix) { return sw; } -async function unregisterSW(prefix) { +export async function unregisterSW(prefix) { const reg = await registerSW(prefix); reg?.unregister(prefix); } diff --git a/client/sw/register.spec.js b/client/sw/register.spec.mjs similarity index 91% rename from client/sw/register.spec.js rename to client/sw/register.spec.mjs index 9b42a0e6..98f3ef4c 100644 --- a/client/sw/register.spec.js +++ b/client/sw/register.spec.mjs @@ -1,16 +1,12 @@ -'use strict'; - -const autoGlobals = require('auto-globals'); -const tape = require('supertape'); - -const {stub} = require('@cloudcmd/stub'); - -const {tryCatch} = require('try-catch'); -const { +import autoGlobals from 'auto-globals'; +import tape from 'supertape'; +import {stub} from '@cloudcmd/stub'; +import {tryCatch} from 'try-catch'; +import { listenSW, registerSW, unregisterSW, -} = require('./register'); +} from './register.mjs'; const test = autoGlobals(tape);