Skip to content

Commit ddf4248

Browse files
webstackdevwebstackdev
authored
Merge pull request #671 from webstackdev/dependabot/npm_and_yarn/npm-dependencies-0f801e42cb
Bump the npm-dependencies group with 24 updates
2 parents d33eec8 + 9ec8f79 commit ddf4248

43 files changed

Lines changed: 2000 additions & 1451 deletions

Some content is hidden

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

‎.github/dependabot.yml‎

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,41 @@
11
version: 2
22
updates:
3-
- package-ecosystem: "npm"
4-
directory: "/"
5-
versioning-strategy: "increase"
3+
- package-ecosystem: 'npm'
4+
directory: '/'
5+
versioning-strategy: 'increase'
66
schedule:
7-
interval: "weekly"
7+
interval: 'weekly'
88
open-pull-requests-limit: 1
9+
ignore:
10+
- dependency-name: '*'
11+
update-types:
12+
- 'version-update:semver-major'
913
labels:
10-
- "type: dependencies 🔗"
11-
- "automerge 🤞"
14+
- 'type: dependencies 🔗'
15+
- 'automerge 🤞'
1216
groups:
1317
npm-dependencies:
1418
patterns:
15-
- "*"
16-
- package-ecosystem: "github-actions"
17-
directory: "/"
19+
- '*'
20+
- package-ecosystem: 'github-actions'
21+
directory: '/'
1822
schedule:
19-
interval: "weekly"
23+
interval: 'weekly'
2024
open-pull-requests-limit: 1
2125
groups:
2226
github-actions:
2327
patterns:
24-
- "*"
28+
- '*'
2529

26-
- package-ecosystem: "pip"
27-
directory: "/"
30+
- package-ecosystem: 'pip'
31+
directory: '/'
2832
schedule:
29-
interval: "weekly"
33+
interval: 'weekly'
3034
open-pull-requests-limit: 1
3135
labels:
32-
- "type: dependencies 🔗"
33-
- "automerge 🤞"
36+
- 'type: dependencies 🔗'
37+
- 'automerge 🤞'
3438
groups:
3539
python-dependencies:
3640
patterns:
37-
- "*"
41+
- '*'

‎.github/workflows/deployment-preview.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ jobs:
3939
WEBMENTION_IO_TOKEN: ${{ secrets.WEBMENTION_IO_TOKEN }}
4040

4141
# Secrets are not available to forked PRs. Also, we don't want to deploy untrusted forks.
42-
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.fork == false
42+
if: github.event_name != 'pull_request' ||
43+
github.event.pull_request.head.repo.fork == false
4344

4445
permissions:
4546
contents: read
@@ -60,7 +61,7 @@ jobs:
6061
cache: npm
6162

6263
- name: Install dependencies
63-
run: npm ci --force
64+
run: npm ci
6465

6566
- name: Install Playwright Chromium (with system deps)
6667
run: npx playwright install --with-deps chromium
@@ -72,7 +73,7 @@ jobs:
7273
run: |
7374
mkdir -p .vercel
7475
cat > .vercel/project.json <<EOF
75-
{"projectId":"$VERCEL_PROJECT_ID","orgId":"$VERCEL_ORG_ID","settings":{"framework":"astro","installCommand":"npm ci --force"}}
76+
{"projectId":"$VERCEL_PROJECT_ID","orgId":"$VERCEL_ORG_ID","settings":{"framework":"astro","installCommand":"npm ci"}}
7677
EOF
7778
7879
- name: Skip preview deployment when Vercel token is unavailable
@@ -100,4 +101,3 @@ jobs:
100101
PUBLIC_UPSTASH_SEARCH_REST_URL: ${{ vars.PUBLIC_UPSTASH_SEARCH_REST_URL }}
101102
PUBLIC_UPSTASH_SEARCH_READONLY_TOKEN: ${{ vars.PUBLIC_UPSTASH_SEARCH_READONLY_TOKEN }}
102103
GITHUB_DEPLOYMENT_ENV: Preview
103-

‎.github/workflows/deployment-production.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
cache: npm
5353

5454
- name: Install dependencies
55-
run: npm ci --force
55+
run: npm ci
5656

5757
- name: Install Playwright Chromium (with system deps)
5858
run: npx playwright install --with-deps chromium
@@ -64,7 +64,7 @@ jobs:
6464
run: |
6565
mkdir -p .vercel
6666
cat > .vercel/project.json <<EOF
67-
{"projectId":"$VERCEL_PROJECT_ID","orgId":"$VERCEL_ORG_ID","settings":{"framework":"astro","installCommand":"npm ci --force"}}
67+
{"projectId":"$VERCEL_PROJECT_ID","orgId":"$VERCEL_ORG_ID","settings":{"framework":"astro","installCommand":"npm ci"}}
6868
EOF
6969
7070
- name: Vercel build (production)
@@ -102,4 +102,3 @@ jobs:
102102
PUBLIC_UPSTASH_SEARCH_REST_URL: ${{ vars.PUBLIC_UPSTASH_SEARCH_REST_URL }}
103103
PUBLIC_UPSTASH_SEARCH_READONLY_TOKEN: ${{ vars.PUBLIC_UPSTASH_SEARCH_READONLY_TOKEN }}
104104
GITHUB_DEPLOYMENT_ENV: Production
105-

‎.github/workflows/lint.yml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,20 +41,20 @@ jobs:
4141
- name: Setup Python
4242
uses: actions/setup-python@v6.2.0
4343
with:
44-
python-version: '3.13'
45-
cache: 'pip'
44+
python-version: "3.13"
45+
cache: "pip"
4646

4747
- name: Install Python dependencies
4848
run: python3 -m pip install -r requirements.txt
4949

5050
- name: Setup Node.js
5151
uses: actions/setup-node@v6.4.0
5252
with:
53-
node-version: '24.x'
54-
cache: 'npm'
53+
node-version: "24.x"
54+
cache: "npm"
5555

5656
- name: Install dependencies
57-
run: npm ci --force
57+
run: npm ci
5858

5959
- name: Run lint
6060
run: npm run lint
@@ -72,4 +72,3 @@ jobs:
7272
steps:
7373
- name: Skip lint for hotfix branch
7474
run: echo "hotfix/* branch detected; skipping lint but allowing deployments."
75-

‎.github/workflows/migrations-preview.yml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ jobs:
1616
runs-on: ubuntu-latest
1717
environment: preview
1818

19-
if: github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success'
19+
if: github.event_name == 'workflow_dispatch' ||
20+
github.event.workflow_run.conclusion == 'success'
2021

2122
permissions:
2223
contents: read
@@ -99,12 +100,12 @@ jobs:
99100
if: steps.gate.outputs.should_migrate == 'true'
100101
uses: actions/setup-node@v6.4.0
101102
with:
102-
node-version: '24.x'
103-
cache: 'npm'
103+
node-version: "24.x"
104+
cache: "npm"
104105

105106
- name: Install dependencies
106107
if: steps.gate.outputs.should_migrate == 'true'
107-
run: npm ci --force
108+
run: npm ci
108109

109110
- name: Verify database schema is up to date
110111
id: verify
@@ -139,7 +140,8 @@ jobs:
139140
exit 1
140141
141142
- name: Push database migrations (preview)
142-
if: steps.gate.outputs.should_migrate == 'true' && steps.verify.outputs.needs_push == 'true'
143+
if: steps.gate.outputs.should_migrate == 'true' &&
144+
steps.verify.outputs.needs_push == 'true'
143145
env:
144146
ASTRO_DB_REMOTE_URL: ${{ secrets.ASTRO_DB_REMOTE_URL }}
145147
ASTRO_DB_APP_TOKEN: ${{ secrets.ASTRO_DB_APP_TOKEN }}

‎.github/workflows/migrations-production.yml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ jobs:
1616
runs-on: ubuntu-latest
1717
environment: production
1818

19-
if: github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success'
19+
if: github.event_name == 'workflow_dispatch' ||
20+
github.event.workflow_run.conclusion == 'success'
2021

2122
permissions:
2223
contents: read
@@ -78,12 +79,12 @@ jobs:
7879
if: steps.gate.outputs.should_migrate == 'true'
7980
uses: actions/setup-node@v6.4.0
8081
with:
81-
node-version: '24.x'
82-
cache: 'npm'
82+
node-version: "24.x"
83+
cache: "npm"
8384

8485
- name: Install dependencies
8586
if: steps.gate.outputs.should_migrate == 'true'
86-
run: npm ci --force
87+
run: npm ci
8788

8889
- name: Verify database schema is up to date
8990
id: verify
@@ -118,7 +119,8 @@ jobs:
118119
exit 1
119120
120121
- name: Push database migrations (production)
121-
if: steps.gate.outputs.should_migrate == 'true' && steps.verify.outputs.needs_push == 'true'
122+
if: steps.gate.outputs.should_migrate == 'true' &&
123+
steps.verify.outputs.needs_push == 'true'
122124
env:
123125
ASTRO_DB_REMOTE_URL: ${{ secrets.ASTRO_DB_REMOTE_URL }}
124126
ASTRO_DB_APP_TOKEN: ${{ secrets.ASTRO_DB_APP_TOKEN }}

‎.github/workflows/playwright.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ jobs:
5050
- name: Setup Node.js
5151
uses: actions/setup-node@v6.4.0
5252
with:
53-
node-version: '24.x'
54-
cache: 'npm'
53+
node-version: "24.x"
54+
cache: "npm"
5555

5656
- name: Install dependencies
57-
run: npm ci --force
57+
run: npm ci
5858

5959
- name: Install Playwright browsers
6060
run: npx playwright install --with-deps
@@ -148,7 +148,7 @@ jobs:
148148
- name: Run Playwright E2E tests
149149
run: npm run test:e2e:smoke
150150
env:
151-
CI: '1'
151+
CI: "1"
152152

153153
- name: Stop Astro dev server
154154
if: always()
@@ -175,4 +175,5 @@ jobs:
175175

176176
steps:
177177
- name: Skip E2E for hotfix branch
178-
run: echo "hotfix/* branch detected; skipping e2e workflow but allowing deployments."
178+
run: echo "hotfix/* branch detected; skipping e2e workflow but allowing
179+
deployments."

‎.github/workflows/test.yml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ jobs:
5151
- name: Setup Node.js
5252
uses: actions/setup-node@v6.4.0
5353
with:
54-
node-version: '24.x'
55-
cache: 'npm'
54+
node-version: "24.x"
55+
cache: "npm"
5656

5757
- name: Install dependencies
58-
run: npm ci --force
58+
run: npm ci
5959

6060
# Astro build runs sync, check, and integrations including verify links
6161
- name: Verify green build (local DB snapshot)
@@ -66,12 +66,13 @@ jobs:
6666
run: npm run test:coverage
6767

6868
- name: Report Coverage
69-
if: steps.vitest.outcome == 'success' && hashFiles('coverage/coverage-summary.json') != ''
69+
if: steps.vitest.outcome == 'success' &&
70+
hashFiles('coverage/coverage-summary.json') != ''
7071
# v2.9.0
7172
uses: davelosert/vitest-coverage-report-action@3c50566c523e04813df28de8f7c48dd97d663f1c
7273
with:
73-
json-summary-path: './coverage/coverage-summary.json'
74-
json-final-path: './coverage/coverage-final.json'
74+
json-summary-path: "./coverage/coverage-summary.json"
75+
json-final-path: "./coverage/coverage-final.json"
7576

7677
- name: Upload test coverage
7778
if: always() && hashFiles('coverage/coverage-summary.json') != ''
@@ -90,5 +91,5 @@ jobs:
9091

9192
steps:
9293
- name: Skip testing for hotfix branch
93-
run: echo "hotfix/* branch detected; skipping lint, unit, and e2e workflows but allowing deployments."
94-
94+
run: echo "hotfix/* branch detected; skipping lint, unit, and e2e workflows but
95+
allowing deployments."

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ build/Release
7171
# Python bytecode
7272
__pycache__/
7373
*.py[cod]
74+
.venv/
7475

7576
# Planning docs
7677
CONTENT*.md

‎astro.config.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import AstroPWA from '@vite-pwa/astro'
21
import db from '@astrojs/db'
32
import lit from '@semantic-ui/astro-lit'
43
import mdx from '@astrojs/mdx'
@@ -11,6 +10,7 @@ import { defineConfig } from 'astro/config'
1110
import type { AstroUserConfig } from 'astro'
1211
import { fileURLToPath } from 'node:url'
1312
import { createLogger, type LogOptions, type PluginOption } from 'vite'
13+
import { VitePWA } from 'vite-plugin-pwa'
1414
/**
1515
* You cannot use path aliases (`@lib`, `@components`, etc.) in files that are
1616
* imported by astro.config.ts, because the path alias resolution happens
@@ -66,7 +66,6 @@ const shouldSuppressRollupWarning = (warning: {
6666
}
6767

6868
const standardIntegrations = [
69-
AstroPWA(pwaConfig),
7069
/** Astro DB - uses Tursa for backing store in production */
7170
db(),
7271
mdx(markdownConfig),
@@ -209,6 +208,7 @@ export default defineConfig({
209208
plugins: [
210209
fixContentAssetPropagation(),
211210
tailwindcss(),
211+
VitePWA(pwaConfig),
212212
pwaDevAssetServer(),
213213
] as PluginOption[],
214214
resolve: {

0 commit comments

Comments
 (0)