Skip to content

Commit c7b35e2

Browse files
authored
Merge pull request #266 from ilios/disastro
Convert to Astro
2 parents ea15783 + dcf4a95 commit c7b35e2

File tree

254 files changed

+10906
-3360
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

254 files changed

+10906
-3360
lines changed

.github/dependabot.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
version: 2
22
updates:
3-
- package-ecosystem: bundler
4-
directory: "/"
5-
schedule:
6-
interval: daily
7-
time: "02:30"
8-
timezone: America/Los_Angeles
9-
open-pull-requests-limit: 10
3+
- package-ecosystem: npm
4+
directory: '/'
5+
schedule:
6+
interval: weekly
7+
open-pull-requests-limit: 10
8+
- package-ecosystem: github-actions
9+
directory: '/'
10+
schedule:
11+
interval: weekly

.github/workflows/ci.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches: [main, master]
6+
pull_request: {}
7+
8+
concurrency:
9+
group: ci-${{ github.head_ref || github.ref }}
10+
cancel-in-progress: true
11+
12+
jobs:
13+
test:
14+
name: 'Lint and Test'
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/checkout@v6
18+
- uses: pnpm/action-setup@v4
19+
- uses: actions/setup-node@v4
20+
with:
21+
node-version: 24
22+
cache: pnpm
23+
- run: pnpm install
24+
- run: pnpm run lint
25+
- run: pnpm exec playwright install --with-deps
26+
- run: pnpm run test
27+
28+
build:
29+
name: Build
30+
runs-on: ubuntu-latest
31+
steps:
32+
- uses: actions/checkout@v6
33+
- uses: pnpm/action-setup@v4
34+
- uses: actions/setup-node@v4
35+
with:
36+
node-version: 24
37+
cache: pnpm
38+
- run: pnpm install
39+
- name: test build
40+
run: pnpm run build
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
name: Update pnpm Version
2+
on:
3+
schedule:
4+
- cron: '0 23 * * 4' # Weekly on Thursday afternoons (UTC)
5+
workflow_dispatch:
6+
7+
jobs:
8+
update-pnpm:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v6
12+
- uses: pnpm/action-setup@v4
13+
- name: Setup Node.js
14+
uses: actions/setup-node@v6
15+
with:
16+
node-version: 24
17+
- name: Get latest pnpm version
18+
run: |
19+
PNPM_VERSION="$(npm view pnpm version)" # get the latest version of pnpm from the registry
20+
echo ${PNPM_VERSION}
21+
echo "pnpm_version=${PNPM_VERSION}" >> $GITHUB_ENV
22+
- name: Update package.json
23+
run: |
24+
jq '.packageManager = "pnpm@'"${{ env.pnpm_version }}"'"' package.json > temp.json
25+
mv temp.json package.json
26+
- name: Create Pull Request
27+
id: cpr
28+
uses: peter-evans/create-pull-request@v8
29+
with:
30+
token: ${{ secrets.ZORGBORT_TOKEN }}
31+
commit-message: Update PNPM to v${{ env.pnpm_version }}
32+
title: Update PNPM to v${{ env.pnpm_version }}
33+
body: |
34+
Update PNPM to v${{ env.pnpm_version }} the latest release.
35+
Auto-generated by [update-pnpm-version][1]
36+
37+
[1]: https://github.com/ilios/iliosproject.org/.github/workflows/update-pnpm-version.yml
38+
branch: update-pnpm-version
39+
labels: dependencies
40+
- name: Approve Pull Request
41+
if: steps.cpr.outputs.pull-request-operation == 'created'
42+
run: gh pr review --approve -b "Auto Approved" ${{ steps.cpr.outputs.pull-request-number }}
43+
env:
44+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
45+
- name: Enable Pull Request Automerge and Label
46+
if: steps.cpr.outputs.pull-request-operation == 'created'
47+
run: |
48+
gh pr edit --add-label "dependencies" ${{ steps.cpr.outputs.pull-request-number }}
49+
gh pr merge --merge --auto ${{ steps.cpr.outputs.pull-request-number }}
50+
env:
51+
GH_TOKEN: ${{ secrets.ZORGBORT_TOKEN }}
52+
- uses: act10ns/slack@v2
53+
if: failure()
54+
env:
55+
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_ILIOS_DEPLOYMENT_WEBHOOK_URL }}
56+
with:
57+
status: ${{ job.status }}
58+
message: Update PNPM Job Failed for website {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/actions/runs/{{ env.GITHUB_RUN_ID }}

.github/workflows/visual-diff.yml

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
name: Visual Diff
2+
3+
on:
4+
pull_request: {}
5+
6+
concurrency:
7+
group: visual-diff-${{ github.head_ref || github.ref }}
8+
cancel-in-progress: true
9+
10+
jobs:
11+
baseline:
12+
name: Baseline
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@v6
16+
with:
17+
ref: ${{ github.base_ref }}
18+
- uses: pnpm/action-setup@v4
19+
- uses: actions/setup-node@v6
20+
with:
21+
node-version: 22
22+
cache: pnpm
23+
- run: pnpm install
24+
- run: pnpm exec playwright install --with-deps
25+
- name: Capture Screenshots
26+
run: pnpm run test
27+
- uses: actions/upload-artifact@v6
28+
with:
29+
name: baseline
30+
path: build/screenshots
31+
32+
candidate:
33+
name: Candidate
34+
runs-on: ubuntu-latest
35+
steps:
36+
- uses: actions/checkout@v6
37+
- uses: pnpm/action-setup@v4
38+
- uses: actions/setup-node@v6
39+
with:
40+
node-version: 22
41+
cache: pnpm
42+
- run: pnpm install
43+
- run: pnpm exec playwright install --with-deps
44+
- name: Capture Screenshots
45+
run: pnpm run test
46+
- uses: actions/upload-artifact@v6
47+
with:
48+
name: candidate
49+
path: build/screenshots
50+
51+
compare:
52+
name: Visual Diff
53+
needs: [baseline, candidate]
54+
runs-on: ubuntu-latest
55+
steps:
56+
- uses: actions/download-artifact@v7
57+
- run: ls -lh baseline candidate
58+
- uses: actions/setup-node@v6
59+
with:
60+
node-version: 24
61+
- name: Create Visual Diff
62+
run: npx visual-differ baseline candidate results/visual-diff-${{ github.event.pull_request.number }}
63+
- uses: actions/upload-artifact@v6
64+
if: always()
65+
with:
66+
name: visual-diff-${{ github.event.pull_request.number }}
67+
path: results

.gitignore

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,34 @@
1-
_site
2-
.sass-cache
3-
.jekyll-cache
1+
# build output
2+
dist/
3+
# generated types
4+
.astro/
5+
6+
# screenshots
7+
build/
8+
9+
# dependencies
10+
node_modules/
11+
12+
# logs
13+
npm-debug.log*
14+
yarn-debug.log*
15+
yarn-error.log*
16+
pnpm-debug.log*
17+
18+
19+
# environment variables
20+
.env
21+
.env.production
22+
23+
# macOS-specific files
424
.DS_Store
25+
26+
# jetbrains setting folder
27+
.idea/
28+
29+
# Playwright
30+
/test-results/
31+
/playwright-report/
32+
/blob-report/
33+
/playwright/.cache/
34+
/playwright/.auth/

.husky/pre-commit

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
pnpm lint
2+
pnpm test

.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
24

.prettierignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
dist
2+
node_modules
3+
.astro
4+
package-lock.json
5+
pnpm-lock.yaml
6+
yarn.lock
7+
public

.prettierrc.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"singleQuote": true,
3+
"printWidth": 100,
4+
"plugins": ["prettier-plugin-astro"],
5+
"overrides": [
6+
{
7+
"files": "*.astro",
8+
"options": {
9+
"parser": "astro"
10+
}
11+
}
12+
]
13+
}

.ruby-version

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)