Skip to content

Commit

Permalink
Merge pull request #16 from fuzzypawzz/upgrade-to-vite-5
Browse files Browse the repository at this point in the history
Upgrade to Vite 5 (and other package updates to latest)
  • Loading branch information
fuzzypawzz authored Dec 23, 2023
2 parents f596d6e + f2b506d commit 9d87b58
Show file tree
Hide file tree
Showing 8 changed files with 7,249 additions and 17,910 deletions.
2 changes: 1 addition & 1 deletion .storybook/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const { loadConfigFromFile, mergeConfig } = require('vite')
module.exports = {
async viteFinal(config, { configType }) {
const { config: userConfig } = await loadConfigFromFile(
path.resolve(__dirname, '../vite.config.ts')
path.resolve(__dirname, '../vite.config.mts')
)

// Return a custom config
Expand Down
25,115 changes: 7,226 additions & 17,889 deletions package-lock.json

Large diffs are not rendered by default.

27 changes: 14 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"*.{js,css,md}": "prettier --write"
},
"dependencies": {
"include-media": "^1.4.10",
"include-media": "^2.0.0",
"jest-environment-jsdom": "^29.6.2",
"vue": "^3.2.41",
"vue-router": "^4.1.5"
Expand All @@ -31,32 +31,33 @@
"@storybook/addon-essentials": "^7.0.6",
"@storybook/addon-interactions": "^7.0.6",
"@storybook/addon-links": "^7.0.6",
"@storybook/testing-library": "^0.1.0",
"@storybook/testing-library": "^0.2.2",
"@storybook/vue3": "^7.0.6",
"@storybook/vue3-vite": "^7.0.6",
"@swc/core": "^1.3.51",
"@swc/jest": "^0.2.26",
"@types/node": "^16.11.68",
"@vitejs/plugin-vue": "^3.1.2",
"@vue/eslint-config-prettier": "^7.0.0",
"@vue/eslint-config-typescript": "^11.0.0",
"@vue/tsconfig": "^0.1.3",
"babel-loader": "^8.3.0",
"@tsconfig/node20": "^20.1.2",
"@types/node": "^20.10.5",
"@vitejs/plugin-vue": "^4.5.2",
"@vue/eslint-config-prettier": "^8.0.0",
"@vue/eslint-config-typescript": "^12.0.0",
"@vue/tsconfig": "^0.5.1",
"babel-loader": "^9.1.3",
"eslint": "^8.22.0",
"eslint-plugin-storybook": "^0.6.11",
"eslint-plugin-vue": "^9.3.0",
"husky": "^8.0.3",
"jest": "^29.5.0",
"lint-staged": "^13.2.2",
"lint-staged": "^15.2.0",
"npm-run-all": "^4.1.5",
"prettier": "^2.7.1",
"prettier": "^3.1.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"sass": "^1.56.1",
"storybook": "^7.0.6",
"typescript": "~4.7.4",
"vite": "^3.1.8",
"vue-loader": "^16.8.3",
"typescript": "^5.3.3",
"vite": "^5.0.10",
"vue-loader": "^17.3.1",
"vue-tsc": "^1.0.8"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,6 @@ it('throws if trying to start from an index greather than array length', () => {
})

expect(() => generator.next()).toThrow(
ERROR.START_INDEX_GREATER_THAN_ARRAY_LENGTH
ERROR.START_INDEX_GREATER_THAN_ARRAY_LENGTH,
)
})
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export function useWindowHeightVariable() {
function setWindowHeightVariable() {
document.documentElement.style.setProperty(
WINDOW_HEIGHT_CSS_VAR,
`${window.innerHeight / 100}px`
`${window.innerHeight / 100}px`,
)
}

Expand Down
6 changes: 5 additions & 1 deletion tsconfig.config.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
{
"extends": "@vue/tsconfig/tsconfig.node.json",
"extends": [
"@tsconfig/node20/tsconfig.json",
"@vue/tsconfig/tsconfig.json"
],
"include": ["vite.config.*", "vitest.config.*", "cypress.config.*", "playwright.config.*"],
"compilerOptions": {
"noEmit": false,
"composite": true,
"types": ["node"]
}
Expand Down
5 changes: 1 addition & 4 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "@vue/tsconfig/tsconfig.web.json",
"extends": "@vue/tsconfig/tsconfig.dom.json",
"include": ["env.d.ts", "src/**/*", "src/**/*.vue"],
"compilerOptions": {
"baseUrl": ".",
Expand All @@ -8,10 +8,7 @@
},
"allowJs": true,
"noImplicitOverride": true,
"experimentalDecorators": true,
"emitDecoratorMetadata": true
},

"references": [
{
"path": "./tsconfig.config.json"
Expand Down
File renamed without changes.

0 comments on commit 9d87b58

Please sign in to comment.