Skip to content

Commit 16e7dcb

Browse files
J-SekJ-Sek
committed
Merge branch 'master' into next
| Conflicts: | packages/docs/src/pages/en/getting-started/upgrade-guide.md
2 parents 4b4bfa5 + 46e3a84 commit 16e7dcb

File tree

96 files changed

+3115
-2756
lines changed

Some content is hidden

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

96 files changed

+3115
-2756
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ jobs:
136136
- run: pnpm build api
137137
- run: pnpm build docs
138138
env:
139-
NODE_OPTIONS: --max-old-space-size=6144
139+
NODE_OPTIONS: --max-old-space-size=8192
140140
VITE_COSMIC_2_BUCKET_SLUG: ${{ secrets.COSMIC_2_BUCKET_SLUG }}
141141
VITE_COSMIC_2_BUCKET_READ_KEY: ${{ secrets.COSMIC_2_BUCKET_READ_KEY }}
142142
VITE_COSMIC_BUCKET_SLUG: ${{ secrets.COSMIC_BUCKET_SLUG }}

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
FROM caddy:2.10.0-alpine
1+
FROM caddy:2.10.2-alpine
22
COPY ./packages/docs/dist /srv
33
COPY ./packages/docs/build/Caddyfile /etc/caddy/Caddyfile

‎LICENSE.md‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎LICENSE.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
packages/vuetify/LICENSE.md

‎README.md‎

Lines changed: 0 additions & 331 deletions
This file was deleted.

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
packages/vuetify/README.md

‎lerna.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
}
1414
},
1515
"npmClient": "pnpm",
16-
"version": "3.10.1"
16+
"version": "3.10.5"
1717
}

0 commit comments

Comments
 (0)