Skip to content

Commit b946cec

Browse files
committed
upgrades including astro 5
1 parent 2b4ccf4 commit b946cec

9 files changed

Lines changed: 1763 additions & 1043 deletions

File tree

astro.config.mjs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ const siteMapFilter = new Set(["admin"]);
2424
const isNetlify = process.env.NETLIFY === "false" ? false : true;
2525
const isCloudflare = process.env.CLOUDFLARE_ACCOUNT_ID ? true : false;
2626
let output = process.env.ASTRO_OUTPUT || "static";
27-
if (isNetlify || isCloudflare) {
28-
output = "hybrid"; // TODO hybrid does not work in netlify
29-
}
3027

3128
// https://astro.build/config
3229
export default defineConfig({
@@ -37,7 +34,7 @@ export default defineConfig({
3734
? cloudflare()
3835
: isNetlify
3936
? netlify()
40-
: output === "server" || output === "hybrid"
37+
: output === "server"
4138
? node({ mode: "middleware" })
4239
: undefined,
4340
compressHTML: true,

package.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -40,28 +40,28 @@
4040
"@astro.hrry.dev/obsidian": "workspace:*",
4141
"@astro.hrry.dev/robots.txt": "workspace:*",
4242
"@astro.hrry.dev/wikilink": "workspace:*",
43-
"@astrojs/check": "^0.9.3",
44-
"@astrojs/cloudflare": "^11.0.5",
45-
"@astrojs/mdx": "^2.3",
46-
"@astrojs/netlify": "^5.5.3",
47-
"@astrojs/node": "^8.3.4",
48-
"@astrojs/rss": "^4.0.7",
49-
"@astrojs/sitemap": "^3.1.6",
50-
"@astrojs/solid-js": "^4.4.2",
43+
"@astrojs/check": "^0.9.4",
44+
"@astrojs/cloudflare": "^12",
45+
"@astrojs/mdx": "^4",
46+
"@astrojs/netlify": "^6",
47+
"@astrojs/node": "^9",
48+
"@astrojs/rss": "^4.0.11",
49+
"@astrojs/sitemap": "^3.2",
50+
"@astrojs/solid-js": "^5",
5151
"@hrry.me/api": "workspace:*",
52-
"astro": "^4",
53-
"astro-purgecss": "^4.6",
54-
"github-slugger": "^2.0.0",
52+
"astro": "^5",
53+
"astro-purgecss": "^5",
54+
"github-slugger": "^2",
5555
"prism-themes-scss": "github:harrybrwn/prism-themes-scss#main",
5656
"solid-js": "^1.9"
5757
},
5858
"devDependencies": {
59-
"@modyfi/vite-plugin-yaml": "^1.1.0",
59+
"@modyfi/vite-plugin-yaml": "^1.1",
6060
"prettier": "^3.3.3",
6161
"prettier-plugin-astro": "^0.14.1",
62-
"purgecss": "^6.0.0",
62+
"purgecss": "^7",
6363
"sass": "^1.57.1",
64-
"typescript": "^5.6.2",
64+
"typescript": "^5",
6565
"walkdir": "^0.4.1"
6666
},
6767
"trustedDependencies": [

packages/astro/compress/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"astro-compress": "^2.3"
2424
},
2525
"devDependencies": {
26-
"css-tree": "^2.3.1",
26+
"css-tree": "^3.1",
2727
"typescript": "^5",
2828
"vitest": "^0.30.1"
2929
}

packages/astro/compress/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ const compress = (settings: any): AstroIntegration => {
105105
"astro:build:setup": (options) => {
106106
for (const [name, page] of options.pages.entries()) {
107107
if (page.route.type === 'page' && page.route.prerender === true) {
108-
prerendered.push(name)
108+
prerendered.push(name);
109109
}
110110
}
111111
},

packages/astro/new/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@
2424
},
2525
"dependencies": {
2626
"prompts": "^2.4.2",
27-
"github-slugger": "^2.0.0"
27+
"github-slugger": "^2"
2828
}
2929
}

packages/astro/obsidian/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"clean": "rm -rf ./dist"
1818
},
1919
"dependencies": {
20-
"astro": "^4",
20+
"astro": "^5",
2121
"remark-wiki-link": "^2.0.1"
2222
},
2323
"devDependencies": {

packages/astro/robots.txt/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"clean": "rm -rf ./dist"
1818
},
1919
"dependencies": {
20-
"astro": "^4"
20+
"astro": "^5"
2121
},
2222
"devDependencies": {
2323
"typescript": "^5"

packages/astro/wikilink/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"clean": "true"
1818
},
1919
"dependencies": {
20-
"github-slugger": "^2.0.0",
20+
"github-slugger": "^2",
2121
"remark-wiki-link-plus": "^1.1.1"
2222
}
2323
}

0 commit comments

Comments
 (0)