From 035609595cabb6a863ee6ba73c7bb546fe4bd387 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 19 Jul 2024 09:40:25 +0200 Subject: [PATCH] move `storyGlobals` type to types as discussed here: https://github.com/ComponentDriven/csf/pull/95#issuecomment-2234809100 --- code/addons/links/package.json | 2 +- code/core/package.json | 2 +- code/core/src/types/modules/story.ts | 2 ++ code/lib/blocks/package.json | 2 +- code/lib/codemod/package.json | 2 +- code/lib/source-loader/package.json | 2 +- code/lib/test/package.json | 2 +- code/package.json | 2 +- code/renderers/server/package.json | 2 +- code/yarn.lock | 34 ++++++++++++++-------------- 10 files changed, 27 insertions(+), 25 deletions(-) diff --git a/code/addons/links/package.json b/code/addons/links/package.json index b5a1b0378b22..5ad730d8d1d7 100644 --- a/code/addons/links/package.json +++ b/code/addons/links/package.json @@ -67,7 +67,7 @@ "prep": "node --loader ../../../scripts/node_modules/esbuild-register/loader.js -r ../../../scripts/node_modules/esbuild-register/register.js ../../../scripts/prepare/addon-bundle.ts" }, "dependencies": { - "@storybook/csf": "0.1.12--canary.95.1b1fb52.0", + "@storybook/csf": "^0.1.11", "@storybook/global": "^5.0.0", "ts-dedent": "^2.0.0" }, diff --git a/code/core/package.json b/code/core/package.json index 2ad6d19e181c..7d420a0fdfea 100644 --- a/code/core/package.json +++ b/code/core/package.json @@ -253,7 +253,7 @@ "prep": "bun ./scripts/prep.ts" }, "dependencies": { - "@storybook/csf": "0.1.12--canary.95.1b1fb52.0", + "@storybook/csf": "^0.1.11", "@types/express": "^4.17.21", "@types/node": "^18.0.0", "browser-assert": "^1.2.1", diff --git a/code/core/src/types/modules/story.ts b/code/core/src/types/modules/story.ts index 69d10027bbe9..341802ebaa04 100644 --- a/code/core/src/types/modules/story.ts +++ b/code/core/src/types/modules/story.ts @@ -6,6 +6,7 @@ import type { CleanupCallback, StepRunner, Canvas, + Globals, } from '@storybook/csf'; import type { @@ -112,6 +113,7 @@ export type PreparedStory = testingLibraryRender?: (...args: never[]) => unknown; renderToCanvas?: ProjectAnnotations['renderToCanvas']; usesMount: boolean; + storyGlobals: Globals; }; export type PreparedMeta = Omit< diff --git a/code/lib/blocks/package.json b/code/lib/blocks/package.json index 4790c82c575f..f02bcc555287 100644 --- a/code/lib/blocks/package.json +++ b/code/lib/blocks/package.json @@ -44,7 +44,7 @@ "prep": "node --loader ../../../scripts/node_modules/esbuild-register/loader.js -r ../../../scripts/node_modules/esbuild-register/register.js ../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/csf": "0.1.12--canary.95.1b1fb52.0", + "@storybook/csf": "^0.1.11", "@storybook/global": "^5.0.0", "@storybook/icons": "^1.2.5", "@types/lodash": "^4.14.167", diff --git a/code/lib/codemod/package.json b/code/lib/codemod/package.json index 54fcfa6c1bce..351064e9fdae 100644 --- a/code/lib/codemod/package.json +++ b/code/lib/codemod/package.json @@ -58,7 +58,7 @@ "@babel/preset-env": "^7.24.4", "@babel/types": "^7.24.0", "@storybook/core": "workspace:*", - "@storybook/csf": "0.1.12--canary.95.1b1fb52.0", + "@storybook/csf": "^0.1.11", "@types/cross-spawn": "^6.0.2", "cross-spawn": "^7.0.3", "globby": "^14.0.1", diff --git a/code/lib/source-loader/package.json b/code/lib/source-loader/package.json index 6546c16b497c..3d1350076ef1 100644 --- a/code/lib/source-loader/package.json +++ b/code/lib/source-loader/package.json @@ -45,7 +45,7 @@ "prep": "node --loader ../../../scripts/node_modules/esbuild-register/loader.js -r ../../../scripts/node_modules/esbuild-register/register.js ../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/csf": "0.1.12--canary.95.1b1fb52.0", + "@storybook/csf": "^0.1.11", "estraverse": "^5.2.0", "lodash": "^4.17.21", "prettier": "^3.1.1" diff --git a/code/lib/test/package.json b/code/lib/test/package.json index 1c61e54ea0e2..110563d71aa4 100644 --- a/code/lib/test/package.json +++ b/code/lib/test/package.json @@ -44,7 +44,7 @@ "prep": "node --loader ../../../scripts/node_modules/esbuild-register/loader.js -r ../../../scripts/node_modules/esbuild-register/register.js ../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/csf": "0.1.12--canary.95.1b1fb52.0", + "@storybook/csf": "^0.1.11", "@storybook/instrumenter": "workspace:*", "@testing-library/dom": "10.1.0", "@testing-library/jest-dom": "6.4.5", diff --git a/code/package.json b/code/package.json index 738913106752..6b48ede80666 100644 --- a/code/package.json +++ b/code/package.json @@ -118,7 +118,7 @@ "@storybook/codemod": "workspace:*", "@storybook/core": "workspace:*", "@storybook/core-webpack": "workspace:*", - "@storybook/csf": "0.1.12--canary.95.1b1fb52.0", + "@storybook/csf": "^0.1.11", "@storybook/csf-plugin": "workspace:*", "@storybook/ember": "workspace:*", "@storybook/eslint-config-storybook": "^4.0.0", diff --git a/code/renderers/server/package.json b/code/renderers/server/package.json index 8d7aaf6412ae..24f266fb7b01 100644 --- a/code/renderers/server/package.json +++ b/code/renderers/server/package.json @@ -47,7 +47,7 @@ }, "dependencies": { "@storybook/components": "workspace:^", - "@storybook/csf": "0.1.12--canary.95.1b1fb52.0", + "@storybook/csf": "^0.1.11", "@storybook/global": "^5.0.0", "@storybook/manager-api": "workspace:^", "@storybook/preview-api": "workspace:^", diff --git a/code/yarn.lock b/code/yarn.lock index 6a47006ab78f..42ce040fbfd6 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -5289,7 +5289,7 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/addon-links@workspace:addons/links" dependencies: - "@storybook/csf": "npm:0.1.12--canary.95.1b1fb52.0" + "@storybook/csf": "npm:^0.1.11" "@storybook/global": "npm:^5.0.0" fs-extra: "npm:^11.1.0" ts-dedent: "npm:^2.0.0" @@ -5516,7 +5516,7 @@ __metadata: resolution: "@storybook/blocks@workspace:lib/blocks" dependencies: "@storybook/addon-actions": "workspace:*" - "@storybook/csf": "npm:0.1.12--canary.95.1b1fb52.0" + "@storybook/csf": "npm:^0.1.11" "@storybook/global": "npm:^5.0.0" "@storybook/icons": "npm:^1.2.5" "@storybook/react": "workspace:*" @@ -5669,7 +5669,7 @@ __metadata: "@babel/preset-env": "npm:^7.24.4" "@babel/types": "npm:^7.24.0" "@storybook/core": "workspace:*" - "@storybook/csf": "npm:0.1.12--canary.95.1b1fb52.0" + "@storybook/csf": "npm:^0.1.11" "@types/cross-spawn": "npm:^6.0.2" "@types/jscodeshift": "npm:^0.11.10" ansi-regex: "npm:^6.0.1" @@ -5763,7 +5763,7 @@ __metadata: "@radix-ui/react-dialog": "npm:^1.0.5" "@radix-ui/react-scroll-area": "npm:^1.0.5" "@radix-ui/react-slot": "npm:^1.0.2" - "@storybook/csf": "npm:0.1.12--canary.95.1b1fb52.0" + "@storybook/csf": "npm:^0.1.11" "@storybook/docs-mdx": "npm:4.0.0-next.0" "@storybook/global": "npm:^5.0.0" "@storybook/icons": "npm:^1.2.5" @@ -5899,15 +5899,6 @@ __metadata: languageName: unknown linkType: soft -"@storybook/csf@npm:0.1.12--canary.95.1b1fb52.0": - version: 0.1.12--canary.95.1b1fb52.0 - resolution: "@storybook/csf@npm:0.1.12--canary.95.1b1fb52.0" - dependencies: - type-fest: "npm:^2.19.0" - checksum: 10c0/4a1547ebe656f6ba6e2f9fda07202f6d8eb662651170d286b4d5036b8588afcbed5a026a6b71d975190619e3521db3fdec5eb7ee8b0b1bd08bbc9e12041af2aa - languageName: node - linkType: hard - "@storybook/csf@npm:^0.0.1": version: 0.0.1 resolution: "@storybook/csf@npm:0.0.1" @@ -5917,6 +5908,15 @@ __metadata: languageName: node linkType: hard +"@storybook/csf@npm:^0.1.11": + version: 0.1.11 + resolution: "@storybook/csf@npm:0.1.11" + dependencies: + type-fest: "npm:^2.19.0" + checksum: 10c0/c5329fc13e7d762049b5c91df1bc1c0e510a1a898c401b72b68f1ff64139a85ab64a92f8e681d2fcb226c0a4a55d0f23b569b2bdb517e0f067bd05ea46228356 + languageName: node + linkType: hard + "@storybook/docs-mdx@npm:4.0.0-next.0": version: 4.0.0-next.0 resolution: "@storybook/docs-mdx@npm:4.0.0-next.0" @@ -6509,7 +6509,7 @@ __metadata: "@storybook/codemod": "workspace:*" "@storybook/core": "workspace:*" "@storybook/core-webpack": "workspace:*" - "@storybook/csf": "npm:0.1.12--canary.95.1b1fb52.0" + "@storybook/csf": "npm:^0.1.11" "@storybook/csf-plugin": "workspace:*" "@storybook/ember": "workspace:*" "@storybook/eslint-config-storybook": "npm:^4.0.0" @@ -6645,7 +6645,7 @@ __metadata: resolution: "@storybook/server@workspace:renderers/server" dependencies: "@storybook/components": "workspace:^" - "@storybook/csf": "npm:0.1.12--canary.95.1b1fb52.0" + "@storybook/csf": "npm:^0.1.11" "@storybook/global": "npm:^5.0.0" "@storybook/manager-api": "workspace:^" "@storybook/preview-api": "workspace:^" @@ -6664,7 +6664,7 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/source-loader@workspace:lib/source-loader" dependencies: - "@storybook/csf": "npm:0.1.12--canary.95.1b1fb52.0" + "@storybook/csf": "npm:^0.1.11" estraverse: "npm:^5.2.0" lodash: "npm:^4.17.21" prettier: "npm:^3.1.1" @@ -6770,7 +6770,7 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/test@workspace:lib/test" dependencies: - "@storybook/csf": "npm:0.1.12--canary.95.1b1fb52.0" + "@storybook/csf": "npm:^0.1.11" "@storybook/instrumenter": "workspace:*" "@testing-library/dom": "npm:10.1.0" "@testing-library/jest-dom": "npm:6.4.5"