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
5 changes: 5 additions & 0 deletions .changeset/spicy-moles-stop.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@marko/run": patch
---

Use Marko API of top layout for route entry files
23 changes: 13 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Use node
uses: actions/setup-node@v4
uses: actions/setup-node@v6
with:
node-version: 22
node-version: 24
cache: npm
- name: Install dependencies
run: npm ci
Expand All @@ -34,12 +34,12 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest]
node: [20, 22]
node: [20, 22, 24]
steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Use node@${{ matrix.node }}
uses: actions/setup-node@v4
uses: actions/setup-node@v6
with:
node-version: ${{ matrix.node }}
cache: npm
Expand All @@ -57,13 +57,17 @@ jobs:
runs-on: ubuntu-latest
needs: [build, test]
if: ${{ github.repository_owner == 'marko-js' && github.event_name == 'push' }}
permissions:
id-token: write
contents: write
pull-requests: write
steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Setup node
uses: actions/setup-node@v4
uses: actions/setup-node@v6
with:
node-version: 22
node-version: 24
cache: npm
- name: Install dependencies
run: npm ci
Expand All @@ -77,4 +81,3 @@ jobs:
title: "[ci] release"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
15 changes: 7 additions & 8 deletions examples/netlify/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,17 @@
"preview": "marko-run preview"
},
"dependencies": {
"marko": "^5.37.4"
"marko": "^5.38.2"
},
"devDependencies": {
"@marko/compiler": "^5.39.4",
"@marko/run": "^0.9.3",
"@marko/run-adapter-netlify": "^3.0.2",
"@types/compression": "^1.7.5",
"@types/express": "^5.0.0",
"@types/compression": "^1.8.1",
"@types/express": "^5.0.6",
"@types/mocha": "^10.0.10",
"@types/node": "^22.9.1",
"prettier": "^3.3.3",
"typescript": "^5.7.2",
"vite": "^6.0.0"
"@types/node": "^25.0.1",
"prettier": "^3.7.4",
"typescript": "^5.9.3",
"vite": "^7.2.7"
}
}
15 changes: 7 additions & 8 deletions examples/node-express/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,17 @@
"preview": "marko-run preview src/index.ts"
},
"dependencies": {
"compression": "^1.7.5",
"compression": "^1.8.1",
"express": "^4.21.1",
"marko": "^5.37.3"
"marko": "^5.38.2"
},
"devDependencies": {
"@marko/compiler": "^5.39.3",
"@marko/run": "^0.9.3",
"@marko/run-adapter-node": "^2.0.4",
"@types/node": "^22.9.1",
"prettier": "^3.3.3",
"tsx": "^4.19.2",
"typescript": "^5.7.2",
"vite": "^6.0.0"
"@types/node": "^25.0.1",
"prettier": "^3.7.4",
"tsx": "^4.21.0",
"typescript": "^5.9.3",
"vite": "^7.2.7"
}
}
13 changes: 6 additions & 7 deletions examples/static/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,16 @@
"preview": "marko-run preview"
},
"dependencies": {
"marko": "^5.37.4"
"marko": "^5.38.2"
},
"devDependencies": {
"@marko/compiler": "^5.39.4",
"@marko/run": "^0.9.3",
"@marko/run-adapter-static": "^2.0.4",
"@types/mocha": "^10.0.10",
"@types/node": "^22.9.1",
"prettier": "^3.3.3",
"tsx": "^4.19.2",
"typescript": "^5.7.2",
"vite": "^6.0.0"
"@types/node": "^25.0.1",
"prettier": "^3.7.4",
"tsx": "^4.21.0",
"typescript": "^5.9.3",
"vite": "^7.2.7"
}
}
2 changes: 1 addition & 1 deletion examples/zero-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
"preview": "marko-run preview"
},
"dependencies": {
"marko": "^5.37.4"
"marko": "^5.38.2"
}
}
Loading