diff --git a/Makefile b/Makefile index 4a9e4866..7b0710ea 100644 --- a/Makefile +++ b/Makefile @@ -59,7 +59,7 @@ syncdev: distro cp config.js $(TMP) #aws --profile pzp s3 sync --follow-symlinks $(TMP)/ s3://8bitworkshop.com/dev/ s3cmd -c ~/.s3pzp sync -MFP $(TMP)/ s3://8bitworkshop.com/dev/ - rsync --stats -riltz --chmod=a+rx -e "ssh" $(TMP)/ config.js $(RSYNC_PATH)/dev/ + rsync --stats -riltz --delete --chmod=a+rx -e "ssh" $(TMP)/ config.js $(RSYNC_PATH)/dev/ syncprod: distro @[ "${VERSION}" ] || ( echo ">> No version set at HEAD, tag it first"; exit 1 ) diff --git a/electron.html b/electron.html index 941af236..7ec36b5d 100644 --- a/electron.html +++ b/electron.html @@ -373,25 +373,11 @@ body { - - - - - - - @@ -399,30 +385,7 @@ function require(modname) { - - - - - - - - - - - - - - - - - - - - - - - - + - - diff --git a/meta/electron.diff b/meta/electron.diff index 9a90cb81..c4a5e42f 100644 --- a/meta/electron.diff +++ b/meta/electron.diff @@ -1,5 +1,5 @@ ---- index.html 2021-07-11 18:38:37.000000000 -0500 -+++ electron.html 2021-07-10 13:34:48.000000000 -0500 +--- index.html 2021-08-01 21:41:37.000000000 -0500 ++++ electron.html 2021-08-02 09:36:47.000000000 -0500 @@ -3,18 +3,7 @@ @@ -42,7 +42,17 @@ -@@ -65,26 +38,6 @@ +@@ -55,9 +28,6 @@ +
  • -@@ -110,35 +63,6 @@ +@@ -113,35 +63,6 @@
  • Break Expression...
    • @@ -105,7 +115,7 @@ -@@ -234,41 +158,8 @@ +@@ -237,41 +158,8 @@ evals/clk @@ -148,7 +158,34 @@ -@@ -452,73 +343,6 @@ +@@ -286,24 +174,21 @@ +
    + +
    @@ -222,8 +259,17 @@ -@@ -613,28 +437,5 @@ - startUI(); +@@ -556,8 +374,6 @@ + + + +- +- + + + +@@ -580,28 +396,5 @@ + }); - diff --git a/package.json b/package.json index 9084b007..86be2cc5 100644 --- a/package.json +++ b/package.json @@ -58,12 +58,13 @@ "vgm-parser": "^0.6.3" }, "scripts": { - "build": "tsc --build tsconfig.json", + "build": "npm run tsbuild && npm run esbuild-clean && npm run esbuild", "test": "npm run test-node", + "tsbuild": "tsc --build tsconfig.json", "esbuild": "npm run esbuild-worker && npm run esbuild-ui", "esbuild-clean": "rm -f ./gen/*.*", - "esbuild-worker": "esbuild src/worker/workermain.ts --bundle --minify --sourcemap --target=es2020,chrome58,firefox57,safari11 --outfile=./gen/worker/bundle.js", - "esbuild-ui": "esbuild src/ide/ui.ts src/ide/embedui.ts --splitting --format=esm --bundle --minify --sourcemap --target=es2020 --outdir=./gen/ --external:path --external:fs", + "esbuild-worker": "esbuild src/worker/workermain.ts --bundle --minify --sourcemap --target=es2017 --outfile=./gen/worker/bundle.js", + "esbuild-ui": "esbuild src/ide/ui.ts src/ide/embedui.ts --splitting --format=esm --bundle --minify --sourcemap --target=es2017 --outdir=./gen/ --external:path --external:fs", "test-one": "NODE_PATH=$(pwd) mocha --recursive --timeout 60000", "test-node": "NODE_PATH=$(pwd) mocha --recursive --timeout 60000 test/cli", "test-profile": "NODE_PATH=$(pwd) mocha --recursive --timeout 60000 --prof test/cli", diff --git a/tsconfig.json b/tsconfig.json index 6075d4c5..d03218c7 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -13,6 +13,7 @@ "dom" ], "esModuleInterop": true, + "isolatedModules": true, "noImplicitThis": false, "noImplicitAny": false, "preserveConstEnums": true,