Merge remote-tracking branch 'origin/main' into mg/test-refactor1

Author: mattgodbolt

.eslintrc.yml

@@ -6,11 +6,11 @@ jobs:
   build-and-test:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
       - name: Use Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18
           cache: npm
@@ -24,11 +24,11 @@ jobs:
   long-test:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: "recursive"
       - name: Use Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18
           cache: npm
@@ -42,9 +42,9 @@ jobs:
     if: github.ref == 'refs/heads/main'
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Use Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18
           cache: npm
@@ -53,9 +53,9 @@ jobs:
           make dist
       - uses: jakejarvis/s3-sync-action@master
         with:
-          args: --acl public-read --cache-control max-age=30 --metadata-directive REPLACE
+          args: --cache-control max-age=30 --metadata-directive REPLACE
         env:
-          AWS_S3_BUCKET: bbc.godbolt.org
+          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"

.github/workflows/test-and-deploy.yml

@@ -8,3 +8,5 @@
 /perf.data
 .eslintcache
 **/.DS_Store
+coverage
+/dist

.gitignore

@@ -1 +1,3 @@
 _
+
+coverage

.husky/.gitignore

@@ -1,5 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-npx lint-staged
-npm run test:unit
+npm run pre-commit

.husky/pre-commit

@@ -1,4 +1,4 @@
-out
+dist
 tests/6502_65C02_functional_tests
 tests/integration/dp111_6502Timing
 package-lock.json

.idea/.gitignore

@@ -0,0 +1,14 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "chrome",
+      "request": "launch",
+      "name": "Debug a running dev server",
+      "url": "http://localhost:8080?logFdcStateChanges&logFdcCommands&model=MasterADFS&disc=CodenameDroid-ADFS_E.adf",
+      "webRoot": "${workspaceFolder}",
+      "sourceMaps": true,
+      "trace": true
+    }
+  ]
+}

.idea/codeStyles/Project.xml

@@ -0,0 +1,6 @@
+{
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
+  "[javascript]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  }
+}

.idea/deployment.xml

@@ -21,13 +21,9 @@ HASH := $(shell git rev-parse HEAD)
 dist: npm
 	npm run build
 
-.PHONY: upload
-upload: dist
-	aws s3 sync out/dist/ s3://bbc.godbolt.org/$(BRANCH) --cache-control max-age=30 --metadata-directive REPLACE
-
 .PHONY: clean
 clean:
-	@rm -rf out
+	@rm -rf dist out
 
 .PHONY: spotless
 spotless: clean