From 83a131a36144f7a5fbf3a5dffc882531a2961296 Mon Sep 17 00:00:00 2001 From: dorsaf frigui Date: Mon, 22 Aug 2022 10:43:33 +0200 Subject: [PATCH] bugfix(storybook): remove unnecessary components from storybook (#836) * remove wizard-page from stories * simplify tabs * remove tab from tsconfig * simplify button toggle * update demo --- angular.json | 39 ------- libs/web-components/README.md | 4 +- .../button-toggle-group/README.md | 1 - .../button-toggle-group/demo/index.html | 24 +++-- .../button-toggle-group/package.json | 7 +- .../button-toggle}/button-toggle-filter.ts | 0 .../src/button-toggle}/button-toggle.ts | 4 +- .../src/button-toggle}/filter-styles.scss | 0 .../src/button-toggle}/styles.scss | 0 .../button-toggle-group/src/index.ts | 4 + .../stories/button-toggle-group.stories.ts | 3 +- .../button-toggle/.eslintrc.json | 17 --- libs/web-components/button-toggle/.npmignore | 8 -- libs/web-components/button-toggle/README.md | 34 ------ .../button-toggle/demo/index.html | 7 -- .../web-components/button-toggle/package.json | 26 ----- .../web-components/button-toggle/src/index.ts | 2 - .../stories/button-toggle.stories.ts | 44 -------- .../button-toggle/test/button-toggle.test.ts | 11 -- .../button-toggle/tsconfig.json | 10 -- .../button-toggle/webpack.config.cjs | 10 -- libs/web-components/tab-bar/.eslintrc.json | 17 --- libs/web-components/tab-bar/.npmignore | 8 -- libs/web-components/tab-bar/README.md | 45 -------- libs/web-components/tab-bar/demo/index.html | 45 -------- libs/web-components/tab-bar/package.json | 26 ----- .../tab-bar/stories/tab-bar.stories.ts | 66 ------------ .../tab-bar/test/tab-bar.test.ts | 12 --- libs/web-components/tab-bar/tsconfig.json | 10 -- .../web-components/tab-bar/webpack.config.cjs | 10 -- libs/web-components/tab/.eslintrc.json | 17 --- libs/web-components/tab/.npmignore | 8 -- libs/web-components/tab/README.md | 30 ------ libs/web-components/tab/demo/index.html | 6 -- libs/web-components/tab/package.json | 27 ----- .../web-components/tab/stories/tab.stories.ts | 34 ------ libs/web-components/tab/test/tab.test.ts | 14 --- libs/web-components/tab/tsconfig.json | 10 -- libs/web-components/tab/webpack.config.cjs | 10 -- libs/web-components/tabs/demo/index.html | 2 - libs/web-components/tabs/package.json | 6 +- libs/web-components/tabs/src/index.ts | 6 +- .../src/tab-bar/tab-bar.scss} | 0 .../src => tabs/src/tab-bar}/tab-bar.ts | 2 +- libs/web-components/tabs/src/tab-group.ts | 4 +- .../src/styles.scss => tabs/src/tab/tab.scss} | 0 .../{tab/src => tabs/src/tab}/tab.ts | 4 +- libs/web-components/tsconfig.json | 12 --- .../web-components/wizard-page/.eslintrc.json | 17 --- libs/web-components/wizard-page/.npmignore | 8 -- libs/web-components/wizard-page/README.md | 28 ----- .../wizard-page/demo/index.html | 2 - libs/web-components/wizard-page/package.json | 26 ----- .../stories/wizard-page.stories.ts | 32 ------ .../wizard-page/test/wizard-page.test.ts | 12 --- libs/web-components/wizard-page/tsconfig.json | 10 -- .../wizard-page/webpack.config.cjs | 10 -- libs/web-components/wizard/README.md | 4 +- libs/web-components/wizard/demo/index.html | 4 +- libs/web-components/wizard/package.json | 6 +- libs/web-components/wizard/src/index.ts | 2 + .../src/wizard-page.scss} | 0 .../src/wizard-page.ts | 3 +- .../wizard/stories/wizard.stories.ts | 1 - package-lock.json | 100 ++---------------- 65 files changed, 52 insertions(+), 899 deletions(-) rename libs/web-components/{button-toggle/src => button-toggle-group/src/button-toggle}/button-toggle-filter.ts (100%) rename libs/web-components/{button-toggle/src => button-toggle-group/src/button-toggle}/button-toggle.ts (100%) rename libs/web-components/{button-toggle/src => button-toggle-group/src/button-toggle}/filter-styles.scss (100%) rename libs/web-components/{button-toggle/src => button-toggle-group/src/button-toggle}/styles.scss (100%) create mode 100644 libs/web-components/button-toggle-group/src/index.ts delete mode 100644 libs/web-components/button-toggle/.eslintrc.json delete mode 100644 libs/web-components/button-toggle/.npmignore delete mode 100644 libs/web-components/button-toggle/README.md delete mode 100644 libs/web-components/button-toggle/demo/index.html delete mode 100644 libs/web-components/button-toggle/package.json delete mode 100644 libs/web-components/button-toggle/src/index.ts delete mode 100644 libs/web-components/button-toggle/stories/button-toggle.stories.ts delete mode 100644 libs/web-components/button-toggle/test/button-toggle.test.ts delete mode 100644 libs/web-components/button-toggle/tsconfig.json delete mode 100644 libs/web-components/button-toggle/webpack.config.cjs delete mode 100644 libs/web-components/tab-bar/.eslintrc.json delete mode 100644 libs/web-components/tab-bar/.npmignore delete mode 100644 libs/web-components/tab-bar/README.md delete mode 100644 libs/web-components/tab-bar/demo/index.html delete mode 100644 libs/web-components/tab-bar/package.json delete mode 100644 libs/web-components/tab-bar/stories/tab-bar.stories.ts delete mode 100644 libs/web-components/tab-bar/test/tab-bar.test.ts delete mode 100644 libs/web-components/tab-bar/tsconfig.json delete mode 100644 libs/web-components/tab-bar/webpack.config.cjs delete mode 100644 libs/web-components/tab/.eslintrc.json delete mode 100644 libs/web-components/tab/.npmignore delete mode 100644 libs/web-components/tab/README.md delete mode 100644 libs/web-components/tab/demo/index.html delete mode 100644 libs/web-components/tab/package.json delete mode 100644 libs/web-components/tab/stories/tab.stories.ts delete mode 100644 libs/web-components/tab/test/tab.test.ts delete mode 100644 libs/web-components/tab/tsconfig.json delete mode 100644 libs/web-components/tab/webpack.config.cjs rename libs/web-components/{tab-bar/src/styles.scss => tabs/src/tab-bar/tab-bar.scss} (100%) rename libs/web-components/{tab-bar/src => tabs/src/tab-bar}/tab-bar.ts (94%) rename libs/web-components/{tab/src/styles.scss => tabs/src/tab/tab.scss} (100%) rename libs/web-components/{tab/src => tabs/src/tab}/tab.ts (95%) delete mode 100644 libs/web-components/wizard-page/.eslintrc.json delete mode 100644 libs/web-components/wizard-page/.npmignore delete mode 100644 libs/web-components/wizard-page/README.md delete mode 100644 libs/web-components/wizard-page/demo/index.html delete mode 100644 libs/web-components/wizard-page/package.json delete mode 100644 libs/web-components/wizard-page/stories/wizard-page.stories.ts delete mode 100644 libs/web-components/wizard-page/test/wizard-page.test.ts delete mode 100644 libs/web-components/wizard-page/tsconfig.json delete mode 100644 libs/web-components/wizard-page/webpack.config.cjs create mode 100644 libs/web-components/wizard/src/index.ts rename libs/web-components/{wizard-page/src/styles.scss => wizard/src/wizard-page.scss} (100%) rename libs/web-components/{wizard-page => wizard}/src/wizard-page.ts (96%) diff --git a/angular.json b/angular.json index dd7899acb..7a12e2f32 100644 --- a/angular.json +++ b/angular.json @@ -1158,32 +1158,6 @@ }, "tags": ["web-components"] }, - "tab": { - "$schema": "../../../node_modules/nx/schemas/project-schema.json", - "root": "libs/web-components/tab", - "architect": { - "lint": { - "builder": "@nrwl/linter:eslint", - "options": { - "lintFilePatterns": ["libs/web-components/tab/src/**/*.ts"] - } - } - }, - "tags": ["web-components"] - }, - "tab-bar": { - "$schema": "../../../node_modules/nx/schemas/project-schema.json", - "root": "libs/web-components/tab-bar", - "architect": { - "lint": { - "builder": "@nrwl/linter:eslint", - "options": { - "lintFilePatterns": ["libs/web-components/tab-bar/src/**/*.ts"] - } - } - }, - "tags": ["web-components"] - }, "table": { "$schema": "../../../node_modules/nx/schemas/project-schema.json", "projectType": "library", @@ -1681,19 +1655,6 @@ } }, "tags": [] - }, - "wizard-page": { - "$schema": "../../../node_modules/nx/schemas/project-schema.json", - "root": "libs/web-components/wizard-page", - "architect": { - "lint": { - "builder": "@nrwl/linter:eslint", - "options": { - "lintFilePatterns": ["libs/web-components/wizard-page/src/**/*.ts"] - } - } - }, - "tags": ["web-components"] } } } diff --git a/libs/web-components/README.md b/libs/web-components/README.md index f58fe447e..ec7321614 100644 --- a/libs/web-components/README.md +++ b/libs/web-components/README.md @@ -32,7 +32,6 @@ | Name | Package | Version | Links | | ----------------------- | ------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------ | --------------------------------------------------------------------------------------------- | | **Button** | [`@finastra/button`](https://npmjs.com/package/@finastra/button) | [![latest](https://img.shields.io/npm/v/@finastra/button.svg)](https://npmjs.com/package/@finastra/button) | [![README](https://img.shields.io/badge/README--56C271.svg)](./button/README.md) | -| **Button Toggle** | [`@finastra/button-toggle`](https://npmjs.com/package/@finastra/button-toggle) | [![latest](https://img.shields.io/npm/v/@finastra/button-toggle.svg)](https://npmjs.com/package/@finastra/button-toggle) | [![README](https://img.shields.io/badge/README--56C271.svg)](./button-toggle/README.md) | | **Button Toggle Group** | [`@finastra/button-toggle-group`](https://npmjs.com/package/@finastra/button-toggle-group) | [![latest](https://img.shields.io/npm/v/@finastra/button-toggle-group.svg)](https://npmjs.com/package/@finastra/button-toggle-group) | [![README](https://img.shields.io/badge/README--56C271.svg)](./button-toggle-group/README.md) | | **Icon Button** | [`@finastra/icon-button`](https://npmjs.com/package/@finastra/icon-button) | [![latest](https://img.shields.io/npm/v/@finastra/icon-button.svg)](https://npmjs.com/package/@finastra/icon-button) | [![README](https://img.shields.io/badge/README--56C271.svg)](./icon-button/README.md) | | **FAB** | [`@finastra/fab`](https://npmjs.com/package/@finastra/fab) | [![latest](https://img.shields.io/npm/v/@finastra/fab.svg)](https://npmjs.com/package/@finastra/fab) | [![README](https://img.shields.io/badge/README--56C271.svg)](./fab/README.md) | @@ -82,8 +81,7 @@ | **Global Search** | [`@finastra/global-search`](https://npmjs.com/package/@finastra/global-search) | [![latest](https://img.shields.io/npm/v/@finastra/global-search.svg)](https://npmjs.com/package/@finastra/global-search) | [![README](https://img.shields.io/badge/README--56C271.svg)](./global-search/README.md) | | | **Icon Bar** | [`@finastra/icon-bar`](https://npmjs.com/package/@finastra/icon-bar) | N/A | TBD | | **Launchpad** | [`@finastra/launchpad`](https://npmjs.com/package/@finastra/launchpad) | [![latest](https://img.shields.io/npm/v/@finastra/launchpad.svg)](https://npmjs.com/package/@finastra/launchpad) | [![README](https://img.shields.io/badge/README--56C271.svg)](./launchpad/README.md) | -| **Sidenav** | [`@finastra/sidenav`](https://npmjs.com/package/@finastra/sidenav) | [![latest](https://img.shields.io/npm/v/@finastra/sidenav.svg)](https://npmjs.com/package/@finastra/sidenav) | [![README](https://img.shields.io/badge/README--56C271.svg)](./sidenav/README.md) | -| **Tab** | [`@finastra/tab`](https://npmjs.com/package/@finastra/tab) | [![latest](https://img.shields.io/npm/v/@finastra/tab.svg)](https://npmjs.com/package/@finastra/tab) | [![README](https://img.shields.io/badge/README--56C271.svg)](./tab/README.md) | +| **Sidenav** | [`@finastra/sidenav`](https://npmjs.com/package/@finastra/sidenav) | [![latest](https://img.shields.io/npm/v/@finastra/sidenav.svg)](https://npmjs.com/package/@finastra/sidenav) | [![README](https://img.shields.io/badge/README--56C271.svg)](./sidenav/README.md) | | | **Tab bar** | [`@finastra/tab-bar`](https://npmjs.com/package/@finastra/tab-bar) | [![latest](https://img.shields.io/npm/v/@finastra/tab-bar.svg)](https://npmjs.com/package/@finastra/tab-bar) | [![README](https://img.shields.io/badge/README--56C271.svg)](./tab-bar/README.md) | | **User Profile** | [`@finastra/user-profile`](https://npmjs.com/package/@finastra/user-profile) | [![latest](https://img.shields.io/npm/v/@finastra/user-profile.svg)](https://npmjs.com/package/@finastra/user-profile) | [![README](https://img.shields.io/badge/README--56C271.svg)](./user-profile/README.md) | diff --git a/libs/web-components/button-toggle-group/README.md b/libs/web-components/button-toggle-group/README.md index 5cd748d76..73851a7d5 100644 --- a/libs/web-components/button-toggle-group/README.md +++ b/libs/web-components/button-toggle-group/README.md @@ -29,7 +29,6 @@ import '@finastra/button-toggle-group'; ```html - diff --git a/libs/web-components/button-toggle-group/demo/index.html b/libs/web-components/button-toggle-group/demo/index.html index 68ab28b0b..8d5e96f85 100644 --- a/libs/web-components/button-toggle-group/demo/index.html +++ b/libs/web-components/button-toggle-group/demo/index.html @@ -1,43 +1,47 @@ - - - + +
- + - + - + - + - + - + -
\ No newline at end of file + + \ No newline at end of file diff --git a/libs/web-components/button-toggle-group/package.json b/libs/web-components/button-toggle-group/package.json index d86325c5a..cf6832e74 100644 --- a/libs/web-components/button-toggle-group/package.json +++ b/libs/web-components/button-toggle-group/package.json @@ -9,14 +9,15 @@ "ButtonToggleGroup" ], "license": "MIT", - "main": "dist/src/button-toggle-group.js", - "module": "dist/src/button-toggle-group.js", + "main": "dist/src/index.js", + "module": "dist/src/index.js", "scripts": { "build": "webpack", - "build:style": "node ../../../scripts/sass-to-lit-css/index.js src/styles.scss" + "build:style": "node ../../../scripts/sass-to-lit-css/index.js src/styles.scss src/button-toggle/styles.scss src/button-toggle/filter-styles.scss" }, "dependencies": { "@material/mwc-tab-bar": "^0.26.1", + "@material/mwc-tab": "^0.26.1", "lit": "^2.0.0", "tslib": "^2.0.1" }, diff --git a/libs/web-components/button-toggle/src/button-toggle-filter.ts b/libs/web-components/button-toggle-group/src/button-toggle/button-toggle-filter.ts similarity index 100% rename from libs/web-components/button-toggle/src/button-toggle-filter.ts rename to libs/web-components/button-toggle-group/src/button-toggle/button-toggle-filter.ts diff --git a/libs/web-components/button-toggle/src/button-toggle.ts b/libs/web-components/button-toggle-group/src/button-toggle/button-toggle.ts similarity index 100% rename from libs/web-components/button-toggle/src/button-toggle.ts rename to libs/web-components/button-toggle-group/src/button-toggle/button-toggle.ts index 8501a38a3..21207ae84 100644 --- a/libs/web-components/button-toggle/src/button-toggle.ts +++ b/libs/web-components/button-toggle-group/src/button-toggle/button-toggle.ts @@ -1,8 +1,8 @@ -import { customElement } from 'lit/decorators.js'; import { TabBase } from '@material/mwc-tab/mwc-tab-base'; - +import { customElement } from 'lit/decorators.js'; import { styles } from './styles.css'; + /** * @attr [label=''] - Text label to display in button toggle. * @attr [icon=''] - Material design icon name to display. diff --git a/libs/web-components/button-toggle/src/filter-styles.scss b/libs/web-components/button-toggle-group/src/button-toggle/filter-styles.scss similarity index 100% rename from libs/web-components/button-toggle/src/filter-styles.scss rename to libs/web-components/button-toggle-group/src/button-toggle/filter-styles.scss diff --git a/libs/web-components/button-toggle/src/styles.scss b/libs/web-components/button-toggle-group/src/button-toggle/styles.scss similarity index 100% rename from libs/web-components/button-toggle/src/styles.scss rename to libs/web-components/button-toggle-group/src/button-toggle/styles.scss diff --git a/libs/web-components/button-toggle-group/src/index.ts b/libs/web-components/button-toggle-group/src/index.ts new file mode 100644 index 000000000..bf0d4af6f --- /dev/null +++ b/libs/web-components/button-toggle-group/src/index.ts @@ -0,0 +1,4 @@ +export * from './button-toggle-group'; +export * from './button-toggle/button-toggle'; +export * from './button-toggle/button-toggle-filter'; + diff --git a/libs/web-components/button-toggle-group/stories/button-toggle-group.stories.ts b/libs/web-components/button-toggle-group/stories/button-toggle-group.stories.ts index 705035d9e..7890b90b9 100644 --- a/libs/web-components/button-toggle-group/stories/button-toggle-group.stories.ts +++ b/libs/web-components/button-toggle-group/stories/button-toggle-group.stories.ts @@ -1,12 +1,11 @@ const README = require('../README.md'); -import '@finastra/button-toggle'; import '@finastra/button-toggle-group'; import { Meta, Story } from '@storybook/web-components'; import { html } from 'lit-html'; import { argTypes, cssprops } from './sb-generated/fds-button-toggle-group.json'; export default { - title: 'ACTIONS/Toggle/Button Toggle Group', + title: 'ACTIONS/Toggle', component: 'fds-button-toggle-group', argTypes, parameters: { diff --git a/libs/web-components/button-toggle/.eslintrc.json b/libs/web-components/button-toggle/.eslintrc.json deleted file mode 100644 index 85fd269fd..000000000 --- a/libs/web-components/button-toggle/.eslintrc.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "extends": ["../../../.eslintrc.json"], - "ignorePatterns": ["!**/*"], - "overrides": [ - { - "files": ["*.ts"], - "parserOptions": { - "project": ["libs/web-components/button-toggle/tsconfig.*?.json"] - }, - "rules": {} - }, - { - "files": ["*.html"], - "rules": {} - } - ] -} diff --git a/libs/web-components/button-toggle/.npmignore b/libs/web-components/button-toggle/.npmignore deleted file mode 100644 index 83ebb4f4c..000000000 --- a/libs/web-components/button-toggle/.npmignore +++ /dev/null @@ -1,8 +0,0 @@ -.tsbuildinfo -tsconfig.json -.eslintignore -*.tgz -images/* -test/* -*.ts -!*.d.ts diff --git a/libs/web-components/button-toggle/README.md b/libs/web-components/button-toggle/README.md deleted file mode 100644 index 8499e3330..000000000 --- a/libs/web-components/button-toggle/README.md +++ /dev/null @@ -1,34 +0,0 @@ -# Button Toggle - -[![See it on NPM!](https://img.shields.io/npm/v/@finastra/button-toggle?style=for-the-badge)](https://www.npmjs.com/package/@finastra/button-toggle) -[![How big is this package in your project?](https://img.shields.io/bundlephobia/minzip/@finastra/button-toggle?style=for-the-badge)](https://bundlephobia.com/result?p=@finastra/button-toggle') -[![Storybook](https://shields.io/badge/-Play%20with%20this%20web%20component-2a0481?logo=storybook&style=for-the-badge)](https://finastra.github.io/finastra-design-system/?path=/story/actions-toggle-button-toggle--default) - -Button toggles are on/off toggles with the appearance of a button. - -We created two types of button toggle, a default usable with the `` selector and a filter usable with `` selector. - -## Usage - -### Import - -``` -npm i @finastra/button-toggle -``` - -```ts -import '@finastra/button-toggle'; -... - -``` - -### Pure HTML pages - -```html - - - - - - -``` diff --git a/libs/web-components/button-toggle/demo/index.html b/libs/web-components/button-toggle/demo/index.html deleted file mode 100644 index fbe3379e8..000000000 --- a/libs/web-components/button-toggle/demo/index.html +++ /dev/null @@ -1,7 +0,0 @@ - - - -
- - -
\ No newline at end of file diff --git a/libs/web-components/button-toggle/package.json b/libs/web-components/button-toggle/package.json deleted file mode 100644 index f53c3ab5f..000000000 --- a/libs/web-components/button-toggle/package.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "@finastra/button-toggle", - "displayName": "ButtonToggle", - "version": "0.0.39", - "description": "ButtonToggle Web Component", - "keywords": [ - "Finastra Design System", - "Web Components", - "ButtonToggle" - ], - "license": "MIT", - "main": "dist/src/index.js", - "module": "dist/src/index.js", - "scripts": { - "build": "webpack", - "build:style": "node ../../../scripts/sass-to-lit-css/index.js src/styles.scss src/filter-styles.scss" - }, - "dependencies": { - "@material/mwc-tab": "^0.26.1", - "lit": "^2.0.0", - "tslib": "^2.0.1" - }, - "publishConfig": { - "access": "public" - } -} diff --git a/libs/web-components/button-toggle/src/index.ts b/libs/web-components/button-toggle/src/index.ts deleted file mode 100644 index c56420f80..000000000 --- a/libs/web-components/button-toggle/src/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './button-toggle'; -export * from './button-toggle-filter'; \ No newline at end of file diff --git a/libs/web-components/button-toggle/stories/button-toggle.stories.ts b/libs/web-components/button-toggle/stories/button-toggle.stories.ts deleted file mode 100644 index 869c9edde..000000000 --- a/libs/web-components/button-toggle/stories/button-toggle.stories.ts +++ /dev/null @@ -1,44 +0,0 @@ -const README = require('../README.md'); -import '@finastra/button-toggle'; -import '@finastra/button-toggle-group'; -import { Meta, Story } from '@storybook/web-components'; -import { html } from 'lit-html'; -import { argTypes, cssprops } from './sb-generated/fds-button-toggle.json'; - -export default { - title: 'ACTIONS/Toggle/Button Toggle', - component: 'fds-button-toggle', - argTypes, - parameters: { - docs: { - description: { component: README } - }, - cssprops, - design: { - type: 'figma', - url: 'https://www.figma.com/file/E1Mb1556RT3HbAUVu2Q0LV/Finastra-design-system?node-id=94522%3A28102' - } - } -} as Meta; - -const Template: Story = ({ label, icon, disabled}) => { - return html` - `; -}; - -const FilterTemplate: Story = ({ label, icon, disabled}) => { - return html` - `; -}; - -export const Default: Story = Template.bind({}); -Default.args = { - label: 'label', - icon: 'event' -}; - -export const Filter: Story = FilterTemplate.bind({}); -Filter.args = { - label: 'label', - icon: 'event' -}; diff --git a/libs/web-components/button-toggle/test/button-toggle.test.ts b/libs/web-components/button-toggle/test/button-toggle.test.ts deleted file mode 100644 index 7dd14a11b..000000000 --- a/libs/web-components/button-toggle/test/button-toggle.test.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { html, fixture, expect, elementUpdated } from '@open-wc/testing'; -import { ButtonToggle } from '../src/button-toggle.js'; -import '../src/button-toggle.js'; - -describe('ButtonToggle', () => { - it('loads accessibly', async () => { - const el: ButtonToggle = await fixture(html`
`); - await elementUpdated(el); - await expect(el).to.be.accessible(); - }); -}); diff --git a/libs/web-components/button-toggle/tsconfig.json b/libs/web-components/button-toggle/tsconfig.json deleted file mode 100644 index f63d15656..000000000 --- a/libs/web-components/button-toggle/tsconfig.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../tsconfig.json", - "compilerOptions": { - "composite": true, - "rootDir": "./", - "outDir": "./dist", - "tsBuildInfoFile": "./dist/.tsbuildinfo" - }, - "include": ["src/**/*.ts", "test/**/*.ts"] -} diff --git a/libs/web-components/button-toggle/webpack.config.cjs b/libs/web-components/button-toggle/webpack.config.cjs deleted file mode 100644 index 8a9cd1d99..000000000 --- a/libs/web-components/button-toggle/webpack.config.cjs +++ /dev/null @@ -1,10 +0,0 @@ -const path = require('path'); -const config = require('../base-webpack.config.cjs'); - -config.entry = path.resolve(__dirname, './src/index.ts'), -config.output = { - filename: 'fds-button-toggle.js', - path: path.resolve(__dirname, 'dist'), -}, - -module.exports = config; \ No newline at end of file diff --git a/libs/web-components/tab-bar/.eslintrc.json b/libs/web-components/tab-bar/.eslintrc.json deleted file mode 100644 index 13d679b43..000000000 --- a/libs/web-components/tab-bar/.eslintrc.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "extends": ["../../../.eslintrc.json"], - "ignorePatterns": ["!**/*"], - "overrides": [ - { - "files": ["*.ts"], - "parserOptions": { - "project": ["libs/web-components/tab-bar/tsconfig.*?.json"] - }, - "rules": {} - }, - { - "files": ["*.html"], - "rules": {} - } - ] -} diff --git a/libs/web-components/tab-bar/.npmignore b/libs/web-components/tab-bar/.npmignore deleted file mode 100644 index 83ebb4f4c..000000000 --- a/libs/web-components/tab-bar/.npmignore +++ /dev/null @@ -1,8 +0,0 @@ -.tsbuildinfo -tsconfig.json -.eslintignore -*.tgz -images/* -test/* -*.ts -!*.d.ts diff --git a/libs/web-components/tab-bar/README.md b/libs/web-components/tab-bar/README.md deleted file mode 100644 index 81fb80eff..000000000 --- a/libs/web-components/tab-bar/README.md +++ /dev/null @@ -1,45 +0,0 @@ -# TabBar - -[![See it on NPM!](https://img.shields.io/npm/v/@finastra/tab-bar?style=for-the-badge)](https://www.npmjs.com/package/@finastra/tab-bar) -[![How big is this package in your project?](https://img.shields.io/bundlephobia/minzip/@finastra/tab-bar?style=for-the-badge)](https://bundlephobia.com/result?p=@finastra/tab-bar') -[![Storybook](https://shields.io/badge/-Play%20with%20this%20web%20component-2a0481?logo=storybook&style=for-the-badge)](https://finastra.github.io/finastra-design-system/?path=/story/navigation-tabs-tab-bar--default) - - -Tabs organize content across different screens, data sets, and other interactions. - -The `fds-tab-bar` extends [Material web's mwc-tab-bar-base](https://github.com/material-components/material-web/tree/master/packages/tab-bar). - -## Usage - -### Import - -``` -npm i @finastra/tab-bar -``` - -```ts -import '@finastra/tab-bar'; -import '@finastra/tab'; -... - - - - - - -``` - -### Pure HTML pages - -```html - - - - - - - - - -``` - diff --git a/libs/web-components/tab-bar/demo/index.html b/libs/web-components/tab-bar/demo/index.html deleted file mode 100644 index 3b4fc0774..000000000 --- a/libs/web-components/tab-bar/demo/index.html +++ /dev/null @@ -1,45 +0,0 @@ - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - \ No newline at end of file diff --git a/libs/web-components/tab-bar/package.json b/libs/web-components/tab-bar/package.json deleted file mode 100644 index 2a0e39a7d..000000000 --- a/libs/web-components/tab-bar/package.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "@finastra/tab-bar", - "displayName": "TabBar", - "version": "0.0.39", - "description": "TabBar Web Component", - "keywords": [ - "Finastra Design System", - "Web Components", - "TabBar" - ], - "license": "MIT", - "main": "dist/src/tab-bar.js", - "module": "dist/src/tab-bar.js", - "scripts": { - "build": "webpack", - "build:style": "node ../../../scripts/sass-to-lit-css/index.js src/styles.scss" - }, - "dependencies": { - "@material/mwc-tab-bar": "^0.26.1", - "lit": "^2.0.0", - "tslib": "^2.0.1" - }, - "publishConfig": { - "access": "public" - } -} diff --git a/libs/web-components/tab-bar/stories/tab-bar.stories.ts b/libs/web-components/tab-bar/stories/tab-bar.stories.ts deleted file mode 100644 index 18ebfa8d3..000000000 --- a/libs/web-components/tab-bar/stories/tab-bar.stories.ts +++ /dev/null @@ -1,66 +0,0 @@ -const README = require('../README.md'); -import '@finastra/tab'; -import '@finastra/tab-bar'; -import { Meta, Story } from '@storybook/web-components'; -import { html } from 'lit-html'; -import { argTypes, cssprops } from './sb-generated/fds-tab-bar.json'; - -export default { - title: 'NAVIGATION/Tabs/Tab Bar', - component: 'fds-tab-bar', - argTypes, - parameters: { - docs: { - description: { component: README } - }, - design: { - type: 'figma', - url: 'https://www.figma.com/file/E1Mb1556RT3HbAUVu2Q0LV/Finastra-design-system?node-id=251%3A5493' - }, - cssprops - } -} as Meta; - - -const Template: Story = ({ label, icon, segmented, stacked, classic, activeIndex, seperator}) => { - return html` - - - -`; -}; - -export const Default: Story = Template.bind({}); -Default.args = { - label: 'Active', - icon: "location_on", - activeIndex: 0 -}; - -export const Segmented: Story = Template.bind({}); -Segmented.args = { - label: 'active', - icon: "location_on", - segmented: true -}; - -export const Classic: Story = Template.bind({}); -Classic.args = { - label: 'Active', - icon: "location_on", - classic: true -}; - -export const Stacked: Story = Template.bind({}); -Stacked.args = { - label: 'Active', - icon: "location_on", - stacked: true -}; - -export const Separated: Story = Template.bind({}); -Separated.args = { - label: 'Active', - icon: "location_on", - seperator: true -}; diff --git a/libs/web-components/tab-bar/test/tab-bar.test.ts b/libs/web-components/tab-bar/test/tab-bar.test.ts deleted file mode 100644 index 28c863562..000000000 --- a/libs/web-components/tab-bar/test/tab-bar.test.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { html, fixture, expect, elementUpdated } from '@open-wc/testing'; -import { TabBar } from '../src/tab-bar.js'; -import '../src/tab-bar.js'; - -describe('TabBar', () => { - it('loads accessibly', async () => { - const el: TabBar = await fixture(html``); - - await elementUpdated(el); - await expect(el).to.be.accessible(); - }); -}); diff --git a/libs/web-components/tab-bar/tsconfig.json b/libs/web-components/tab-bar/tsconfig.json deleted file mode 100644 index f63d15656..000000000 --- a/libs/web-components/tab-bar/tsconfig.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../tsconfig.json", - "compilerOptions": { - "composite": true, - "rootDir": "./", - "outDir": "./dist", - "tsBuildInfoFile": "./dist/.tsbuildinfo" - }, - "include": ["src/**/*.ts", "test/**/*.ts"] -} diff --git a/libs/web-components/tab-bar/webpack.config.cjs b/libs/web-components/tab-bar/webpack.config.cjs deleted file mode 100644 index 5da754eaf..000000000 --- a/libs/web-components/tab-bar/webpack.config.cjs +++ /dev/null @@ -1,10 +0,0 @@ -const path = require('path'); -const config = require('../base-webpack.config.cjs'); - -config.entry = path.resolve(__dirname, './src/tab-bar.ts'), -config.output = { - filename: 'fds-tab-bar.js', - path: path.resolve(__dirname, 'dist'), -}, - -module.exports = config; diff --git a/libs/web-components/tab/.eslintrc.json b/libs/web-components/tab/.eslintrc.json deleted file mode 100644 index d7f66a4df..000000000 --- a/libs/web-components/tab/.eslintrc.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "extends": ["../../../.eslintrc.json"], - "ignorePatterns": ["!**/*"], - "overrides": [ - { - "files": ["*.ts"], - "parserOptions": { - "project": ["libs/web-components/tab/tsconfig.*?.json"] - }, - "rules": {} - }, - { - "files": ["*.html"], - "rules": {} - } - ] -} diff --git a/libs/web-components/tab/.npmignore b/libs/web-components/tab/.npmignore deleted file mode 100644 index 83ebb4f4c..000000000 --- a/libs/web-components/tab/.npmignore +++ /dev/null @@ -1,8 +0,0 @@ -.tsbuildinfo -tsconfig.json -.eslintignore -*.tgz -images/* -test/* -*.ts -!*.d.ts diff --git a/libs/web-components/tab/README.md b/libs/web-components/tab/README.md deleted file mode 100644 index debdfcc9a..000000000 --- a/libs/web-components/tab/README.md +++ /dev/null @@ -1,30 +0,0 @@ -# Tab -[![See it on NPM!](https://img.shields.io/npm/v/@finastra/tab?style=for-the-badge)](https://www.npmjs.com/package/@finastra/tab) -[![How big is this package in your project?](https://img.shields.io/bundlephobia/minzip/@finastra/tab?style=for-the-badge)](https://bundlephobia.com/result?p=@finastra/tab') -[![Storybook](https://shields.io/badge/-Play%20with%20this%20web%20component-2a0481?logo=storybook&style=for-the-badge)](https://finastra.github.io/finastra-design-system/?path=/story/navigation-tabs--default) - - -Tabs organize content across different screens, data sets, and other interactions.\ -This component is meant to be used inside [fds-tab-bar](https://finastra.github.io/finastra-design-system/?path=/story/navigation-tabs-tab-bar--default). - -## Usage - -### Import - -``` -npm i @finastra/tab -``` - -```ts -import '@finastra/tab'; -... - -``` - -### Pure HTML pages - -```html - - - -``` diff --git a/libs/web-components/tab/demo/index.html b/libs/web-components/tab/demo/index.html deleted file mode 100644 index 11627afab..000000000 --- a/libs/web-components/tab/demo/index.html +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/libs/web-components/tab/package.json b/libs/web-components/tab/package.json deleted file mode 100644 index 36cb65927..000000000 --- a/libs/web-components/tab/package.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "name": "@finastra/tab", - "displayName": "Tab", - "version": "0.0.39", - "description": "Tab Web Component", - "keywords": [ - "Finastra Design System", - "Web Components", - "Tab" - ], - "license": "MIT", - "main": "dist/src/tab.js", - "module": "dist/src/tab.js", - "scripts": { - "build": "webpack", - "build:style": "node ../../../scripts/sass-to-lit-css/index.js src/styles.scss" - }, - "dependencies": { - "@finastra/tab-bar": "0.0.39", - "@material/mwc-tab": "^0.26.1", - "lit": "^2.0.0", - "tslib": "^2.0.1" - }, - "publishConfig": { - "access": "public" - } -} diff --git a/libs/web-components/tab/stories/tab.stories.ts b/libs/web-components/tab/stories/tab.stories.ts deleted file mode 100644 index d63e3b44c..000000000 --- a/libs/web-components/tab/stories/tab.stories.ts +++ /dev/null @@ -1,34 +0,0 @@ -const README = require('../README.md'); -import '@finastra/tab'; -import '@finastra/tab-bar'; -import { Meta, Story } from '@storybook/web-components'; -import { html } from 'lit-html'; -import { argTypes, cssprops } from './sb-generated/fds-tab.json'; - -export default { - title: 'NAVIGATION/Tabs/Tab', - component: 'fds-tab', - argTypes, - parameters: { - docs: { - description: { component: README } - }, - design: { - type: 'figma', - url: 'https://www.figma.com/file/E1Mb1556RT3HbAUVu2Q0LV/Finastra-design-system?node-id=251%3A5493' - }, - cssprops - }, -} as Meta; - -const Template: Story = ({ label, icon, segmented, stacked, classic}) => { - return html` - -`; -}; - -export const Default: Story = Template.bind({}); -Default.args = { - label: 'Active', - icon: "location_on", -}; diff --git a/libs/web-components/tab/test/tab.test.ts b/libs/web-components/tab/test/tab.test.ts deleted file mode 100644 index 1d1cb113e..000000000 --- a/libs/web-components/tab/test/tab.test.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { html, fixture, expect, elementUpdated } from '@open-wc/testing'; -import { Tab } from '../src/tab.js'; -import '../src/tab.js'; - -describe('Tab', () => { - it('loads accessibly', async () => { - const el: Tab = await fixture(html`
- -
`); - - await elementUpdated(el); - await expect(el.querySelector('fds-tab')).to.be.accessible(); - }); -}); diff --git a/libs/web-components/tab/tsconfig.json b/libs/web-components/tab/tsconfig.json deleted file mode 100644 index f63d15656..000000000 --- a/libs/web-components/tab/tsconfig.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../tsconfig.json", - "compilerOptions": { - "composite": true, - "rootDir": "./", - "outDir": "./dist", - "tsBuildInfoFile": "./dist/.tsbuildinfo" - }, - "include": ["src/**/*.ts", "test/**/*.ts"] -} diff --git a/libs/web-components/tab/webpack.config.cjs b/libs/web-components/tab/webpack.config.cjs deleted file mode 100644 index ae4efba54..000000000 --- a/libs/web-components/tab/webpack.config.cjs +++ /dev/null @@ -1,10 +0,0 @@ -const path = require('path'); -const config = require('../base-webpack.config.cjs'); - -config.entry = path.resolve(__dirname, './src/tab.ts'), -config.output = { - filename: 'fds-tab.js', - path: path.resolve(__dirname, 'dist'), -}, - -module.exports = config; diff --git a/libs/web-components/tabs/demo/index.html b/libs/web-components/tabs/demo/index.html index 274301ca4..1e7a83ee2 100644 --- a/libs/web-components/tabs/demo/index.html +++ b/libs/web-components/tabs/demo/index.html @@ -1,7 +1,5 @@ - - diff --git a/libs/web-components/tabs/package.json b/libs/web-components/tabs/package.json index f3c997667..a93b80934 100644 --- a/libs/web-components/tabs/package.json +++ b/libs/web-components/tabs/package.json @@ -13,11 +13,11 @@ "module": "dist/src/index.js", "scripts": { "build": "webpack", - "build:style": "node ../../../scripts/sass-to-lit-css/index.js src/styles.scss" + "build:style": "node ../../../scripts/sass-to-lit-css/index.js src/styles.scss src/tab/tab.scss src/tab-bar/tab-bar.scss" }, "dependencies": { - "@finastra/tab": "0.0.39", - "@finastra/tab-bar": "0.0.39", + "@material/mwc-tab-bar": "^0.26.1", + "@material/mwc-tab": "^0.26.1", "lit": "^2.0.0", "tslib": "^2.0.1" }, diff --git a/libs/web-components/tabs/src/index.ts b/libs/web-components/tabs/src/index.ts index e5cae5b7a..341b2471d 100644 --- a/libs/web-components/tabs/src/index.ts +++ b/libs/web-components/tabs/src/index.ts @@ -1,3 +1,5 @@ -export * from './tab-group' -export * from './tab-item' +export * from './tab-bar/tab-bar'; +export * from './tab-group'; +export * from './tab-item'; +export * from './tab/tab'; diff --git a/libs/web-components/tab-bar/src/styles.scss b/libs/web-components/tabs/src/tab-bar/tab-bar.scss similarity index 100% rename from libs/web-components/tab-bar/src/styles.scss rename to libs/web-components/tabs/src/tab-bar/tab-bar.scss diff --git a/libs/web-components/tab-bar/src/tab-bar.ts b/libs/web-components/tabs/src/tab-bar/tab-bar.ts similarity index 94% rename from libs/web-components/tab-bar/src/tab-bar.ts rename to libs/web-components/tabs/src/tab-bar/tab-bar.ts index 09d18c04b..4c5785c3d 100644 --- a/libs/web-components/tab-bar/src/tab-bar.ts +++ b/libs/web-components/tabs/src/tab-bar/tab-bar.ts @@ -1,7 +1,7 @@ import { customElement, property } from 'lit/decorators.js'; import { TabBarBase } from '@material/mwc-tab-bar/mwc-tab-bar-base'; -import { styles } from './styles.css'; +import { styles } from './tab-bar.css'; /** * @attr [activeIndex=0] - Index of tab that is active. diff --git a/libs/web-components/tabs/src/tab-group.ts b/libs/web-components/tabs/src/tab-group.ts index c7893ecc9..ac156f0da 100644 --- a/libs/web-components/tabs/src/tab-group.ts +++ b/libs/web-components/tabs/src/tab-group.ts @@ -1,9 +1,9 @@ -import '@finastra/tab'; -import '@finastra/tab-bar'; import { html, LitElement, PropertyValues } from 'lit'; import { customElement, property, query, state } from 'lit/decorators.js'; import { styles } from './styles.css'; +import "./tab-bar/tab-bar"; import { TabItem } from './tab-item'; +import "./tab/tab"; interface TabInfo { label: string diff --git a/libs/web-components/tab/src/styles.scss b/libs/web-components/tabs/src/tab/tab.scss similarity index 100% rename from libs/web-components/tab/src/styles.scss rename to libs/web-components/tabs/src/tab/tab.scss diff --git a/libs/web-components/tab/src/tab.ts b/libs/web-components/tabs/src/tab/tab.ts similarity index 95% rename from libs/web-components/tab/src/tab.ts rename to libs/web-components/tabs/src/tab/tab.ts index 44558e367..e858ff998 100644 --- a/libs/web-components/tab/src/tab.ts +++ b/libs/web-components/tabs/src/tab/tab.ts @@ -1,7 +1,7 @@ -import { customElement, property } from 'lit/decorators.js'; import { TabBase } from '@material/mwc-tab/mwc-tab-base'; +import { customElement, property } from 'lit/decorators.js'; +import { styles } from './tab.css'; -import { styles } from './styles.css'; /** * @attr [label=''] - Text label to display in tab. diff --git a/libs/web-components/tsconfig.json b/libs/web-components/tsconfig.json index a99375ad6..cb1d5d284 100644 --- a/libs/web-components/tsconfig.json +++ b/libs/web-components/tsconfig.json @@ -88,12 +88,6 @@ { "path": "stepper" }, - { - "path": "tab" - }, - { - "path": "tab-bar" - }, { "path": "select" }, @@ -103,9 +97,6 @@ { "path": "slider" }, - { - "path": "button-toggle" - }, { "path": "button-toggle-group" }, @@ -127,9 +118,6 @@ { "path": "wizard" }, - { - "path": "wizard-page" - }, { "path": "fab" }, diff --git a/libs/web-components/wizard-page/.eslintrc.json b/libs/web-components/wizard-page/.eslintrc.json deleted file mode 100644 index 7b74e2265..000000000 --- a/libs/web-components/wizard-page/.eslintrc.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "extends": ["../../../.eslintrc.json"], - "ignorePatterns": ["!**/*"], - "overrides": [ - { - "files": ["*.ts"], - "parserOptions": { - "project": ["libs/web-components/wizard-page/tsconfig.*?.json"] - }, - "rules": {} - }, - { - "files": ["*.html"], - "rules": {} - } - ] -} diff --git a/libs/web-components/wizard-page/.npmignore b/libs/web-components/wizard-page/.npmignore deleted file mode 100644 index 83ebb4f4c..000000000 --- a/libs/web-components/wizard-page/.npmignore +++ /dev/null @@ -1,8 +0,0 @@ -.tsbuildinfo -tsconfig.json -.eslintignore -*.tgz -images/* -test/* -*.ts -!*.d.ts diff --git a/libs/web-components/wizard-page/README.md b/libs/web-components/wizard-page/README.md deleted file mode 100644 index f9dd19d1b..000000000 --- a/libs/web-components/wizard-page/README.md +++ /dev/null @@ -1,28 +0,0 @@ -# WizardPage - -The wizard page is used in a context of the wizard pattern. For usage please see [fds-wizard](https://finastra.github.io/finastra-design-system/?path=/story/patterns-wizard--default) -[![See it on NPM!](https://img.shields.io/npm/v/@finastra/wizard-page?style=for-the-badge)](https://www.npmjs.com/package/@finastra/wizard-page) -[![How big is this package in your project?](https://img.shields.io/bundlephobia/minzip/@finastra/wizard-page?style=for-the-badge)](https://bundlephobia.com/result?p=@finastra/wizard-page') -[![Storybook](https://shields.io/badge/-Play%20with%20this%20web%20component-2a0481?logo=storybook&style=for-the-badge)](https://finastra.github.io/finastra-design-system/?path=/story/forms-wizardpage--default) - -## Usage - -### Import - -``` -npm i @finastra/wizard @finastra/wizard-page -``` - -```ts -import '@finastra/wizard-page'; -... - -``` - -### Pure HTML pages - -```html - - - -``` diff --git a/libs/web-components/wizard-page/demo/index.html b/libs/web-components/wizard-page/demo/index.html deleted file mode 100644 index 937c48a13..000000000 --- a/libs/web-components/wizard-page/demo/index.html +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/libs/web-components/wizard-page/package.json b/libs/web-components/wizard-page/package.json deleted file mode 100644 index 6b654704a..000000000 --- a/libs/web-components/wizard-page/package.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "@finastra/wizard-page", - "displayName": "WizardPage", - "version": "0.0.39", - "description": "WizardPage Web Component", - "keywords": [ - "Finastra Design System", - "Web Components", - "WizardPage" - ], - "license": "MIT", - "main": "dist/src/wizard-page.js", - "module": "dist/src/wizard-page.js", - "scripts": { - "build": "webpack", - "build:style": "node ../../../scripts/sass-to-lit-css/index.js src/styles.scss" - }, - "dependencies": { - "@finastra/chip": "0.0.39", - "lit": "^2.0.0", - "tslib": "^2.0.1" - }, - "publishConfig": { - "access": "public" - } -} diff --git a/libs/web-components/wizard-page/stories/wizard-page.stories.ts b/libs/web-components/wizard-page/stories/wizard-page.stories.ts deleted file mode 100644 index a1c669fb9..000000000 --- a/libs/web-components/wizard-page/stories/wizard-page.stories.ts +++ /dev/null @@ -1,32 +0,0 @@ -const README = require('../README.md'); -import '@finastra/wizard-page'; -import type { WizardPage } from '@finastra/wizard-page'; -import { Meta, Story } from '@storybook/web-components'; -import { html } from 'lit-html'; -import { argTypes, cssprops } from './sb-generated/fds-wizard-page.json'; - -export default { - title: 'FORMS/WizardPage', - component: 'fds-wizard-page', - argTypes, - parameters: { - docs: { - description: { component: README } - }, - cssprops - }, - decorators: [ - (story) => html`${story()}` - ] -} as Meta; - -const Template: Story = ({ title }) => { - return html``; -}; - -export const Default: Story = Template.bind({}); -Default.args = { - title: "title" -}; diff --git a/libs/web-components/wizard-page/test/wizard-page.test.ts b/libs/web-components/wizard-page/test/wizard-page.test.ts deleted file mode 100644 index 99214dc49..000000000 --- a/libs/web-components/wizard-page/test/wizard-page.test.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { html, fixture, expect, elementUpdated } from '@open-wc/testing'; -import { WizardPage } from '../src/wizard-page.js'; -import '../src/wizard-page.js'; - -describe('WizardPage', () => { - it('loads accessibly', async () => { - const el: WizardPage = await fixture(html``); - - await elementUpdated(el); - await expect(el).to.be.accessible(); - }); -}); diff --git a/libs/web-components/wizard-page/tsconfig.json b/libs/web-components/wizard-page/tsconfig.json deleted file mode 100644 index f63d15656..000000000 --- a/libs/web-components/wizard-page/tsconfig.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../tsconfig.json", - "compilerOptions": { - "composite": true, - "rootDir": "./", - "outDir": "./dist", - "tsBuildInfoFile": "./dist/.tsbuildinfo" - }, - "include": ["src/**/*.ts", "test/**/*.ts"] -} diff --git a/libs/web-components/wizard-page/webpack.config.cjs b/libs/web-components/wizard-page/webpack.config.cjs deleted file mode 100644 index 29721ba20..000000000 --- a/libs/web-components/wizard-page/webpack.config.cjs +++ /dev/null @@ -1,10 +0,0 @@ -const path = require('path'); -const config = require('../base-webpack.config.cjs'); - -config.entry = path.resolve(__dirname, './src/wizard-page.ts'), -config.output = { - filename: 'fds-wizard-page.js', - path: path.resolve(__dirname, 'dist'), -}, - -module.exports = config; diff --git a/libs/web-components/wizard/README.md b/libs/web-components/wizard/README.md index 8a561e229..b394cb2e3 100644 --- a/libs/web-components/wizard/README.md +++ b/libs/web-components/wizard/README.md @@ -11,12 +11,11 @@ A wizard is a setup process where the user is guided through a series of steps t ### Import ``` -npm i @finastra/wizard @finastra/wizard-page +npm i @finastra/wizard ``` ```ts import '@finastra/wizard'; -import '@finastra/wizard-page'; ... @@ -54,7 +53,6 @@ import '@finastra/wizard-page'; ```html - diff --git a/libs/web-components/wizard/demo/index.html b/libs/web-components/wizard/demo/index.html index e79196e7a..b39d35c8e 100644 --- a/libs/web-components/wizard/demo/index.html +++ b/libs/web-components/wizard/demo/index.html @@ -1,8 +1,6 @@ - + - - diff --git a/libs/web-components/wizard/package.json b/libs/web-components/wizard/package.json index ae8f4db7a..ce4ce9d17 100644 --- a/libs/web-components/wizard/package.json +++ b/libs/web-components/wizard/package.json @@ -9,11 +9,11 @@ "Wizard" ], "license": "MIT", - "main": "dist/src/wizard.js", - "module": "dist/src/wizard.js", + "main": "dist/src/index.js", + "module": "dist/src/index.js", "scripts": { "build": "webpack", - "build:style": "node ../../../scripts/sass-to-lit-css/index.js src/styles.scss" + "build:style": "node ../../../scripts/sass-to-lit-css/index.js src/styles.scss src/wizard-page.scss" }, "dependencies": { "@finastra/divider": "0.0.39", diff --git a/libs/web-components/wizard/src/index.ts b/libs/web-components/wizard/src/index.ts new file mode 100644 index 000000000..66eef76b6 --- /dev/null +++ b/libs/web-components/wizard/src/index.ts @@ -0,0 +1,2 @@ +export * from './wizard'; +export * from './wizard-page'; diff --git a/libs/web-components/wizard-page/src/styles.scss b/libs/web-components/wizard/src/wizard-page.scss similarity index 100% rename from libs/web-components/wizard-page/src/styles.scss rename to libs/web-components/wizard/src/wizard-page.scss diff --git a/libs/web-components/wizard-page/src/wizard-page.ts b/libs/web-components/wizard/src/wizard-page.ts similarity index 96% rename from libs/web-components/wizard-page/src/wizard-page.ts rename to libs/web-components/wizard/src/wizard-page.ts index 9243bb55a..fa859c928 100644 --- a/libs/web-components/wizard-page/src/wizard-page.ts +++ b/libs/web-components/wizard/src/wizard-page.ts @@ -2,8 +2,7 @@ import '@finastra/chip'; import { html, LitElement } from 'lit'; import { customElement, property } from 'lit/decorators.js'; -import { styles } from './styles.css'; - +import { styles } from './wizard-page.css'; @customElement('fds-wizard-page') export class WizardPage extends LitElement { diff --git a/libs/web-components/wizard/stories/wizard.stories.ts b/libs/web-components/wizard/stories/wizard.stories.ts index 710687feb..fe8706fd1 100644 --- a/libs/web-components/wizard/stories/wizard.stories.ts +++ b/libs/web-components/wizard/stories/wizard.stories.ts @@ -1,7 +1,6 @@ const README = require('../README.md'); import '@finastra/wizard'; import { POSITION, Wizard } from '@finastra/wizard'; -import '@finastra/wizard-page'; import { Meta, Story } from '@storybook/web-components'; import { html } from 'lit-html'; import { argTypes, cssprops } from './sb-generated/fds-wizard.json'; diff --git a/package-lock.json b/package-lock.json index 0dee58371..43a4261fb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -259,21 +259,12 @@ "tslib": "^2.0.1" } }, - "libs/web-components/button-toggle": { - "name": "@finastra/button-toggle", - "version": "0.0.39", - "license": "MIT", - "dependencies": { - "@material/mwc-tab": "^0.26.1", - "lit": "^2.0.0", - "tslib": "^2.0.1" - } - }, "libs/web-components/button-toggle-group": { "name": "@finastra/button-toggle-group", "version": "0.0.39", "license": "MIT", "dependencies": { + "@material/mwc-tab": "^0.26.1", "@material/mwc-tab-bar": "^0.26.1", "lit": "^2.0.0", "tslib": "^2.0.1" @@ -585,34 +576,13 @@ "tslib": "^2.0.1" } }, - "libs/web-components/tab": { - "name": "@finastra/tab", - "version": "0.0.39", - "license": "MIT", - "dependencies": { - "@finastra/tab-bar": "0.0.39", - "@material/mwc-tab": "^0.26.1", - "lit": "^2.0.0", - "tslib": "^2.0.1" - } - }, - "libs/web-components/tab-bar": { - "name": "@finastra/tab-bar", - "version": "0.0.39", - "license": "MIT", - "dependencies": { - "@material/mwc-tab-bar": "^0.26.1", - "lit": "^2.0.0", - "tslib": "^2.0.1" - } - }, "libs/web-components/tabs": { "name": "@finastra/tabs", "version": "0.0.39", "license": "MIT", "dependencies": { - "@finastra/tab": "0.0.39", - "@finastra/tab-bar": "0.0.39", + "@material/mwc-tab": "^0.26.1", + "@material/mwc-tab-bar": "^0.26.1", "lit": "^2.0.0", "tslib": "^2.0.1" } @@ -661,16 +631,6 @@ "tslib": "^2.0.1" } }, - "libs/web-components/wizard-page": { - "name": "@finastra/wizard-page", - "version": "0.0.39", - "license": "MIT", - "dependencies": { - "@finastra/chip": "0.0.39", - "lit": "^2.0.0", - "tslib": "^2.0.1" - } - }, "node_modules/@actions/core": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.9.1.tgz", @@ -4328,10 +4288,6 @@ "resolved": "libs/web-components/button", "link": true }, - "node_modules/@finastra/button-toggle": { - "resolved": "libs/web-components/button-toggle", - "link": true - }, "node_modules/@finastra/button-toggle-group": { "resolved": "libs/web-components/button-toggle-group", "link": true @@ -4452,14 +4408,6 @@ "resolved": "libs/web-components/switch", "link": true }, - "node_modules/@finastra/tab": { - "resolved": "libs/web-components/tab", - "link": true - }, - "node_modules/@finastra/tab-bar": { - "resolved": "libs/web-components/tab-bar", - "link": true - }, "node_modules/@finastra/tabs": { "resolved": "libs/web-components/tabs", "link": true @@ -4484,10 +4432,6 @@ "resolved": "libs/web-components/wizard", "link": true }, - "node_modules/@finastra/wizard-page": { - "resolved": "libs/web-components/wizard-page", - "link": true - }, "node_modules/@gar/promisify": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", @@ -61774,17 +61718,10 @@ "tslib": "^2.0.1" } }, - "@finastra/button-toggle": { - "version": "file:libs/web-components/button-toggle", - "requires": { - "@material/mwc-tab": "^0.26.1", - "lit": "^2.0.0", - "tslib": "^2.0.1" - } - }, "@finastra/button-toggle-group": { "version": "file:libs/web-components/button-toggle-group", "requires": { + "@material/mwc-tab": "^0.26.1", "@material/mwc-tab-bar": "^0.26.1", "lit": "^2.0.0", "tslib": "^2.0.1" @@ -62057,28 +61994,11 @@ "tslib": "^2.0.1" } }, - "@finastra/tab": { - "version": "file:libs/web-components/tab", - "requires": { - "@finastra/tab-bar": "0.0.39", - "@material/mwc-tab": "^0.26.1", - "lit": "^2.0.0", - "tslib": "^2.0.1" - } - }, - "@finastra/tab-bar": { - "version": "file:libs/web-components/tab-bar", - "requires": { - "@material/mwc-tab-bar": "^0.26.1", - "lit": "^2.0.0", - "tslib": "^2.0.1" - } - }, "@finastra/tabs": { "version": "file:libs/web-components/tabs", "requires": { - "@finastra/tab": "0.0.39", - "@finastra/tab-bar": "0.0.39", + "@material/mwc-tab": "^0.26.1", + "@material/mwc-tab-bar": "^0.26.1", "lit": "^2.0.0", "tslib": "^2.0.1" } @@ -62146,14 +62066,6 @@ "tslib": "^2.0.1" } }, - "@finastra/wizard-page": { - "version": "file:libs/web-components/wizard-page", - "requires": { - "@finastra/chip": "0.0.39", - "lit": "^2.0.0", - "tslib": "^2.0.1" - } - }, "@gar/promisify": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz",