From 2de53e306a6fda72e72a400b5a282eb9b02b13c7 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 21 Jan 2026 15:22:13 +0000 Subject: [PATCH] Tidy shared-components storybook (#31836) * Fix compound.css - it is not pcss Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Improve types in shared-components storybook Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Update i18n:sort script and remove patch-package --------- Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .../.storybook/{compound.pcss => compound.css} | 0 packages/shared-components/.storybook/languageAddon.tsx | 2 +- packages/shared-components/.storybook/main.ts | 1 - packages/shared-components/.storybook/preview.tsx | 2 +- packages/shared-components/package.json | 2 +- packages/shared-components/tsconfig.json | 2 +- packages/shared-components/tsconfig.node.json | 2 ++ 7 files changed, 6 insertions(+), 5 deletions(-) rename packages/shared-components/.storybook/{compound.pcss => compound.css} (100%) diff --git a/packages/shared-components/.storybook/compound.pcss b/packages/shared-components/.storybook/compound.css similarity index 100% rename from packages/shared-components/.storybook/compound.pcss rename to packages/shared-components/.storybook/compound.css diff --git a/packages/shared-components/.storybook/languageAddon.tsx b/packages/shared-components/.storybook/languageAddon.tsx index b1474bd308..dcb9d8d814 100644 --- a/packages/shared-components/.storybook/languageAddon.tsx +++ b/packages/shared-components/.storybook/languageAddon.tsx @@ -10,7 +10,7 @@ import { WithTooltip, IconButton, TooltipLinkList } from "storybook/internal/com import React from "react"; import { GlobeIcon } from "@storybook/icons"; -const languages = JSON.parse(process.env.STORYBOOK_LANGUAGES); +const languages: string[] = JSON.parse(process.env.STORYBOOK_LANGUAGES!); /** * Returns the title of a language in the user's locale. diff --git a/packages/shared-components/.storybook/main.ts b/packages/shared-components/.storybook/main.ts index b7b03ee2ba..2696e0b2a3 100644 --- a/packages/shared-components/.storybook/main.ts +++ b/packages/shared-components/.storybook/main.ts @@ -6,7 +6,6 @@ Please see LICENSE files in the repository root for full details. */ import type { StorybookConfig } from "@storybook/react-vite"; -import path from "node:path"; import fs from "node:fs"; import { nodePolyfills } from "vite-plugin-node-polyfills"; import { mergeConfig } from "vite"; diff --git a/packages/shared-components/.storybook/preview.tsx b/packages/shared-components/.storybook/preview.tsx index 0d8bfc3a6d..4d4069e58a 100644 --- a/packages/shared-components/.storybook/preview.tsx +++ b/packages/shared-components/.storybook/preview.tsx @@ -1,6 +1,6 @@ import type { ArgTypes, Preview, Decorator, ReactRenderer, StrictArgs } from "@storybook/react-vite"; -import "./compound.pcss"; +import "./compound.css"; import "./preview.css"; import React, { useLayoutEffect } from "react"; import { setLanguage } from "../src/utils/i18n"; diff --git a/packages/shared-components/package.json b/packages/shared-components/package.json index 803e3dd89f..65010edb43 100644 --- a/packages/shared-components/package.json +++ b/packages/shared-components/package.json @@ -36,7 +36,7 @@ ], "scripts": { "i18n": "matrix-gen-i18n src && yarn i18n:sort && yarn i18n:lint", - "i18n:sort": "jq --sort-keys '.' src/i18n/strings/en_EN.json > src/i18n/strings/en_EN.json.tmp && mv src/i18n/strings/en_EN.json.tmp src/i18n/strings/en_EN.json", + "i18n:sort": "matrix-sort-i18n src/i18n/strings/en_EN.json", "i18n:lint": "matrix-i18n-lint && prettier --log-level=silent --write src/i18n/strings/ --ignore-path /dev/null", "test": "jest", "prepare": "patch-package && vite build", diff --git a/packages/shared-components/tsconfig.json b/packages/shared-components/tsconfig.json index 3acebbb63c..6044db4d92 100644 --- a/packages/shared-components/tsconfig.json +++ b/packages/shared-components/tsconfig.json @@ -19,6 +19,6 @@ "jest-matrix-react": ["./src/test/utils/jest-matrix-react"] } }, - "include": ["./src/**/*.ts", "./src/**/*.tsx"], + "include": ["./src/**/*.ts", "./src/**/*.tsx", ".storybook/*.ts", ".storybook/*.tsx"], "references": [{ "path": "./tsconfig.node.json" }] } diff --git a/packages/shared-components/tsconfig.node.json b/packages/shared-components/tsconfig.node.json index 98dfb8b49b..8434738150 100644 --- a/packages/shared-components/tsconfig.node.json +++ b/packages/shared-components/tsconfig.node.json @@ -4,7 +4,9 @@ "target": "ESNext", "module": "esnext", "moduleResolution": "bundler", + "esModuleInterop": true, "strict": true, + "types": [], "allowSyntheticDefaultImports": true }, "include": ["vite.config.ts"]