diff --git a/extension/test/assets.test.ts b/extension/test/assets.test.ts index cd6551fe..6fbda287 100644 --- a/extension/test/assets.test.ts +++ b/extension/test/assets.test.ts @@ -64,7 +64,9 @@ describe('extension asset packs', function () { }); it('puts cc65 and SDCC 3.x in their own packs, with the tools that hand off to them', function () { - for (var f of ['src/worker/wasm/cc65.wasm', 'src/worker/wasm/ca65.wasm', 'src/worker/wasm/ld65.wasm', 'src/worker/fs/cc65-fs-nes.zip']) { + for (var f of ['src/worker/wasm/cc65.wasm', 'src/worker/wasm/ca65.wasm', 'src/worker/wasm/ld65.wasm', 'src/worker/fs/cc65-fs-nes.zip', + 'src/worker/wasm/fastbasic-int.js', 'src/worker/wasm/fastbasic-int.wasm', + 'src/worker/wasm/fastbasic-fp.js', 'src/worker/wasm/fastbasic-fp.wasm']) { assert.equal(packForFile(f), 'cc65', f); } for (var f of ['src/worker/wasm/sdcc.wasm', 'src/worker/wasm/sdasgb.js', 'src/worker/wasm/sdldz80.wasm', 'src/worker/fs/fssdcc.data', 'src/worker/fs/fssdcc.js.metadata']) { diff --git a/src/tools/assetpacks.ts b/src/tools/assetpacks.ts index 6847816e..5b2c2117 100644 --- a/src/tools/assetpacks.ts +++ b/src/tools/assetpacks.ts @@ -63,10 +63,11 @@ const EXTRA_FILES_RE = new RegExp('^src/worker/(' + [ 'fs/(oscar64-fs|cc2600-fs|cc7800-fs|sdcc-fs)\\.zip', ].join('|') + ')'); -// cc65 and SDCC 3.x (SDCC 4.x is in extra) each serve a family of platforms, +// cc65 (with fastbasic, which always assembles with ca65) and SDCC 3.x +// (SDCC 4.x is in extra) each serve a family of platforms, // so they get their own packs: a NES user never downloads SDCC, nor a Game Boy // user cc65's 10MB of per-target filesystems. -const CC65_FILES_RE = /^src\/worker\/(wasm\/(cc65|ca65|ld65)\.(js|wasm)|fs\/cc65-fs-[^/]+\.zip)$/; +const CC65_FILES_RE = /^src\/worker\/(wasm\/(cc65|ca65|ld65|fastbasic-int|fastbasic-fp)\.(js|wasm)|fs\/cc65-fs-[^/]+\.zip)$/; const SDCC_FILES_RE = /^src\/worker\/(wasm\/(sdcc|sdasz80|sdasgb|sdldz80)\.(js|wasm)|fs\/fssdcc\.[^/]+)$/; /**