From f1a7509dcba545f957c9b08b62f30fa310c5b603 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Wed, 28 Feb 2024 14:38:29 +0100 Subject: [PATCH 01/10] move chromatic to script directory --- code/package.json | 3 +-- code/yarn.lock | 12 ------------ scripts/package.json | 1 + scripts/yarn.lock | 20 ++++++++++++++++++++ 4 files changed, 22 insertions(+), 14 deletions(-) diff --git a/code/package.json b/code/package.json index 065499ca7dbe..a33be9195165 100644 --- a/code/package.json +++ b/code/package.json @@ -48,7 +48,7 @@ "storybook:blocks:chromatic": "STORYBOOK_BLOCKS_ONLY=true yarn storybook:ui:chromatic --project-token=${CHROMATIC_TOKEN_STORYBOOK_BLOCKS:-MISSING_PROJECT_TOKEN}", "storybook:ui": "NODE_OPTIONS=\"--preserve-symlinks --preserve-symlinks-main\" ./lib/cli/bin/index.js dev --port 6006 --config-dir ./ui/.storybook", "storybook:ui:build": "NODE_OPTIONS=\"--preserve-symlinks --preserve-symlinks-main\" ./lib/cli/bin/index.js build --config-dir ./ui/.storybook", - "storybook:ui:chromatic": "yarn chromatic --build-script-name storybook:ui:build --storybook-config-dir ./ui/.storybook --storybook-base-dir ./code --project-token=${CHROMATIC_TOKEN_STORYBOOK_UI:-MISSING_PROJECT_TOKEN} --only-changed --exit-zero-on-changes --exit-once-uploaded", + "storybook:ui:chromatic": "../scripts/node_modules/.bin/chromatic --build-script-name storybook:ui:build --storybook-config-dir ./ui/.storybook --storybook-base-dir ./code --project-token=${CHROMATIC_TOKEN_STORYBOOK_UI:-MISSING_PROJECT_TOKEN} --only-changed --exit-zero-on-changes --exit-once-uploaded", "task": "yarn --cwd ../scripts task", "test": "NODE_OPTIONS=--max_old_space_size=4096 vitest run", "test:watch": "NODE_OPTIONS=--max_old_space_size=4096 vitest watch" @@ -186,7 +186,6 @@ "@typescript-eslint/parser": "^6.18.1", "@vitejs/plugin-react": "^3.0.1", "@vitest/coverage-v8": "^1.2.2", - "chromatic": "7.1.0", "concurrently": "^5.3.0", "cross-env": "^7.0.3", "danger": "^11.2.6", diff --git a/code/yarn.lock b/code/yarn.lock index c0338dabe0c4..91e0494f57cb 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -6664,7 +6664,6 @@ __metadata: "@typescript-eslint/parser": "npm:^6.18.1" "@vitejs/plugin-react": "npm:^3.0.1" "@vitest/coverage-v8": "npm:^1.2.2" - chromatic: "npm:7.1.0" concurrently: "npm:^5.3.0" cross-env: "npm:^7.0.3" danger: "npm:^11.2.6" @@ -11646,17 +11645,6 @@ __metadata: languageName: node linkType: hard -"chromatic@npm:7.1.0": - version: 7.1.0 - resolution: "chromatic@npm:7.1.0" - bin: - chroma: dist/bin.js - chromatic: dist/bin.js - chromatic-cli: dist/bin.js - checksum: d5bc18f97b7829799673018e8eaa0ef6537a47e3050208b791e083bef6753c44a2506f1fef2180b71fbf05c67bc80cdaf253ea599924dee82103e58ed344ef8a - languageName: node - linkType: hard - "chromatic@npm:^9.0.0": version: 9.1.0 resolution: "chromatic@npm:9.1.0" diff --git a/scripts/package.json b/scripts/package.json index 52d2013ec288..f8732ca7b345 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -113,6 +113,7 @@ "boxen": "^7.1.1", "browser-assert": "^1.2.1", "chalk": "^4.1.0", + "chromatic": "^11.0.0", "codecov": "^3.8.1", "commander": "^6.2.1", "cross-env": "^7.0.3", diff --git a/scripts/yarn.lock b/scripts/yarn.lock index fd8ab47be372..d8ced58adb95 100644 --- a/scripts/yarn.lock +++ b/scripts/yarn.lock @@ -2753,6 +2753,7 @@ __metadata: boxen: "npm:^7.1.1" browser-assert: "npm:^1.2.1" chalk: "npm:^4.1.0" + chromatic: "npm:^11.0.0" codecov: "npm:^3.8.1" commander: "npm:^6.2.1" cross-env: "npm:^7.0.3" @@ -5212,6 +5213,25 @@ __metadata: languageName: node linkType: hard +"chromatic@npm:^11.0.0": + version: 11.0.0 + resolution: "chromatic@npm:11.0.0" + peerDependencies: + "@chromatic-com/cypress": ^0.5.2 || ^1.0.0 + "@chromatic-com/playwright": ^0.5.2 || ^1.0.0 + peerDependenciesMeta: + "@chromatic-com/cypress": + optional: true + "@chromatic-com/playwright": + optional: true + bin: + chroma: dist/bin.js + chromatic: dist/bin.js + chromatic-cli: dist/bin.js + checksum: edd92b3fb370c8d358cd587392686e83af34aec0e5d6592bfc637d6b6c1f670f3910ff572182192dcf1adf8e34384f785597dcdcb89196482f0c6fa55547d1bf + languageName: node + linkType: hard + "ci-info@npm:^2.0.0": version: 2.0.0 resolution: "ci-info@npm:2.0.0" From 8cfa773a333b265a79ed25f10fe5fb74cf70d0e1 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Wed, 28 Feb 2024 14:58:02 +0100 Subject: [PATCH 02/10] add package for `code/ui/.storybook/preview.tsx` --- code/package.json | 1 + code/yarn.lock | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/code/package.json b/code/package.json index a33be9195165..ea575e25d841 100644 --- a/code/package.json +++ b/code/package.json @@ -186,6 +186,7 @@ "@typescript-eslint/parser": "^6.18.1", "@vitejs/plugin-react": "^3.0.1", "@vitest/coverage-v8": "^1.2.2", + "chromatic": "^11.0.0", "concurrently": "^5.3.0", "cross-env": "^7.0.3", "danger": "^11.2.6", diff --git a/code/yarn.lock b/code/yarn.lock index 91e0494f57cb..c2bffa9020c7 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -6664,6 +6664,7 @@ __metadata: "@typescript-eslint/parser": "npm:^6.18.1" "@vitejs/plugin-react": "npm:^3.0.1" "@vitest/coverage-v8": "npm:^1.2.2" + chromatic: "npm:^11.0.0" concurrently: "npm:^5.3.0" cross-env: "npm:^7.0.3" danger: "npm:^11.2.6" @@ -11645,6 +11646,25 @@ __metadata: languageName: node linkType: hard +"chromatic@npm:^11.0.0": + version: 11.0.0 + resolution: "chromatic@npm:11.0.0" + peerDependencies: + "@chromatic-com/cypress": ^0.5.2 || ^1.0.0 + "@chromatic-com/playwright": ^0.5.2 || ^1.0.0 + peerDependenciesMeta: + "@chromatic-com/cypress": + optional: true + "@chromatic-com/playwright": + optional: true + bin: + chroma: dist/bin.js + chromatic: dist/bin.js + chromatic-cli: dist/bin.js + checksum: edd92b3fb370c8d358cd587392686e83af34aec0e5d6592bfc637d6b6c1f670f3910ff572182192dcf1adf8e34384f785597dcdcb89196482f0c6fa55547d1bf + languageName: node + linkType: hard + "chromatic@npm:^9.0.0": version: 9.1.0 resolution: "chromatic@npm:9.1.0" From 3823695cb936ff76e08e3e0aa90329562656aeda Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Wed, 28 Feb 2024 15:44:24 +0100 Subject: [PATCH 03/10] set `--storybook-config-dir` to root --- code/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/package.json b/code/package.json index ea575e25d841..e0b8346a8d87 100644 --- a/code/package.json +++ b/code/package.json @@ -48,7 +48,7 @@ "storybook:blocks:chromatic": "STORYBOOK_BLOCKS_ONLY=true yarn storybook:ui:chromatic --project-token=${CHROMATIC_TOKEN_STORYBOOK_BLOCKS:-MISSING_PROJECT_TOKEN}", "storybook:ui": "NODE_OPTIONS=\"--preserve-symlinks --preserve-symlinks-main\" ./lib/cli/bin/index.js dev --port 6006 --config-dir ./ui/.storybook", "storybook:ui:build": "NODE_OPTIONS=\"--preserve-symlinks --preserve-symlinks-main\" ./lib/cli/bin/index.js build --config-dir ./ui/.storybook", - "storybook:ui:chromatic": "../scripts/node_modules/.bin/chromatic --build-script-name storybook:ui:build --storybook-config-dir ./ui/.storybook --storybook-base-dir ./code --project-token=${CHROMATIC_TOKEN_STORYBOOK_UI:-MISSING_PROJECT_TOKEN} --only-changed --exit-zero-on-changes --exit-once-uploaded", + "storybook:ui:chromatic": "../scripts/node_modules/.bin/chromatic --build-script-name storybook:ui:build --storybook-config-dir ./ --storybook-base-dir ./code --project-token=${CHROMATIC_TOKEN_STORYBOOK_UI:-MISSING_PROJECT_TOKEN} --only-changed --exit-zero-on-changes --exit-once-uploaded", "task": "yarn --cwd ../scripts task", "test": "NODE_OPTIONS=--max_old_space_size=4096 vitest run", "test:watch": "NODE_OPTIONS=--max_old_space_size=4096 vitest watch" From 1b73ae276145829262e7e6ccca1d43e9e6924a4c Mon Sep 17 00:00:00 2001 From: Reuben Ellis Date: Wed, 28 Feb 2024 08:16:07 -0700 Subject: [PATCH 04/10] Update vite plugin --- code/package.json | 2 +- code/ui/.storybook/main.ts | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/code/package.json b/code/package.json index e0b8346a8d87..2b083a38164e 100644 --- a/code/package.json +++ b/code/package.json @@ -47,7 +47,7 @@ "storybook:blocks:build": "STORYBOOK_BLOCKS_ONLY=true yarn storybook:ui:build", "storybook:blocks:chromatic": "STORYBOOK_BLOCKS_ONLY=true yarn storybook:ui:chromatic --project-token=${CHROMATIC_TOKEN_STORYBOOK_BLOCKS:-MISSING_PROJECT_TOKEN}", "storybook:ui": "NODE_OPTIONS=\"--preserve-symlinks --preserve-symlinks-main\" ./lib/cli/bin/index.js dev --port 6006 --config-dir ./ui/.storybook", - "storybook:ui:build": "NODE_OPTIONS=\"--preserve-symlinks --preserve-symlinks-main\" ./lib/cli/bin/index.js build --config-dir ./ui/.storybook", + "storybook:ui:build": "NODE_OPTIONS=\"--preserve-symlinks --preserve-symlinks-main\" ./lib/cli/bin/index.js build --config-dir ./ui/.storybook --webpack-stats-json", "storybook:ui:chromatic": "../scripts/node_modules/.bin/chromatic --build-script-name storybook:ui:build --storybook-config-dir ./ --storybook-base-dir ./code --project-token=${CHROMATIC_TOKEN_STORYBOOK_UI:-MISSING_PROJECT_TOKEN} --only-changed --exit-zero-on-changes --exit-once-uploaded", "task": "yarn --cwd ../scripts task", "test": "NODE_OPTIONS=--max_old_space_size=4096 vitest run", diff --git a/code/ui/.storybook/main.ts b/code/ui/.storybook/main.ts index 3defc0046331..b3e8e881de81 100644 --- a/code/ui/.storybook/main.ts +++ b/code/ui/.storybook/main.ts @@ -1,5 +1,4 @@ import path from 'path'; -import pluginTurbosnap from 'vite-plugin-turbosnap'; // eslint-disable-next-line @typescript-eslint/no-restricted-imports import { mergeConfig } from 'vite'; import type { StorybookConfig } from '../../frameworks/react-vite'; @@ -79,11 +78,6 @@ const config: StorybookConfig = { : {}), }, }, - plugins: [ - configType === 'PRODUCTION' - ? pluginTurbosnap({ rootDir: path.resolve(__dirname, '../..') }) - : [], - ], optimizeDeps: { force: true }, build: { // disable sourcemaps in CI to not run out of memory From 2174004107b8fb4b70e226c01d54eff7b02f88e3 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Wed, 28 Feb 2024 16:52:35 +0100 Subject: [PATCH 05/10] remove unused dependency --- code/package.json | 1 - code/yarn.lock | 8 -------- 2 files changed, 9 deletions(-) diff --git a/code/package.json b/code/package.json index 2b083a38164e..3b81b004db37 100644 --- a/code/package.json +++ b/code/package.json @@ -221,7 +221,6 @@ "typescript": "^5.3.2", "util": "^0.12.4", "vite": "^4.0.0", - "vite-plugin-turbosnap": "^1.0.1", "vitest": "^1.2.2", "wait-on": "^7.0.1" }, diff --git a/code/yarn.lock b/code/yarn.lock index c2bffa9020c7..4f7cc327f6d1 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -6699,7 +6699,6 @@ __metadata: typescript: "npm:^5.3.2" util: "npm:^0.12.4" vite: "npm:^4.0.0" - vite-plugin-turbosnap: "npm:^1.0.1" vitest: "npm:^1.2.2" wait-on: "npm:^7.0.1" dependenciesMeta: @@ -29515,13 +29514,6 @@ __metadata: languageName: node linkType: hard -"vite-plugin-turbosnap@npm:^1.0.1": - version: 1.0.3 - resolution: "vite-plugin-turbosnap@npm:1.0.3" - checksum: fd4a283708e24b54442b5db05461f8302bc57094234fd5b0dae1a6f76bb79078c68a729e516f352d04b89fea7c459f8272921f788bd3cd20d1488c7e73d7238e - languageName: node - linkType: hard - "vite@npm:4.5.0": version: 4.5.0 resolution: "vite@npm:4.5.0" From cf5e82b30255b593f2437b9cb90534248a6e05ff Mon Sep 17 00:00:00 2001 From: Reuben Ellis Date: Wed, 28 Feb 2024 10:44:15 -0700 Subject: [PATCH 06/10] Update chromatic script because we cd --- code/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/package.json b/code/package.json index 3b81b004db37..730f24cd6e30 100644 --- a/code/package.json +++ b/code/package.json @@ -48,7 +48,7 @@ "storybook:blocks:chromatic": "STORYBOOK_BLOCKS_ONLY=true yarn storybook:ui:chromatic --project-token=${CHROMATIC_TOKEN_STORYBOOK_BLOCKS:-MISSING_PROJECT_TOKEN}", "storybook:ui": "NODE_OPTIONS=\"--preserve-symlinks --preserve-symlinks-main\" ./lib/cli/bin/index.js dev --port 6006 --config-dir ./ui/.storybook", "storybook:ui:build": "NODE_OPTIONS=\"--preserve-symlinks --preserve-symlinks-main\" ./lib/cli/bin/index.js build --config-dir ./ui/.storybook --webpack-stats-json", - "storybook:ui:chromatic": "../scripts/node_modules/.bin/chromatic --build-script-name storybook:ui:build --storybook-config-dir ./ --storybook-base-dir ./code --project-token=${CHROMATIC_TOKEN_STORYBOOK_UI:-MISSING_PROJECT_TOKEN} --only-changed --exit-zero-on-changes --exit-once-uploaded", + "storybook:ui:chromatic": "../scripts/node_modules/.bin/chromatic --build-script-name storybook:ui:build --storybook-base-dir ./ --project-token=${CHROMATIC_TOKEN_STORYBOOK_UI:-MISSING_PROJECT_TOKEN} --only-changed --exit-zero-on-changes --exit-once-uploaded", "task": "yarn --cwd ../scripts task", "test": "NODE_OPTIONS=--max_old_space_size=4096 vitest run", "test:watch": "NODE_OPTIONS=--max_old_space_size=4096 vitest watch" From 0afea015a1bc14a94ee0a5392b8178862c2c6aaf Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Mon, 4 Mar 2024 20:38:29 +0100 Subject: [PATCH 07/10] remove chromatic as dependency in code --- .../components/InteractionsPanel.stories.tsx | 5 +- code/package.json | 1 - code/ui/.storybook/isChromatic.ts | 8 ++ code/ui/.storybook/preview.tsx | 2 +- code/ui/manager/src/typings.d.ts | 1 - code/yarn.lock | 92 ++----------------- 6 files changed, 22 insertions(+), 87 deletions(-) create mode 100644 code/ui/.storybook/isChromatic.ts diff --git a/code/addons/interactions/src/components/InteractionsPanel.stories.tsx b/code/addons/interactions/src/components/InteractionsPanel.stories.tsx index a2435113ef02..eedd675988d4 100644 --- a/code/addons/interactions/src/components/InteractionsPanel.stories.tsx +++ b/code/addons/interactions/src/components/InteractionsPanel.stories.tsx @@ -4,7 +4,10 @@ import { CallStates } from '@storybook/instrumenter'; import { styled } from '@storybook/theming'; import { userEvent, within, waitFor } from '@storybook/testing-library'; import { expect } from '@storybook/test'; -import isChromatic from 'chromatic/isChromatic'; + +// this os the best way to prevent a heavy dependency +// see: https://github.com/storybookjs/storybook/pull/26233#pullrequestreview-1910542379 +import { isChromatic } from '../../../../ui/.storybook/isChromatic'; import { getCalls, getInteractions } from '../mocks'; import { InteractionsPanel } from './InteractionsPanel'; diff --git a/code/package.json b/code/package.json index 09c1851f5fb3..0f8113035c25 100644 --- a/code/package.json +++ b/code/package.json @@ -186,7 +186,6 @@ "@typescript-eslint/parser": "^6.18.1", "@vitejs/plugin-react": "^3.0.1", "@vitest/coverage-v8": "^1.2.2", - "chromatic": "^11.0.0", "concurrently": "^5.3.0", "cross-env": "^7.0.3", "danger": "^11.2.6", diff --git a/code/ui/.storybook/isChromatic.ts b/code/ui/.storybook/isChromatic.ts new file mode 100644 index 000000000000..27bba700bb3b --- /dev/null +++ b/code/ui/.storybook/isChromatic.ts @@ -0,0 +1,8 @@ +export function isChromatic(windowArg: any) { + const windowToCheck = windowArg || (typeof window !== 'undefined' && window); + return !!( + windowToCheck && + (windowToCheck.navigator.userAgent.match(/Chromatic/) || + windowToCheck.location.href.match(/chromatic=true/)) + ); +} diff --git a/code/ui/.storybook/preview.tsx b/code/ui/.storybook/preview.tsx index 34d955269f75..5a5ed1a7ad75 100644 --- a/code/ui/.storybook/preview.tsx +++ b/code/ui/.storybook/preview.tsx @@ -1,6 +1,6 @@ import { global } from '@storybook/global'; import React, { Fragment, useEffect } from 'react'; -import isChromatic from 'chromatic/isChromatic'; +import { isChromatic } from './isChromatic'; import { Global, ThemeProvider, diff --git a/code/ui/manager/src/typings.d.ts b/code/ui/manager/src/typings.d.ts index 93ee4ae948d6..c51fcc2f2f86 100644 --- a/code/ui/manager/src/typings.d.ts +++ b/code/ui/manager/src/typings.d.ts @@ -1,5 +1,4 @@ /* eslint-disable no-underscore-dangle, @typescript-eslint/naming-convention */ -declare module 'chromatic/isChromatic'; declare var DOCS_OPTIONS: any; declare var CONFIG_TYPE: 'DEVELOPMENT' | 'PRODUCTION'; diff --git a/code/yarn.lock b/code/yarn.lock index 1e0580d06c5f..62fa940673d1 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -6671,7 +6671,6 @@ __metadata: "@typescript-eslint/parser": "npm:^6.18.1" "@vitejs/plugin-react": "npm:^3.0.1" "@vitest/coverage-v8": "npm:^1.2.2" - chromatic: "npm:^11.0.0" concurrently: "npm:^5.3.0" cross-env: "npm:^7.0.3" danger: "npm:^11.2.6" @@ -7085,7 +7084,7 @@ __metadata: languageName: node linkType: hard -"@sveltejs/vite-plugin-svelte-inspector@npm:^2.0.0, @sveltejs/vite-plugin-svelte-inspector@npm:^2.0.0-next.0 || ^2.0.0": +"@sveltejs/vite-plugin-svelte-inspector@npm:^2.0.0": version: 2.0.0 resolution: "@sveltejs/vite-plugin-svelte-inspector@npm:2.0.0" dependencies: @@ -7098,25 +7097,7 @@ __metadata: languageName: node linkType: hard -"@sveltejs/vite-plugin-svelte@npm:^3.0.1": - version: 3.0.1 - resolution: "@sveltejs/vite-plugin-svelte@npm:3.0.1" - dependencies: - "@sveltejs/vite-plugin-svelte-inspector": "npm:^2.0.0-next.0 || ^2.0.0" - debug: "npm:^4.3.4" - deepmerge: "npm:^4.3.1" - kleur: "npm:^4.1.5" - magic-string: "npm:^0.30.5" - svelte-hmr: "npm:^0.15.3" - vitefu: "npm:^0.2.5" - peerDependencies: - svelte: ^4.0.0 || ^5.0.0-next.0 - vite: ^5.0.0 - checksum: 889d41014d4cc5dfb578cb0a80e64f72c0f8c143e9a299c3a4e2372fd582d982ce118dad5e158e0b747d1df7354a909ed9490b1adcd1bf982b56c82fffd4652c - languageName: node - linkType: hard - -"@sveltejs/vite-plugin-svelte@npm:^3.0.2": +"@sveltejs/vite-plugin-svelte@npm:^3.0.1, @sveltejs/vite-plugin-svelte@npm:^3.0.2": version: 3.0.2 resolution: "@sveltejs/vite-plugin-svelte@npm:3.0.2" dependencies: @@ -7593,10 +7574,10 @@ __metadata: languageName: node linkType: hard -"@types/estree@npm:*, @types/estree@npm:^1.0.0, @types/estree@npm:^1.0.1": - version: 1.0.2 - resolution: "@types/estree@npm:1.0.2" - checksum: 4b5c601d435ea8e2205458de15fd1556b5ae6c9a8323bad8a940ea502d6c824664faca94234c0bf76bf9c87cbf6ac41abee550c9e20433256549d589c9b543bd +"@types/estree@npm:*, @types/estree@npm:^1.0.0, @types/estree@npm:^1.0.1, @types/estree@npm:^1.0.5": + version: 1.0.5 + resolution: "@types/estree@npm:1.0.5" + checksum: b3b0e334288ddb407c7b3357ca67dbee75ee22db242ca7c56fe27db4e1a31989cb8af48a84dd401deb787fe10cc6b2ab1ee82dc4783be87ededbe3d53c79c70d languageName: node linkType: hard @@ -7607,13 +7588,6 @@ __metadata: languageName: node linkType: hard -"@types/estree@npm:^1.0.5": - version: 1.0.5 - resolution: "@types/estree@npm:1.0.5" - checksum: b3b0e334288ddb407c7b3357ca67dbee75ee22db242ca7c56fe27db4e1a31989cb8af48a84dd401deb787fe10cc6b2ab1ee82dc4783be87ededbe3d53c79c70d - languageName: node - linkType: hard - "@types/express-serve-static-core@npm:*, @types/express-serve-static-core@npm:^4.17.33": version: 4.17.37 resolution: "@types/express-serve-static-core@npm:4.17.37" @@ -9556,16 +9530,7 @@ __metadata: languageName: node linkType: hard -"acorn@npm:^8.0.0, acorn@npm:^8.10.0, acorn@npm:^8.11.2, acorn@npm:^8.4.1, acorn@npm:^8.6.0, acorn@npm:^8.7.1, acorn@npm:^8.8.2, acorn@npm:^8.9.0": - version: 8.11.2 - resolution: "acorn@npm:8.11.2" - bin: - acorn: bin/acorn - checksum: a3ed76c761b75ec54b1ec3068fb7f113a182e95aea7f322f65098c2958d232e3d211cb6dac35ff9c647024b63714bc528a26d54a925d1fef2c25585b4c8e4017 - languageName: node - linkType: hard - -"acorn@npm:^8.11.3": +"acorn@npm:^8.0.0, acorn@npm:^8.10.0, acorn@npm:^8.11.2, acorn@npm:^8.11.3, acorn@npm:^8.4.1, acorn@npm:^8.6.0, acorn@npm:^8.7.1, acorn@npm:^8.8.2, acorn@npm:^8.9.0": version: 8.11.3 resolution: "acorn@npm:8.11.3" bin: @@ -11687,25 +11652,6 @@ __metadata: languageName: node linkType: hard -"chromatic@npm:^11.0.0": - version: 11.0.0 - resolution: "chromatic@npm:11.0.0" - peerDependencies: - "@chromatic-com/cypress": ^0.5.2 || ^1.0.0 - "@chromatic-com/playwright": ^0.5.2 || ^1.0.0 - peerDependenciesMeta: - "@chromatic-com/cypress": - optional: true - "@chromatic-com/playwright": - optional: true - bin: - chroma: dist/bin.js - chromatic: dist/bin.js - chromatic-cli: dist/bin.js - checksum: edd92b3fb370c8d358cd587392686e83af34aec0e5d6592bfc637d6b6c1f670f3910ff572182192dcf1adf8e34384f785597dcdcb89196482f0c6fa55547d1bf - languageName: node - linkType: hard - "chromatic@npm:^9.0.0": version: 9.1.0 resolution: "chromatic@npm:9.1.0" @@ -25023,20 +24969,7 @@ __metadata: languageName: node linkType: hard -"recast@npm:^0.23.1, recast@npm:^0.23.3": - version: 0.23.4 - resolution: "recast@npm:0.23.4" - dependencies: - assert: "npm:^2.0.0" - ast-types: "npm:^0.16.1" - esprima: "npm:~4.0.0" - source-map: "npm:~0.6.1" - tslib: "npm:^2.0.1" - checksum: d719633be8029e28f23b8191d4a525c5dbdac721792ab3cb5e9dfcf1694fb93f3c147b186916195a9c7fa0711f1e4990ba457cdcee02faed3899d4a80da1bd1f - languageName: node - linkType: hard - -"recast@npm:^0.23.5": +"recast@npm:^0.23.1, recast@npm:^0.23.3, recast@npm:^0.23.5": version: 0.23.5 resolution: "recast@npm:0.23.5" dependencies: @@ -28074,14 +28007,7 @@ __metadata: languageName: node linkType: hard -"tiny-invariant@npm:^1.3.1": - version: 1.3.1 - resolution: "tiny-invariant@npm:1.3.1" - checksum: 5b87c1d52847d9452b60d0dcb77011b459044e0361ca8253bfe7b43d6288106e12af926adb709a6fc28900e3864349b91dad9a4ac93c39aa15f360b26c2ff4db - languageName: node - linkType: hard - -"tiny-invariant@npm:^1.3.3": +"tiny-invariant@npm:^1.3.1, tiny-invariant@npm:^1.3.3": version: 1.3.3 resolution: "tiny-invariant@npm:1.3.3" checksum: 65af4a07324b591a059b35269cd696aba21bef2107f29b9f5894d83cc143159a204b299553435b03874ebb5b94d019afa8b8eff241c8a4cfee95872c2e1c1c4a From 55868557471d437b7aa1d9c63d4c337a65a4e9c3 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Mon, 4 Mar 2024 20:39:08 +0100 Subject: [PATCH 08/10] make it argument optional --- code/ui/.storybook/isChromatic.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/ui/.storybook/isChromatic.ts b/code/ui/.storybook/isChromatic.ts index 27bba700bb3b..244058b2fabf 100644 --- a/code/ui/.storybook/isChromatic.ts +++ b/code/ui/.storybook/isChromatic.ts @@ -1,4 +1,4 @@ -export function isChromatic(windowArg: any) { +export function isChromatic(windowArg?: any) { const windowToCheck = windowArg || (typeof window !== 'undefined' && window); return !!( windowToCheck && From c9a7555116e6a1dcaa7ac4e436d87e6176617583 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Mon, 11 Mar 2024 18:03:05 +0100 Subject: [PATCH 09/10] Discard changes to code/frameworks/react-webpack5/README.md --- code/frameworks/react-webpack5/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/frameworks/react-webpack5/README.md b/code/frameworks/react-webpack5/README.md index d691444758e2..53e3de782715 100644 --- a/code/frameworks/react-webpack5/README.md +++ b/code/frameworks/react-webpack5/README.md @@ -1,3 +1,3 @@ # Storybook for React & Webpack -See [documentation](https://storybook.js.org/docs/8.0/get-started/react-webpack5?renderer=react) for installation instructions, usage examples, APIs, and more. +See [documentation](https://storybook.js.org/docs/8.0/get-started/react-webpack5?renderer=react) for installation instructions, usage examples, APIs, and more. \ No newline at end of file From d95716f1d8441216fb14c69d943b39d2c8a80a2b Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Mon, 11 Mar 2024 18:03:08 +0100 Subject: [PATCH 10/10] Discard changes to code/frameworks/react-vite/README.md --- code/frameworks/react-vite/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/frameworks/react-vite/README.md b/code/frameworks/react-vite/README.md index 847119afd03d..272f8f50d55f 100644 --- a/code/frameworks/react-vite/README.md +++ b/code/frameworks/react-vite/README.md @@ -1,3 +1,3 @@ # Storybook for React & Vite -See [documentation](https://storybook.js.org/docs/8.0/get-started/react-vite?renderer=react) for installation instructions, usage examples, APIs, and more. +See [documentation](https://storybook.js.org/docs/8.0/get-started/react-vite?renderer=react) for installation instructions, usage examples, APIs, and more. \ No newline at end of file