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.

Sign up for GitHub

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

build: add vite support #559

Merged
merged 14 commits into from
May 3, 2024
Merged

build: add vite support #559

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
0c84ac5
build: started migrating webpack to vite
ErikBjare May 1, 2024
36855f0
ci: switch to node v20
ErikBjare May 1, 2024
8c1e7f7
fix: changed `require` to `import`
ErikBjare May 1, 2024
b4f2fde
fix: fixed broken icons
ErikBjare May 1, 2024
5768ea4
fix: rename jest.config.js -> jest.config.cjs
ErikBjare May 1, 2024
7a61a82
build(deps): removed @babel/plugin-syntax-dynamic-import (default in …
ErikBjare May 1, 2024
3b83471
test: fixed import errors in tests
ErikBjare May 2, 2024
9f39bde
fix: more progress on vite builds
ErikBjare May 2, 2024
df981d2
fix: fixed vite builds!
ErikBjare May 3, 2024
609f55f
fix: fix CSP for both vite and webpack
ErikBjare May 3, 2024
2a03bff
fix: make files in ./static serve at root (harmonize webpack and vite)
ErikBjare May 3, 2024
54684ae
fix: added pwa manifest generation in vite
ErikBjare May 3, 2024
9602ad1
fix: fixed dark theme toggle in webpack
ErikBjare May 3, 2024
134aa22
ci: split build job into webpack and vite
ErikBjare May 3, 2024
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
8 changes: 4 additions & 4 deletions .github/workflows/nodejs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:

strategy:
matrix:
node-version: [16]
node-version: [20]
python-version: ['3.9']
include:
- node-version: '16'
- node-version: '20'
python-version: '3.9'

steps:
Expand Down Expand Up @@ -44,12 +44,12 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [16]
node-version: [20]
python-version: ['3.9']
aw-server: ["aw-server", "aw-server-rust"]
aw-version: ["v0.12.3b11"]
include:
- node-version: '16'
- node-version: '20'
python-version: '3.9'
aw-server: "aw-server-rust"
aw-version: "master"
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ coverage-ts
screenshots
test/unit/coverage
test/e2e/reports
*.map

# platform-specific trash
.DS_Store
Expand Down
6 changes: 6 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ endif
build: install static/logo.png static/logo.svg
npm run build ${androidflag}

vite-build:
npx vite build

vite-dev:
npx vite

static/logo.%: media/logo/logo.%
@mkdir -p static
cp $< $@
Expand Down
5 changes: 5 additions & 0 deletions babel.config.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module.exports = {
presets: ['@vue/cli-plugin-babel/preset'],
plugins: ['lodash', '@babel/plugin-proposal-nullish-coalescing-operator'],
comments: false,
};
9 changes: 0 additions & 9 deletions babel.config.js
View file
Open in desktop

This file was deleted.

5 changes: 3 additions & 2 deletions src/index.html → index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,17 @@
<head>
<meta charset="utf-8">
<title>ActivityWatch</title>
<link rel="icon" type="image/png" href="/static/logo.png">
<link rel="icon" type="image/png" href="/logo.png">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<!-- Verify with https://csp-evaluator.withgoogle.com/ -->
<!-- TODO: fix CSP (should depend on prod/dev mode, as pre-vite )-->
<meta http-equiv="Content-Security-Policy" content="default-src 'self' <%= htmlWebpackPlugin.options.templateParameters.cspDefaultSrc %> https://api.github.com/repos/ActivityWatch/activitywatch/releases/latest; img-src 'self' data:; font-src 'self' data:; style-src 'self' 'unsafe-inline'; object-src 'none'; script-src 'self' 'unsafe-eval'">
</head>
<body>
<noscript>
<strong>We're sorry but the ActivityWatch Web UI doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
</noscript>
<div id="app"></div>
<!-- built files will be auto injected -->
<script type="module" src="/src/main.js"></script>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thought this would mess up the webpack build... But seems to work.

</body>
</html>
0 jest.config.js → jest.config.cjs
View file
Open in desktop
File renamed without changes.
Loading
Loading