Skip to content

Commit 2ef5522

Browse files
committed
chore: merge main and resolve vercel.json conflict
2 parents 91a16ee + 3ec42e0 commit 2ef5522

File tree

354 files changed

+27436
-5245
lines changed

Some content is hidden

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

354 files changed

+27436
-5245
lines changed

.env.example

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#secure password, can use openssl rand -hex 32
2+
NUXT_SESSION_PASSWORD=""

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* text eol=lf
1+
* text=auto eol=lf

.github/workflows/autofix.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,25 @@ jobs:
1818

1919
steps:
2020
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
21-
- run: corepack enable
21+
2222
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
2323
with:
2424
node-version: lts/*
25-
cache: 'pnpm'
25+
26+
- uses: pnpm/action-setup@1e1c8eafbd745f64b1ef30a7d7ed7965034c486c
27+
name: Install pnpm
28+
with:
29+
cache: true
2630

2731
- name: 📦 Install dependencies
2832
run: pnpm install
2933

3034
- name: 📦 Install browsers
3135
run: pnpm playwright install
3236

37+
- name: 🌐 Compare translations
38+
run: pnpm i18n:check
39+
3340
- name: 🌍 Update lunaria data
3441
run: pnpm build:lunaria
3542

.github/workflows/ci.yml

Lines changed: 36 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ on:
1111
branches:
1212
- main
1313

14+
# cancel in-progress runs on new commits to same PR (gitub.event.number)
15+
concurrency:
16+
group: ${{ github.workflow }}-${{ github.event.number || github.sha }}
17+
cancel-in-progress: true
18+
1419
permissions:
1520
contents: read
1621

@@ -20,11 +25,15 @@ jobs:
2025

2126
steps:
2227
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
23-
- run: corepack enable
28+
2429
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
2530
with:
2631
node-version: lts/*
27-
cache: pnpm
32+
33+
- uses: pnpm/action-setup@1e1c8eafbd745f64b1ef30a7d7ed7965034c486c
34+
name: Install pnpm
35+
with:
36+
cache: true
2837

2938
- name: 📦 Install dependencies
3039
run: pnpm install
@@ -37,11 +46,15 @@ jobs:
3746

3847
steps:
3948
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
40-
- run: corepack enable
49+
4150
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
4251
with:
4352
node-version: lts/*
44-
cache: pnpm
53+
54+
- uses: pnpm/action-setup@1e1c8eafbd745f64b1ef30a7d7ed7965034c486c
55+
name: Install pnpm
56+
with:
57+
cache: true
4558

4659
- name: 📦 Install dependencies
4760
run: pnpm install
@@ -65,11 +78,15 @@ jobs:
6578

6679
steps:
6780
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
68-
- run: corepack enable
81+
6982
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
7083
with:
7184
node-version: lts/*
72-
cache: pnpm
85+
86+
- uses: pnpm/action-setup@1e1c8eafbd745f64b1ef30a7d7ed7965034c486c
87+
name: Install pnpm
88+
with:
89+
cache: true
7390

7491
- name: 📦 Install dependencies
7592
run: pnpm install
@@ -82,11 +99,15 @@ jobs:
8299

83100
steps:
84101
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
85-
- run: corepack enable
102+
86103
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
87104
with:
88105
node-version: lts/*
89-
cache: pnpm
106+
107+
- uses: pnpm/action-setup@1e1c8eafbd745f64b1ef30a7d7ed7965034c486c
108+
name: Install pnpm
109+
with:
110+
cache: true
90111

91112
- name: 📦 Install dependencies
92113
run: pnpm install
@@ -104,14 +125,18 @@ jobs:
104125

105126
steps:
106127
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
107-
- run: corepack enable
128+
108129
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
109130
with:
110131
node-version: lts/*
111-
cache: pnpm
132+
133+
- uses: pnpm/action-setup@1e1c8eafbd745f64b1ef30a7d7ed7965034c486c
134+
name: Install pnpm
135+
with:
136+
cache: true
112137

113138
- name: 📦 Install dependencies
114139
run: pnpm install
115140

116141
- name: 🔍 Check for unused code
117-
run: pnpm knip:production
142+
run: pnpm knip

.github/workflows/lunaria.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,14 @@ jobs:
2828
# Makes the action clone the entire git history
2929
fetch-depth: 0
3030

31-
- run: corepack enable
3231
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
3332
with:
3433
node-version: lts/*
35-
cache: pnpm
34+
35+
- uses: pnpm/action-setup@1e1c8eafbd745f64b1ef30a7d7ed7965034c486c
36+
name: Install pnpm
37+
with:
38+
cache: true
3639

3740
- name: 📦 Install dependencies
3841
run: pnpm install

.github/workflows/provenance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: ci
1+
name: provenance
22

33
on:
44
push:

.lighthouserc.cjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ module.exports = {
2929
url: [
3030
'http://localhost:3000/',
3131
'http://localhost:3000/search?q=nuxt',
32-
'http://localhost:3000/nuxt',
32+
'http://localhost:3000/package/nuxt',
3333
],
3434
numberOfRuns: 1,
3535
chromePath: findChrome(),

.oxfmtrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "./node_modules/oxfmt/configuration_schema.json",
2+
"$schema": "https://unpkg.com/oxfmt/configuration_schema.json",
33
"semi": false,
44
"singleQuote": true,
55
"arrowParens": "avoid",

.oxlintrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "./node_modules/oxlint/configuration_schema.json",
2+
"$schema": "https://unpkg.com/oxlint/configuration_schema.json",
33
"plugins": ["unicorn", "typescript", "oxc", "vue", "vitest"],
44
"categories": {
55
"correctness": "error",

.vscode/extensions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"recommendations": ["oxc.oxc-vscode", "Vue.volar", "lokalise.i18n-ally"]
2+
"recommendations": ["oxc.oxc-vscode", "Vue.volar", "lokalise.i18n-ally", "antfu.unocss"]
33
}

0 commit comments

Comments
 (0)