Skip to content

Update dependencies and TypeScript version in templates #1585

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Adammatthiesen wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Update dependencies and TypeScript version in templates #1585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b89b308
refactor: migrate from 'virtual:studiocms/site' to 'astro:config/clie…
Adammatthiesen Jul 13, 2026
f00275d
chore: bump to Astro 6.1.0 and migrate back to astro:config virtual m…
Adammatthiesen Jul 13, 2026
5f07e1b
chore: update dependencies and TypeScript version across templates
Adammatthiesen Jul 13, 2026
e6a263a
chore: add @types/node as a devDependency and update tsconfig files
Adammatthiesen Jul 13, 2026
70c23d0
fix: update import assertion syntax and clean up configuration files
Adammatthiesen Jul 13, 2026
2cb25fd
fix: update i18n virtual module dynamic import for TypeScript 6 support
Adammatthiesen Jul 13, 2026
48e37b7
Merge branch 'main' into typescript-6
Adammatthiesen Jul 13, 2026
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
5 changes: 5 additions & 0 deletions .changeset/bumpy-yaks-mix.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"studiocms": patch
---

Update i18n virtual module dynamic import for TS6 support
3 changes: 2 additions & 1 deletion .github/renovate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
"@astrojs/rss",
"@astrojs/internal-helpers",
"@astrojs/markdown-remark",
"kysely"
"kysely",
"typescript"
]
}
1 change: 1 addition & 0 deletions packages/@studiocms/markdown-remark/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@
"@types/js-yaml": "^4.0.9",
"@types/mdast": "^4.0.4",
"@types/unist": "^3.0.3",
"astro": "catalog:astrojs-current",
"mdast-util-mdx-expression": "^2.0.1"
},
"peerDependencies": {
Expand Down
3 changes: 3 additions & 0 deletions packages/@withstudiocms/cli-kit/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@
"default": "./dist/*.js"
}
},
"devDependencies": {
"@types/node": "catalog:"
},
"dependencies": {
"strip-ansi": "^7.2.0",
"wrap-ansi": "^10.0.0",
Expand Down
3 changes: 2 additions & 1 deletion packages/@withstudiocms/config-utils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@
"tsdown": "catalog:"
},
"devDependencies": {
"@types/node": "catalog:"
"@types/node": "catalog:",
"astro": "catalog:astrojs-current"
},
"peerDependencies": {
"astro": "catalog:astrojs-min",
Expand Down
2 changes: 1 addition & 1 deletion packages/studiocms/src/virtuals/i18n/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export const defaultLang: UiTranslationKey = config.defaultLocale;
*/
export const baseServerTranslations = (
await import('./translations/en.json', {
assert: { type: 'json' },
with: { type: 'json' },
})
).default;

Expand Down
1 change: 0 additions & 1 deletion packages/studiocms/tsconfig.build.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"exclude": ["dist"],
"compilerOptions": {
"outDir": "./dist",
"baseUrl": ".",
"emitDeclarationOnly": true,
"resolveJsonModule": true,
"rootDir": "./src",
Expand Down
1 change: 0 additions & 1 deletion packages/studiocms/tsconfig.tspc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"exclude": ["dist"],
"compilerOptions": {
"outDir": "./dist",
"baseUrl": ".",
"rootDir": "."
}
}
4 changes: 0 additions & 4 deletions playground/astro.config.mts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import node from '@astrojs/node';
import { defineConfig } from 'astro/config';
import studioCMS from 'studiocms';
import Inspect from 'vite-plugin-inspect';

const site =
process.env.NODE_ENV === 'production'
Expand All @@ -25,9 +24,6 @@ export default defineConfig({
],
},
integrations: [studioCMS()],
vite: {
plugins: [Inspect()],
},
// Used for devcontainer/docker development
server: {
port: 4321,
Expand Down
3 changes: 1 addition & 2 deletions playground/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
"astro": "catalog:astrojs-current",
"kysely-turso": "catalog:kysely",
"studiocms": "workspace:*",
"sharp": "catalog:",
"vite-plugin-inspect": "11.3.3"
"sharp": "catalog:"
}
}
1,817 changes: 478 additions & 1,339 deletions pnpm-lock.yaml
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions pnpm-workspace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ onlyBuiltDependencies:

# General dependency catalog for monorepo packages
catalog:
"@codecov/astro-plugin": ^1.9.1
"@types/mdast": ^4.0.4
"@types/node": ^22.0.0
"@types/semver": ^7.7.1
Expand All @@ -44,7 +43,7 @@ catalog:
esbuild: ^0.25.8
sharp: ^0.34.3
tinyglobby: ^0.2.17
typescript: ^5.9.3
typescript: ^6.0.3
diff: ^8.0.4
dotenv: ^17.4.2
semver: ^7.8.5
Expand All @@ -58,7 +57,6 @@ catalogs:
"@astrojs/rss": ^4.0.17
astro: ^6.1.0
vite: ^7.3.1
zod: ^4.3.6

astrojs-min:
"@astrojs/internal-helpers": ^0.7.5 || ^0.8.0
Expand Down
6 changes: 3 additions & 3 deletions templates/blog-libsql/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@
},
"devDependencies": {
"@types/node": "^22.13.5",
"typescript": "^5.9.3"
"typescript": "^6.0.3"
},
"dependencies": {
"@astrojs/node": "^9.5.4",
"@astrojs/node": "^10.0.0",
"@effect/platform": "^0.96.2",
"@effect/platform-node": "^0.107.0",
"@libsql/client": "^0.15.15",
"@studiocms/blog": "^0.3.0",
"@studiocms/md": "^0.3.0",
"astro": "^5.18.0",
"astro": "^6.1.0",
"effect": "^3.21.4",
"kysely-turso": "^0.1.1",
"sharp": "^0.34.3",
Expand Down
6 changes: 3 additions & 3 deletions templates/blog-mysql/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
},
"devDependencies": {
"@types/node": "^22.13.5",
"typescript": "^5.9.3"
"typescript": "^6.0.3"
},
"dependencies": {
"@astrojs/node": "^9.5.4",
"@astrojs/node": "^10.0.0",
"@effect/platform": "^0.96.2",
"@effect/platform-node": "^0.107.0",
"@studiocms/blog": "^0.3.0",
"@studiocms/md": "^0.3.0",
"astro": "^5.18.0",
"astro": "^6.1.0",
"effect": "^3.21.4",
"mysql2": "^3.22.6",
"sharp": "^0.34.3",
Expand Down
6 changes: 3 additions & 3 deletions templates/blog-postgres/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
},
"devDependencies": {
"@types/node": "^22.13.5",
"typescript": "^5.9.3"
"typescript": "^6.0.3"
},
"dependencies": {
"@astrojs/node": "^9.5.4",
"@astrojs/node": "^10.0.0",
"@effect/platform": "^0.96.2",
"@effect/platform-node": "^0.107.0",
"@studiocms/blog": "^0.3.0",
"@studiocms/md": "^0.3.0",
"astro": "^5.18.0",
"astro": "^6.1.0",
"effect": "^3.21.4",
"pg": "^8.22.0",
"sharp": "^0.34.3",
Expand Down
6 changes: 3 additions & 3 deletions templates/headless-libsql/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@
},
"devDependencies": {
"@types/node": "^22.13.5",
"typescript": "^5.9.3"
"typescript": "^6.0.3"
},
"dependencies": {
"@astrojs/node": "^9.5.4",
"@astrojs/node": "^10.0.0",
"@effect/platform": "^0.96.2",
"@effect/platform-node": "^0.107.0",
"@libsql/client": "^0.15.15",
"@studiocms/github": "^0.3.0",
"@studiocms/md": "^0.3.0",
"@studiocms/html": "^0.3.0",
"astro": "^5.18.0",
"astro": "^6.1.0",
"effect": "^3.21.4",
"kysely-turso": "^0.1.1",
"sharp": "^0.34.3",
Expand Down
6 changes: 3 additions & 3 deletions templates/headless-mysql/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@
},
"devDependencies": {
"@types/node": "^22.13.5",
"typescript": "^5.9.3"
"typescript": "^6.0.3"
},
"dependencies": {
"@astrojs/node": "^9.5.4",
"@astrojs/node": "^10.0.0",
"@effect/platform": "^0.96.2",
"@effect/platform-node": "^0.107.0",
"@studiocms/github": "^0.3.0",
"@studiocms/md": "^0.3.0",
"@studiocms/html": "^0.3.0",
"astro": "^5.18.0",
"astro": "^6.1.0",
"effect": "^3.21.4",
"mysql2": "^3.22.6",
"sharp": "^0.34.3",
Expand Down
6 changes: 3 additions & 3 deletions templates/headless-postgres/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@
},
"devDependencies": {
"@types/node": "^22.13.5",
"typescript": "^5.9.3"
"typescript": "^6.0.3"
},
"dependencies": {
"@astrojs/node": "^9.5.4",
"@astrojs/node": "^10.0.0",
"@effect/platform": "^0.96.2",
"@effect/platform-node": "^0.107.0",
"@studiocms/github": "^0.3.0",
"@studiocms/md": "^0.3.0",
"@studiocms/html": "^0.3.0",
"astro": "^5.18.0",
"astro": "^6.1.0",
"effect": "^3.21.4",
"pg": "^8.22.0",
"sharp": "^0.34.3",
Expand Down
1 change: 1 addition & 0 deletions tsconfig.base.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"pretty": true,
"noErrorTruncation": true,
"allowImportingTsExtensions": true,
"types": ["node"],
"plugins": [
{
"name": "@effect/language-service"
Expand Down
5 changes: 4 additions & 1 deletion tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
{
"extends": "./tsconfig.base.json"
"extends": "./tsconfig.base.json",
"compilerOptions": {
"rootDir": "."
}
}
10 changes: 0 additions & 10 deletions zizmor.yml
View file
Open in desktop

This file was deleted.

Loading