diff --git a/build.js b/build.js index 4c236891..7c5e2d0d 100755 --- a/build.js +++ b/build.js @@ -111,7 +111,6 @@ if (projects.includes('web')) { glulxe: 'node_modules/emglken/build/glulxe.*', hugo: 'node_modules/emglken/build/hugo.*', ie: 'src/common/ie.js', - 'jquery.min': 'node_modules/jquery/dist/jquery.min.js', //quixe: 'src/common/quixe.js', scare: 'node_modules/emglken/build/scare.*', tads: 'node_modules/emglken/build/tads.*', @@ -121,6 +120,16 @@ if (projects.includes('web')) { }, outdir: 'dist/web', sourcemap: true, + }, + // To avoid breaking .min.js files, we'll copy jQuery by itself + { + entryPoints: { + 'jquery.min': 'node_modules/jquery/dist/jquery.min.js', + }, + loader: { + '.min.js': 'copy', + }, + outdir: 'dist/web', }, { entryPoints: ['src/fonts/iosevka/*.woff2'], outdir: 'dist/fonts/iosevka', @@ -134,7 +143,6 @@ const common_options = { loader: { '.gif': 'copy', '.html': 'copy', - '.min.js': 'copy', '.wasm': 'copy', '.woff2': 'copy', }, diff --git a/package.json b/package.json index 23f7f9fb..a74dca46 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "@types/minimist": "^1.2.2", "@typescript-eslint/eslint-plugin": "~6.7.0", "@typescript-eslint/parser": "~6.7.0", - "esbuild": "^0.23.0", + "esbuild": "^0.24.0", "esbuild-svelte": "^0.8.1", "eslint": "^8.3.0", "eslint-plugin-compat": "^4.0.0", diff --git a/src/upstream/asyncglk b/src/upstream/asyncglk index 1f18301a..3d94932d 160000 --- a/src/upstream/asyncglk +++ b/src/upstream/asyncglk @@ -1 +1 @@ -Subproject commit 1f18301a969769975e12d2a1369b8da87ace698d +Subproject commit 3d94932da6d0828fc02c11e602eec88fdb7a7b38 diff --git a/src/web/web.css b/src/web/web.css index 01db9388..15bb6ef5 100644 --- a/src/web/web.css +++ b/src/web/web.css @@ -2,7 +2,6 @@ @import url('./parchment.css'); @import url('../upstream/asyncglk/src/glkote/web/glkote.css'); -@import url('../upstream/asyncglk/src/dialog/browser/ui/dialog.css'); @import url('../fonts/fonts.css'); @import url('../upstream/asyncglk/src/glkote/web/light.css'); @import url('../upstream/asyncglk/src/glkote/web/dark.css'); \ No newline at end of file