Merge pull request #19 from mattgodbolt/mg/vite

Port over to vite
mattgodbolt · Dec 19, 2024 · 173e870 · 173e870
2 parents 511e48c + fb01a90
commit 173e870
Show file tree

Hide file tree

Showing 44 changed files with 1,608 additions and 28,269 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -13,6 +13,7 @@ jobs:
           python-version: '3.10' 
       - name: Unpack existing ROMs
         run: |
+          cd public
           curl -sL https://miracle.xania.org/miracle-roms.tar.gz | tar zx
       - name: Build distribution
         run: |
@@ -26,4 +27,4 @@ jobs:
           AWS_S3_BUCKET: miracle.xania.org
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          SOURCE_DIR: "."
+          SOURCE_DIR: dist
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,28 @@
-roms/
-.*.swp
-roms.js
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
+
+# From original Miracle
+public/roms/
+src/roms.js
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/Miracle.iml b/.idea/Miracle.iml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.jshintrc b/.jshintrc
diff --git a/.project b/.project
diff --git a/Makefile b/Makefile
@@ -18,19 +18,20 @@
 # Matthew Westcott, 14 Daisy Hill Drive, Adlington, Chorley, Lancs PR6 9NE UNITED KINGDOM
 
 .PHONY: all z80 clean dist
-all: z80 roms.js
+all: z80 src/roms.js
 dist: all
+	npm run build
 
-ROMS := $(shell find roms -type f | sort)
+ROMS := $(shell find public/roms -type f | sort)
 
-roms.js: $(ROMS) Makefile
-	echo 'var RomList = [' > roms.js
-	for rom in $(ROMS); do echo \"$$rom\", | sed 's/roms\///g' >> roms.js; done
-	echo '];' >> roms.js
+src/roms.js: $(ROMS) Makefile
+	echo 'export const RomList = [' > src/roms.js
+	for rom in $(ROMS); do echo \"$$rom\", | sed 's|public/roms/||g' >> src/roms.js; done
+	echo '];' >> src/roms.js
 
 z80:
-	$(MAKE) -C z80
+	$(MAKE) -C src/z80
 
 clean:
-	$(MAKE) -C z80 clean
-	rm -f roms.js
+	$(MAKE) -C src/z80 clean
+	rm -f src/roms.js
diff --git a/README.md b/README.md
@@ -1,9 +1,11 @@
 Miracle - a Javascript Sega Master System emulator
 --------------------------------------------------
 
-Requires `make`, `perl` and `python` to build.  Place ROMs in the `roms` directory as
+Requires `make`, `perl` and `python` to build.  Place ROMs in the `public/roms` directory as
 `romname.sms` and then run `make` to build the emulation script files and the ROM data.
 
+To run locally run `npm run dev` and then go to http://localhost:5173.
+
 z80 emulation and test are based on rev 1071 of http://svn.matt.west.co.tt/svn/jsspec/trunk
 
 Miracle can be taken for a spin at https://miracle.xania.org/
diff --git a/index.html b/index.html
@@ -24,19 +24,8 @@
 <html lang="en">
 <head>
     <title>Miracle - a JavaScript Sega Master System emulator</title>
-    <link rel="stylesheet" href="miracle.css" type="text/css">
-    <script type="text/javascript" src="lib/jquery-3.7.1.min.js"></script>
-    <script type="text/javascript" src="lib/jquery.editable-1.3.3.min.js"></script>
-    <script type="text/javascript" src="z80/z80_full.js"></script>
-    <script type="text/javascript" src="z80/z80_ops_full.js"></script>
-    <script type="text/javascript" src="z80/z80_dis.js"></script>
-    <script type="text/javascript" src="vdp.js"></script>
-    <script type="text/javascript" src="soundchip.js"></script>
-    <script type="text/javascript" src="miracle.js"></script>
-    <script type="text/javascript" src="debug.js"></script>
-    <script type="text/javascript" src="benchmark.js"></script>
-    <script type="text/javascript" src="roms.js"></script>
-    <script type="text/javascript" src="main.js"></script>
+    <link rel="stylesheet" href="/miracle.css" type="text/css">
+    <script type="module" src="/src/main.js"></script>
     <script type="text/javascript">
 
         var _gaq = _gaq || [];

diff --git a/lib/jquery-3.7.1.min.js b/lib/jquery-3.7.1.min.js
diff --git a/lib/jquery.editable-1.3.3.min.js b/lib/jquery.editable-1.3.3.min.js