Merge dev into main

.github/workflows/browser.yml

@@ -13,7 +13,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-node@v1
       with:
-        node-version: 14.x
+        node-version: 22.x
     - run: npm install && cd example/browser && npm install
     - run: docker run --name seq -d -p 5341:80 -e ACCEPT_EULA=Y datalust/seq:latest
     - run: cd example/browser && npm run test:html

.github/workflows/node.js.yml

@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x, 16.x, 18.x, 20.x]
+        node-version: [18.x, 20.x, 22.x]
         os: [ubuntu-latest, windows-latest, macOS-latest]
 
     steps:

.github/workflows/npm-publish.yml

@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: 14
+          node-version: 18
       - run: npm ci
       - run: npm test
 
@@ -26,7 +26,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: 14
+          node-version: 18
           registry-url: https://registry.npmjs.org/
       - run: npm ci
       - run: npm publish

README.md

@@ -5,15 +5,15 @@
 ### Requiring for Node
 
 ```js
-const seq = require('seq-logging');
+import { Logger } from 'seq-logging';
 ```
 
 ### Requiring for a browser
 
 Using `seq-logging` in a browser context is the same, except the module to import is `seq-logging/browser`.
 
 ```js
-const seq = require('seq-logging/browser');
+import { Logger } from 'seq-logging/browser';
 ```
 
 ### Usage
@@ -22,10 +22,10 @@ A `Logger` is configured with `serverUrl`, and optionally `apiKey` as well as ev
 `requestTimeout` can be used to adjust timeout for stalled connections, default: 30s.
 
 ```js
-const process = require('process');
-const seq = require('seq-logging');
+import process from 'process';
+import { Logger } from 'seq-logging';
 
-const logger = new seq.Logger({ serverUrl: 'http://localhost:5341' });
+const logger = new Logger({ serverUrl: 'http://localhost:5341' });
 
 logger.emit({
     timestamp: new Date(),

browser.js

@@ -1,5 +1,13 @@
 "use strict";
 
-let Logger = require('./seq_logger')(Blob, fetch, typeof AbortController !== 'undefined' ? AbortController : require('abort-controller'));
+// Variable used to force testing fallback modules
+// This should remain false, but can be changed in testing
+const fallback = false;
 
-module.exports = {Logger};
+const Logger = (await import('./seq_logger.js')).DefineLogger(
+    Blob,
+    fetch,
+    !fallback && typeof AbortController !== 'undefined' ? AbortController : (await import('abort-controller')).AbortController
+);
+
+export { Logger };

example/browser/cypress.config.js

@@ -0,0 +1,10 @@
+const { defineConfig } = require('cypress')
+
+module.exports = defineConfig({
+  video: false,
+  e2e: {
+    setupNodeEvents(on, config) {
+      return require('./cypress/plugins/index.js')(on, config)
+    },
+  },
+})

example/browser/package.json

@@ -12,12 +12,12 @@
     "seq-logging": "file:../../"
   },
   "devDependencies": {
-    "@cypress/webpack-dev-server": "^1.3",
-    "cypress": "^7.5",
-    "html-loader": "^2.1",
-    "html-webpack-plugin": "^5.3",
-    "webpack": "^5.38",
-    "webpack-cli": "^4.7",
-    "webpack-dev-server": "^3.11"
+    "@cypress/webpack-dev-server": "^4.0.2",
+    "cypress": "^14.3.2",
+    "html-loader": "^5.1.0",
+    "html-webpack-plugin": "^5.6.3",
+    "webpack": "^5.99.7",
+    "webpack-cli": "^6.0.1",
+    "webpack-dev-server": "^5.2.1"
   }
 }

example/browser/src/log.js

@@ -2,12 +2,12 @@
 Create a logger that can write events to Seq.
 */
 
-import seq from 'seq-logging/browser';
+import { Logger as SeqLogger } from 'seq-logging/browser';
 import status from './status';
 
 export default (messageTemplate) => {
     // Connect to the Seq server
-    const logger = new seq.Logger({ serverUrl: 'http://localhost:5341' });
+    const logger = new SeqLogger({ serverUrl: 'http://localhost:5341' });
 
     // When the button is hit, send an event to Seq
     document.getElementById('log-event').addEventListener('click', () => {

example/example.js

@@ -1,12 +1,12 @@
 "use strict";
 
-let process = require('process');
-let SeqLogger = require('../index').Logger;
+import process from 'process';
+import { Logger as SeqLogger } from '../index.js';
 
-let seq = new SeqLogger({ serverUrl: 'http://localhost:5341' });
+const seq = new SeqLogger({ serverUrl: 'http://localhost:5341' });
 var n = 0;
 
-let interval = setInterval(sayHello, 100);
+const interval = setInterval(sayHello, 100);
 
 function sayHello() {
     n = n + 1;
@@ -31,4 +31,3 @@ function sayHello() {
         seq.close();
     }
 }
-

example/example_async.js

@@ -1,9 +1,9 @@
 "use strict";
 
-let process = require('process');
-let SeqLogger = require('../index').Logger;
+import process from 'process';
+import { Logger as SeqLogger } from '../index.js';
 
-let seq = new SeqLogger({ serverUrl: 'http://localhost:5341', onRemoteConfigChange: (config) => {
+const seq = new SeqLogger({ serverUrl: 'http://localhost:5341', onRemoteConfigChange: (config) => {
     console.log(config);
 }});
 
@@ -30,4 +30,3 @@ async function sayHello(times) {
         }
     }
 }
-

index.js

@@ -1,9 +1,13 @@
 "use strict";
 
-let Logger = require('./seq_logger')(
-    typeof Blob !== 'undefined' ? Blob : require('buffer').Blob,
-    typeof fetch !== 'undefined' ? fetch : require('node-fetch'),
-    typeof AbortController !== 'undefined' ? AbortController : require('abort-controller')
+// Variable used to force testing fallback modules
+// This should remain false, but can be changed in testing
+const fallback = false;
+
+const Logger = (await import('./seq_logger.js')).DefineLogger(
+    !fallback && typeof Blob !== 'undefined' ? Blob : (await import('buffer')).Blob,
+    !fallback && typeof fetch !== 'undefined' ? fetch : (await import('node-fetch')).default,
+    !fallback && typeof AbortController !== 'undefined' ? AbortController : (await import('abort-controller')).AbortController
 );
 
-module.exports = {Logger};
+export { Logger };