fixed npm run build; isolatedModules=true; es2017; fixed electron
This commit is contained in:
Steven Hugg
parent
4506ebd7e0
commit
1daa080e70
2
Makefile
2
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 )
|
||||
|
|
|
|||
|
|
@ -373,25 +373,11 @@ body {
|
|||
<script src="codemirror/addon/selection/active-line.js"></script>
|
||||
<link rel="stylesheet" href="codemirror/addon/dialog/dialog.css">
|
||||
<script src="javatari.js/release/javatari/javatari.js"></script>
|
||||
<script src="jsnes/dist/jsnes.min.js"></script>
|
||||
<script src="src/common/cpu/6809.js"></script>
|
||||
<script src="lib/mousetrap.min.js"></script>
|
||||
<script src="lib/mousetrap-global-bind.min.js"></script>
|
||||
<!-- UI-only stuff -->
|
||||
<link rel="stylesheet" href="lib/bootstrap-tourist.css">
|
||||
<script src="lib/bootstrap-tourist.js"></script>
|
||||
<script src="lib/FileSaver.min.js"></script>
|
||||
<script src="lib/localforage.min.js"></script>
|
||||
<script src="lib/split.min.js"></script>
|
||||
|
||||
<script>
|
||||
var exports = {};
|
||||
function require(modname) {
|
||||
if (modname == 'jquery') return $;
|
||||
else if (modname.startsWith('.')) return exports;
|
||||
else { console.log("Unknown require()", modname); return exports; }
|
||||
}
|
||||
</script>
|
||||
|
||||
<script src="lib/octokat.js"></script>
|
||||
<script src="tss/js/tss/PsgDeviceChannel.js"></script>
|
||||
|
|
@ -399,30 +385,7 @@ function require(modname) {
|
|||
<script src="tss/js/tss/AudioLooper.js"></script>
|
||||
<script src="tss/js/Log.js"></script>
|
||||
|
||||
<script src="gen/ide/vlist.js"></script>
|
||||
<script src="gen/common/video/tms9918a.js"></script>
|
||||
<script src="gen/common/util.js"></script>
|
||||
<script src="gen/ide/store.js"></script>
|
||||
<script src="gen/common/emu.js"></script>
|
||||
<script src="gen/common/baseplatform.js"></script>
|
||||
<script src="gen/common/analysis.js"></script>
|
||||
<script src="gen/common/audio.js"></script>
|
||||
<script src="gen/common/cpu/disasm6502.js"></script>
|
||||
<script src="gen/common/cpu/disasmz80.js"></script>
|
||||
<script src="gen/common/workertypes.js"></script>
|
||||
<script src="gen/ide/project.js"></script>
|
||||
<script src="gen/ide/windows.js"></script>
|
||||
<script src="gen/ide/views.js"></script>
|
||||
<script src="gen/common/recorder.js"></script>
|
||||
<script src="gen/ide/waveform.js"></script>
|
||||
<script src="gen/ide/pixeleditor.js"></script>
|
||||
<script src="gen/ide/services.js"></script>
|
||||
<script src="gen/ide/ui.js"></script>
|
||||
<script src="gen/common/devices.js"></script>
|
||||
<script src="gen/common/cpu/MOS6502.js"></script>
|
||||
<script src="gen/common/cpu/ZilogZ80.js"></script>
|
||||
<script src="gen/common/cpu/ARM.js"></script>
|
||||
<script src="gen/machine/vdp_z80.js"></script>
|
||||
<script src="gen/ui.js" type="module"></script>
|
||||
|
||||
<script>
|
||||
// submenus open on click + hover
|
||||
|
|
@ -433,9 +396,5 @@ $( ".dropdown-submenu" ).click(function(event) {
|
|||
});
|
||||
</script>
|
||||
|
||||
<script>
|
||||
startUI();
|
||||
</script>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -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 @@
|
||||
|
||||
<head>
|
||||
|
|
@ -42,7 +42,17 @@
|
|||
</head>
|
||||
<body>
|
||||
|
||||
@@ -65,26 +38,6 @@
|
||||
@@ -55,9 +28,6 @@
|
||||
<ul class="dropdown-menu dropdown-menu-left" aria-labelledby="dropdownMenuButton" style="left:auto">
|
||||
<li><a class="dropdown-item" href="#" id="item_new_file">New Project...</a></li>
|
||||
<li><a class="dropdown-item" href="#" id="item_upload_file">Upload...</a></li>
|
||||
- <!--
|
||||
- <li><a class="dropdown-item" href="#" id="item_open_directory">Open Local Directory...</a></li>
|
||||
- -->
|
||||
<hr>
|
||||
<li class="dropdown dropdown-submenu">
|
||||
<a tabindex="-1" href="#">File</a>
|
||||
@@ -68,26 +38,6 @@
|
||||
<hr>
|
||||
<li><a class="dropdown-item" href="#" id="item_addfile_include">Add Include File...</a></li>
|
||||
<li><a class="dropdown-item" href="#" id="item_addfile_link">Add Linked File...</a></li>
|
||||
|
|
@ -69,7 +79,7 @@
|
|||
</ul>
|
||||
</li>
|
||||
<li class="dropdown dropdown-submenu">
|
||||
@@ -110,35 +63,6 @@
|
||||
@@ -113,35 +63,6 @@
|
||||
<li><a class="dropdown-item" href="#" id="item_debug_expr">Break Expression...</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
|
|
@ -105,7 +115,7 @@
|
|||
</ul>
|
||||
</span>
|
||||
|
||||
@@ -234,41 +158,8 @@
|
||||
@@ -237,41 +158,8 @@
|
||||
<span class="label"><span id="settle_label"></span> evals/clk</span>
|
||||
</span>
|
||||
|
||||
|
|
@ -148,7 +158,34 @@
|
|||
|
||||
</div><!-- controls_dynamic -->
|
||||
</div><!-- controls_top -->
|
||||
@@ -452,73 +343,6 @@
|
||||
@@ -286,24 +174,21 @@
|
||||
<div class="emulator disable-select" id="emulator">
|
||||
<!-- replay slider -->
|
||||
<div id="replaydiv" class="replaydiv" style="display:none;color:#ccc;text-align:left">
|
||||
- <div style="display:grid; grid-template-columns: 3em 3em auto 1em 3em; grid-gap: 1em">
|
||||
- <!-- first row -->
|
||||
+ <div style="display:grid; grid-template-columns: 3em 3em auto 3em; grid-gap: 1em">
|
||||
<button id="replay_back" class="btn" title="Back one frame"><span class="glyphicon glyphicon-backward" aria-hidden="true"></span></button>
|
||||
<div>
|
||||
Frame<br>
|
||||
<span id="replay_frame" style="width:3em">-</span>
|
||||
</div>
|
||||
<input type="range" min="0" max="0" value="0" class="slider" id="replayslider">
|
||||
- <div> </div>
|
||||
<button id="replay_fwd" class="btn" title="Ahead one frame"><span class="glyphicon glyphicon-forward" aria-hidden="true"></span></button>
|
||||
- <!-- second row -->
|
||||
+
|
||||
<button id="clock_back" class="btn" title="Back one step"><span class="glyphicon glyphicon-backward" aria-hidden="true"></span></button>
|
||||
<div>
|
||||
Step<br>
|
||||
<span id="replay_clock" style="width:3em">-</span>
|
||||
</div>
|
||||
<input type="range" min="0" max="0" value="0" class="slider" id="clockslider">
|
||||
- <div> </div>
|
||||
<button id="clock_fwd" class="btn" title="Forward one step"><span class="glyphicon glyphicon-forward" aria-hidden="true"></span></button>
|
||||
</div>
|
||||
</div>
|
||||
@@ -458,73 +343,6 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -222,8 +259,17 @@
|
|||
|
||||
<script src="jquery/jquery.min.js"></script>
|
||||
|
||||
@@ -613,28 +437,5 @@
|
||||
startUI();
|
||||
@@ -556,8 +374,6 @@
|
||||
<link rel="stylesheet" href="codemirror/addon/dialog/dialog.css">
|
||||
<script src="javatari.js/release/javatari/javatari.js"></script>
|
||||
<script src="src/common/cpu/6809.js"></script>
|
||||
-<script src="lib/mousetrap.min.js"></script>
|
||||
-<script src="lib/mousetrap-global-bind.min.js"></script>
|
||||
<!-- UI-only stuff -->
|
||||
<link rel="stylesheet" href="lib/bootstrap-tourist.css">
|
||||
<script src="lib/bootstrap-tourist.js"></script>
|
||||
@@ -580,28 +396,5 @@
|
||||
});
|
||||
</script>
|
||||
|
||||
-<!-- Sentry error reporting -->
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
"dom"
|
||||
],
|
||||
"esModuleInterop": true,
|
||||
"isolatedModules": true,
|
||||
"noImplicitThis": false,
|
||||
"noImplicitAny": false,
|
||||
"preserveConstEnums": true,
|
||||
|
|
|
|||
Loading…
Reference in New Issue