Merge remote-tracking branch 'origin/main' into mg/webaudiohackery

mattgodbolt · Dec 31, 2024 · 7b3710b · 7b3710b
2 parents 0df3f55 + a6b8942
commit 7b3710b
Show file tree

Hide file tree

Showing 167 changed files with 3,907 additions and 7,699 deletions.
diff --git a/.github/workflows/test-and-deploy.yml b/.github/workflows/test-and-deploy.yml
@@ -58,4 +58,4 @@ jobs:
           AWS_S3_BUCKET: bbc.xania.org
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          SOURCE_DIR: "out/dist"
+          SOURCE_DIR: "dist"
diff --git a/.gitignore b/.gitignore
@@ -8,5 +8,5 @@
 /perf.data
 .eslintcache
 **/.DS_Store
-
-coverage
+coverage
+/dist
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -1,2 +1 @@
-npx lint-staged
-npm run test:unit
+npm run pre-commit
diff --git a/.prettierignore b/.prettierignore
@@ -1,4 +1,4 @@
-out
+dist
 tests/6502_65C02_functional_tests
 tests/integration/dp111_6502Timing
 package-lock.json
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -4,7 +4,7 @@
     {
       "type": "chrome",
       "request": "launch",
-      "name": "Debug a running webpack dev server",
+      "name": "Debug a running dev server",
       "url": "http://localhost:8080?logFdcStateChanges&logFdcCommands&model=MasterADFS&disc=CodenameDroid-ADFS_E.adf",
       "webRoot": "${workspaceFolder}",
       "sourceMaps": true,

diff --git a/Dockerfile b/Dockerfile
diff --git a/Makefile b/Makefile
@@ -23,7 +23,7 @@ dist: npm
 
 .PHONY: clean
 clean:
-	@rm -rf out
+	@rm -rf dist out
 
 .PHONY: spotless
 spotless: clean

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 # jsbeeb - JavaScript BBC Micro Emulator
 
-[![jsbeeb](images/jsbeeb-example.png)](https://bbc.xania.org/)
+[![jsbeeb](public/images/jsbeeb-example.png)](https://bbc.xania.org/)
 
 A BBC Micro emulator written in JavaScript and running in modern browsers. Emulates a 32K BBC B (with sideways RAM)
 and a 128K BBC Master, along with a number of different peripherals.
@@ -54,9 +54,9 @@ case), press shift-F12 (which is shift-Break on the BBC).
    ```sh
    npm start
    ```
-4. Visit `http://localhost:8080/` in your browser.
+4. Visit `http://localhost:5173/` in your browser.
 
-jsbeeb uses Node.js and webpack to afford simple and standard web development tooling and third-party library access
+jsbeeb uses Node.js and vite to afford simple and standard web development tooling and third-party library access
 without lots of painful copy/paste or wheel-reinventing, as well as the ability to better run tests, and "pack" up the
 site to make it smaller and faster to load when it's deployed to [https://bbc.xania.org](https://bbc.xania.org).
 

diff --git a/build/icon.ico b/build/icon.ico
diff --git a/build/icon.png b/build/icon.png
diff --git a/eslint.config.js b/eslint.config.js
@@ -4,11 +4,13 @@ import js from "@eslint/js";
 import globals from "globals";
 
 export default [
+    {
+        ignores: ["lib/", "out/", "dist/"],
+    },
     js.configs.recommended,
     eslintConfigPrettier,
     {
         plugins: { prettier },
-        ignores: ["lib/", "out/"],
         languageOptions: {
             parserOptions: {
                 ecmaVersion: 2020,

diff --git a/index.html b/index.html
@@ -22,6 +22,7 @@
     />
     <title>jsbeeb - Javascript BBC Micro emulator</title>
     <link rel="shortcut icon" href="/favicon.ico" />
+    <script type="module" src="/src/main.js"></script>
   </head>
 
   <body>
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,6 +22,7 @@ @@
         />
         <title>jsbeeb - Javascript BBC Micro emulator</title>
         <link rel="shortcut icon" href="/favicon.ico" />
+        <script type="module" src="/src/main.js"></script>
       </head>
       <body>
@@ Expand Down @@