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/nine-days-prove.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@storybook/marko-vite": major
---

Upgrade to latest @marko/vite to support vite 8 natively.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Use node
uses: actions/setup-node@v4
with:
node-version: 20
node-version: 24
cache: npm
- name: Install dependencies
run: npm ci
Expand All @@ -43,7 +43,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [20]
node: [24]
steps:
- name: Checkout code
uses: actions/checkout@v4
Expand All @@ -70,7 +70,7 @@ jobs:
- name: Setup node
uses: actions/setup-node@v4
with:
node-version: 20
node-version: 24
cache: npm
- name: Install dependencies
run: npm ci
Expand Down
4,023 changes: 2,378 additions & 1,645 deletions package-lock.json

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
"version": "changeset version && npm i --package-lock-only"
},
"devDependencies": {
"@babel/plugin-transform-modules-commonjs": "^7.27.1",
"@babel/plugin-transform-modules-commonjs": "^7.28.6",
"@babel/preset-typescript": "^7.28.5",
"@babel/register": "^7.28.3",
"@changesets/changelog-github": "^0.5.1",
"@changesets/cli": "^2.29.7",
"@marko/compiler": "^5.39.41",
"@babel/register": "^7.28.6",
"@changesets/changelog-github": "^0.6.0",
"@changesets/cli": "^2.30.0",
"@marko/compiler": "^5.39.62",
"@marko/testing-library": "^6.4.1",
"@marko/type-check": "^2.1.10",
"@marko/type-check": "^2.1.29",
"@playwright/test": "^1.56.1",
"@testing-library/dom": "^10.4.1",
"@types/babel__register": "^7.17.3",
Expand All @@ -36,16 +36,16 @@
"@typescript-eslint/eslint-plugin": "^7.10.0",
"@typescript-eslint/parser": "^7.10.0",
"~preload": "file:scripts/preload.js",
"c8": "^10.1.3",
"esbuild": "^0.25.12",
"c8": "^11.0.0",
"esbuild": "^0.27.4",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"husky": "^9.1.7",
"jsdom": "^27.1.0",
"lint-staged": "^16.2.6",
"marko": "^5.37.61",
"prettier": "^3.6.2",
"sort-package-json": "^3.4.0",
"lint-staged": "^16.4.0",
"marko": "^5.38.33",
"prettier": "^3.8.1",
"sort-package-json": "^3.6.1",
"typescript": "^5.9.3"
}
}
4 changes: 2 additions & 2 deletions packages/frameworks/marko-vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
],
"dependencies": {
"@marko/compiler": "^5",
"@marko/vite": "^5",
"@storybook/builder-vite": "^10.0.5"
"@marko/vite": "^6",
"@storybook/builder-vite": "^10.3.0"
}
}
6 changes: 2 additions & 4 deletions packages/renderers/marko/src/testing-api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,8 @@ const defaultProjectAnnotations: Preview = {
*/
export function composeStory<
Input extends Args = Args,
Export extends StoryAnnotationsOrFn<
MarkoRenderer,
Input
> = StoryAnnotationsOrFn<MarkoRenderer, Input>,
Export extends StoryAnnotationsOrFn<MarkoRenderer, Input> =
StoryAnnotationsOrFn<MarkoRenderer, Input>,
>(
story: Export,
componentAnnotations: Meta<Input>,
Expand Down
12 changes: 6 additions & 6 deletions tests/frameworks/vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
"storybook": "storybook dev -p $PORT --no-version-updates --disable-telemetry --no-open"
},
"devDependencies": {
"@marko/compiler": "^5.39.41",
"@marko/vite": "^5.3.3",
"@storybook/addon-links": "^10.0.5",
"@marko/compiler": "^5.39.62",
"@marko/vite": "^6.0.0",
"@storybook/addon-links": "^10.3.0",
"@storybook/marko": "*",
"@storybook/marko-vite": "*",
"marko": "^5.37.61",
"storybook": "^10.0.5",
"vite": "^7.2.1"
"marko": "^5.38.33",
"storybook": "^10.3.0",
"vite": "^8.0.0"
}
}
10 changes: 5 additions & 5 deletions tests/frameworks/webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
"storybook": "storybook dev -p ${PORT:-3000} --no-version-updates --disable-telemetry --no-open"
},
"devDependencies": {
"@marko/compiler": "^5.39.41",
"@marko/compiler": "^5.39.62",
"@marko/webpack": "^10.0.1",
"@storybook/addon-webpack5-compiler-babel": "^3.0.6",
"@storybook/addon-webpack5-compiler-babel": "^4.0.0",
"@storybook/marko": "*",
"@storybook/marko-webpack": "*",
"marko": "^5.37.61",
"storybook": "^10.0.5",
"webpack": "^5.102.1"
"marko": "^5.38.33",
"storybook": "^10.3.0",
"webpack": "^5.105.4"
}
}
Loading