Upgrade dependencies

Author: philipwalton

package-lock.json

@@ -56,62 +56,62 @@
     "singleQuote": true
   },
   "devDependencies": {
-    "@rollup/plugin-node-resolve": "^15.2.3",
-    "@rollup/plugin-replace": "^5.0.5",
+    "@rollup/plugin-node-resolve": "^16.0.0",
+    "@rollup/plugin-replace": "^6.0.2",
     "@rollup/plugin-terser": "^0.4.4",
-    "@wdio/cli": "^8.36.1",
-    "@wdio/local-runner": "^8.36.1",
-    "@wdio/mocha-framework": "^8.36.1",
-    "@wdio/spec-reporter": "^8.36.1",
-    "chalk": "^5.3.0",
-    "chokidar": "^3.6.0",
-    "chromedriver": "^124.0.3",
+    "@wdio/cli": "^9.7.1",
+    "@wdio/local-runner": "^9.7.1",
+    "@wdio/mocha-framework": "^9.6.4",
+    "@wdio/spec-reporter": "^9.6.3",
+    "chalk": "^5.4.1",
+    "chokidar": "^4.0.3",
+    "chromedriver": "^132.0.1",
     "common-tags": "^1.8.2",
-    "cssnano": "7.0.1",
+    "cssnano": "7.0.6",
     "dom-utils": "^0.9.0",
     "eslint": "^8.57.0",
-    "fs-extra": "^11.2.0",
-    "globby": "^14.0.1",
+    "fs-extra": "^11.3.0",
+    "globby": "^14.0.2",
     "gzip-size": "^7.0.0",
     "he": "~1.2.0",
-    "highlight.js": "^11.9.0",
+    "highlight.js": "^11.11.1",
     "html-minifier": "^4.0.0",
-    "husky": "^9.0.11",
-    "image-size": "^1.1.1",
-    "jsesc": "^3.0.2",
-    "lint-staged": "^15.2.2",
+    "husky": "^9.1.7",
+    "image-size": "^1.2.0",
+    "jsesc": "^3.1.0",
+    "lint-staged": "^15.4.2",
     "markdown-it": "^14.1.0",
-    "markdown-it-anchor": "^8.6.7",
+    "markdown-it-anchor": "^9.2.0",
     "md5": "^2.3.0",
-    "mocha": "^10.4.0",
-    "moment-timezone": "^0.5.45",
+    "mocha": "^11.1.0",
+    "moment-timezone": "^0.5.46",
     "npm-run-all": "^4.1.5",
     "nunjucks": "^3.2.4",
     "path": "^0.12.7",
-    "postcss": "^8.4.38",
+    "postcss": "^8.5.1",
     "postcss-import": "^16.1.0",
-    "postcss-preset-env": "^9.5.13",
+    "postcss-preset-env": "^10.1.3",
     "postcss-url": "^10.1.3",
-    "prettier": "^3.2.5",
+    "prettier": "^3.4.2",
     "rev-hash": "^4.1.0",
     "rev-path": "^3.0.0",
-    "rollup": "^4.17.2",
-    "sharp": "^0.33.3",
-    "vitest": "^1.6.0",
-    "wait-on": "^7.2.0",
+    "rollup": "^4.32.0",
+    "sharp": "^0.33.5",
+    "vitest": "^3.0.4",
+    "wait-on": "^8.0.2",
     "wdio-chromedriver-service": "^8.1.1",
-    "web-vitals": "^4.2.1",
-    "webdriverio": "^8.36.1",
-    "workbox-background-sync": "^7.1.0",
-    "workbox-broadcast-update": "^7.1.0",
-    "workbox-core": "^7.1.0",
-    "workbox-expiration": "^7.1.0",
-    "workbox-google-analytics": "^7.1.0",
-    "workbox-precaching": "^7.1.0",
-    "workbox-routing": "^7.1.0",
-    "workbox-strategies": "^7.1.0",
-    "workbox-streams": "^7.1.0",
-    "workbox-window": "^7.1.0",
-    "wrangler": "^3.64.0"
+    "web-vitals": "^4.2.4",
+    "webdriverio": "^9.7.1",
+    "workbox-background-sync": "^7.3.0",
+    "workbox-broadcast-update": "^7.3.0",
+    "workbox-core": "^7.3.0",
+    "workbox-expiration": "^7.3.0",
+    "workbox-google-analytics": "^7.3.0",
+    "workbox-precaching": "^7.3.0",
+    "workbox-routing": "^7.3.0",
+    "workbox-strategies": "^7.3.0",
+    "workbox-streams": "^7.3.0",
+    "workbox-window": "^7.3.0",
+    "wrangler": "^3.105.1"
   }
 }

package.json

@@ -4,56 +4,60 @@ import {cssCache, jsCache} from './lib/cache.js';
 import {buildAll} from './lib/content.js';
 import {bundleSW} from './lib/sw.js';
 
-const cssWatcher = chokidar.watch('src/css/**/*.css');
+const watch = (arg) => {
+  return chokidar.watch(arg, {ignoreInitial: true});
+};
+
+const cssWatcher = watch('src/css');
 
 cssWatcher.on('ready', () => {
-  cssWatcher.on('all', async (...args) => {
-    console.log('css', ...args);
+  cssWatcher.on('all', async (event, path) => {
+    console.log('css', event, path);
     cssCache.invalidate();
     await buildAll();
     await bundleSW();
   });
 });
 
-const jsWatcher = chokidar.watch('src/javascript/**/*.js');
+const jsWatcher = watch('src/javascript');
 
 jsWatcher.on('ready', () => {
-  jsWatcher.on('all', async (...args) => {
-    console.log('js', ...args);
+  jsWatcher.on('all', async (event, path) => {
+    console.log('js', event, path);
     jsCache.invalidate();
     await buildAll();
     await bundleSW();
   });
 });
 
-const swWatcher = chokidar.watch(['src/sw/**/*.js', 'worker/**/*.js']);
+const swWatcher = watch(['src/sw', 'worker']);
 
 swWatcher.on('ready', () => {
-  swWatcher.on('all', async (...args) => {
-    console.log('sw', ...args);
+  swWatcher.on('all', async (event, path) => {
+    console.log('sw', event, path);
     await bundleSW();
   });
 });
 
-const staticWatcher = chokidar.watch(['src/static/*']);
+const staticWatcher = watch(['src/static']);
 
 staticWatcher.on('ready', () => {
-  staticWatcher.on('all', async (...args) => {
-    console.log('static', ...args);
+  staticWatcher.on('all', async (event, path) => {
+    console.log('static', event, path);
     await fs.copy('./src/static/', 'build/', {recursive: true});
   });
 });
 
-const contentWatcher = chokidar.watch([
+const contentWatcher = watch([
   'book.json',
-  'src/templates/**/*',
-  'src/articles/*.md',
+  'src/templates',
+  'src/articles',
   'worker/lib/experiments.js',
 ]);
 
 contentWatcher.on('ready', () => {
-  contentWatcher.on('all', async (...args) => {
-    console.log('content', ...args);
+  contentWatcher.on('all', async (event, path) => {
+    console.log('content', event, path);
     await buildAll();
     await bundleSW();
   });

tasks/watch.js

@@ -339,15 +339,15 @@ describe('worker', () => {
         });
 
         expect(await a.text()).toMatch(
-          /<meta http-equiv="origin-trial" content="AiFbmKao6wuKvoETvcxO14nv9K/,
+          /<meta http-equiv="origin-trial" content="Ao1ryfd8fdqfiAsCIPw8u/,
         );
 
         const b = await worker.fetch('/', {
           headers: {'Cookie': 'xid=.567'},
         });
 
         expect(await b.text()).not.toMatch(
-          /<meta http-equiv="origin-trial" content="AiFbmKao6wuKvoETvcxO14nv9K/,
+          /<meta http-equiv="origin-trial" content="Ao1ryfd8fdqfiAsCIPw8u/,
         );
       });
     });

test/vitest/worker.js

@@ -1,4 +1,5 @@
 import assert from 'assert';
+import {clearStorage} from './utils/clearStorage.js';
 import {initBook} from '../../tasks/lib/book.js';
 
 let site;
@@ -12,12 +13,7 @@ describe('The content loader', async () => {
     articles = book.articles;
     pages = book.pages;
 
-    await browser.url('/__reset');
-    await browser.waitUntil(async () => {
-      return await browser.execute(() => {
-        return window.__ready__ === true;
-      });
-    });
+    await clearStorage();
   });
 
   beforeEach(async () => {
@@ -161,7 +157,7 @@ describe('The content loader', async () => {
     await articleLink.click();
 
     const shareButton = await $('#share');
-    assert(await shareButton.isDisplayedInViewport());
+    assert(await shareButton.isDisplayed({withinViewport: true}));
 
     await assertIsInitialPageLoad();
   });

test/wdio/content-loading.js

@@ -1,12 +1,9 @@
 import {strict as assert} from 'node:assert';
 import {beaconsContain, clearBeacons, getBeacons} from './utils/beacons.js';
+import {clearStorage} from './utils/clearStorage.js';
+import {setExperimentCookie} from './utils/setExperimentCookie.js';
 import {initBook} from '../../tasks/lib/book.js';
 
-import {
-  clearExperimentCookie,
-  setExperimentCookie,
-} from './utils/experiments.js';
-
 let articles;
 let pages;
 
@@ -21,10 +18,10 @@ describe('log', function () {
 
   beforeEach(async () => {
     await clearBeacons();
-    await clearExperimentCookie();
+    await clearStorage();
   });
 
-  describe('experiments', () => {
+  describe.only('experiments', () => {
     // Unskip when running an experiment
     it('should load the proper experiment', async () => {
       await setExperimentCookie('.234');
@@ -54,7 +51,8 @@ describe('log', function () {
         });
       });
 
-      await browser.url('/__reset');
+      await clearStorage();
+
       await setExperimentCookie('.789');
       await browser.url(`/articles/?test_id=${++testID}`);
 

test/wdio/log.js

@@ -1,10 +1,12 @@
 import assert from 'assert';
 import fs from 'fs-extra';
+import {clearStorage} from './utils/clearStorage.js';
 
 describe('Service Worker', () => {
   beforeEach(async () => {
     restoreSWVersion();
-    await browser.url('/__reset');
+    await clearStorage();
+
     // Set the default experiment group.
     await browser.setCookies({name: 'xid', value: '.999', path: '/'});
   });

test/wdio/sw.js

@@ -0,0 +1,12 @@
+/**
+ * @returns {Promise}
+ */
+export async function clearStorage() {
+  await browser.deleteCookies();
+  await browser.url('/__reset');
+  await browser.waitUntil(async () => {
+    return await browser.execute(() => {
+      return window.__ready__ === true;
+    });
+  });
+}

test/wdio/utils/clearStorage.js

@@ -0,0 +1,15 @@
+/**
+ * @param {string} value
+ * @returns {Promise}
+ */
+export async function setExperimentCookie(value) {
+  await browser.setCookies({
+    name: 'xid',
+    value: value,
+    path: '/',
+    expiry: Math.floor(Date.now() / 1000 + 60 * 60 * 24 * 365),
+    secure: true,
+    httpOnly: true,
+    sameSite: 'strict',
+  });
+}

test/wdio/utils/experiments.js

@@ -1,4 +1,5 @@
 import {strict as assert} from 'assert';
+import {clearStorage} from './utils/clearStorage.js';
 
 describe('worker', function () {
   describe('priority hints', function () {
@@ -40,14 +41,7 @@ describe('worker', function () {
         }).observe({type: 'resource', buffered: true});
       });
 
-      await browser.url('/__reset');
-
-      // Wait until the SW has unregistered.
-      await browser.waitUntil(async () => {
-        return await browser.execute(() => {
-          return window.__ready__ === true;
-        });
-      });
+      await clearStorage();
 
       // Set a query param to ensure a cached version of the page isn't used.
       await browser.url(urlWithLCPImage + '?cache=bust');
@@ -71,14 +65,7 @@ describe('worker', function () {
       // to ensure that it doesn't happen.
       await browser.pause(2000);
 
-      await browser.url('/__reset');
-
-      // Wait until the SW has unregistered.
-      await browser.waitUntil(async () => {
-        return await browser.execute(() => {
-          return window.__ready__ === true;
-        });
-      });
+      await clearStorage();
 
       // Set a query param to ensure a cached version of the page isn't used.
       await browser.url(urlWithoutLCPImage + '?cache=bust');