Merge pull request #28599 from storybookjs/norbert/cpc-add-shim-depen…

…dencies-to-renderers

CPC: Direct dependencies on shim packages in renderers

code/frameworks/angular/package.json

@@ -38,8 +38,12 @@
  },
  "dependencies": {
  "@storybook/builder-webpack5": "workspace:*",
+ "@storybook/components": "workspace:^",
  "@storybook/core-webpack": "workspace:*",
  "@storybook/global": "^5.0.0",
+ "@storybook/manager-api": "workspace:^",
+ "@storybook/preview-api": "workspace:^",
+ "@storybook/theming": "workspace:^",
  "@types/node": "^18.0.0",
  "@types/react": "^18.0.37",
  "@types/react-dom": "^18.0.11",

code/renderers/html/package.json

@@ -47,7 +47,11 @@
  "prep": "node --loader ../../../scripts/node_modules/esbuild-register/loader.js -r ../../../scripts/node_modules/esbuild-register/register.js ../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
+ "@storybook/components": "workspace:^",
  "@storybook/global": "^5.0.0",
+ "@storybook/manager-api": "workspace:^",
+ "@storybook/preview-api": "workspace:^",
+ "@storybook/theming": "workspace:^",
  "ts-dedent": "^2.0.0"
  },
  "devDependencies": {

code/renderers/preact/package.json

@@ -47,7 +47,11 @@
  "prep": "node --loader ../../../scripts/node_modules/esbuild-register/loader.js -r ../../../scripts/node_modules/esbuild-register/register.js ../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
+ "@storybook/components": "workspace:^",
  "@storybook/global": "^5.0.0",
+ "@storybook/manager-api": "workspace:^",
+ "@storybook/preview-api": "workspace:^",
+ "@storybook/theming": "workspace:^",
  "ts-dedent": "^2.0.0"
  },
  "devDependencies": {

code/renderers/react/package.json

@@ -64,8 +64,12 @@
  "prep": "node --loader ../../../scripts/node_modules/esbuild-register/loader.js -r ../../../scripts/node_modules/esbuild-register/register.js ../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
+ "@storybook/components": "workspace:^",
  "@storybook/global": "^5.0.0",
+ "@storybook/manager-api": "workspace:^",
+ "@storybook/preview-api": "workspace:^",
  "@storybook/react-dom-shim": "workspace:*",
+ "@storybook/theming": "workspace:^",
  "@types/escodegen": "^0.0.6",
  "@types/estree": "^0.0.51",
  "@types/node": "^18.0.0",

code/renderers/server/package.json

@@ -46,8 +46,12 @@
  "prep": "node --loader ../../../scripts/node_modules/esbuild-register/loader.js -r ../../../scripts/node_modules/esbuild-register/register.js ../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
+ "@storybook/components": "workspace:^",
  "@storybook/csf": "0.1.11",
  "@storybook/global": "^5.0.0",
+ "@storybook/manager-api": "workspace:^",
+ "@storybook/preview-api": "workspace:^",
+ "@storybook/theming": "workspace:^",
  "@types/fs-extra": "^11.0.1",
  "fs-extra": "^11.1.0",
  "ts-dedent": "^2.0.0",

code/renderers/svelte/package.json

@@ -57,7 +57,11 @@
  "prep": "node --loader ../../../scripts/node_modules/esbuild-register/loader.js -r ../../../scripts/node_modules/esbuild-register/register.js ../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
+ "@storybook/components": "workspace:^",
  "@storybook/global": "^5.0.0",
+ "@storybook/manager-api": "workspace:^",
+ "@storybook/preview-api": "workspace:^",
+ "@storybook/theming": "workspace:^",
  "sveltedoc-parser": "^4.2.1",
  "ts-dedent": "^2.0.0",
  "type-fest": "~2.19"

code/renderers/vue3/package.json

@@ -63,7 +63,11 @@
  "prep": "node --loader ../../../scripts/node_modules/esbuild-register/loader.js -r ../../../scripts/node_modules/esbuild-register/register.js ../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
+ "@storybook/components": "workspace:^",
  "@storybook/global": "^5.0.0",
+ "@storybook/manager-api": "workspace:^",
+ "@storybook/preview-api": "workspace:^",
+ "@storybook/theming": "workspace:^",
  "@vue/compiler-core": "^3.0.0",
  "lodash": "^4.17.21",
  "ts-dedent": "^2.0.0",

code/renderers/web-components/package.json

@@ -50,7 +50,11 @@
  "prep": "node --loader ../../../scripts/node_modules/esbuild-register/loader.js -r ../../../scripts/node_modules/esbuild-register/register.js ../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
+ "@storybook/components": "workspace:^",
  "@storybook/global": "^5.0.0",
+ "@storybook/manager-api": "workspace:^",
+ "@storybook/preview-api": "workspace:^",
+ "@storybook/theming": "workspace:^",
  "tiny-invariant": "^1.3.1",
  "ts-dedent": "^2.0.0"
  },

code/yarn.lock

@@ -5437,8 +5437,12 @@ __metadata:
  "@angular/platform-browser": "npm:^17.3.0"
  "@angular/platform-browser-dynamic": "npm:^17.3.0"
  "@storybook/builder-webpack5": "workspace:*"
+ "@storybook/components": "workspace:^"
  "@storybook/core-webpack": "workspace:*"
  "@storybook/global": "npm:^5.0.0"
+ "@storybook/manager-api": "workspace:^"
+ "@storybook/preview-api": "workspace:^"
+ "@storybook/theming": "workspace:^"
  "@types/cross-spawn": "npm:^6.0.2"
  "@types/node": "npm:^18.0.0"
  "@types/react": "npm:^18.0.37"
@@ -5688,7 +5692,7 @@ __metadata:
  languageName: unknown
  linkType: soft
 
-"@storybook/components@workspace:deprecated/components":
+"@storybook/components@workspace:^, @storybook/components@workspace:deprecated/components":
  version: 0.0.0-use.local
  resolution: "@storybook/components@workspace:deprecated/components"
  peerDependencies:
@@ -6000,7 +6004,11 @@ __metadata:
  version: 0.0.0-use.local
  resolution: "@storybook/html@workspace:renderers/html"
  dependencies:
+ "@storybook/components": "workspace:^"
  "@storybook/global": "npm:^5.0.0"
+ "@storybook/manager-api": "workspace:^"
+ "@storybook/preview-api": "workspace:^"
+ "@storybook/theming": "workspace:^"
  ts-dedent: "npm:^2.0.0"
  typescript: "npm:^5.3.2"
  peerDependencies:
@@ -6058,7 +6066,7 @@ __metadata:
  languageName: node
  linkType: hard
 
-"@storybook/manager-api@workspace:deprecated/manager-api":
+"@storybook/manager-api@workspace:^, @storybook/manager-api@workspace:deprecated/manager-api":
  version: 0.0.0-use.local
  resolution: "@storybook/manager-api@workspace:deprecated/manager-api"
  peerDependencies:
@@ -6187,7 +6195,11 @@ __metadata:
  version: 0.0.0-use.local
  resolution: "@storybook/preact@workspace:renderers/preact"
  dependencies:
+ "@storybook/components": "workspace:^"
  "@storybook/global": "npm:^5.0.0"
+ "@storybook/manager-api": "workspace:^"
+ "@storybook/preview-api": "workspace:^"
+ "@storybook/theming": "workspace:^"
  preact: "npm:^10.5.13"
  ts-dedent: "npm:^2.0.0"
  typescript: "npm:^5.3.2"
@@ -6327,7 +6339,7 @@ __metadata:
  languageName: unknown
  linkType: soft
 
-"@storybook/preview-api@workspace:deprecated/preview-api":
+"@storybook/preview-api@workspace:^, @storybook/preview-api@workspace:deprecated/preview-api":
  version: 0.0.0-use.local
  resolution: "@storybook/preview-api@workspace:deprecated/preview-api"
  peerDependencies:
@@ -6420,9 +6432,13 @@ __metadata:
  version: 0.0.0-use.local
  resolution: "@storybook/react@workspace:renderers/react"
  dependencies:
+ "@storybook/components": "workspace:^"
  "@storybook/global": "npm:^5.0.0"
+ "@storybook/manager-api": "workspace:^"
+ "@storybook/preview-api": "workspace:^"
  "@storybook/react-dom-shim": "workspace:*"
  "@storybook/test": "workspace:*"
+ "@storybook/theming": "workspace:^"
  "@types/babel-plugin-react-docgen": "npm:^4"
  "@types/escodegen": "npm:^0.0.6"
  "@types/estree": "npm:^0.0.51"
@@ -6626,8 +6642,12 @@ __metadata:
  version: 0.0.0-use.local
  resolution: "@storybook/server@workspace:renderers/server"
  dependencies:
+ "@storybook/components": "workspace:^"
  "@storybook/csf": "npm:0.1.11"
  "@storybook/global": "npm:^5.0.0"
+ "@storybook/manager-api": "workspace:^"
+ "@storybook/preview-api": "workspace:^"
+ "@storybook/theming": "workspace:^"
  "@types/fs-extra": "npm:^11.0.1"
  fs-extra: "npm:^11.1.0"
  ts-dedent: "npm:^2.0.0"
@@ -6696,7 +6716,11 @@ __metadata:
  version: 0.0.0-use.local
  resolution: "@storybook/svelte@workspace:renderers/svelte"
  dependencies:
+ "@storybook/components": "workspace:^"
  "@storybook/global": "npm:^5.0.0"
+ "@storybook/manager-api": "workspace:^"
+ "@storybook/preview-api": "workspace:^"
+ "@storybook/theming": "workspace:^"
  "@sveltejs/vite-plugin-svelte": "npm:^3.0.2"
  "@testing-library/jest-dom": "npm:^6.4.1"
  "@testing-library/svelte": "patch:@testing-library/svelte@npm%3A4.1.0#~/.yarn/patches/@testing-library-svelte-npm-4.1.0-34b7037bc0.patch"
@@ -6773,7 +6797,7 @@ __metadata:
  languageName: node
  linkType: hard
 
-"@storybook/theming@workspace:*, @storybook/theming@workspace:deprecated/theming":
+"@storybook/theming@workspace:*, @storybook/theming@workspace:^, @storybook/theming@workspace:deprecated/theming":
  version: 0.0.0-use.local
  resolution: "@storybook/theming@workspace:deprecated/theming"
  peerDependencies:
@@ -6832,7 +6856,11 @@ __metadata:
  resolution: "@storybook/vue3@workspace:renderers/vue3"
  dependencies:
  "@digitak/esrun": "npm:^3.2.2"
+ "@storybook/components": "workspace:^"
  "@storybook/global": "npm:^5.0.0"
+ "@storybook/manager-api": "workspace:^"
+ "@storybook/preview-api": "workspace:^"
+ "@storybook/theming": "workspace:^"
  "@testing-library/vue": "npm:^8.0.0"
  "@types/prettier": "npm:^3.0.0"
  "@vitejs/plugin-vue": "npm:^4.4.0"
@@ -6883,7 +6911,11 @@ __metadata:
  version: 0.0.0-use.local
  resolution: "@storybook/web-components@workspace:renderers/web-components"
  dependencies:
+ "@storybook/components": "workspace:^"
  "@storybook/global": "npm:^5.0.0"
+ "@storybook/manager-api": "workspace:^"
+ "@storybook/preview-api": "workspace:^"
+ "@storybook/theming": "workspace:^"
  "@types/cross-spawn": "npm:^6.0.2"
  "@types/node": "npm:^18.0.0"
  cross-spawn: "npm:^7.0.3"

test-storybooks/ember-cli/package.json

@@ -35,13 +35,15 @@
  "@storybook/builder-webpack5": "file:../../code/builders/builder-webpack5",
  "@storybook/client-logger": "file:../../code/lib/client-logger",
  "@storybook/codemod": "file:../../code/lib/codemod",
+ "@storybook/components": "file:../../code/deprecated/components",
  "@storybook/core": "file:../../code/core",
  "@storybook/core-webpack": "file:../../code/lib/core-webpack",
  "@storybook/csf-plugin": "file:../../code/lib/csf-plugin",
  "@storybook/ember": "file:../../code/frameworks/ember",
  "@storybook/html": "file:../../code/renderers/html",
  "@storybook/html-webpack5": "file:../../code/frameworks/html-webpack5",
  "@storybook/instrumenter": "file:../../code/lib/instrumenter",
+ "@storybook/manager-api": "file:../../code/deprecated/manager-api",
  "@storybook/nextjs": "file:../../code/frameworks/nextjs",
  "@storybook/preact": "file:../../code/renderers/preact",
  "@storybook/preact-vite": "file:../../code/frameworks/preact-vite",
@@ -53,8 +55,7 @@
  "@storybook/preset-server-webpack": "file:../../code/presets/server-webpack",
  "@storybook/preset-svelte-webpack": "file:../../code/presets/svelte-webpack",
  "@storybook/preset-vue3-webpack": "file:../../code/presets/vue3-webpack",
- "@storybook/preview": "file:../../code/lib/preview",
- "@storybook/preview-api": "file:../../code/lib/preview-api",
+ "@storybook/preview-api": "file:../../code/deprecated/preview-api",
  "@storybook/react": "file:../../code/renderers/react",
  "@storybook/react-dom-shim": "file:../../code/lib/react-dom-shim",
  "@storybook/react-vite": "file:../../code/frameworks/react-vite",
@@ -67,6 +68,7 @@
  "@storybook/svelte-webpack5": "file:../../code/frameworks/svelte-webpack5",
  "@storybook/sveltekit": "file:../../code/frameworks/sveltekit",
  "@storybook/test": "file:../../code/lib/test",
+ "@storybook/theming": "file:../../code/deprecated/theming",
  "@storybook/vue3": "file:../../code/renderers/vue3",
  "@storybook/vue3-vite": "file:../../code/frameworks/vue3-vite",
  "@storybook/vue3-webpack5": "file:../../code/frameworks/vue3-webpack5",
@@ -127,4 +129,4 @@
  "projectToken": "19z23qxndju"
  }
  }
-}
+}

test-storybooks/external-docs/package.json

@@ -35,13 +35,15 @@
  "@storybook/builder-webpack5": "file:../../code/builders/builder-webpack5",
  "@storybook/client-logger": "file:../../code/lib/client-logger",
  "@storybook/codemod": "file:../../code/lib/codemod",
+ "@storybook/components": "file:../../code/deprecated/components",
  "@storybook/core": "file:../../code/core",
  "@storybook/core-webpack": "file:../../code/lib/core-webpack",
  "@storybook/csf-plugin": "file:../../code/lib/csf-plugin",
  "@storybook/ember": "file:../../code/frameworks/ember",
  "@storybook/html": "file:../../code/renderers/html",
  "@storybook/html-webpack5": "file:../../code/frameworks/html-webpack5",
  "@storybook/instrumenter": "file:../../code/lib/instrumenter",
+ "@storybook/manager-api": "file:../../code/deprecated/manager-api",
  "@storybook/nextjs": "file:../../code/frameworks/nextjs",
  "@storybook/preact": "file:../../code/renderers/preact",
  "@storybook/preact-vite": "file:../../code/frameworks/preact-vite",
@@ -53,8 +55,7 @@
  "@storybook/preset-server-webpack": "file:../../code/presets/server-webpack",
  "@storybook/preset-svelte-webpack": "file:../../code/presets/svelte-webpack",
  "@storybook/preset-vue3-webpack": "file:../../code/presets/vue3-webpack",
- "@storybook/preview": "file:../../code/lib/preview",
- "@storybook/preview-api": "file:../../code/lib/preview-api",
+ "@storybook/preview-api": "file:../../code/deprecated/preview-api",
  "@storybook/react": "file:../../code/renderers/react",
  "@storybook/react-dom-shim": "file:../../code/lib/react-dom-shim",
  "@storybook/react-vite": "file:../../code/frameworks/react-vite",
@@ -67,6 +68,7 @@
  "@storybook/svelte-webpack5": "file:../../code/frameworks/svelte-webpack5",
  "@storybook/sveltekit": "file:../../code/frameworks/sveltekit",
  "@storybook/test": "file:../../code/lib/test",
+ "@storybook/theming": "file:../../code/deprecated/theming",
  "@storybook/vue3": "file:../../code/renderers/vue3",
  "@storybook/vue3-vite": "file:../../code/frameworks/vue3-vite",
  "@storybook/vue3-webpack5": "file:../../code/frameworks/vue3-webpack5",

test-storybooks/portable-stories-kitchen-sink/nextjs/package.json

@@ -36,13 +36,15 @@
  "@storybook/builder-vite": "file:../../../code/builders/builder-vite",
  "@storybook/builder-webpack5": "file:../../../code/builders/builder-webpack5",
  "@storybook/codemod": "file:../../../code/lib/codemod",
+ "@storybook/components": "file:../../../code/deprecated/components",
  "@storybook/core": "file:../../../code/core",
  "@storybook/core-webpack": "file:../../../code/lib/core-webpack",
  "@storybook/csf-plugin": "file:../../../code/lib/csf-plugin",
  "@storybook/ember": "file:../../../code/frameworks/ember",
  "@storybook/html": "file:../../../code/renderers/html",
  "@storybook/html-webpack5": "file:../../../code/frameworks/html-webpack5",
  "@storybook/instrumenter": "file:../../../code/lib/instrumenter",
+ "@storybook/manager-api": "file:../../../code/deprecated/manager-api",
  "@storybook/nextjs": "file:../../../code/frameworks/nextjs",
  "@storybook/preact": "file:../../../code/renderers/preact",
  "@storybook/preact-vite": "file:../../../code/frameworks/preact-vite",
@@ -54,6 +56,7 @@
  "@storybook/preset-server-webpack": "file:../../../code/presets/server-webpack",
  "@storybook/preset-svelte-webpack": "file:../../../code/presets/svelte-webpack",
  "@storybook/preset-vue3-webpack": "file:../../../code/presets/vue3-webpack",
+ "@storybook/preview-api": "file:../../../code/deprecated/preview-api",
  "@storybook/react": "file:../../../code/renderers/react",
  "@storybook/react-dom-shim": "file:../../../code/lib/react-dom-shim",
  "@storybook/react-vite": "file:../../../code/frameworks/react-vite",
@@ -66,6 +69,7 @@
  "@storybook/svelte-webpack5": "file:../../../code/frameworks/svelte-webpack5",
  "@storybook/sveltekit": "file:../../../code/frameworks/sveltekit",
  "@storybook/test": "file:../../../code/lib/test",
+ "@storybook/theming": "file:../../../code/deprecated/theming",
  "@storybook/vue3": "file:../../../code/renderers/vue3",
  "@storybook/vue3-vite": "file:../../../code/frameworks/vue3-vite",
  "@storybook/vue3-webpack5": "file:../../../code/frameworks/vue3-webpack5",

test-storybooks/portable-stories-kitchen-sink/react/package.json

@@ -38,13 +38,15 @@
  "@storybook/builder-vite": "portal:../../../code/builders/builder-vite",
  "@storybook/builder-webpack5": "portal:../../../code/builders/builder-webpack5",
  "@storybook/codemod": "portal:../../../code/lib/codemod",
+ "@storybook/components": "file:../../../code/deprecated/components",
  "@storybook/core": "portal:../../../code/core",
  "@storybook/core-webpack": "portal:../../../code/lib/core-webpack",
  "@storybook/csf-plugin": "portal:../../../code/lib/csf-plugin",
  "@storybook/ember": "portal:../../../code/frameworks/ember",
  "@storybook/html": "portal:../../../code/renderers/html",
  "@storybook/html-webpack5": "portal:../../../code/frameworks/html-webpack5",
  "@storybook/instrumenter": "portal:../../../code/lib/instrumenter",
+ "@storybook/manager-api": "file:../../../code/deprecated/manager-api",
  "@storybook/nextjs": "portal:../../../code/frameworks/nextjs",
  "@storybook/preact": "portal:../../../code/renderers/preact",
  "@storybook/preact-vite": "portal:../../../code/frameworks/preact-vite",
@@ -56,6 +58,7 @@
  "@storybook/preset-server-webpack": "portal:../../../code/presets/server-webpack",
  "@storybook/preset-svelte-webpack": "portal:../../../code/presets/svelte-webpack",
  "@storybook/preset-vue3-webpack": "portal:../../../code/presets/vue3-webpack",
+ "@storybook/preview-api": "file:../../../code/deprecated/preview-api",
  "@storybook/react": "portal:../../../code/renderers/react",
  "@storybook/react-dom-shim": "portal:../../../code/lib/react-dom-shim",
  "@storybook/react-vite": "portal:../../../code/frameworks/react-vite",
@@ -68,6 +71,7 @@
  "@storybook/svelte-webpack5": "portal:../../../code/frameworks/svelte-webpack5",
  "@storybook/sveltekit": "portal:../../../code/frameworks/sveltekit",
  "@storybook/test": "portal:../../../code/lib/test",
+ "@storybook/theming": "file:../../../code/deprecated/theming",
  "@storybook/vue3": "portal:../../../code/renderers/vue3",
  "@storybook/vue3-vite": "portal:../../../code/frameworks/vue3-vite",
  "@storybook/vue3-webpack5": "portal:../../../code/frameworks/vue3-webpack5",