From 1e8da12fa73b078a5535cdc771c72f7160070c1b Mon Sep 17 00:00:00 2001
From: Dannii Willis <curiousdannii@gmail.com>
Date: Sat, 14 Dec 2024 16:21:10 +1000
Subject: [PATCH] Update Emscripten and Node dependencies

---
 .eslintrc.cjs     | 26 --------------------------
 bin/.eslintrc.cjs |  5 -----
 bin/emglken.js    | 12 ++++--------
 eslint.config.js  | 31 +++++++++++++++++++++++++++++++
 package.json      |  6 +++---
 src/Dockerfile    |  2 +-
 6 files changed, 39 insertions(+), 43 deletions(-)
 delete mode 100644 .eslintrc.cjs
 delete mode 100644 bin/.eslintrc.cjs
 create mode 100644 eslint.config.js

diff --git a/.eslintrc.cjs b/.eslintrc.cjs
deleted file mode 100644
index 99f6ff6..0000000
--- a/.eslintrc.cjs
+++ /dev/null
@@ -1,26 +0,0 @@
-module.exports = {
-    'env': {
-        'commonjs': true,
-        'es2020': true,
-        'shared-node-browser': true,
-    },
-    'extends': 'eslint:recommended',
-    'globals': {
-        'TextEncoder': 'readonly',
-    },
-    'parserOptions': {
-        ecmaVersion: 12,
-        sourceType: 'module',
-    },
-    'root': true,
-    'rules': {
-        'eqeqeq': ['error', 'always', {'null': 'ignore'}],
-        'indent': ['error', 4],
-        'linebreak-style': ['error', 'unix'],
-        'no-empty': ['off'],
-        'no-var': ['error'],
-        'prefer-const': ['error', {"destructuring": "all"}],
-        'quotes': ['error', 'single'],
-        'semi': ['error', 'never'],
-    },
-}
\ No newline at end of file
diff --git a/bin/.eslintrc.cjs b/bin/.eslintrc.cjs
deleted file mode 100644
index 0520748..0000000
--- a/bin/.eslintrc.cjs
+++ /dev/null
@@ -1,5 +0,0 @@
-module.exports = {
-    'env': {
-        'node': true
-    },
-}
\ No newline at end of file
diff --git a/bin/emglken.js b/bin/emglken.js
index 71b876a..ebefc61 100755
--- a/bin/emglken.js
+++ b/bin/emglken.js
@@ -53,24 +53,20 @@ const formats = [
     },
 ]
 
-async function run()
-{
+async function run() {
     const argv = minimist(process.argv.slice(2))
 
     const storyfile = argv._[0]
 
     let format
-    for (const formatspec of formats)
-    {
-        if (formatspec.id === argv.vm || (!argv.vm && formatspec.extensions.test(storyfile)))
-        {
+    for (const formatspec of formats) {
+        if (formatspec.id === argv.vm || (!argv.vm && formatspec.extensions.test(storyfile))) {
             format = formatspec
             break
         }
     }
 
-    if (!format)
-    {
+    if (!format) {
         console.error('Unknown storyfile format')
         return
     }
diff --git a/eslint.config.js b/eslint.config.js
new file mode 100644
index 0000000..b097a0f
--- /dev/null
+++ b/eslint.config.js
@@ -0,0 +1,31 @@
+import globals from 'globals'
+import js from '@eslint/js'
+
+export default [
+    js.configs.recommended,
+    {
+        languageOptions: {
+            ecmaVersion: 12,
+            globals: {
+                ...globals.browser,
+                ...globals.es2020,
+                ...globals.node,
+            },
+            sourceType: 'module',
+        },
+        rules: {
+            'brace-style': ['error', 'stroustrup', {'allowSingleLine': true}],
+            'comma-dangle': ['error', 'always-multiline'],
+            curly: ['error'],
+            eqeqeq: ['error', 'always', {null: 'ignore'}],
+            indent: ['error', 4, {SwitchCase: 1}],
+            'linebreak-style': ['error', 'unix'],
+            'no-constant-condition': ['error', {checkLoops: false}],
+            'no-control-regex': ['off'],
+            'no-empty': ['error', {allowEmptyCatch: true}],
+            'prefer-const': ['error', {destructuring: 'all'}],
+            quotes: ['error', 'single'],
+            semi: ['error', 'never'],
+        },
+    },
+]
\ No newline at end of file
diff --git a/package.json b/package.json
index 2a65fa9..cebeb82 100644
--- a/package.json
+++ b/package.json
@@ -22,11 +22,11 @@
   "dependencies": {
     "lodash-es": "^4.17.21",
     "minimist": "^1.2.6",
-    "mute-stream": "1.0.0"
+    "mute-stream": "2.0.0"
   },
   "devDependencies": {
-    "esbuild": "^0.20.0",
-    "eslint": "^8.16.0"
+    "esbuild": "^0.24.0",
+    "eslint": "^9.0.0"
   },
   "scripts": {
     "build": "./build.sh",
diff --git a/src/Dockerfile b/src/Dockerfile
index c62818f..eb4a0d9 100644
--- a/src/Dockerfile
+++ b/src/Dockerfile
@@ -2,7 +2,7 @@
 # See https://doc.rust-lang.org/rustc/linker-plugin-lto.html
 
 # LLVM version: 18~19
-FROM emscripten/emsdk:3.1.63
+FROM emscripten/emsdk:3.1.74
 
 ENV CARGO_HOME=/.cargo \
     PATH="/.cargo/bin:$PATH" \