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/14] 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/14] 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/14] 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/14] 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/14] 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/14] 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/14] 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/14] 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/14] 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/14] 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 From 55761f87770417ebd3b750adbed4ab4f32485a59 Mon Sep 17 00:00:00 2001 From: Valentin Palkovic Date: Wed, 13 Mar 2024 13:09:29 +0100 Subject: [PATCH 11/14] Add key property to list children in Highlight component --- code/ui/manager/src/components/sidebar/SearchResults.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/ui/manager/src/components/sidebar/SearchResults.tsx b/code/ui/manager/src/components/sidebar/SearchResults.tsx index c8b0e185edcd..faead314e0e8 100644 --- a/code/ui/manager/src/components/sidebar/SearchResults.tsx +++ b/code/ui/manager/src/components/sidebar/SearchResults.tsx @@ -111,10 +111,10 @@ const Highlight: FC> = React.memo(function const { value, indices } = match; const { nodes: result } = indices.reduce<{ cursor: number; nodes: ReactNode[] }>( ({ cursor, nodes }, [start, end], index, { length }) => { - nodes.push({value.slice(cursor, start)}); - nodes.push({value.slice(start, end + 1)}); + nodes.push({value.slice(cursor, start)}); + nodes.push({value.slice(start, end + 1)}); if (index === length - 1) { - nodes.push({value.slice(end + 1)}); + nodes.push({value.slice(end + 1)}); } return { cursor: end + 1, nodes }; }, From 318a6f0ca37b10885b17ae389ca0c6c5202c2ce0 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Wed, 13 Mar 2024 16:15:10 +0100 Subject: [PATCH 12/14] upgrade to latest version of VTA in monorepo --- code/package.json | 4 +- code/ui/.storybook/main.ts | 2 +- code/yarn.lock | 327 ++++--------------------------------- 3 files changed, 31 insertions(+), 302 deletions(-) diff --git a/code/package.json b/code/package.json index 205aacdf8b5e..2d5ca8864675 100644 --- a/code/package.json +++ b/code/package.json @@ -88,6 +88,7 @@ "type-fest": "~2.19" }, "dependencies": { + "@chromatic-com/storybook": "^1.2.18", "@nx/workspace": "17.0.2", "@playwright/test": "1.36.0", "@storybook/addon-a11y": "workspace:*", @@ -226,9 +227,6 @@ "vitest": "^1.2.2", "wait-on": "^7.0.1" }, - "devDependencies": { - "@chromaui/addon-visual-tests": "^0.0.124" - }, "dependenciesMeta": { "ejs": { "built": false diff --git a/code/ui/.storybook/main.ts b/code/ui/.storybook/main.ts index 3defc0046331..6e394a12ab44 100644 --- a/code/ui/.storybook/main.ts +++ b/code/ui/.storybook/main.ts @@ -53,7 +53,7 @@ const config: StorybookConfig = { '@storybook/addon-interactions', '@storybook/addon-storysource', '@storybook/addon-designs', - '@chromaui/addon-visual-tests', + '@chromatic-com/storybook', ], build: { test: { diff --git a/code/yarn.lock b/code/yarn.lock index 2a8cf58a01de..854ac90fdf48 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -5,18 +5,6 @@ __metadata: version: 8 cacheKey: 10c0 -"@0no-co/graphql.web@npm:^1.0.1": - version: 1.0.4 - resolution: "@0no-co/graphql.web@npm:1.0.4" - peerDependencies: - graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 - peerDependenciesMeta: - graphql: - optional: true - checksum: bf63cb5b017063363c9a9e06dc17532abc1c2da402c7ebcbc7b5ab2a0601ec93b02de93af9e50d9daffb3b747eddcf0b1e5418a46d1182c5b8087b7d7a1768ad - languageName: node - linkType: hard - "@aashutoshrathi/word-wrap@npm:^1.2.3": version: 1.2.6 resolution: "@aashutoshrathi/word-wrap@npm:1.2.6" @@ -2191,7 +2179,7 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.14.8, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2": +"@babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.14.8, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2": version: 7.23.6 resolution: "@babel/runtime@npm:7.23.6" dependencies: @@ -2263,38 +2251,16 @@ __metadata: languageName: node linkType: hard -"@chromaui/addon-visual-tests@npm:^0.0.124": - version: 0.0.124 - resolution: "@chromaui/addon-visual-tests@npm:0.0.124" +"@chromatic-com/storybook@npm:^1.2.18": + version: 1.2.18 + resolution: "@chromatic-com/storybook@npm:1.2.18" dependencies: - "@storybook/design-system": "npm:^7.15.15" - "@urql/exchange-auth": "npm:^2.1.6" - chromatic: "npm:^9.0.0" - date-fns: "npm:^2.30.0" + chromatic: "npm:^11.0.0" filesize: "npm:^10.0.12" jsonfile: "npm:^6.1.0" - pluralize: "npm:^8.0.0" - ts-dedent: "npm:^2.2.0" - urql: "npm:^4.0.3" - uuid: "npm:^9.0.0" - zod: "npm:^3.22.2" - peerDependencies: - "@storybook/blocks": ^7.2.0 - "@storybook/client-logger": ^7.2.0 - "@storybook/components": ^7.2.0 - "@storybook/core-events": ^7.2.0 - "@storybook/manager-api": ^7.2.0 - "@storybook/preview-api": ^7.2.0 - "@storybook/theming": ^7.2.0 - "@storybook/types": ^7.2.0 - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - peerDependenciesMeta: - react: - optional: true - react-dom: - optional: true - checksum: d4ff22ca45c87f31e5799ed57e540c4669c917c099fe7284b945d2c49faccd4aec9c6d981dc33380c4c9b44e6e10942fdc0cdc29da63eb75346491da2ec346d8 + react-confetti: "npm:^6.1.0" + strip-ansi: "npm:^7.1.0" + checksum: b0b4c48dba1d6cddcc2b2541ba970ac4be7861583387f9525d60797663459fdb8db25fe99759c7e51ebb256daf185116450f5f33a04e35e0a2aa458f0ab24541 languageName: node linkType: hard @@ -2576,7 +2542,7 @@ __metadata: languageName: node linkType: hard -"@emotion/weak-memoize@npm:^0.3.0, @emotion/weak-memoize@npm:^0.3.1": +"@emotion/weak-memoize@npm:^0.3.1": version: 0.3.1 resolution: "@emotion/weak-memoize@npm:0.3.1" checksum: ed514b3cb94bbacece4ac2450d98898066c0a0698bdeda256e312405ca53634cb83c75889b25cd8bbbe185c80f4c05a1f0a0091e1875460ba6be61d0334f0b8a @@ -3358,19 +3324,6 @@ __metadata: languageName: node linkType: hard -"@hypnosphi/create-react-context@npm:^0.3.1": - version: 0.3.1 - resolution: "@hypnosphi/create-react-context@npm:0.3.1" - dependencies: - gud: "npm:^1.0.0" - warning: "npm:^4.0.3" - peerDependencies: - prop-types: ^15.0.0 - react: ">=0.14.0" - checksum: e8072221f9f9c2c47c3ebc5bc6079f9a71938e181d2b4aa3e1d3922707bc097336d5260dad088cf47c1d6e1ff34839fa21f2505a95bddda0d7548c5a955b5691 - languageName: node - linkType: hard - "@isaacs/cliui@npm:^8.0.2": version: 8.0.2 resolution: "@isaacs/cliui@npm:8.0.2" @@ -5775,32 +5728,6 @@ __metadata: languageName: node linkType: hard -"@storybook/design-system@npm:^7.15.15": - version: 7.15.15 - resolution: "@storybook/design-system@npm:7.15.15" - dependencies: - "@emotion/weak-memoize": "npm:^0.3.0" - "@storybook/theming": "npm:^7.0.2" - "@types/pluralize": "npm:^0.0.29" - "@types/prismjs": "npm:^1.16.6" - "@types/react-modal": "npm:^3.12.1" - "@types/uuid": "npm:^8.3.1" - copy-to-clipboard: "npm:^3.3.1" - human-format: "npm:^0.11.0" - pluralize: "npm:^8.0.0" - polished: "npm:^3.6.4" - prismjs: "npm:1.25.0" - react-github-button: "npm:^0.1.11" - react-modal: "npm:^3.11.2" - react-popper-tooltip: "npm:^2.11.1" - uuid: "npm:^3.3.3" - peerDependencies: - react: ^15.0.0 || ^16.0.0 || ^17.0.0 - react-dom: ^15.0.0 || ^16.0.0 || ^17.0.0 - checksum: 3f2ea63556aed966e906b8e56fa0ef12fd67f919426a63350a7ecba5a6cff277b8e18362d680530f7fdfa7240c8ceb890984a0594f5129f2b9d972e991b297cf - languageName: node - linkType: hard - "@storybook/docs-mdx@npm:3.0.0": version: 3.0.0 resolution: "@storybook/docs-mdx@npm:3.0.0" @@ -6447,7 +6374,7 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/root@workspace:." dependencies: - "@chromaui/addon-visual-tests": "npm:^0.0.124" + "@chromatic-com/storybook": "npm:^1.2.18" "@nx/workspace": "npm:17.0.2" "@playwright/test": "npm:1.36.0" "@storybook/addon-a11y": "workspace:*" @@ -7876,13 +7803,6 @@ __metadata: languageName: node linkType: hard -"@types/pluralize@npm:^0.0.29": - version: 0.0.29 - resolution: "@types/pluralize@npm:0.0.29" - checksum: 840796fa1db158eb4d9787758d134736e29d9a8035f5b0cbad06e3801fc64b79112ba944c83f9a1a5b94da08703f505b8315b7e0f28bfc0f8e9e1ccfead7b083 - languageName: node - linkType: hard - "@types/prettier@npm:^3.0.0": version: 3.0.0 resolution: "@types/prettier@npm:3.0.0" @@ -7899,13 +7819,6 @@ __metadata: languageName: node linkType: hard -"@types/prismjs@npm:^1.16.6": - version: 1.26.1 - resolution: "@types/prismjs@npm:1.26.1" - checksum: 74b624bd0def16ba2fe4492ac74422ed9eaf5588814c14d8825c85dd4ef05b900a3685c5ec00bb13991e9f0cc4bbda196b9de3ba75cf7c00bc8ffd960c125124 - languageName: node - linkType: hard - "@types/prompts@npm:^2.0.9": version: 2.4.9 resolution: "@types/prompts@npm:2.4.9" @@ -7953,15 +7866,6 @@ __metadata: languageName: node linkType: hard -"@types/react-modal@npm:^3.12.1": - version: 3.16.1 - resolution: "@types/react-modal@npm:3.16.1" - dependencies: - "@types/react": "npm:*" - checksum: 4f586bd00e4b15633ec6607cb3266183b81419a2c0931d40e6127427e944a986d3d9a9c8a23c86cb586b15e541a1c6682f6ab0d2561a3b81fcf857772727ff44 - languageName: node - linkType: hard - "@types/react-refresh@npm:^0": version: 0.14.5 resolution: "@types/react-refresh@npm:0.14.5" @@ -8175,13 +8079,6 @@ __metadata: languageName: node linkType: hard -"@types/uuid@npm:^8.3.1": - version: 8.3.4 - resolution: "@types/uuid@npm:8.3.4" - checksum: b9ac98f82fcf35962317ef7dc44d9ac9e0f6fdb68121d384c88fe12ea318487d5585d3480fa003cf28be86a3bbe213ca688ba786601dce4a97724765eb5b1cf2 - languageName: node - linkType: hard - "@types/uuid@npm:^9.0.1": version: 9.0.7 resolution: "@types/uuid@npm:9.0.7" @@ -8516,26 +8413,6 @@ __metadata: languageName: node linkType: hard -"@urql/core@npm:>=4.1.0, @urql/core@npm:^4.1.0": - version: 4.2.0 - resolution: "@urql/core@npm:4.2.0" - dependencies: - "@0no-co/graphql.web": "npm:^1.0.1" - wonka: "npm:^6.3.2" - checksum: dbbd500705c2bbf842674016aa69865a90c3d40c1e16034faf6423c9211c37540e975abbf448eae072b7dd38920ed517e8b34ba351f881da1764c22177ca12ed - languageName: node - linkType: hard - -"@urql/exchange-auth@npm:^2.1.6": - version: 2.1.6 - resolution: "@urql/exchange-auth@npm:2.1.6" - dependencies: - "@urql/core": "npm:>=4.1.0" - wonka: "npm:^6.3.2" - checksum: d4140ad0fba0b1beacefcfb7a520662d97429f70888c61191c94e8811ac2b0678a01127e97fa473918dbe34a3e6cf6eece52bf44f6943057232594fa0949d58a - languageName: node - linkType: hard - "@vitejs/plugin-basic-ssl@npm:1.0.1": version: 1.0.1 resolution: "@vitejs/plugin-basic-ssl@npm:1.0.1" @@ -11484,14 +11361,22 @@ __metadata: languageName: node linkType: hard -"chromatic@npm:^9.0.0": - version: 9.1.0 - resolution: "chromatic@npm:9.1.0" +"chromatic@npm:^11.0.0": + version: 11.0.8 + resolution: "chromatic@npm:11.0.8" + peerDependencies: + "@chromatic-com/cypress": ^0.*.* || ^1.0.0 + "@chromatic-com/playwright": ^0.*.* || ^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: 27d0ff5ef993024301f31d137e9774b051de908d48dcd461c33b51c92e5e7b57cd062eaddafcd02f1c2a98cfe5d5ef26b7fcdf77b76df94e357171074a23b950 + checksum: 422ab9afd9667f94813b2355144092fe5abe6538394e308619411050fea8265b9531a88a13b8563bf40172bd99b47de3c89642f34ec2d1f1bc42c958568e2902 languageName: node linkType: hard @@ -12595,7 +12480,7 @@ __metadata: languageName: node linkType: hard -"date-fns@npm:^2.0.1, date-fns@npm:^2.30.0": +"date-fns@npm:^2.0.1": version: 2.30.0 resolution: "date-fns@npm:2.30.0" dependencies: @@ -12722,20 +12607,6 @@ __metadata: languageName: node linkType: hard -"deep-equal@npm:^1.1.1": - version: 1.1.1 - resolution: "deep-equal@npm:1.1.1" - dependencies: - is-arguments: "npm:^1.0.4" - is-date-object: "npm:^1.0.1" - is-regex: "npm:^1.0.4" - object-is: "npm:^1.0.1" - object-keys: "npm:^1.1.1" - regexp.prototype.flags: "npm:^1.2.0" - checksum: 473d5dd1d707afd5ad3068864765590591b049d0e0d9a01931599dbbd820e35f09d0a42faa6e4644deb7cf6b7dc90f7bfdf5559f42279d67f714209b62036212 - languageName: node - linkType: hard - "deep-equal@npm:^2.0.5": version: 2.2.2 resolution: "deep-equal@npm:2.2.2" @@ -14882,13 +14753,6 @@ __metadata: languageName: node linkType: hard -"exenv@npm:^1.2.0": - version: 1.2.2 - resolution: "exenv@npm:1.2.2" - checksum: 4e96b355a6b9b9547237288ca779dd673b2e698458b409e88b50df09feb7c85ef94c07354b6b87bc3ed0193a94009a6f7a3c71956da12f45911c0d0f5aa3caa0 - languageName: node - linkType: hard - "expand-brackets@npm:^2.1.4": version: 2.1.4 resolution: "expand-brackets@npm:2.1.4" @@ -16443,13 +16307,6 @@ __metadata: languageName: node linkType: hard -"gud@npm:^1.0.0": - version: 1.0.0 - resolution: "gud@npm:1.0.0" - checksum: a4db6edc18e2c4e3a22dc9e639e40a4e5650d53dae9cf384a96d5380dfa17ddda376cf6b7797a5c30d140d2532e5a69d167bdb70c2c151dd673253bac6b027f3 - languageName: node - linkType: hard - "gunzip-maybe@npm:^1.4.2": version: 1.4.2 resolution: "gunzip-maybe@npm:1.4.2" @@ -17157,13 +17014,6 @@ __metadata: languageName: node linkType: hard -"human-format@npm:^0.11.0": - version: 0.11.0 - resolution: "human-format@npm:0.11.0" - checksum: 83cc87af67036b4abb6dc585533fcc232279373f8a3a7a4fc1f6d988f6aa35664f986adb818d04d9de3dee240648ec94a9944a8ab1852df21eb67c254e991ea7 - languageName: node - linkType: hard - "human-signals@npm:^2.1.0": version: 2.1.0 resolution: "human-signals@npm:2.1.0" @@ -18012,7 +17862,7 @@ __metadata: languageName: node linkType: hard -"is-regex@npm:^1.0.3, is-regex@npm:^1.0.4, is-regex@npm:^1.1.4": +"is-regex@npm:^1.0.3, is-regex@npm:^1.1.4": version: 1.1.4 resolution: "is-regex@npm:1.1.4" dependencies: @@ -22016,7 +21866,7 @@ __metadata: languageName: node linkType: hard -"object-is@npm:^1.0.1, object-is@npm:^1.1.5": +"object-is@npm:^1.1.5": version: 1.1.5 resolution: "object-is@npm:1.1.5" dependencies: @@ -23089,15 +22939,6 @@ __metadata: languageName: node linkType: hard -"polished@npm:^3.6.4": - version: 3.7.2 - resolution: "polished@npm:3.7.2" - dependencies: - "@babel/runtime": "npm:^7.12.5" - checksum: c36439946b5bfbac16c06dd7b00a89f45e07410427344e909c540ce3ddeb9b44d2ae9cc035a9d77f4551e07b9803419ae77767aec85958a0978158a95c0115d8 - languageName: node - linkType: hard - "polished@npm:^4.2.2": version: 4.2.2 resolution: "polished@npm:4.2.2" @@ -23107,7 +22948,7 @@ __metadata: languageName: node linkType: hard -"popper.js@npm:^1.14.4, popper.js@npm:^1.16.0": +"popper.js@npm:^1.16.0": version: 1.16.1 resolution: "popper.js@npm:1.16.1" checksum: 1c1a826f757edb5b8c2049dfd7a9febf6ae1e9d0e51342fc715b49a0c1020fced250d26484619883651e097c5764bbcacd2f31496e3646027f079dd83e072681 @@ -23452,13 +23293,6 @@ __metadata: languageName: node linkType: hard -"prismjs@npm:1.25.0": - version: 1.25.0 - resolution: "prismjs@npm:1.25.0" - checksum: 0c3853a6c815b23a07bef77700f60a40b2a12018a383a75cd7d108718717b73927c809e7dd08ac0ae9f16fbe1e005b337262bc95952cf9cfc91914f986b07bd3 - languageName: node - linkType: hard - "prismjs@npm:^1.27.0": version: 1.29.0 resolution: "prismjs@npm:1.29.0" @@ -23560,7 +23394,7 @@ __metadata: languageName: node linkType: hard -"prop-types@npm:^15.5.10, prop-types@npm:^15.6.1, prop-types@npm:^15.6.2, prop-types@npm:^15.7.2, prop-types@npm:^15.8.1": +"prop-types@npm:^15.6.2, prop-types@npm:^15.7.2, prop-types@npm:^15.8.1": version: 15.8.1 resolution: "prop-types@npm:15.8.1" dependencies: @@ -24120,15 +23954,6 @@ __metadata: languageName: node linkType: hard -"react-github-button@npm:^0.1.11": - version: 0.1.11 - resolution: "react-github-button@npm:0.1.11" - dependencies: - prop-types: "npm:^15.5.10" - checksum: e00fa4f3b2dee74f45fff0c9d68d7d75eefa495d27a56ef2e2391f9600623d16b8a9f99c1d35a7b4f620dfb95dd8ed0b1a76fbbfece4be0843cd507c17a37dfa - languageName: node - linkType: hard - "react-helmet-async@npm:^1.3.0": version: 1.3.0 resolution: "react-helmet-async@npm:1.3.0" @@ -24215,13 +24040,6 @@ __metadata: languageName: node linkType: hard -"react-lifecycles-compat@npm:^3.0.0": - version: 3.0.4 - resolution: "react-lifecycles-compat@npm:3.0.4" - checksum: 1d0df3c85af79df720524780f00c064d53a9dd1899d785eddb7264b378026979acbddb58a4b7e06e7d0d12aa1494fd5754562ee55d32907b15601068dae82c27 - languageName: node - linkType: hard - "react-merge-refs@npm:^1.0.0": version: 1.1.0 resolution: "react-merge-refs@npm:1.1.0" @@ -24229,34 +24047,6 @@ __metadata: languageName: node linkType: hard -"react-modal@npm:^3.11.2": - version: 3.16.1 - resolution: "react-modal@npm:3.16.1" - dependencies: - exenv: "npm:^1.2.0" - prop-types: "npm:^15.7.2" - react-lifecycles-compat: "npm:^3.0.0" - warning: "npm:^4.0.3" - peerDependencies: - react: ^0.14.0 || ^15.0.0 || ^16 || ^17 || ^18 - react-dom: ^0.14.0 || ^15.0.0 || ^16 || ^17 || ^18 - checksum: 7b56e2c505b2b924736c471a34754a4211df40ac2d6fb0949cf095aea5e65d3326bd9f111fa7898acf40afa54f526809ad8aa47e02b8328663d11422568dc7b1 - languageName: node - linkType: hard - -"react-popper-tooltip@npm:^2.11.1": - version: 2.11.1 - resolution: "react-popper-tooltip@npm:2.11.1" - dependencies: - "@babel/runtime": "npm:^7.9.2" - react-popper: "npm:^1.3.7" - peerDependencies: - react: ^16.6.0 - react-dom: ^16.6.0 - checksum: f81278f1ea87899ffa57fed85c2531fa583ebca424ae5522e3a1b05c5635c014b3467391e77fb9c48bbc8e7b9f1050fa9302e8ee6134a9333858b5a6e0ae1b49 - languageName: node - linkType: hard - "react-popper-tooltip@npm:^4.4.2": version: 4.4.2 resolution: "react-popper-tooltip@npm:4.4.2" @@ -24271,23 +24061,6 @@ __metadata: languageName: node linkType: hard -"react-popper@npm:^1.3.7": - version: 1.3.11 - resolution: "react-popper@npm:1.3.11" - dependencies: - "@babel/runtime": "npm:^7.1.2" - "@hypnosphi/create-react-context": "npm:^0.3.1" - deep-equal: "npm:^1.1.1" - popper.js: "npm:^1.14.4" - prop-types: "npm:^15.6.1" - typed-styles: "npm:^0.0.7" - warning: "npm:^4.0.2" - peerDependencies: - react: 0.14.x || ^15.0.0 || ^16.0.0 || ^17.0.0 - checksum: d5dd1d0d4b5a3407134681b42a079fce525c94bce892ad177515d54a8cf64203eecbc30231476367e916aaff91221f5b6abd5afc207a86c698f35b7254178488 - languageName: node - linkType: hard - "react-popper@npm:^2.3.0": version: 2.3.0 resolution: "react-popper@npm:2.3.0" @@ -24730,7 +24503,7 @@ __metadata: languageName: node linkType: hard -"regexp.prototype.flags@npm:^1.2.0, regexp.prototype.flags@npm:^1.5.0, regexp.prototype.flags@npm:^1.5.2": +"regexp.prototype.flags@npm:^1.5.0, regexp.prototype.flags@npm:^1.5.2": version: 1.5.2 resolution: "regexp.prototype.flags@npm:1.5.2" dependencies: @@ -28170,13 +27943,6 @@ __metadata: languageName: node linkType: hard -"typed-styles@npm:^0.0.7": - version: 0.0.7 - resolution: "typed-styles@npm:0.0.7" - checksum: ec159f0e538364750cf9b8f19136375df64ad364fda355e6f7a7216ebffc67f18b436722c5c6853c89f70e6507eb69e5061ceb9334fa1f54902c0f6be1b985fe - languageName: node - linkType: hard - "typedarray@npm:^0.0.6": version: 0.0.6 resolution: "typedarray@npm:0.0.6" @@ -28786,18 +28552,6 @@ __metadata: languageName: node linkType: hard -"urql@npm:^4.0.3": - version: 4.0.5 - resolution: "urql@npm:4.0.5" - dependencies: - "@urql/core": "npm:^4.1.0" - wonka: "npm:^6.3.2" - peerDependencies: - react: ">= 16.8.0" - checksum: 9560d04b3c2fe72c921bdb21e969039b776e07999704d23bce35f815eb537c9357b6c7322a1b8cd43957550798c30cd15f5130ddd054dfd8a890d17d2be85282 - languageName: node - linkType: hard - "use-callback-ref@npm:^1.3.0": version: 1.3.1 resolution: "use-callback-ref@npm:1.3.1" @@ -28933,15 +28687,6 @@ __metadata: languageName: node linkType: hard -"uuid@npm:^3.3.3": - version: 3.4.0 - resolution: "uuid@npm:3.4.0" - bin: - uuid: ./bin/uuid - checksum: 1c13950df865c4f506ebfe0a24023571fa80edf2e62364297a537c80af09c618299797bbf2dbac6b1f8ae5ad182ba474b89db61e0e85839683991f7e08795347 - languageName: node - linkType: hard - "uuid@npm:^8.0.0, uuid@npm:^8.3.2": version: 8.3.2 resolution: "uuid@npm:8.3.2" @@ -29595,7 +29340,7 @@ __metadata: languageName: node linkType: hard -"warning@npm:^4.0.2, warning@npm:^4.0.3": +"warning@npm:^4.0.2": version: 4.0.3 resolution: "warning@npm:4.0.3" dependencies: @@ -30079,13 +29824,6 @@ __metadata: languageName: node linkType: hard -"wonka@npm:^6.3.2": - version: 6.3.4 - resolution: "wonka@npm:6.3.4" - checksum: 77329eea673da07717476e1b8f1a22f1e1a4f261bb9a58fa446c03d3da13dbd5b254664f8aded5928d953f33ee5b399a17a4f70336e8b236e478209c0e78cda4 - languageName: node - linkType: hard - "wordwrap@npm:^1.0.0": version: 1.0.0 resolution: "wordwrap@npm:1.0.0" @@ -30454,13 +30192,6 @@ __metadata: languageName: node linkType: hard -"zod@npm:^3.22.2": - version: 3.22.4 - resolution: "zod@npm:3.22.4" - checksum: 7578ab283dac0eee66a0ad0fc4a7f28c43e6745aadb3a529f59a4b851aa10872b3890398b3160f257f4b6817b4ce643debdda4fb21a2c040adda7862cab0a587 - languageName: node - linkType: hard - "zone.js@npm:^0.14.2": version: 0.14.2 resolution: "zone.js@npm:0.14.2" From 47c1c0535c49d92109b6543f8c77a7faa2221955 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Wed, 13 Mar 2024 16:20:00 +0100 Subject: [PATCH 13/14] fix config issue --- code/chromatic.config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/chromatic.config.json b/code/chromatic.config.json index 01493ceba46a..8dce5c096c80 100644 --- a/code/chromatic.config.json +++ b/code/chromatic.config.json @@ -3,6 +3,6 @@ "projectToken": "80b312430ec4", "buildScriptName": "storybook:ui:build", "onlyChanged": true, - "storybookConfigDir": "./ui/.storybook", + "storybookConfigDir": "ui/.storybook", "storybookBaseDir": "./code" } From a33bd455b7a368bcb9b56dd3626ffa4b6fa0c880 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Wed, 13 Mar 2024 16:25:08 +0100 Subject: [PATCH 14/14] Add zip option to chromatic.config.json --- code/chromatic.config.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/chromatic.config.json b/code/chromatic.config.json index 8dce5c096c80..77130b818b6d 100644 --- a/code/chromatic.config.json +++ b/code/chromatic.config.json @@ -4,5 +4,6 @@ "buildScriptName": "storybook:ui:build", "onlyChanged": true, "storybookConfigDir": "ui/.storybook", - "storybookBaseDir": "./code" + "storybookBaseDir": "./code", + "zip": true }