Merge remote-tracking branch 'origin/main' into steven/cypress-comman…

…d-name
chromaui · Jan 18, 2024 · 7723cdb · 7723cdb
2 parents 0ee3ca1 + c63a77c
commit 7723cdb
Show file tree

Hide file tree

Showing 8 changed files with 1,408 additions and 27 deletions.
diff --git a/packages/cypress/CHANGELOG.md b/packages/cypress/CHANGELOG.md
@@ -1,5 +1,11 @@
 # chromatic-cypress
 
+## 0.3.0
+
+### Minor Changes
+
+- 21b691d: depend on storybook instead of @storybook/cli
+
 ## 0.2.0
 
 ### Minor Changes

diff --git a/packages/cypress/package.json b/packages/cypress/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chromatic-cypress",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Chromatic Visual Regression Testing for Cypress",
   "repository": {
     "type": "git",
@@ -66,5 +66,10 @@
     "chrome-remote-interface": "^0.33.0",
     "lodash.debounce": "^4.0.8",
     "rrweb-snapshot": "^2.0.0-alpha.4"
+  },
+  "peerDependencies": {
+    "@storybook/addon-essentials": "^7.0.0 || ^8.0.x",
+    "@storybook/server-webpack5": "^7.0.0 || ^8.0.x",
+    "storybook": "^7.0.0 || ^8.0.x"
   }
 }
diff --git a/packages/playwright/CHANGELOG.md b/packages/playwright/CHANGELOG.md
@@ -1,5 +1,11 @@
 # chromatic-playwright
 
+## 0.3.0
+
+### Minor Changes
+
+- 21b691d: depend on storybook instead of @storybook/cli
+
 ## 0.2.0
 
 ### Minor Changes

diff --git a/packages/playwright/package.json b/packages/playwright/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chromatic-playwright",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Chromatic Visual Regression Testing for Playwright",
   "repository": {
     "type": "git",
@@ -64,6 +64,9 @@
     "ts-dedent": "^2.2.0"
   },
   "peerDependencies": {
-    "@playwright/test": "^1.0.0"
+    "@playwright/test": "^1.0.0",
+    "@storybook/addon-essentials": "^7.0.0 || ^8.0.x",
+    "@storybook/server-webpack5": "^7.0.0 || ^8.0.x",
+    "storybook": "^7.0.0 || ^8.0.x"
   }
 }
diff --git a/packages/shared/CHANGELOG.md b/packages/shared/CHANGELOG.md
@@ -0,0 +1,7 @@
+# @chromaui/shared-e2e
+
+## 0.1.0
+
+### Minor Changes
+
+- 21b691d: depend on storybook instead of @storybook/cli
diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@chromaui/shared-e2e",
   "private": true,
-  "version": "0.0.1",
+  "version": "0.1.0",
   "description": "Shared Chromatic E2E",
   "repository": {
     "type": "git",
@@ -65,7 +65,6 @@
     "@jest/types": "^27.0.6",
     "@playwright/test": "^1.39.0",
     "@storybook/addon-essentials": "^7.5.2",
-    "@storybook/cli": "^7.5.2",
     "@storybook/eslint-config-storybook": "^3.1.2",
     "@storybook/server-webpack5": "^7.5.2",
     "@testing-library/dom": "^8.1.0",
@@ -92,6 +91,7 @@
     "react-dom": "^17.0.1",
     "rimraf": "^3.0.2",
     "srcset": "^4.0.0",
+    "storybook": "^7.5.2",
     "ts-dedent": "^2.2.0",
     "ts-jest": "^27.0.4",
     "tsup": "^6.7.0",

diff --git a/packages/shared/src/archive-storybook/index.ts b/packages/shared/src/archive-storybook/index.ts
@@ -5,19 +5,13 @@ import { checkArchivesDirExists } from '../utils/filePaths';
 export function archiveStorybook(processArgs: string[], configDir: string) {
   checkArchivesDirExists();
 
-  const binPath = resolve(
-    dirname(require.resolve('@storybook/cli/package.json')),
-    './bin/index.js'
-  );
+  const binPath = resolve(dirname(require.resolve('storybook/package.json')), './index.js');
   execFileSync('node', [binPath, 'dev', ...processArgs, '-c', configDir], { stdio: 'inherit' });
 }
 
 export function buildArchiveStorybook(processArgs: string[], configDir: string) {
   checkArchivesDirExists();
 
-  const binPath = resolve(
-    dirname(require.resolve('@storybook/cli/package.json')),
-    './bin/index.js'
-  );
+  const binPath = resolve(dirname(require.resolve('storybook/package.json')), './index.js');
   execFileSync('node', [binPath, 'build', ...processArgs, '-c', configDir], { stdio: 'inherit' });
 }