Skip to content

Commit

Permalink
Chore: fix version conflicts update deps ( vue nuxt versions ) (#684)
Browse files Browse the repository at this point in the history 
<!---
☝️ PR title should follow conventional commits (https://conventionalcommits.org)
-->

### 🔗 Linked issue

<!-- If it resolves an open issue, please link the issue here. For example "Resolves #123" -->

### ❓ Type of change

<!-- What types of changes does your code introduce? Put an `x` in all the boxes that apply. -->

- [ ] 📖 Documentation (updates to the documentation or readme)
- [ ] 🐞 Bug fix (a non-breaking change that fixes an issue)
- [ ] 👌 Enhancement (improving an existing functionality)
- [ ] ✨ New feature (a non-breaking change that adds functionality)
- [ x] 🧹 Chore (updates to the build process or auxiliary tools and libraries)
- [ ] ⚠️ Breaking change (fix or feature that would cause existing functionality to change)

### 📚 Description

fix the conflicts in type because of different vue and nuxt versions are installed
  • Loading branch information
@chakAs3
chakAs3 authored Jul 10, 2024
1 parent 7c07168 commit 496c9ce
Show file tree
Hide file tree
Showing 4 changed files with 15,789 additions and 14,561 deletions.
198 changes: 100 additions & 98 deletions packages/storybook-addon/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,103 +1,105 @@
{
"name": "@storybook-vue/nuxt",
"version": "0.2.9",
"description": "Storybook addon for Nuxt and Vite",
"license": "MIT",
"homepage": "https://storybook.nuxtjs.org",
"repository": {
"type": "git",
"url": "git+https://github.com/nuxt-modules/storybook.git",
"directory": "packages/storybook-addon"
},
"bugs": {
"url": "https://github.com/nuxt-modules/storybook/issues"
},
"keywords": [
"storybook",
"nuxt",
"vite",
"vue3"
],
"type": "module",
"exports": {
".": {
"types": "./dist/index.d.ts",
"node": "./dist/index.cjs",
"import": "./dist/index.mjs",
"require": "./dist/index.cjs"
"name": "@storybook-vue/nuxt",
"version": "0.2.9",
"description": "Storybook addon for Nuxt and Vite",
"license": "MIT",
"homepage": "https://storybook.nuxtjs.org",
"repository": {
"type": "git",
"url": "git+https://github.com/nuxt-modules/storybook.git",
"directory": "packages/storybook-addon"
},
"./preset": {
"types": "./dist/preset.d.ts",
"require": "./dist/preset.cjs"
"bugs": {
"url": "https://github.com/nuxt-modules/storybook/issues"
},
"./preview": {
"types": "./dist/preview.d.ts",
"import": "./dist/preview.mjs",
"default": "./preview.js"
"keywords": [
"storybook",
"nuxt",
"vite",
"vue3"
],
"type": "module",
"exports": {
".": {
"types": "./dist/index.d.ts",
"node": "./dist/index.cjs",
"import": "./dist/index.mjs",
"require": "./dist/index.cjs"
},
"./preset": {
"types": "./dist/preset.d.ts",
"require": "./dist/preset.cjs"
},
"./preview": {
"types": "./dist/preview.d.ts",
"import": "./dist/preview.mjs",
"default": "./preview.js"
},
"./package.json": "./package.json"
},
"./package.json": "./package.json"
},
"main": "dist/index.cjs",
"module": "dist/index.mjs",
"types": "dist/index.d.ts",
"files": [
"dist/**/*",
"template/**/*",
"README.md",
"*.js",
"*.mjs",
"*.cjs",
"*.d.ts"
],
"engines": {
"node": ">=18.0.0"
},
"scripts": {
"build": "unbuild",
"dev:prepare": "unbuild --stub",
"test": "vitest run",
"dev": "unbuild",
"prepack": "unbuild"
},
"peerDependencies": {
"@vitejs/plugin-vue": "^5.0.4",
"nuxt": "^3.6 || ^3.7 || ^3.8",
"vite": "^3.0.0 || ^4.0.0 || ^5.0.0",
"vue": "^3.0.0"
},
"dependencies": {
"@nuxt/kit": "^3.11.1",
"@nuxt/schema": "^3.11.1",
"@nuxt/vite-builder": "^3.11.1",
"@rollup/plugin-replace": "^5.0.7",
"@storybook/builder-vite": "^8.1.11",
"@storybook/vue3": "^8.1.11",
"@storybook/vue3-vite": "^8.1.11",
"json-stable-stringify": "^1.1.1",
"nuxt": "^3.11.1",
"ofetch": "^1.3.4",
"pathe": "^1.1.2",
"unctx": "^2.3.1",
"vue": "^3.4.21",
"vue-router": "^4.3.0"
},
"devDependencies": {
"@storybook/types": "^8.1.11",
"@types/json-stable-stringify": "^1.0.36",
"@vitejs/plugin-vue": "^5.0.4",
"typescript": "^5.4.3",
"unbuild": "^2.0.0",
"vite": "^5.2.2"
},
"publishConfig": {
"access": "public"
},
"bundler": {
"entries": [
"./src/index.ts",
"./src/preview.ts",
"./src/preset.ts"
"main": "dist/index.cjs",
"module": "dist/index.mjs",
"types": "dist/index.d.ts",
"files": [
"dist/**/*",
"template/**/*",
"README.md",
"*.js",
"*.mjs",
"*.cjs",
"*.d.ts"
],
"platform": "node"
}
}
"engines": {
"node": ">=18.0.0"
},
"scripts": {
"build": "unbuild",
"dev:prepare": "unbuild --stub",
"test": "vitest run",
"dev": "unbuild",
"prepack": "unbuild",
"release": "pnpm changelogen --release --push && pnpm publish"
},
"peerDependencies": {
"nuxt": "^3.6 || ^3.7 || ^3.8",
"vite": "^3.0.0 || ^4.0.0 || ^5.0.0",
"vue": "^3.0.0"
},
"dependencies": {
"@nuxt/kit": "^3.12.2",
"@nuxt/schema": "^3.12.2",
"@nuxt/vite-builder": "^3.12.2",
"@rollup/plugin-replace": "^5.0.7",
"@storybook/builder-vite": "^8.1.11",
"@storybook/vue3": "^8.1.11",
"@storybook/vue3-vite": "^8.1.11",
"json-stable-stringify": "^1.1.1",
"nuxt": "^3.12.2",
"ofetch": "^1.3.4",
"pathe": "^1.1.2",
"unctx": "^2.3.1",
"vue": "^3.4.31",
"vue-router": "^4.3.0"
},
"devDependencies": {
"@storybook/types": "^8.1.11",
"@types/json-stable-stringify": "^1.0.36",
"@vitejs/plugin-vue": "^5.0.4",
"@vitejs/plugin-vue-jsx": "^4.0.0",
"changelogen": "^0.5.5",
"typescript": "^5.4.3",
"unbuild": "^2.0.0",
"vite": "^5.2.2"
},
"publishConfig": {
"access": "public"
},
"bundler": {
"entries": [
"./src/index.ts",
"./src/preview.ts",
"./src/preset.ts"
],
"platform": "node"
}
}
2 changes: 1 addition & 1 deletion packages/storybook-addon/src/preview.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ setup(async (vueApp, storyContext) => {
}

// Provide the config of the Nuxt app
// @ts-expect-error: internal Nuxt property

window.__NUXT__ = {
serverRendered: false,
config: {
Expand Down
46 changes: 23 additions & 23 deletions playground/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
{
"name": "nuxt-storybook-playground",
"private": true,
"type": "module",
"scripts": {
"build": "nuxt build",
"dev": "nuxt dev",
"generate": "nuxt generate",
"preview": "nuxt preview",
"prepare": "nuxt prepare",
"storybook": "storybook dev --port 6006",
"build-storybook": "storybook build"
},
"devDependencies": {
"@nuxt/devtools": "^1.1.5",
"@nuxtjs/storybook": "workspace:*",
"@storybook/addon-essentials": "^8.1.11",
"@storybook/addon-interactions": "^8.1.11",
"@storybook/addon-links": "^8.1.11",
"nuxt": "^3.11.1",
"storybook": "^8.1.11",
"vite-plugin-inspect": "^0.8.4"
}
}
"name": "nuxt-storybook-playground",
"private": true,
"type": "module",
"scripts": {
"build": "nuxt build",
"dev": "nuxt dev",
"generate": "nuxt generate",
"preview": "nuxt preview",
"prepare": "nuxt prepare",
"storybook": "storybook dev --port 6006",
"build-storybook": "storybook build"
},
"devDependencies": {
"@nuxt/devtools": "^1.1.5",
"@nuxtjs/storybook": "workspace:*",
"@storybook/addon-essentials": "^8.1.11",
"@storybook/addon-interactions": "^8.1.11",
"@storybook/addon-links": "^8.1.11",
"nuxt": "^3.12.2",
"storybook": "^8.1.11",
"vite-plugin-inspect": "^0.8.4"
}
}
Loading

0 comments on commit 496c9ce

Please sign in to comment.