Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Vite all the things #460

Merged
merged 5 commits into from
Dec 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test-and-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
/perf.data
.eslintcache
**/.DS_Store

coverage
coverage
/dist
2 changes: 1 addition & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dist: npm

.PHONY: clean
clean:
@rm -rf out
@rm -rf dist out

.PHONY: spotless
spotless: clean
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ case), press shift-F12 (which is shift-Break on the BBC).
```
4. Visit `http://localhost:8080/` 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).

Expand Down
4 changes: 3 additions & 1 deletion eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions index.html
Original file line number Diff 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
Loading