Skip to content

Commit 90f0fe1

Browse files
authored
chore: dep upgrades (#34)
1 parent 51740e3 commit 90f0fe1

File tree

10 files changed

+11299
-19544
lines changed

10 files changed

+11299
-19544
lines changed

.changeset/shaggy-shirts-sneeze.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@storybook/marko-vite": patch
3+
---
4+
5+
Fix issue with @marko/vite not being deduped.

.changeset/silver-baboons-change.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@storybook/marko-webpack": major
3+
---
4+
5+
Upgrade to @marko/webpack@10

.husky/pre-commit

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
1-
#!/usr/bin/env sh
2-
. "$(dirname -- "$0")/_/husky.sh"
3-
41
npm exec -- lint-staged && npm run build:types

package-lock.json

Lines changed: 11245 additions & 19495 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,34 +20,34 @@
2020
"version": "changeset version && npm i --package-lock-only"
2121
},
2222
"devDependencies": {
23-
"@babel/plugin-transform-modules-commonjs": "^7.24.1",
24-
"@babel/preset-typescript": "^7.24.1",
25-
"@babel/register": "^7.23.7",
23+
"@babel/plugin-transform-modules-commonjs": "^7.24.8",
24+
"@babel/preset-typescript": "^7.24.7",
25+
"@babel/register": "^7.24.6",
2626
"@changesets/changelog-github": "^0.5.0",
27-
"@changesets/cli": "^2.27.3",
28-
"@marko/compiler": "^5.36.2",
27+
"@changesets/cli": "^2.27.8",
28+
"@marko/compiler": "^5.37.9",
2929
"@marko/testing-library": "^6.2.0",
30-
"@marko/type-check": "^1.1.7",
31-
"@playwright/test": "^1.44.0",
32-
"@testing-library/dom": "^10.1.0",
30+
"@marko/type-check": "^1.1.8",
31+
"@playwright/test": "^1.47.0",
32+
"@testing-library/dom": "^10.4.0",
3333
"@types/babel__register": "^7.17.3",
34-
"@types/node": "^20.12.12",
34+
"@types/node": "^22.5.4",
3535
"@types/resolve": "^1.20.6",
3636
"@typescript-eslint/eslint-plugin": "^7.10.0",
3737
"@typescript-eslint/parser": "^7.10.0",
38-
"c8": "^9.1.0",
39-
"esbuild": "^0.21.3",
38+
"c8": "^10.1.2",
39+
"esbuild": "^0.23.1",
4040
"eslint": "^8.57.0",
4141
"eslint-config-prettier": "^9.1.0",
4242
"eslint-import-resolver-typescript": "^3.6.1",
4343
"eslint-plugin-import": "^2.29.1",
44-
"husky": "^9.0.11",
45-
"jsdom": "^24.0.0",
46-
"lint-staged": "^15.2.2",
47-
"marko": "^5.34.5",
48-
"prettier": "^3.2.5",
49-
"sort-package-json": "^2.10.0",
50-
"typescript": "^5.4.5",
44+
"husky": "^9.1.5",
45+
"jsdom": "^25.0.0",
46+
"lint-staged": "^15.2.10",
47+
"marko": "^5.35.14",
48+
"prettier": "^3.3.3",
49+
"sort-package-json": "^2.10.1",
50+
"typescript": "^5.6.2",
5151
"~preload": "file:scripts/preload.js"
5252
}
5353
}

packages/frameworks/marko-vite/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
"dependencies": {
4040
"@marko/compiler": "^5",
4141
"@marko/vite": "^4",
42-
"@storybook/builder-vite": "^8.1.2",
43-
"@storybook/core-common": "^8.1.2",
42+
"@storybook/builder-vite": "^8.2.9",
43+
"@storybook/core-common": "^8.2.9",
4444
"@storybook/global": "^5.0.0",
45-
"@storybook/types": "^8.1.2"
45+
"@storybook/types": "^8.2.9"
4646
}
4747
}

packages/frameworks/marko-vite/src/preset.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export const viteFinal: StorybookConfig["viteFinal"] = async (baseConfig) => {
3131
},
3232
plugins:
3333
// Ensure @marko/vite included unless already added.
34-
(await hasVitePlugins(baseConfig.plugins || [], ["@marko/vite"]))
34+
(await hasVitePlugins(baseConfig.plugins || [], ["marko-vite:pre"]))
3535
? []
3636
: [(await import("@marko/vite")).default({ linked: false })],
3737
});

packages/frameworks/marko-webpack/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@
3838
],
3939
"dependencies": {
4040
"@marko/compiler": "^5",
41-
"@marko/webpack": "^9",
42-
"@storybook/builder-webpack5": "^8.1.2",
43-
"@storybook/core-common": "^8.1.2",
41+
"@marko/webpack": "^10",
42+
"@storybook/builder-webpack5": "^8.2.9",
43+
"@storybook/core-common": "^8.2.9",
4444
"@storybook/global": "^5.0.0",
45-
"@storybook/types": "^8.1.2"
45+
"@storybook/types": "^8.2.9"
4646
}
4747
}

tests/frameworks/vite/package.json

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,16 @@
55
"storybook": "storybook dev -p $PORT --no-version-updates --disable-telemetry --no-open"
66
},
77
"devDependencies": {
8-
"@marko/compiler": "^5.35.7",
9-
"@marko/vite": "^4.1.3",
10-
"@storybook/addon-essentials": "^8.0.0",
11-
"@storybook/addon-interactions": "^8.0.0",
12-
"@storybook/addon-links": "^8.0.0",
13-
"@storybook/blocks": "^8.0.0",
8+
"@marko/compiler": "^5.37.9",
9+
"@marko/vite": "^4.1.19",
10+
"@storybook/addon-essentials": "^8.2.9",
11+
"@storybook/addon-interactions": "^8.2.9",
12+
"@storybook/addon-links": "^8.2.9",
13+
"@storybook/blocks": "^8.2.9",
1414
"@storybook/marko": "*",
1515
"@storybook/marko-vite": "*",
16-
"@storybook/testing-library": "^0.2.2",
17-
"marko": "^5.33.8",
18-
"storybook": "^8.0.0",
19-
"vite": "^5.1.6"
16+
"marko": "^5.35.14",
17+
"storybook": "^8.2.9",
18+
"vite": "^5.4.3"
2019
}
2120
}

tests/frameworks/webpack/package.json

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,17 @@
55
"storybook": "storybook dev -p ${PORT:-3000} --no-version-updates --disable-telemetry --no-open"
66
},
77
"devDependencies": {
8-
"@marko/compiler": "^5.35.7",
9-
"@marko/webpack": "^9.3.7",
10-
"@storybook/addon-essentials": "^8.0.0",
11-
"@storybook/addon-interactions": "^8.0.0",
12-
"@storybook/addon-links": "^8.0.0",
8+
"@marko/compiler": "^5.37.9",
9+
"@marko/webpack": "^10.0.0",
10+
"@storybook/addon-essentials": "^8.2.9",
11+
"@storybook/addon-interactions": "^8.2.9",
12+
"@storybook/addon-links": "^8.2.9",
1313
"@storybook/addon-webpack5-compiler-babel": "^3.0.3",
14-
"@storybook/blocks": "^8.0.0",
14+
"@storybook/blocks": "^8.2.9",
1515
"@storybook/marko": "*",
1616
"@storybook/marko-webpack": "*",
17-
"@storybook/testing-library": "^0.2.2",
18-
"marko": "^5.33.8",
19-
"storybook": "^8.0.0",
20-
"webpack": "^5.90.3"
17+
"marko": "^5.35.14",
18+
"storybook": "^8.2.9",
19+
"webpack": "^5.94.0"
2120
}
2221
}

0 commit comments

Comments
 (0)