Skip to content

Commit

Permalink
chore: dep upgrades (#34)
Browse files Browse the repository at this point in the history
  • Loading branch information
DylanPiercey committed Sep 10, 2024
1 parent 51740e3 commit 90f0fe1
Show file tree
Hide file tree
Showing 10 changed files with 11,299 additions and 19,544 deletions.
5 changes: 5 additions & 0 deletions .changeset/shaggy-shirts-sneeze.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@storybook/marko-vite": patch
---

Fix issue with @marko/vite not being deduped.
5 changes: 5 additions & 0 deletions .changeset/silver-baboons-change.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@storybook/marko-webpack": major
---

Upgrade to @marko/webpack@10
3 changes: 0 additions & 3 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

npm exec -- lint-staged && npm run build:types
30,740 changes: 11,245 additions & 19,495 deletions package-lock.json

Large diffs are not rendered by default.

36 changes: 18 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,34 +20,34 @@
"version": "changeset version && npm i --package-lock-only"
},
"devDependencies": {
"@babel/plugin-transform-modules-commonjs": "^7.24.1",
"@babel/preset-typescript": "^7.24.1",
"@babel/register": "^7.23.7",
"@babel/plugin-transform-modules-commonjs": "^7.24.8",
"@babel/preset-typescript": "^7.24.7",
"@babel/register": "^7.24.6",
"@changesets/changelog-github": "^0.5.0",
"@changesets/cli": "^2.27.3",
"@marko/compiler": "^5.36.2",
"@changesets/cli": "^2.27.8",
"@marko/compiler": "^5.37.9",
"@marko/testing-library": "^6.2.0",
"@marko/type-check": "^1.1.7",
"@playwright/test": "^1.44.0",
"@testing-library/dom": "^10.1.0",
"@marko/type-check": "^1.1.8",
"@playwright/test": "^1.47.0",
"@testing-library/dom": "^10.4.0",
"@types/babel__register": "^7.17.3",
"@types/node": "^20.12.12",
"@types/node": "^22.5.4",
"@types/resolve": "^1.20.6",
"@typescript-eslint/eslint-plugin": "^7.10.0",
"@typescript-eslint/parser": "^7.10.0",
"c8": "^9.1.0",
"esbuild": "^0.21.3",
"c8": "^10.1.2",
"esbuild": "^0.23.1",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-import": "^2.29.1",
"husky": "^9.0.11",
"jsdom": "^24.0.0",
"lint-staged": "^15.2.2",
"marko": "^5.34.5",
"prettier": "^3.2.5",
"sort-package-json": "^2.10.0",
"typescript": "^5.4.5",
"husky": "^9.1.5",
"jsdom": "^25.0.0",
"lint-staged": "^15.2.10",
"marko": "^5.35.14",
"prettier": "^3.3.3",
"sort-package-json": "^2.10.1",
"typescript": "^5.6.2",
"~preload": "file:scripts/preload.js"
}
}
6 changes: 3 additions & 3 deletions packages/frameworks/marko-vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
"dependencies": {
"@marko/compiler": "^5",
"@marko/vite": "^4",
"@storybook/builder-vite": "^8.1.2",
"@storybook/core-common": "^8.1.2",
"@storybook/builder-vite": "^8.2.9",
"@storybook/core-common": "^8.2.9",
"@storybook/global": "^5.0.0",
"@storybook/types": "^8.1.2"
"@storybook/types": "^8.2.9"
}
}
2 changes: 1 addition & 1 deletion packages/frameworks/marko-vite/src/preset.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export const viteFinal: StorybookConfig["viteFinal"] = async (baseConfig) => {
},
plugins:
// Ensure @marko/vite included unless already added.
(await hasVitePlugins(baseConfig.plugins || [], ["@marko/vite"]))
(await hasVitePlugins(baseConfig.plugins || [], ["marko-vite:pre"]))
? []
: [(await import("@marko/vite")).default({ linked: false })],
});
Expand Down
8 changes: 4 additions & 4 deletions packages/frameworks/marko-webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@
],
"dependencies": {
"@marko/compiler": "^5",
"@marko/webpack": "^9",
"@storybook/builder-webpack5": "^8.1.2",
"@storybook/core-common": "^8.1.2",
"@marko/webpack": "^10",
"@storybook/builder-webpack5": "^8.2.9",
"@storybook/core-common": "^8.2.9",
"@storybook/global": "^5.0.0",
"@storybook/types": "^8.1.2"
"@storybook/types": "^8.2.9"
}
}
19 changes: 9 additions & 10 deletions tests/frameworks/vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,16 @@
"storybook": "storybook dev -p $PORT --no-version-updates --disable-telemetry --no-open"
},
"devDependencies": {
"@marko/compiler": "^5.35.7",
"@marko/vite": "^4.1.3",
"@storybook/addon-essentials": "^8.0.0",
"@storybook/addon-interactions": "^8.0.0",
"@storybook/addon-links": "^8.0.0",
"@storybook/blocks": "^8.0.0",
"@marko/compiler": "^5.37.9",
"@marko/vite": "^4.1.19",
"@storybook/addon-essentials": "^8.2.9",
"@storybook/addon-interactions": "^8.2.9",
"@storybook/addon-links": "^8.2.9",
"@storybook/blocks": "^8.2.9",
"@storybook/marko": "*",
"@storybook/marko-vite": "*",
"@storybook/testing-library": "^0.2.2",
"marko": "^5.33.8",
"storybook": "^8.0.0",
"vite": "^5.1.6"
"marko": "^5.35.14",
"storybook": "^8.2.9",
"vite": "^5.4.3"
}
}
19 changes: 9 additions & 10 deletions tests/frameworks/webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,17 @@
"storybook": "storybook dev -p ${PORT:-3000} --no-version-updates --disable-telemetry --no-open"
},
"devDependencies": {
"@marko/compiler": "^5.35.7",
"@marko/webpack": "^9.3.7",
"@storybook/addon-essentials": "^8.0.0",
"@storybook/addon-interactions": "^8.0.0",
"@storybook/addon-links": "^8.0.0",
"@marko/compiler": "^5.37.9",
"@marko/webpack": "^10.0.0",
"@storybook/addon-essentials": "^8.2.9",
"@storybook/addon-interactions": "^8.2.9",
"@storybook/addon-links": "^8.2.9",
"@storybook/addon-webpack5-compiler-babel": "^3.0.3",
"@storybook/blocks": "^8.0.0",
"@storybook/blocks": "^8.2.9",
"@storybook/marko": "*",
"@storybook/marko-webpack": "*",
"@storybook/testing-library": "^0.2.2",
"marko": "^5.33.8",
"storybook": "^8.0.0",
"webpack": "^5.90.3"
"marko": "^5.35.14",
"storybook": "^8.2.9",
"webpack": "^5.94.0"
}
}

0 comments on commit 90f0fe1

Please sign in to comment.