-fix folder structure -add new package json -edit main to correct ts-…

…config path
bitwarden · Jan 15, 2025 · d72b97a · d72b97a
1 parent ab42883
commit d72b97a
Show file tree

Hide file tree

Showing 17 changed files with 37 additions and 26 deletions.
diff --git a/...ill/content/components/.storybook/main.ts → ...content/components/.lit-storybook/main.ts b/...ill/content/components/.storybook/main.ts → ...content/components/.lit-storybook/main.ts
@@ -1,4 +1,5 @@
 import { dirname, join } from "path";
+import path from "path";
 import type { StorybookConfig } from "@storybook/web-components-webpack5";
 import TsconfigPathsPlugin from "tsconfig-paths-webpack-plugin";
 import remarkGfm from "remark-gfm";
@@ -7,7 +8,7 @@ const getAbsolutePath = (value: string): string =>
   dirname(require.resolve(join(value, "package.json")));
 
 const config: StorybookConfig = {
-  stories: ["../stories/**/*.lit-stories.@(js|jsx|ts|tsx)"],
+  stories: ["../lit-stories/**/*.lit-stories.@(js|jsx|ts|tsx)"],
   addons: [
     getAbsolutePath("@storybook/addon-links"),
     getAbsolutePath("@storybook/addon-essentials"),
@@ -40,7 +41,11 @@ const config: StorybookConfig = {
   }),
   webpackFinal: async (config) => {
     if (config.resolve) {
-      config.resolve.plugins = [new TsconfigPathsPlugin()] as any;
+      config.resolve.plugins = [
+        new TsconfigPathsPlugin({
+          configFile: path.resolve(__dirname, "../../../../../tsconfig.json"),
+        }),
+      ] as any;
     }
 
     if (config.module && config.module.rules) {

diff --git a/...tton-stories/action-button.lit-stories.ts → ...ries/buttons/action-button.lit-stories.ts b/...tton-stories/action-button.lit-stories.ts → ...ries/buttons/action-button.lit-stories.ts
@@ -2,7 +2,7 @@ import { Meta, StoryObj } from "@storybook/web-components";
 
 import { Theme, ThemeTypes } from "@bitwarden/common/platform/enums/theme-type.enum";
 
-import { ActionButton } from "../../../buttons/action-button";
+import { ActionButton } from "../../buttons/action-button";
 
 type Args = {
   buttonText: string;

diff --git a/...utton-stories/badge-button.lit-stories.ts → ...ories/buttons/badge-button.lit-stories.ts b/...utton-stories/badge-button.lit-stories.ts → ...ories/buttons/badge-button.lit-stories.ts
@@ -2,7 +2,7 @@ import { Meta, StoryObj } from "@storybook/web-components";
 
 import { Theme, ThemeTypes } from "@bitwarden/common/platform/enums/theme-type.enum";
 
-import { BadgeButton } from "../../../buttons/badge-button";
+import { BadgeButton } from "../../buttons/badge-button";
 
 type Args = {
   buttonAction: (e: Event) => void;

diff --git a/...utton-stories/close-button.lit-stories.ts → ...ories/buttons/close-button.lit-stories.ts b/...utton-stories/close-button.lit-stories.ts → ...ories/buttons/close-button.lit-stories.ts
@@ -2,7 +2,7 @@ import { Meta, StoryObj } from "@storybook/web-components";
 
 import { Theme, ThemeTypes } from "@bitwarden/common/platform/enums/theme-type.enum";
 
-import { CloseButton } from "../../../buttons/close-button";
+import { CloseButton } from "../../buttons/close-button";
 
 type Args = {
   handleCloseNotification: (e: Event) => void;

diff --git a/...button-stories/edit-button.lit-stories.ts → ...tories/buttons/edit-button.lit-stories.ts b/...button-stories/edit-button.lit-stories.ts → ...tories/buttons/edit-button.lit-stories.ts
@@ -2,7 +2,7 @@ import { Meta, StoryObj } from "@storybook/web-components";
 
 import { Theme, ThemeTypes } from "@bitwarden/common/platform/enums/theme-type.enum";
 
-import { EditButton } from "../../../buttons/edit-button";
+import { EditButton } from "../../buttons/edit-button";
 
 type Args = {
   buttonAction: (e: Event) => void;

diff --git a/...tion-stories/cipher-action.lit-stories.ts → ...ries/ciphers/cipher-action.lit-stories.ts b/...tion-stories/cipher-action.lit-stories.ts → ...ries/ciphers/cipher-action.lit-stories.ts
@@ -2,16 +2,16 @@ import { Meta, StoryObj } from "@storybook/web-components";
 
 import { Theme, ThemeTypes } from "@bitwarden/common/platform/enums/theme-type.enum";
 
-import { NotificationTypes } from "../../../../../notification/abstractions/notification-bar";
-import { CipherAction } from "../../../cipher/cipher-action";
+import { NotificationTypes } from "../../../../notification/abstractions/notification-bar";
+import { CipherAction } from "../../cipher/cipher-action";
 
 type Args = {
   handleAction?: (e: Event) => void;
   notificationType: typeof NotificationTypes.Change | typeof NotificationTypes.Add;
   theme: Theme;
 };
 export default {
-  title: "Components/Cipher/Cipher Action",
+  title: "Components/Ciphers/Cipher Action",
   argTypes: {
     theme: { control: "select", options: [...Object.values(ThemeTypes)] },
     notificationType: {

diff --git a/...r-icon-stories/cipher-icon.lit-stories.ts → ...tories/ciphers/cipher-icon.lit-stories.ts b/...r-icon-stories/cipher-icon.lit-stories.ts → ...tories/ciphers/cipher-icon.lit-stories.ts
@@ -3,7 +3,7 @@ import { html } from "lit";
 
 import { Theme, ThemeTypes } from "@bitwarden/common/platform/enums/theme-type.enum";
 
-import { CipherIcon } from "../../../cipher/cipher-icon";
+import { CipherIcon } from "../../cipher/cipher-icon";
 
 type Args = {
   color: string;
@@ -13,7 +13,7 @@ type Args = {
 };
 
 export default {
-  title: "Components/Cipher/Cipher Icon",
+  title: "Components/Ciphers/Cipher Icon",
   argTypes: {
     color: { control: "color" },
     size: { control: "text" },

diff --git a/...ries/cipher-indicator-icon.lit-stories.ts → ...hers/cipher-indicator-icon.lit-stories.ts b/...ries/cipher-indicator-icon.lit-stories.ts → ...hers/cipher-indicator-icon.lit-stories.ts
@@ -3,7 +3,7 @@ import { html } from "lit";
 
 import { Theme, ThemeTypes } from "@bitwarden/common/platform/enums/theme-type.enum";
 
-import { CipherInfoIndicatorIcons } from "../../../cipher/cipher-indicator-icons";
+import { CipherInfoIndicatorIcons } from "../../cipher/cipher-indicator-icons";
 
 type Args = {
   isBusinessOrg?: boolean;
@@ -12,7 +12,7 @@ type Args = {
 };
 
 export default {
-  title: "Components/Cipher/Cipher Indicator Icon",
+  title: "Components/Ciphers/Cipher Indicator Icon",
   argTypes: {
     isBusinessOrg: { control: "boolean" },
     isFamilyOrg: { control: "boolean" },

diff --git a/...onents/stories/icons/icons.lit-stories.ts → ...ts/lit-stories/icons/icons.lit-stories.ts b/...onents/stories/icons/icons.lit-stories.ts → ...ts/lit-stories/icons/icons.lit-stories.ts
diff --git a/...fication/body-stories/body.lit-stories.ts → ...-stories/notification/body.lit-stories.ts b/...fication/body-stories/body.lit-stories.ts → ...-stories/notification/body.lit-stories.ts
@@ -4,9 +4,9 @@ import { Theme, ThemeTypes } from "@bitwarden/common/platform/enums/theme-type.e
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
 
-import { NotificationType } from "../../../../../notification/abstractions/notification-bar";
-import { CipherData } from "../../../cipher/types";
-import { NotificationBody } from "../../../notification/body";
+import { NotificationType } from "../../../../notification/abstractions/notification-bar";
+import { CipherData } from "../../cipher/types";
+import { NotificationBody } from "../../notification/body";
 
 type Args = {
   ciphers: CipherData[];
@@ -15,7 +15,7 @@ type Args = {
 };
 
 export default {
-  title: "Components/Notification/Notification Body",
+  title: "Components/Notifications/Notification Body",
   argTypes: {
     ciphers: { control: "object" },
     theme: { control: "select", options: [...Object.values(ThemeTypes)] },

diff --git a/...tion/footer-stories/footer.lit-stories.ts → ...tories/notification/footer.lit-stories.ts b/...tion/footer-stories/footer.lit-stories.ts → ...tories/notification/footer.lit-stories.ts
@@ -2,16 +2,16 @@ import { Meta, StoryObj } from "@storybook/web-components";
 
 import { Theme, ThemeTypes } from "@bitwarden/common/platform/enums/theme-type.enum";
 
-import { NotificationType } from "../../../../../notification/abstractions/notification-bar";
-import { NotificationFooter } from "../../../notification/footer";
+import { NotificationType } from "../../../../notification/abstractions/notification-bar";
+import { NotificationFooter } from "../../notification/footer";
 
 type Args = {
   notificationType: NotificationType;
   theme: Theme;
 };
 
 export default {
-  title: "Components/Notification/Notification Footer",
+  title: "Components/Notifications/Notification Footer",
   argTypes: {
     theme: { control: "select", options: [...Object.values(ThemeTypes)] },
     notificationType: {

diff --git a/...tion/header-stories/header.lit-stories.ts → ...tories/notification/header.lit-stories.ts b/...tion/header-stories/header.lit-stories.ts → ...tories/notification/header.lit-stories.ts
@@ -2,7 +2,7 @@ import { Meta, StoryObj } from "@storybook/web-components";
 
 import { Theme, ThemeTypes } from "@bitwarden/common/platform/enums/theme-type.enum";
 
-import { NotificationHeader } from "../../../notification/header";
+import { NotificationHeader } from "../../notification/header";
 
 type Args = {
   message: string;
@@ -12,7 +12,7 @@ type Args = {
 };
 
 export default {
-  title: "Components/Notification/Notification Header",
+  title: "Components/Notifications/Notification Header",
   argTypes: {
     message: { control: "text" },
     standalone: { control: "boolean" },

diff --git a/...ion-row-stories/action-row.lit-stories.ts → ...it-stories/rows/action-row.lit-stories.ts b/...ion-row-stories/action-row.lit-stories.ts → ...it-stories/rows/action-row.lit-stories.ts
@@ -2,7 +2,7 @@ import { Meta, StoryObj } from "@storybook/web-components";
 
 import { Theme, ThemeTypes } from "@bitwarden/common/platform/enums/theme-type.enum";
 
-import { ActionRow } from "../../../rows/action-row";
+import { ActionRow } from "../../rows/action-row";
 
 type Args = {
   itemText: string;

diff --git a/...ton-row-stories/button-row.lit-stories.ts → ...it-stories/rows/button-row.lit-stories.ts b/...ton-row-stories/button-row.lit-stories.ts → ...it-stories/rows/button-row.lit-stories.ts
@@ -2,7 +2,7 @@ import { Meta, StoryObj } from "@storybook/web-components";
 
 import { Theme, ThemeTypes } from "@bitwarden/common/platform/enums/theme-type.enum";
 
-import { ButtonRow } from "../../../rows/button-row";
+import { ButtonRow } from "../../rows/button-row";
 
 type Args = {
   theme: Theme;

diff --git a/.../item-row-stories/item-row.lit-stories.ts → .../lit-stories/rows/item-row.lit-stories.ts b/.../item-row-stories/item-row.lit-stories.ts → .../lit-stories/rows/item-row.lit-stories.ts
@@ -3,7 +3,7 @@ import { TemplateResult } from "lit";
 
 import { Theme, ThemeTypes } from "@bitwarden/common/platform/enums/theme-type.enum";
 
-import { ItemRow } from "../../../rows/item-row";
+import { ItemRow } from "../../rows/item-row";
 
 type Args = {
   theme: Theme;

diff --git a/apps/browser/src/autofill/content/components/package.json b/apps/browser/src/autofill/content/components/package.json
@@ -0,0 +1,7 @@
+{
+  "name": "@bitwarden/browser-components",
+  "version": "2025.1.1",
+  "scripts": {
+    "storybook:lit": "storybook dev -p 6006 -c ./.lit-storybook"
+  }
+}
diff --git a/package.json b/package.json
@@ -26,7 +26,6 @@
     "lint:dep-ownership": "tsc --project ./scripts/tsconfig.json && node ./scripts/dist/dep-ownership.js",
     "docs:json": "compodoc -p ./tsconfig.json -e json -d . --disableRoutesGraph",
     "storybook": "ng run components:storybook",
-    "storybook:lit": "storybook dev -p 6006 -c apps/browser/src/autofill/content/components/.storybook",
     "build-storybook": "ng run components:build-storybook",
     "build-storybook:ci": "ng run components:build-storybook --webpack-stats-json",
     "postinstall": "patch-package"