From 4506ebd7e0098fcafcfe4459b1215a3a40999625 Mon Sep 17 00:00:00 2001 From: Steven Hugg Date: Sun, 1 Aug 2021 13:03:50 -0500 Subject: [PATCH] started migration to esbuild modules --- Makefile | 6 +- embed.html | 33 +--- index.html | 41 +--- lib/binaryen.js | 351 ----------------------------------- lib/capstone-arm.min.js | 173 +++++++++++++++++ package-lock.json | 56 +++--- package.json | 18 +- src/common/baseplatform.ts | 3 +- src/common/basic/runtime.ts | 2 +- src/common/cpu/disasm6502.ts | 1 + src/common/emu.ts | 6 +- src/common/hdl/hdlwasm.ts | 3 +- src/common/util.ts | 10 + src/{ide => common}/vlist.ts | 2 +- src/ide/embedui.ts | 38 ++-- src/ide/pixeleditor.ts | 2 +- src/ide/store.ts | 14 -- src/ide/ui.ts | 43 ++--- src/ide/views.ts | 9 +- src/ide/waveform.ts | 3 +- src/platform/_index.ts | 36 ++++ src/platform/arm32.ts | 201 +------------------- src/platform/basic.ts | 3 - src/platform/devel.ts | 5 +- src/platform/nes.ts | 7 +- src/platform/vcs.ts | 5 + src/platform/verilog.ts | 51 ++--- src/platform/x86.ts | 2 +- src/platform/zmachine.ts | 6 +- src/worker/workermain.ts | 1 + test/cli/workertestutils.js | 1 + test/web/testallpresets.js | 73 +++++--- tsconfig.json | 1 + 33 files changed, 384 insertions(+), 822 deletions(-) delete mode 100644 lib/binaryen.js create mode 100644 lib/capstone-arm.min.js rename src/{ide => common}/vlist.ts (99%) delete mode 100644 src/ide/store.ts create mode 100644 src/platform/_index.ts diff --git a/Makefile b/Makefile index dddc8a71..4a9e4866 100644 --- a/Makefile +++ b/Makefile @@ -43,9 +43,11 @@ meta/electron.diff: index.html electron.html -diff -u index.html electron.html > $@ tsweb: + npm run esbuild-clean (ip addr || ifconfig) | grep inet - $(TSC) -w & - npm run eswatch & + $(TSC) -w --preserveWatchOutput & + npm run esbuild-worker -- --watch & + npm run esbuild-ui -- --watch & python3 scripts/serveit.py 2>> /dev/null #http.out astrolibre.b64.txt: astrolibre.rom diff --git a/embed.html b/embed.html index dc693321..eb60fbeb 100644 --- a/embed.html +++ b/embed.html @@ -56,47 +56,16 @@ if (window.location.host.endsWith('8bitworkshop.com')) { - - - - - - - - - - - - - - - - - - - + diff --git a/index.html b/index.html index f9876790..55f201e0 100644 --- a/index.html +++ b/index.html @@ -555,7 +555,6 @@ if (window.location.host.endsWith('8bitworkshop.com')) { - @@ -563,18 +562,6 @@ if (window.location.host.endsWith('8bitworkshop.com')) { - - - - @@ -582,29 +569,7 @@ function require(modname) { - - - - - - - - - - - - - - - - - - - - - - - + - -