Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: disable shameful hoisting and improve dependency declarations #580

Merged
merged 20 commits into from
Jul 7, 2024
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
1 change: 0 additions & 1 deletion .npmrc
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
shamefully-hoist=true
link-workspace-packages=deep
1 change: 0 additions & 1 deletion docs/.npmrc

This file was deleted.

3 changes: 2 additions & 1 deletion examples/showcase/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"@storybook/addon-essentials": "^8.0.8",
"@storybook/addon-links": "^8.0.8",
"@storybook/blocks": "^8.0.8",
"@storybook/test": "^8.0.8"
"@storybook/test": "^8.0.8",
"storybook": "^8.1.11"
}
}
3 changes: 2 additions & 1 deletion examples/starter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"@storybook/addon-essentials": "^8.0.8",
"@storybook/addon-links": "^8.0.8",
"@storybook/blocks": "^8.0.8",
"@storybook/test": "^8.0.8"
"@storybook/test": "^8.0.8",
"storybook": "^8.1.11"
}
}
3 changes: 2 additions & 1 deletion examples/tailwind/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"@storybook/addon-essentials": "^8.0.8",
"@storybook/addon-links": "^8.0.8",
"@storybook/blocks": "^8.0.8",
"@storybook/test": "^8.0.8"
"@storybook/test": "^8.0.8",
"storybook": "^8.1.11"
}
}
29 changes: 15 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,31 +9,31 @@
},
"type": "module",
"scripts": {
"dev": "nuxi dev playground",
"dev:prepare": "pnpm run --recursive --filter=./packages/* --parallel dev:prepare && nuxi prepare playground",
"dev:build": "nuxi build playground",
"dev": "pnpm run --filter=./playground/** dev",
"dev:prepare": "pnpm run --recursive --filter=./packages/* --parallel dev:prepare && pnpm run prepare",
"dev:build": "pnpm run --filter=./playground/** build",
"playground:storybook:build": "cd playground && pnpm run build-storybook",
"playground:storybook:publish": "chromatic --exit-zero-on-changes --build-script-name playground:storybook:build --project-token=chpt_d7cf5e98426e11e",
"example:starter:dev": "nuxi dev examples/starter",
"example:starter:build": "nuxi build examples/starter",
"example:starter:storybook:build": "cd examples/starter && pnpm run build-storybook",
"example:starter:dev": "pnpm run --filter=./examples/starter/** examples/starter dev",
"example:starter:build": "pnpm run --filter=./examples/starter/** build",
"example:starter:storybook:build": "pnpm run --filter=./examples/starter/** build-storybook",
"example:starter:storybook:publish": "chromatic --exit-zero-on-changes --build-script-name example:starter:storybook:build --project-token=chpt_dc04103f8a32bfa",
"example:tailwind:dev": "nuxi dev examples/tailwind",
"example:tailwind:build": "nuxi build examples/tailwind",
"example:tailwind:storybook:build": "cd examples/tailwind && pnpm run build-storybook",
"example:tailwind:dev": "pnpm run --filter=./examples/tailwind/** dev",
"example:tailwind:build": "pnpm run --filter=./examples/tailwind/** build",
"example:tailwind:storybook:build": "pnpm run --filter=./examples/tailwind/** build-storybook",
"example:tailwind:storybook:publish": "chromatic --exit-zero-on-changes --build-script-name example:tailwind:storybook:build --project-token=chpt_fbfe47dc27d4064",
"example:showcase:dev": "nuxi dev examples/showcase",
"example:showcase:build": "nuxi build examples/showcase",
"example:showcase:storybook:build": "cd examples/showcase && pnpm run build-storybook",
"example:showcase:dev": "pnpm run --filter=./examples/showcase/** dev",
"example:showcase:build": "pnpm run --filter=./examples/showcase/** build",
"example:showcase:storybook:build": "pnpm run --filter=./examples/showcase/** build-storybook",
"example:showcase:storybook:publish": "chromatic --exit-zero-on-changes --build-script-name example:showcase:storybook:build --project-token=chpt_a53adf402cb628c",
"build": "pnpm run --recursive --filter=./packages/* --parallel build",
"lint": "pnpm lint:eslint && pnpm lint:prettier",
"lint:eslint": "eslint --report-unused-disable-directives .",
"lint:prettier": "prettier --check .",
"prepack": "pnpm build",
"release": "pnpm jiti prepare-release.ts && pnpm publish --recursive",
"prepare": "nuxi prepare playground",
"docs:build": "(cd docs && nuxi build)",
"prepare": "pnpm run --filter=./playground/** prepare",
"docs:build": "pnpm run --filter=./docs/** build",
"docs:generate": "pnpm run --filter=./docs/** generate",
"test": "vitest run",
"test:watch": "vitest watch",
Expand All @@ -48,6 +48,7 @@
"chromatic": "^11.3.0",
"eslint": "^9.0.0",
"jsdom": "^24.0.0",
"nuxt": "^3.11.1",
"prettier": "^3.2.5",
"release-it": "^17.2.0",
"typescript": "^5.3.3",
Expand Down
6 changes: 5 additions & 1 deletion packages/nuxt-module/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@
"@nuxt/devtools-kit": "^1.0.8",
"@nuxt/kit": "^3.12.0",
"@storybook-vue/nuxt": "workspace:*",
"@storybook/core-common": "^8.1.11",
"@storybook/core-server": "^8.1.11",
"chalk": "^5.0.0",
"consola": "^3.2.3",
"defu": "^6.1.4",
Expand All @@ -51,6 +53,8 @@
"ufo": "^1.5.3"
},
"devDependencies": {
"@nuxt/module-builder": "^0.8.0"
"@nuxt/module-builder": "^0.8.0",
"vite": "^5.2.2",
"unbuild": "^2.0.0"
}
}
2 changes: 1 addition & 1 deletion packages/nuxt-module/src/storybook.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
type PackageJson,
} from '@storybook/core-common'
import { buildDevStandalone, withTelemetry } from '@storybook/core-server'
import storybookPackageJson from '@storybook/core-server/package.json'
import storybookPackageJson from '@storybook/core-server/package.json' with { type: 'json' }

const buildLogger = logger.withTag('build')

Expand Down
6 changes: 6 additions & 0 deletions packages/nuxt-module/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"extends": "../../playground/.nuxt/tsconfig.json",
"compilerOptions": {
"types": ["vite/client"]
}
}
4 changes: 4 additions & 0 deletions packages/storybook-addon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,15 @@
"@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"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/storybook-addon/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"rootDir": "./src",
"target": "ESNext",
"module": "ESNext",
"types": ["node"],
"types": ["vite/client"],
"skipLibCheck": true,
"resolveJsonModule": true,
"strict": true,
Expand Down
2 changes: 0 additions & 2 deletions playground/.npmrc

This file was deleted.

2 changes: 2 additions & 0 deletions playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"dev": "nuxt dev",
"generate": "nuxt generate",
"preview": "nuxt preview",
"prepare": "nuxt prepare",
"storybook": "storybook dev --port 6006",
"build-storybook": "storybook build"
},
Expand All @@ -17,6 +18,7 @@
"@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"
}
}
Loading
Loading