From 30005a6e81962b3ce969bbeeece1cb9ac38d1bd8 Mon Sep 17 00:00:00 2001 From: GregLahaye Date: Tue, 1 Nov 2022 18:18:15 +0800 Subject: [PATCH 1/8] add html-vite framework --- code/frameworks/html-vite/README.md | 1 + code/frameworks/html-vite/package.json | 85 +++++++++++++++++++ code/frameworks/html-vite/preset.js | 1 + code/frameworks/html-vite/src/index.ts | 8 ++ code/frameworks/html-vite/src/preset.ts | 6 ++ code/frameworks/html-vite/tsconfig.json | 10 +++ .../src/automigrate/fixes/new-frameworks.ts | 1 + code/lib/cli/src/repro-templates.ts | 24 ++++++ code/lib/cli/src/versions.ts | 1 + code/package.json | 1 + code/workspace.json | 5 ++ code/yarn.lock | 21 +++++ 12 files changed, 164 insertions(+) create mode 100644 code/frameworks/html-vite/README.md create mode 100644 code/frameworks/html-vite/package.json create mode 100644 code/frameworks/html-vite/preset.js create mode 100644 code/frameworks/html-vite/src/index.ts create mode 100644 code/frameworks/html-vite/src/preset.ts create mode 100644 code/frameworks/html-vite/tsconfig.json diff --git a/code/frameworks/html-vite/README.md b/code/frameworks/html-vite/README.md new file mode 100644 index 000000000000..b1d04f7a5d67 --- /dev/null +++ b/code/frameworks/html-vite/README.md @@ -0,0 +1 @@ +# Storybook for HTML diff --git a/code/frameworks/html-vite/package.json b/code/frameworks/html-vite/package.json new file mode 100644 index 000000000000..ab7e1b14fe9c --- /dev/null +++ b/code/frameworks/html-vite/package.json @@ -0,0 +1,85 @@ +{ + "name": "@storybook/html-vite", + "version": "7.0.0-alpha.47", + "description": "Storybook for HTML and Vite: Develop HTML in isolation with Hot Reloading.", + "keywords": [ + "storybook" + ], + "homepage": "https://github.com/storybookjs/storybook/tree/main/frameworks/html-vite", + "bugs": { + "url": "https://github.com/storybookjs/storybook/issues" + }, + "repository": { + "type": "git", + "url": "https://github.com/storybookjs/storybook.git", + "directory": "frameworks/html-vite" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/storybook" + }, + "license": "MIT", + "exports": { + ".": { + "require": "./dist/index.js", + "import": "./dist/index.mjs", + "types": "./dist/index.d.ts" + }, + "./preset": { + "require": "./dist/preset.js", + "import": "./dist/preset.mjs", + "types": "./dist/preset.d.ts" + }, + "./package.json": { + "require": "./package.json", + "import": "./package.json", + "types": "./package.json" + } + }, + "main": "dist/index.js", + "module": "dist/index.mjs", + "types": "dist/index.d.ts", + "files": [ + "dist/**/*", + "types/**/*", + "README.md", + "*.js", + "*.d.ts" + ], + "scripts": { + "check": "tsc --noEmit", + "prep": "../../../scripts/prepare/bundle.ts" + }, + "dependencies": { + "@storybook/addons": "7.0.0-alpha.47", + "@storybook/builder-vite": "7.0.0-alpha.47", + "@storybook/channel-postmessage": "7.0.0-alpha.47", + "@storybook/channel-websocket": "7.0.0-alpha.47", + "@storybook/client-api": "7.0.0-alpha.47", + "@storybook/core-server": "7.0.0-alpha.47", + "@storybook/html": "7.0.0-alpha.47", + "@storybook/node-logger": "7.0.0-alpha.47", + "@storybook/preview-web": "7.0.0-alpha.47", + "magic-string": "^0.26.1", + "vite": "3" + }, + "devDependencies": { + "@types/node": "^16.0.0", + "typescript": "~4.6.3", + "vite": "^3.1.0" + }, + "engines": { + "node": "^14.18 || >=16" + }, + "publishConfig": { + "access": "public" + }, + "bundler": { + "entries": [ + "./src/index.ts", + "./src/preset.ts" + ], + "platform": "node" + }, + "gitHead": "1c706a4a778831e012343c905f86225fa71491a7" +} diff --git a/code/frameworks/html-vite/preset.js b/code/frameworks/html-vite/preset.js new file mode 100644 index 000000000000..a83f95279e7f --- /dev/null +++ b/code/frameworks/html-vite/preset.js @@ -0,0 +1 @@ +module.exports = require('./dist/preset'); diff --git a/code/frameworks/html-vite/src/index.ts b/code/frameworks/html-vite/src/index.ts new file mode 100644 index 000000000000..8fbdfff5e6e2 --- /dev/null +++ b/code/frameworks/html-vite/src/index.ts @@ -0,0 +1,8 @@ +// exports for builder-vite +export { createChannel as createPostMessageChannel } from '@storybook/channel-postmessage'; +export { createChannel as createWebSocketChannel } from '@storybook/channel-websocket'; +export { addons } from '@storybook/addons'; +export { composeConfigs, PreviewWeb } from '@storybook/preview-web'; +export { ClientApi } from '@storybook/client-api'; + +export type { StorybookConfig } from '@storybook/builder-vite'; diff --git a/code/frameworks/html-vite/src/preset.ts b/code/frameworks/html-vite/src/preset.ts new file mode 100644 index 000000000000..8e2f55a64687 --- /dev/null +++ b/code/frameworks/html-vite/src/preset.ts @@ -0,0 +1,6 @@ +import type { StorybookConfig } from '@storybook/builder-vite'; + +export const core: StorybookConfig['core'] = { + builder: '@storybook/builder-vite', + renderer: '@storybook/html', +}; diff --git a/code/frameworks/html-vite/tsconfig.json b/code/frameworks/html-vite/tsconfig.json new file mode 100644 index 000000000000..534e4ddd108a --- /dev/null +++ b/code/frameworks/html-vite/tsconfig.json @@ -0,0 +1,10 @@ +{ + "extends": "../../tsconfig.json", + "compilerOptions": { + "rootDir": "./src", + "types": ["node"], + "resolveJsonModule": true + }, + "include": ["src/**/*"], + "exclude": ["src/**/*.test.*", "src/**/__testfixtures__/**"] +} diff --git a/code/lib/cli/src/automigrate/fixes/new-frameworks.ts b/code/lib/cli/src/automigrate/fixes/new-frameworks.ts index 8f2382043a37..d0a47b8a5d60 100644 --- a/code/lib/cli/src/automigrate/fixes/new-frameworks.ts +++ b/code/lib/cli/src/automigrate/fixes/new-frameworks.ts @@ -44,6 +44,7 @@ const packagesMap: Record = { }, '@storybook/html': { webpack5: '@storybook/html-webpack5', + vite: '@storybook/html-vite', }, }; diff --git a/code/lib/cli/src/repro-templates.ts b/code/lib/cli/src/repro-templates.ts index bb4ac7b60ce0..933a0531c96c 100644 --- a/code/lib/cli/src/repro-templates.ts +++ b/code/lib/cli/src/repro-templates.ts @@ -149,6 +149,29 @@ const htmlWebpackTemplates = { }, }; +const htmlViteTemplates = { + 'html-vite/default-js': { + name: 'HTML Vite JS', + script: 'yarn create vite . --template vanilla && echo "export default {}" > vite.config.js', + cadence: ['daily', 'weekly'], + expected: { + framework: '@storybook/html-vite', + renderer: '@storybook/html', + builder: '@storybook/builder-vite', + }, + }, + 'html-vite/default-ts': { + name: 'HTML Vite TS', + script: 'yarn create vite . --template vanilla-ts && echo "export default {}" > vite.config.js', + cadence: ['daily', 'weekly'], + expected: { + framework: '@storybook/html-vite', + renderer: '@storybook/html', + builder: '@storybook/builder-vite', + }, + }, +}; + const svelteViteTemplates = { 'svelte-vite/default-js': { name: 'Svelte Vite (JS)', @@ -324,6 +347,7 @@ const reproTemplates = { ...htmlWebpackTemplates, ...preactWebpackTemplates, ...nextjsTemplates, + ...htmlViteTemplates, }; export default reproTemplates; diff --git a/code/lib/cli/src/versions.ts b/code/lib/cli/src/versions.ts index efebad6dd65a..f78988eed523 100644 --- a/code/lib/cli/src/versions.ts +++ b/code/lib/cli/src/versions.ts @@ -41,6 +41,7 @@ export default { '@storybook/docs-tools': '7.0.0-alpha.47', '@storybook/ember': '7.0.0-alpha.47', '@storybook/html': '7.0.0-alpha.47', + '@storybook/html-vite': '7.0.0-alpha.47', '@storybook/html-webpack5': '7.0.0-alpha.47', '@storybook/instrumenter': '7.0.0-alpha.47', '@storybook/nextjs': '7.0.0-alpha.47', diff --git a/code/package.json b/code/package.json index 041f52e6755e..728a6a0bae86 100644 --- a/code/package.json +++ b/code/package.json @@ -191,6 +191,7 @@ "@storybook/ember": "workspace:*", "@storybook/eslint-config-storybook": "^3.1.2", "@storybook/html": "workspace:*", + "@storybook/html-vite": "workspace:*", "@storybook/html-webpack5": "workspace:*", "@storybook/instrumenter": "workspace:*", "@storybook/jest": "^0.0.10", diff --git a/code/workspace.json b/code/workspace.json index bbd44b617358..3e33c825a5fc 100644 --- a/code/workspace.json +++ b/code/workspace.json @@ -226,6 +226,11 @@ "root": "renderers/html", "type": "library" }, + "@storybook/html-vite": { + "implicitDependencies": [], + "root": "frameworks/html-vite", + "type": "library" + }, "@storybook/html-webpack5": { "implicitDependencies": [], "root": "frameworks/html-webpack5", diff --git a/code/yarn.lock b/code/yarn.lock index f4ece33b6da7..a6796cf47e28 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -6759,6 +6759,26 @@ __metadata: languageName: node linkType: hard +"@storybook/html-vite@workspace:*, @storybook/html-vite@workspace:frameworks/html-vite": + version: 0.0.0-use.local + resolution: "@storybook/html-vite@workspace:frameworks/html-vite" + dependencies: + "@storybook/addons": 7.0.0-alpha.47 + "@storybook/builder-vite": 7.0.0-alpha.47 + "@storybook/channel-postmessage": 7.0.0-alpha.47 + "@storybook/channel-websocket": 7.0.0-alpha.47 + "@storybook/client-api": 7.0.0-alpha.47 + "@storybook/core-server": 7.0.0-alpha.47 + "@storybook/html": 7.0.0-alpha.47 + "@storybook/node-logger": 7.0.0-alpha.47 + "@storybook/preview-web": 7.0.0-alpha.47 + "@types/node": ^16.0.0 + magic-string: ^0.26.1 + typescript: ~4.6.3 + vite: ^3.1.0 + languageName: unknown + linkType: soft + "@storybook/html-webpack5@workspace:*, @storybook/html-webpack5@workspace:frameworks/html-webpack5": version: 0.0.0-use.local resolution: "@storybook/html-webpack5@workspace:frameworks/html-webpack5" @@ -7445,6 +7465,7 @@ __metadata: "@storybook/ember": "workspace:*" "@storybook/eslint-config-storybook": ^3.1.2 "@storybook/html": "workspace:*" + "@storybook/html-vite": "workspace:*" "@storybook/html-webpack5": "workspace:*" "@storybook/instrumenter": "workspace:*" "@storybook/jest": ^0.0.10 From c62f71590b5c8b365c044ce5e9aa7cda98c41dd8 Mon Sep 17 00:00:00 2001 From: GregLahaye Date: Wed, 2 Nov 2022 08:47:52 +0800 Subject: [PATCH 2/8] run html-vite/default-ts in ci --- code/lib/cli/src/repro-templates.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/lib/cli/src/repro-templates.ts b/code/lib/cli/src/repro-templates.ts index 933a0531c96c..3d3edff40df9 100644 --- a/code/lib/cli/src/repro-templates.ts +++ b/code/lib/cli/src/repro-templates.ts @@ -163,7 +163,7 @@ const htmlViteTemplates = { 'html-vite/default-ts': { name: 'HTML Vite TS', script: 'yarn create vite . --template vanilla-ts && echo "export default {}" > vite.config.js', - cadence: ['daily', 'weekly'], + cadence: ['ci', 'daily', 'weekly'], expected: { framework: '@storybook/html-vite', renderer: '@storybook/html', From fb87eff18edd672d637070c4821a8edf1bfc389a Mon Sep 17 00:00:00 2001 From: Ian VanSchooten Date: Thu, 3 Nov 2022 10:45:31 -0400 Subject: [PATCH 3/8] Increase parallelism --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 31ed1d0aec8a..28adcba50b37 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -305,7 +305,7 @@ jobs: executor: class: medium name: sb_node_16_browsers - parallelism: 9 + parallelism: 10 steps: - git-shallow-clone/checkout_advanced: clone_options: '--depth 1 --verbose' @@ -324,7 +324,7 @@ jobs: executor: class: medium name: sb_node_16_browsers - parallelism: 9 + parallelism: 10 steps: - git-shallow-clone/checkout_advanced: clone_options: '--depth 1 --verbose' @@ -339,7 +339,7 @@ jobs: executor: class: medium+ name: sb_node_16_browsers - parallelism: 9 + parallelism: 10 steps: - git-shallow-clone/checkout_advanced: clone_options: '--depth 1 --verbose' @@ -358,7 +358,7 @@ jobs: executor: class: medium name: sb_playwright - parallelism: 9 + parallelism: 10 steps: - git-shallow-clone/checkout_advanced: clone_options: '--depth 1 --verbose' @@ -373,7 +373,7 @@ jobs: executor: class: medium name: sb_node_16_browsers - parallelism: 9 + parallelism: 10 steps: - git-shallow-clone/checkout_advanced: clone_options: '--depth 1 --verbose' @@ -388,7 +388,7 @@ jobs: executor: class: medium name: sb_playwright - parallelism: 9 + parallelism: 10 steps: - git-shallow-clone/checkout_advanced: clone_options: '--depth 1 --verbose' From 44328700fafbf16cd47453f6f0bd7751241e53a4 Mon Sep 17 00:00:00 2001 From: Yann Braga Date: Mon, 21 Nov 2022 15:45:54 +0100 Subject: [PATCH 4/8] set html-vite templates to inDevelopment --- code/lib/cli/src/repro-templates.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/lib/cli/src/repro-templates.ts b/code/lib/cli/src/repro-templates.ts index 83dacf817c1f..8721c0d77117 100644 --- a/code/lib/cli/src/repro-templates.ts +++ b/code/lib/cli/src/repro-templates.ts @@ -127,6 +127,8 @@ export const allTemplates = { renderer: '@storybook/html', builder: '@storybook/builder-vite', }, + // TODO: remove this once html-vite framework is released + inDevelopment: true, }, 'html-vite/default-ts': { name: 'HTML Vite TS', @@ -137,6 +139,8 @@ export const allTemplates = { renderer: '@storybook/html', builder: '@storybook/builder-vite', }, + // TODO: remove this once html-vite framework is released + inDevelopment: true, }, 'svelte-vite/default-js': { name: 'Svelte Vite (JS)', From 59d9885ccad6c5c0fcfbbe8cc46b9790d8b7621c Mon Sep 17 00:00:00 2001 From: Yann Braga Date: Fri, 2 Dec 2022 16:52:01 +0100 Subject: [PATCH 5/8] update with recent changes --- .circleci/config.yml | 28 +++++++++++++------------- code/frameworks/html-vite/package.json | 22 ++++++++++---------- code/lib/cli/src/repro-templates.ts | 4 ---- code/lib/cli/src/versions.ts | 1 + code/yarn.lock | 20 +++++++++--------- 5 files changed, 36 insertions(+), 39 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e9baf4f0343c..4be3a2592179 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -536,23 +536,23 @@ workflows: requires: - build - create-sandboxes: - parallelism: 10 + parallelism: 9 requires: - build - build-sandboxes: - parallelism: 10 + parallelism: 9 requires: - create-sandboxes - test-runner-sandboxes: - parallelism: 10 + parallelism: 9 requires: - build-sandboxes - chromatic-sandboxes: - parallelism: 10 + parallelism: 9 requires: - build-sandboxes - e2e-sandboxes: - parallelism: 10 + parallelism: 9 requires: - build-sandboxes merged: @@ -586,11 +586,11 @@ workflows: requires: - build - create-sandboxes: - parallelism: 16 + parallelism: 15 requires: - build - build-sandboxes: - parallelism: 16 + parallelism: 15 requires: - create-sandboxes - test-runner-sandboxes: @@ -598,11 +598,11 @@ workflows: requires: - build-sandboxes - chromatic-sandboxes: - parallelism: 16 + parallelism: 15 requires: - build-sandboxes - e2e-sandboxes: - parallelism: 16 + parallelism: 15 requires: - build-sandboxes daily: @@ -611,25 +611,25 @@ workflows: jobs: - build - create-sandboxes: - parallelism: 26 + parallelism: 25 requires: - build # - smoke-test-sandboxes: # disabled for now # requires: # - create-sandboxes - build-sandboxes: - parallelism: 26 + parallelism: 25 requires: - create-sandboxes - test-runner-sandboxes: - parallelism: 26 + parallelism: 25 requires: - build-sandboxes - chromatic-sandboxes: - parallelism: 26 + parallelism: 25 requires: - build-sandboxes - e2e-sandboxes: - parallelism: 26 + parallelism: 25 requires: - build-sandboxes diff --git a/code/frameworks/html-vite/package.json b/code/frameworks/html-vite/package.json index aa7bea6d7032..fc763370a58f 100644 --- a/code/frameworks/html-vite/package.json +++ b/code/frameworks/html-vite/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/html-vite", - "version": "7.0.0-alpha.52", + "version": "7.0.0-alpha.56", "description": "Storybook for HTML and Vite: Develop HTML in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -51,15 +51,15 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/addons": "7.0.0-alpha.52", - "@storybook/builder-vite": "7.0.0-alpha.52", - "@storybook/channel-postmessage": "7.0.0-alpha.52", - "@storybook/channel-websocket": "7.0.0-alpha.52", - "@storybook/client-api": "7.0.0-alpha.52", - "@storybook/core-server": "7.0.0-alpha.52", - "@storybook/html": "7.0.0-alpha.52", - "@storybook/node-logger": "7.0.0-alpha.52", - "@storybook/preview-web": "7.0.0-alpha.52", + "@storybook/addons": "7.0.0-alpha.56", + "@storybook/builder-vite": "7.0.0-alpha.56", + "@storybook/channel-postmessage": "7.0.0-alpha.56", + "@storybook/channel-websocket": "7.0.0-alpha.56", + "@storybook/client-api": "7.0.0-alpha.56", + "@storybook/core-server": "7.0.0-alpha.56", + "@storybook/html": "7.0.0-alpha.56", + "@storybook/node-logger": "7.0.0-alpha.56", + "@storybook/preview-web": "7.0.0-alpha.56", "magic-string": "^0.26.1", "vite": "3" }, @@ -81,5 +81,5 @@ ], "platform": "node" }, - "gitHead": "1c706a4a778831e012343c905f86225fa71491a7" + "gitHead": "c8e9a862bb83c4a0d6b5975e795b4ca7f7ff7bc2" } diff --git a/code/lib/cli/src/repro-templates.ts b/code/lib/cli/src/repro-templates.ts index 00fc385c2df1..89c1138ec4de 100644 --- a/code/lib/cli/src/repro-templates.ts +++ b/code/lib/cli/src/repro-templates.ts @@ -165,7 +165,6 @@ export const allTemplates: Record = { 'html-vite/default-js': { name: 'HTML Vite JS', script: 'yarn create vite . --template vanilla && echo "export default {}" > vite.config.js', - cadence: ['daily', 'weekly'], expected: { framework: '@storybook/html-vite', renderer: '@storybook/html', @@ -177,7 +176,6 @@ export const allTemplates: Record = { 'html-vite/default-ts': { name: 'HTML Vite TS', script: 'yarn create vite . --template vanilla-ts && echo "export default {}" > vite.config.js', - cadence: ['ci', 'daily', 'weekly'], expected: { framework: '@storybook/html-vite', renderer: '@storybook/html', @@ -335,7 +333,6 @@ export const pr: TemplateKey[] = [ 'svelte-vite/default-ts', 'svelte-kit/skeleton-ts', 'nextjs/default-ts', - 'html-vite/default-ts', ]; export const merged: TemplateKey[] = [ ...pr, @@ -358,7 +355,6 @@ export const daily: TemplateKey[] = [ 'svelte-vite/default-js', 'nextjs/default-js', 'preact-webpack5/default-js', - 'html-vite/default-js', ]; export const templatesByCadence = { ci, pr, merged, daily }; diff --git a/code/lib/cli/src/versions.ts b/code/lib/cli/src/versions.ts index 8c71f8c7d089..4ba2b6a401c7 100644 --- a/code/lib/cli/src/versions.ts +++ b/code/lib/cli/src/versions.ts @@ -42,6 +42,7 @@ export default { '@storybook/ember': '7.0.0-alpha.56', '@storybook/html': '7.0.0-alpha.56', '@storybook/html-webpack5': '7.0.0-alpha.56', + '@storybook/html-vite': '7.0.0-alpha.56', '@storybook/instrumenter': '7.0.0-alpha.56', '@storybook/nextjs': '7.0.0-alpha.56', '@storybook/node-logger': '7.0.0-alpha.56', diff --git a/code/yarn.lock b/code/yarn.lock index 859fef3fa1c2..faf0a34a441a 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -6420,15 +6420,15 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/html-vite@workspace:frameworks/html-vite" dependencies: - "@storybook/addons": 7.0.0-alpha.52 - "@storybook/builder-vite": 7.0.0-alpha.52 - "@storybook/channel-postmessage": 7.0.0-alpha.52 - "@storybook/channel-websocket": 7.0.0-alpha.52 - "@storybook/client-api": 7.0.0-alpha.52 - "@storybook/core-server": 7.0.0-alpha.52 - "@storybook/html": 7.0.0-alpha.52 - "@storybook/node-logger": 7.0.0-alpha.52 - "@storybook/preview-web": 7.0.0-alpha.52 + "@storybook/addons": 7.0.0-alpha.56 + "@storybook/builder-vite": 7.0.0-alpha.56 + "@storybook/channel-postmessage": 7.0.0-alpha.56 + "@storybook/channel-websocket": 7.0.0-alpha.56 + "@storybook/client-api": 7.0.0-alpha.56 + "@storybook/core-server": 7.0.0-alpha.56 + "@storybook/html": 7.0.0-alpha.56 + "@storybook/node-logger": 7.0.0-alpha.56 + "@storybook/preview-web": 7.0.0-alpha.56 "@types/node": ^16.0.0 magic-string: ^0.26.1 typescript: ~4.6.3 @@ -6961,7 +6961,7 @@ __metadata: languageName: unknown linkType: soft -"@storybook/preview-web@workspace:*, @storybook/preview-web@workspace:lib/preview-web": +"@storybook/preview-web@7.0.0-alpha.56, @storybook/preview-web@workspace:*, @storybook/preview-web@workspace:lib/preview-web": version: 0.0.0-use.local resolution: "@storybook/preview-web@workspace:lib/preview-web" dependencies: From 060fbabd58ab1124c88b156db06569d746b13fe2 Mon Sep 17 00:00:00 2001 From: Yann Braga Date: Fri, 2 Dec 2022 16:54:05 +0100 Subject: [PATCH 6/8] improve messaging in generate-sb-packages-versions --- code/lib/cli/scripts/generate-sb-packages-versions.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/code/lib/cli/scripts/generate-sb-packages-versions.js b/code/lib/cli/scripts/generate-sb-packages-versions.js index cba52deaca75..14159fbae83c 100755 --- a/code/lib/cli/scripts/generate-sb-packages-versions.js +++ b/code/lib/cli/scripts/generate-sb-packages-versions.js @@ -16,6 +16,8 @@ const run = async () => { if (!semver.valid(updatedVersion)) throw new Error(`Invalid version: ${updatedVersion}`); + logger.log(`Generating versions.ts with v${updatedVersion}`); + const storybookPackagesPaths = await globby( `${rootDirectory}/@(frameworks|addons|lib|renderers|presets)/**/package.json`, { @@ -40,15 +42,19 @@ const run = async () => { .sort((package1, package2) => package1.name.localeCompare(package2.name)) .reduce((acc, { name }) => ({ ...acc, [name]: updatedVersion }), {}); + const versionsPath = path.join(__dirname, '..', 'src', 'versions.ts'); + await writeFile( - path.join(__dirname, '..', 'src', 'versions.ts'), + versionsPath, dedent` // auto generated file, do not edit export default ${JSON.stringify(packageToVersionMap, null, 2)} ` ); - exec(`yarn lint:js:cmd --fix ${path.join(__dirname, '..', 'src', 'versions.ts')}`, { + logger.log(`Updating versions and formatting results at: ${versionsPath}`); + + exec(`yarn lint:js:cmd --fix ${versionsPath}`, { cwd: path.join(__dirname, '..', '..', '..'), }); }; From 7f0d10c30b333effd68495bd349407b10655f760 Mon Sep 17 00:00:00 2001 From: GregLahaye Date: Sun, 4 Dec 2022 10:08:25 +0800 Subject: [PATCH 7/8] remove re-exports --- code/frameworks/html-vite/src/index.ts | 7 ------- 1 file changed, 7 deletions(-) diff --git a/code/frameworks/html-vite/src/index.ts b/code/frameworks/html-vite/src/index.ts index 8fbdfff5e6e2..d3ded0cdbbb9 100644 --- a/code/frameworks/html-vite/src/index.ts +++ b/code/frameworks/html-vite/src/index.ts @@ -1,8 +1 @@ -// exports for builder-vite -export { createChannel as createPostMessageChannel } from '@storybook/channel-postmessage'; -export { createChannel as createWebSocketChannel } from '@storybook/channel-websocket'; -export { addons } from '@storybook/addons'; -export { composeConfigs, PreviewWeb } from '@storybook/preview-web'; -export { ClientApi } from '@storybook/client-api'; - export type { StorybookConfig } from '@storybook/builder-vite'; From b7bd76951d6dffa7374432da60f2815c63d7415b Mon Sep 17 00:00:00 2001 From: GregLahaye Date: Sun, 4 Dec 2022 10:15:18 +0800 Subject: [PATCH 8/8] update version numbers --- code/frameworks/html-vite/package.json | 20 ++++++++++---------- code/yarn.lock | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/code/frameworks/html-vite/package.json b/code/frameworks/html-vite/package.json index fc763370a58f..1b36174b63d2 100644 --- a/code/frameworks/html-vite/package.json +++ b/code/frameworks/html-vite/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/html-vite", - "version": "7.0.0-alpha.56", + "version": "7.0.0-alpha.57", "description": "Storybook for HTML and Vite: Develop HTML in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -51,15 +51,15 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/addons": "7.0.0-alpha.56", - "@storybook/builder-vite": "7.0.0-alpha.56", - "@storybook/channel-postmessage": "7.0.0-alpha.56", - "@storybook/channel-websocket": "7.0.0-alpha.56", - "@storybook/client-api": "7.0.0-alpha.56", - "@storybook/core-server": "7.0.0-alpha.56", - "@storybook/html": "7.0.0-alpha.56", - "@storybook/node-logger": "7.0.0-alpha.56", - "@storybook/preview-web": "7.0.0-alpha.56", + "@storybook/addons": "7.0.0-alpha.57", + "@storybook/builder-vite": "7.0.0-alpha.57", + "@storybook/channel-postmessage": "7.0.0-alpha.57", + "@storybook/channel-websocket": "7.0.0-alpha.57", + "@storybook/client-api": "7.0.0-alpha.57", + "@storybook/core-server": "7.0.0-alpha.57", + "@storybook/html": "7.0.0-alpha.57", + "@storybook/node-logger": "7.0.0-alpha.57", + "@storybook/preview-web": "7.0.0-alpha.57", "magic-string": "^0.26.1", "vite": "3" }, diff --git a/code/yarn.lock b/code/yarn.lock index 5f36c32dfdab..118415a861f7 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -6420,15 +6420,15 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/html-vite@workspace:frameworks/html-vite" dependencies: - "@storybook/addons": 7.0.0-alpha.56 - "@storybook/builder-vite": 7.0.0-alpha.56 - "@storybook/channel-postmessage": 7.0.0-alpha.56 - "@storybook/channel-websocket": 7.0.0-alpha.56 - "@storybook/client-api": 7.0.0-alpha.56 - "@storybook/core-server": 7.0.0-alpha.56 - "@storybook/html": 7.0.0-alpha.56 - "@storybook/node-logger": 7.0.0-alpha.56 - "@storybook/preview-web": 7.0.0-alpha.56 + "@storybook/addons": 7.0.0-alpha.57 + "@storybook/builder-vite": 7.0.0-alpha.57 + "@storybook/channel-postmessage": 7.0.0-alpha.57 + "@storybook/channel-websocket": 7.0.0-alpha.57 + "@storybook/client-api": 7.0.0-alpha.57 + "@storybook/core-server": 7.0.0-alpha.57 + "@storybook/html": 7.0.0-alpha.57 + "@storybook/node-logger": 7.0.0-alpha.57 + "@storybook/preview-web": 7.0.0-alpha.57 "@types/node": ^16.0.0 magic-string: ^0.26.1 typescript: ~4.6.3 @@ -6961,7 +6961,7 @@ __metadata: languageName: unknown linkType: soft -"@storybook/preview-web@7.0.0-alpha.56, @storybook/preview-web@workspace:*, @storybook/preview-web@workspace:lib/preview-web": +"@storybook/preview-web@7.0.0-alpha.57, @storybook/preview-web@workspace:*, @storybook/preview-web@workspace:lib/preview-web": version: 0.0.0-use.local resolution: "@storybook/preview-web@workspace:lib/preview-web" dependencies: