Skip to content

Commit dd49d93

Browse files
jagu65jagu65
authored
Merge pull request #250 from fedspendingtransparency/fix/DEV13092-dtui-scss
DEV-13092 dtui storybook updates
2 parents 2e6326a + b263f6b commit dd49d93

File tree

295 files changed

+105881
-41659
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

295 files changed

+105881
-41659
lines changed

‎.storybook/main.js‎

Lines changed: 58 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11

2+
const path = require('path');
3+
const MiniCssExtractPlugin = require('mini-css-extract-plugin');
4+
25
export default {
36
// Replace your-framework with the framework you are using (e.g., react-webpack5, vue3-vite)
47
framework: '@storybook/react-webpack5',
@@ -8,25 +11,64 @@ export default {
811
module.exports = {
912
stories: ['./**/stories/*.@(stories.@(js))','./**/stories/*.@(mdx)'],
1013
addons: [
11-
'@storybook/addon-docs',
12-
'@storybook/blocks',
13-
'@storybook/addon-a11y',
14-
'@storybook/addon-viewport',
15-
'@storybook/addon-actions',
16-
'@storybook/addon-essentials',
17-
'@storybook/addon-controls',
18-
'@chromatic-com/storybook',
19-
'@storybook/addon-webpack5-compiler-babel',
20-
'@storybook/addon-interactions'
14+
"@storybook/addon-links",
15+
"@storybook/addon-webpack5-compiler-babel",
16+
"@chromatic-com/storybook",
17+
"@storybook/addon-docs",
18+
"@storybook/addon-styling-webpack",
2119
],
22-
webpack: (config, options) => {
23-
options.cache.set = () => Promise.resolve();
24-
return config;
25-
},
26-
framework: {
20+
webpack: (config, options) => {
21+
options.cache.set = () => Promise.resolve();
22+
return config;
23+
},
24+
webpackFinal: async (config) => {
25+
config.plugins.push(new MiniCssExtractPlugin());
26+
config.module.rules.push({
27+
test: /\.js$|jsx$/,
28+
exclude: /node_modules\.*/,
29+
loader: "babel-loader"
30+
},
31+
{
32+
test: /\.css$/,
33+
use: [
34+
{
35+
loader: MiniCssExtractPlugin.loader
36+
},
37+
{
38+
loader: "css-loader"
39+
}
40+
]
41+
},
42+
{
43+
include: /\.(eot|ttf|woff|woff2|png|svg|ico|gif|jpg|pdf|webp)$/,
44+
loader: 'file-loader',
45+
type: 'javascript/auto',
46+
options: {
47+
name: '[path][name].[ext]'
48+
}
49+
},
50+
{
51+
test: /\.scss$/,
52+
use: [
53+
{ loader: MiniCssExtractPlugin.loader },
54+
{ loader: "css-loader", options: { url: false, sourceMap: true } },
55+
{
56+
loader: "sass-loader",
57+
options: {
58+
sourceMap: true,
59+
sassOptions: {
60+
includePaths: ["./src/_scss", "./node_modules"]
61+
}
62+
}
63+
}
64+
]
65+
});
66+
return config;
67+
},
68+
framework: {
2769
name: '@storybook/react-webpack5',
2870
options: {}
29-
},
71+
},
3072
docs: {},
3173
typescript: {
3274
reactDocgen: 'react-docgen-typescript'

‎.storybook/manager.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { addons } from '@storybook/manager-api';
1+
import { addons } from 'storybook/manager-api';
22
import index from "./theme/index"
33
addons.setConfig({
44
theme: index,

.storybook/manager-head.html renamed to .storybook/preview-head.html

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,31 @@
33
<meta http-equiv="X-UA-Compatible" content="ie=edge">
44
<link rel="shortcut icon" href="/img/favicon.ico">
55
<link rel="icon" type="image/ico" href="./img/favicon.ico" sizes="192x192">
6+
<link rel="preload" href="/assets/fonts/sourcesanspro-bold-webfont.eot" />
7+
<link rel="preload" href="/assets/fonts/sourcesanspro-bold-webfont.ttf" />
8+
<link rel="preload" href="/assets/fonts/sourcesanspro-bold-webfont.woff" />
9+
<link rel="preload" href="/assets/fonts/sourcesanspro-bold-webfont.woff2" />
10+
11+
<link rel="preload" href="/assets/fonts/sourcesanspro-italic-webfont.eot" />
12+
<link rel="preload" href="/assets/fonts/sourcesanspro-italic-webfont.ttf" />
13+
<link rel="preload" href="/assets/fonts/sourcesanspro-italic-webfont.woff" />
14+
<link rel="preload" href="/assets/fonts/sourcesanspro-italic-webfont.woff2" />
15+
16+
<link rel="preload" href="/assets/fonts/sourcesanspro-light-webfont.eot" />
17+
<link rel="preload" href="/assets/fonts/sourcesanspro-light-webfont.ttf" />
18+
<link rel="preload" href="/assets/fonts/sourcesanspro-light-webfont.woff" />
19+
<link rel="preload" href="/assets/fonts/sourcesanspro-light-webfont.woff2" />
20+
21+
<link rel="preload" href="/assets/fonts/sourcesanspro-regular-webfont.eot" />
22+
<link rel="preload" href="/assets/fonts/sourcesanspro-regular-webfont.ttf" />
23+
<link rel="preload" href="/assets/fonts/sourcesanspro-regular-webfont.woff" />
24+
<link rel="preload" href="/assets/fonts/sourcesanspro-regular-webfont.woff2" />
25+
26+
<link rel="preload" href="/assets/fonts/sourcesanspro-semibold-webfont.eot" />
27+
<link rel="preload" href="/assets/fonts/sourcesanspro-semibold-webfont.ttf" />
28+
<link rel="preload" href="/assets/fonts/sourcesanspro-semibold-webfont.woff" />
29+
<link rel="preload" href="/assets/fonts/sourcesanspro-semibold-webfont.woff2" />
30+
631
<style type="text/css">
732
@font-face{
833
font-family: 'Source Sans Pro';
@@ -103,4 +128,5 @@
103128
/* $file-formats: eot woff2 woff ttf */
104129
}
105130
</style>
131+
106132
<title>Data Transparency UI</title>

‎.storybook/preview.js‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import React from 'react';
2-
import { withConsole } from '@storybook/addon-console';
32
import { DocsPage, DocsContainer } from '@storybook/addon-docs';
4-
import { INITIAL_VIEWPORTS } from '@storybook/addon-viewport';
3+
import { INITIAL_VIEWPORTS } from 'storybook/viewport';
54
import { library } from "@fortawesome/fontawesome-svg-core";
65

76
import {
@@ -89,8 +88,8 @@ library.add(
8988
);
9089
import dataTransparencyUiTheme from './theme';
9190

91+
// where global scss styles get applied
9292
import '../styles/storybook.scss';
93-
9493
export const parameters = {
9594
docs: {
9695
container: DocsContainer,
@@ -128,6 +127,5 @@ export const parameters = {
128127

129128
export const decorators = [
130129
(storyFn) => <div style={{ width: "100%" }}>{storyFn()}</div>,
131-
(storyFn, context) => withConsole()(storyFn)(context)
132130
];
133131
export const tags = ['autodocs'];

‎.storybook/stories/SearchBar.stories.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import SearchBar from '../../components/SearchBar';
2-
import { within, userEvent, expect } from '@storybook/test';
2+
import { within, userEvent, expect } from 'storybook/test';
33

44
export default {
55
title: 'Tables/SearchBar',

‎.storybook/stories/card.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Meta, Canvas, Controls} from '@storybook/blocks';
1+
import {Meta, Canvas, Controls} from '@storybook/addon-docs/blocks';
22
import * as CardStories from "./card.stories";
33
import CardBody from "../../components/cards/CardBody";
44
import CardButton from "../../components/cards/CardButton";

‎.storybook/stories/cardBody.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Meta, Canvas, Controls} from '@storybook/blocks';
1+
import {Meta, Canvas, Controls} from '@storybook/addon-docs/blocks';
22
import * as CardBodyStories from "./cardBody.stories";
33
import CardBody from "../../components/cards/CardBody";
44

‎.storybook/stories/cardButton.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Meta, Canvas, Controls} from '@storybook/blocks';
1+
import {Meta, Canvas, Controls} from '@storybook/addon-docs/blocks';
22
import * as CardStories from "./cardButton.stories";
33
import CardButton from "../../components/cards/CardButton";
44

‎.storybook/stories/cardHero.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Meta, Canvas, Controls} from '@storybook/blocks';
1+
import {Meta, Canvas, Controls} from '@storybook/addon-docs/blocks';
22
import * as CardStories from "./cardHero.stories";
33
import CardHero from "../../components/cards/CardHero";
44

‎.storybook/stories/iconButtonExamples.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Meta, Canvas, Controls, Story, Title} from '@storybook/blocks';
1+
import {Meta, Canvas, Controls, Story, Title} from '@storybook/addon-docs/blocks';
22
import * as IconButtons from "./iconButtons.stories";
33
import Buttons from "../../components/Button";
44
import FlexGridCol from '../../components/flexGrid/FlexGridCol';

0 commit comments

Comments
 (0)