Skip to content

Commit

Permalink
feat: minor review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
Saghen authored and ErikBjare committed Feb 4, 2025
1 parent 4a76c4c commit c59a851
Show file tree
Hide file tree
Showing 6 changed files with 79 additions and 75 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ trim_trailing_whitespace = true
charset = utf-8

# 2 spaces for JS, HTML and CSS/SASS
[*.{ts,js,html,css,scss,sass,less}]
[*.{ts,js,html,yml,css,scss,sass,less}]
indent_size = 2

# 4 spaces for markdown
Expand Down
56 changes: 28 additions & 28 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
name: Build

on:
push:
branches: [master]
pull_request:
branches: [master]
push:
branches: [master]
pull_request:
branches: [master]

jobs:
build:
runs-on: ubuntu-latest
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Use Node.js 18.x
uses: actions/setup-node@v3
with:
node-version: 18.x
cache: 'npm'
steps:
- uses: actions/checkout@v3
- name: Use Node.js 18.x
uses: actions/setup-node@v3
with:
node-version: 18.x
cache: npm

- run: npm ci
- run: npm ci

- name: Build Firefox
run: npm run build:firefox
- name: Upload artifact
uses: actions/upload-artifact@v2-preview
with:
name: firefox
path: dist.zip
- name: Build Firefox
run: npm run build:firefox
- name: Upload artifact
uses: actions/upload-artifact@v2-preview
with:
name: firefox
path: dist.zip

- name: Build Chrome
run: npm run build:chrome
- name: Upload artifact
uses: actions/upload-artifact@v2-preview
with:
name: chrome
path: dist.zip
- name: Build Chrome
run: npm run build:chrome
- name: Upload artifact
uses: actions/upload-artifact@v2-preview
with:
name: chrome
path: dist.zip
60 changes: 30 additions & 30 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
name: 'CodeQL'

on:
push:
branches: ['master']
pull_request:
branches: ['master']
schedule:
- cron: '25 4 * * 3'
push:
branches: [master]
pull_request:
branches: [master]
schedule:
- cron: '25 4 * * 3'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write

steps:
- name: Checkout
uses: actions/checkout@v3
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: javascript, typescript
queries: +security-and-quality
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: javascript, typescript
queries: +security-and-quality

- name: Use Node.js 18.x
uses: actions/setup-node@v3
with:
node-version: 18.x
cache: 'npm'
- run: npm ci
- run: npm run build:chrome
- name: Use Node.js 18.x
uses: actions/setup-node@v3
with:
node-version: 18.x
cache: npm
- run: npm ci
- run: npm run build:chrome

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
4 changes: 0 additions & 4 deletions .prettierrc

This file was deleted.

3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ compile:
clean:
rm -rf node_modules build

format:
npx prettier --write .

#---------
## Building

Expand Down
29 changes: 17 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,34 @@
"private": true,
"version": "1.0.0",
"type": "module",
"license": "MPL-2.0",
"bugs": {
"url": "https://github.com/ActivityWatch/aw-watcher-web/issues"
},
"repository": {
"type": "git",
"url": "git+https://github.com/ActivityWatch/aw-watcher-web.git"
},
"scripts": {
"prepare": "husky",
"see-makefile-for-scripts": "echo 'see Makefile for scripts'"
"see-makefile-for-scripts": "echo 'see Makefile for scripts'"
},
"devDependencies": {
"@types/deep-equal": "^1.0.1",
"@types/webextension-polyfill": "^0.10.0",
"husky": "^9.0.11",
"lint-staged": "^15.2.2",
"prettier": "^3.2.5",
"typescript": "^4.9.4",
"vite": "^4.0.4",
"vite-plugin-web-extension": "^1.4.9"
},
"dependencies": {
"aw-client": "^0.4.0",
"deep-equal": "^2.2.0",
"p-retry": "^5.1.2",
"webextension-polyfill": "^0.10.0"
"aw-client": "^0.4.0",
"deep-equal": "^2.2.0",
"p-retry": "^5.1.2",
"webextension-polyfill": "^0.10.0"
},
"lint-staged": {
"*": [
"npm run format"
]
"packageManager": "[email protected]+sha512.127dc83b9ea10c32be65d22a8efb4a65fb952e8fefbdfded39bdc3c97efc32d31b48b00420df2c1187ace28c921c902f0cb5a134a4d032b8b5295cbfa2c681e2",
"prettier": {
"semi": false,
"singleQuote": true
}
}

0 comments on commit c59a851

Please sign in to comment.