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.

Sign up for GitHub

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

Jump to bottom

UI: Enable TurboSnap for UI Storybook #19767

Merged
merged 14 commits into from
Nov 8, 2022
Merged

UI: Enable TurboSnap for UI Storybook #19767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9bd507f
Add vite-plugin-turbosnap to storybook ui
ethriel3695 Nov 7, 2022
6b27668
Merge branch 'next' of github.com:storybookjs/storybook into reuben/a…
ethriel3695 Nov 7, 2022
d51338b
Remove accidental tsconfig change and update ci
ethriel3695 Nov 7, 2022
5e707f0
change fetch-depth to 500
ethriel3695 Nov 7, 2022
66588c2
Using the correct flag name
ethriel3695 Nov 7, 2022
3625a40
Change this step to checkout for full git history
ethriel3695 Nov 7, 2022
14f5a2d
Add a comment to ci file
ethriel3695 Nov 8, 2022
b817a23
Update chromatic to latest version
ethriel3695 Nov 8, 2022
b111529
Update sandbox chromatic script
ethriel3695 Nov 8, 2022
fc57faf
Add debug flag
ethriel3695 Nov 8, 2022
af636f4
Revert sandbox changes and formatting
ethriel3695 Nov 8, 2022
06e73b4
Reverted additional formatting
ethriel3695 Nov 8, 2022
f172cc2
Reverted the last of the formatting
ethriel3695 Nov 8, 2022
acf38f1
Merge branch 'next' into reuben/add-turbosnap-for-ui
ethriel3695 Nov 8, 2022
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
4 changes: 2 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,8 +381,8 @@ jobs:
class: medium
name: sb_node_16_browsers
steps:
- checkout_advanced:
clone_options: '--depth 1 --verbose'
# switched this to the CircleCI helper to get the full git history for TurboSnap
- checkout
- attach_workspace:
at: .
- run:
Expand Down
3 changes: 2 additions & 1 deletion code/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@
"babel-plugin-dynamic-import-node": "^2.3.3",
"babel-plugin-macros": "^3.0.1",
"chalk": "^4.1.0",
"chromatic": "^6.10.2",
"chromatic": "^6.11.3",
"codecov": "^3.8.1",
"commander": "^6.2.1",
"concurrently": "^5.3.0",
Expand Down Expand Up @@ -341,6 +341,7 @@
"typescript": "~4.6.3",
"util": "^0.12.4",
"vite": "^3.1.7",
"vite-plugin-turbosnap": "^1.0.1",
"wait-on": "^5.2.1",
"web-component-analyzer": "^1.1.6",
"webpack": "5",
Expand Down
9 changes: 7 additions & 2 deletions code/ui/.storybook/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { vite as csfPlugin } from '@storybook/csf-plugin';
import pluginTurbosnap from 'vite-plugin-turbosnap';
import type { StorybookConfig } from '../../frameworks/react-vite/dist';

const isBlocksOnly = process.env.BLOCKS_ONLY === 'true';
Expand Down Expand Up @@ -33,9 +34,13 @@ const config: StorybookConfig = {
core: {
disableTelemetry: true,
},
viteFinal: (vite) => ({
viteFinal: (vite, { configType }) => ({
...vite,
plugins: [...(vite.plugins || []), csfPlugin({})],
plugins: [
...(vite.plugins || []),
csfPlugin({}),
configType === 'PRODUCTION' ? pluginTurbosnap({ rootDir: vite.root || '' }) : [],
],
optimizeDeps: { ...vite.optimizeDeps, force: true },
}),
};
Expand Down
18 changes: 13 additions & 5 deletions code/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7513,7 +7513,7 @@ __metadata:
babel-plugin-dynamic-import-node: ^2.3.3
babel-plugin-macros: ^3.0.1
chalk: ^4.1.0
chromatic: ^6.10.2
chromatic: ^6.11.3
codecov: ^3.8.1
commander: ^6.2.1
concurrently: ^5.3.0
Expand Down Expand Up @@ -7592,6 +7592,7 @@ __metadata:
verdaccio: ^4.10.0
verdaccio-auth-memory: ^9.7.2
vite: ^3.1.7
vite-plugin-turbosnap: ^1.0.1
wait-on: ^5.2.1
web-component-analyzer: ^1.1.6
webpack: 5
Expand Down Expand Up @@ -12893,17 +12894,17 @@ __metadata:
languageName: node
linkType: hard

"chromatic@npm:^6.10.2":
version: 6.11.1
resolution: "chromatic@npm:6.11.1"
"chromatic@npm:^6.11.3":
version: 6.11.4
resolution: "chromatic@npm:6.11.4"
dependencies:
"@discoveryjs/json-ext": ^0.5.7
"@types/webpack-env": ^1.17.0
bin:
chroma: bin/main.cjs
chromatic: bin/main.cjs
chromatic-cli: bin/main.cjs
checksum: 39d8b0ec6e4776bff167c5e7a1239de3afb816d8986bd7059e42e9fe3d19a8107d48d9f5014b78547d286fe93715d571363834a015616fe03b4f7fe5bb0aa90b
checksum: 403544ebe647013c5d5db2188c07426094febe6e3254fc782f8218410792f25e20fabb16d9746f3d8864f255589e90fc620f1902f66a5796713ca665a40e5b96
languageName: node
linkType: hard

Expand Down Expand Up @@ -35411,6 +35412,13 @@ __metadata:
languageName: node
linkType: hard

"vite-plugin-turbosnap@npm:^1.0.1":
version: 1.0.1
resolution: "vite-plugin-turbosnap@npm:1.0.1"
checksum: 0ebadba21ad7a5220e00fd393f178503fc89b26cb9b880943d64ac65ad1f2a5f99ca456b6218e270ad7e1775eb3c0f84bc9441e200ead437119a9027b611bb57
languageName: node
linkType: hard

"vite@npm:^3.1.0, vite@npm:^3.1.3, vite@npm:^3.1.7":
version: 3.1.8
resolution: "vite@npm:3.1.8"
Expand Down