Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion .changeset/config.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://unpkg.com/@changesets/config@3.0.5/schema.json",
"$schema": "https://unpkg.com/@changesets/config@4.0.1/schema.json",
"changelog": [
"@changesets/changelog-github",
{
Expand All @@ -10,6 +10,10 @@
"fixed": [],
"linked": [],
"access": "public",
"privatePackages": {
"version": true,
"tag": false
},
"baseBranch": "main",
"updateInternalDependencies": "patch",
"ignore": []
Expand Down
5 changes: 5 additions & 0 deletions .changeset/upgrade-vue-nuxt.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@alanlu-dev/website': patch
---

chore(deps): upgrade Vue/Nuxt stack and workflows
47 changes: 17 additions & 30 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v7

- name: Install pnpm
uses: pnpm/action-setup@v3

- name: Use Node.js 20
uses: actions/setup-node@v4
- name: Setup pnpm and Node.js
uses: pnpm/setup@v3
with:
node-version: 20
cache: 'pnpm'

- name: Install deps
run: pnpm install
runtime: node@24
cache: true
require-lockfile: true

- name: Build
run: pnpm run build
Expand All @@ -57,7 +52,7 @@ jobs:
run: pnpm run typecheck

- name: CSpell
uses: streetsidesoftware/cspell-action@v6
uses: streetsidesoftware/cspell-action@v9

# From https://github.com/rhysd/actionlint/blob/main/docs/usage.md#use-actionlint-on-github-actions
- name: Check workflow files
Expand All @@ -71,48 +66,40 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
node_version: [20, 22]
# node_version: [18, 20]
node_version: [24]
# include:
# # Active LTS + other OS
# - os: macos-latest
# node_version: 20
# node_version: 24
# - os: windows-latest
# node_version: 20
# node_version: 24
fail-fast: false

name: 'Build & Test: node-${{ matrix.node_version }}, ${{ matrix.os }}'
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v7
with:
# Assume PRs are less than 50 commits
fetch-depth: 50

- name: Get changed files
id: changed-files
uses: tj-actions/changed-files@20576b4b9ed46d41e2d45a2256e5e2316dde6834 # v43.0.1
uses: tj-actions/changed-files@9426d40962ed5378910ee2e21d5f8c6fcbf2dd96 # v47.0.6
with:
files: |
docs/**
.github/**
!.github/workflows/ci.yml
**.md

- name: Install pnpm
if: steps.changed-files.outputs.only_changed != 'true'
uses: pnpm/action-setup@v3

- name: Set node version to ${{ matrix.node_version }}
- name: Setup pnpm and Node.js ${{ matrix.node_version }}
if: steps.changed-files.outputs.only_changed != 'true'
uses: actions/setup-node@v4
uses: pnpm/setup@v3
with:
node-version: ${{ matrix.node_version }}
cache: 'pnpm'

- name: Install deps
if: steps.changed-files.outputs.only_changed != 'true'
run: pnpm install
runtime: node@${{ matrix.node_version }}
cache: true
require-lockfile: true

- name: Build
if: steps.changed-files.outputs.only_changed != 'true'
Expand Down
28 changes: 11 additions & 17 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,30 +20,24 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v7

- name: Install pnpm
uses: pnpm/action-setup@v3

- name: Use Node.js 20
uses: actions/setup-node@v4
- name: Setup pnpm and Node.js
uses: pnpm/setup@v3
with:
node-version: 20
cache: 'pnpm'

- name: Install deps
run: pnpm install
runtime: node@24
cache: true
require-lockfile: true

- name: Build
run: pnpm run build

- name: Create Release Pull Request or Publish to npm
uses: changesets/action@v1
uses: changesets/action@v2.1.2
with:
version: pnpm run update:version
publish: pnpm run publish
commit: "chore(release): version update"
title: "chore(release): version update"
version-script: pnpm run update:version
publish-script: pnpm run publish
commit-message: "chore(release): version update"
pr-title: "chore(release): version update"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
13 changes: 1 addition & 12 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -1,12 +1 @@
auto-install-peers=true
public-hoist-pattern[]=*eslint*
public-hoist-pattern[]=*prettier*
public-hoist-pattern[]=*stylelint*
public-hoist-pattern[]=*markdownlint*
public-hoist-pattern[]=*commitlint*
public-hoist-pattern[]=*playwright*
public-hoist-pattern[]=czg
public-hoist-pattern[]=lint-staged
public-hoist-pattern[]=sass
public-hoist-pattern[]=postcss*
public-hoist-pattern[]=@master/*
# pnpm settings live in pnpm-workspace.yaml (pnpm 12+).
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v22.12.0
24.22.1
4 changes: 2 additions & 2 deletions apps/website/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Nuxt 3 Minimal Starter
# Nuxt 4 Minimal Starter

Look at the [Nuxt 3 documentation](https://nuxt.com/docs/getting-started/introduction) to learn more.
Look at the [Nuxt 4 documentation](https://nuxt.com/docs/getting-started/introduction) to learn more.

## Setup

Expand Down
6 changes: 2 additions & 4 deletions apps/website/app/app.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,9 @@ useHead({
},
script: [
{
'src': 'https://plausible.alanlu.dev/js/script.file-downloads.hash.outbound-links.pageview-props.tagged-events.js',
'data-domain': 'alanlu.dev',
'defer': true,
src: 'https://rybbit.alanlu.dev/api/script.js?siteId=1',
defer: true,
},
{ children: 'window.plausible = window.plausible || function() { (window.plausible.q = window.plausible.q || []).push(arguments) }' },
],
})

Expand Down
3 changes: 0 additions & 3 deletions apps/website/nuxt.config.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
// https://nuxt.com/docs/api/configuration/nuxt-config
export default defineNuxtConfig({
devtools: { enabled: true },
future: {
compatibilityVersion: 4,
},
// https://nuxt.com/docs/api/configuration/nuxt-config#modules
modules: [
/* --- ui --- */
Expand Down
6 changes: 3 additions & 3 deletions apps/website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@
"docker:nginx:run": "docker run -d -p 80:80 fast-nginx"
},
"dependencies": {
"vue": "^3.5.18"
"vue": "^3.5.44"
},
"devDependencies": {
"@alanlu-dev/mastercss-config": "^1.0.14",
"@alanlu-dev/mastercss-helpers": "^1.0.14",
"@alanlu-dev/types": "^1.0.12",
"@master/css.nuxt": "2.0.0-rc.47",
"@master/css.vue": "2.0.0-rc.47",
"nuxt": "^3.15.4",
"vue-tsc": "^2.2.0"
"nuxt": "^4.6.3",
"vue-tsc": "^3.3.13"
}
}
36 changes: 18 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@alanlu-dev/alanlu-dev",
"type": "module",
"private": true,
"packageManager": "pnpm@9.15.2",
"packageManager": "pnpm@12.15.0",
"description": "alanlu-dev website.",
"author": "Alan Lu <hi@alanlu.me> (https://github.com/alanlu-tw)",
"license": "MIT",
Expand All @@ -14,8 +14,8 @@
"url": "https://github.com/alanlu-dev/alanlu-dev/issues"
},
"engines": {
"node": ">=20",
"pnpm": ">=9.15.2",
"node": ">=24",
"pnpm": ">=12.15.0",
"npm": "use pnpm please!",
"yarn": "use pnpm please!"
},
Expand Down Expand Up @@ -64,21 +64,21 @@
"@alanlu-dev/stylelint-config": "^1.0.15",
"@alanlu-dev/tsconfig": "^1.0.12",
"@alanlu-dev/types": "^1.0.12",
"@changesets/changelog-github": "^0.5.0",
"@changesets/cli": "^2.27.11",
"@types/node": "^22.10.2",
"@vitest/coverage-v8": "^2.1.8",
"cspell": "^8.17.1",
"dotenv": "^16.4.7",
"happy-dom": "^16.2.8",
"@changesets/changelog-github": "^1.0.1",
"@changesets/cli": "^3.0.3",
"@types/node": "^26.6.5",
"@vitest/coverage-v8": "^5.0.5",
"cspell": "^10.4.0",
"dotenv": "^18.0.9",
"happy-dom": "^21.0.4",
"husky": "^9.1.7",
"prettier": "^3.4.2",
"tsup": "^8.3.5",
"tsx": "^4.19.2",
"turbo": "^2.3.3",
"typescript": "^5.7.2",
"unbuild": "3.2.0",
"vite": "^6.0.6",
"vitest": "^2.1.8"
"prettier": "^3.9.10",
"tsup": "^9.0.0",
"tsx": "^4.23.15",
"turbo": "^2.11.10",
"typescript": "6.0.3",
"unbuild": "^3.6.1",
"vite": "^8.3.5",
"vitest": "^5.0.5"
}
}
Loading
Loading