Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(38312): Update dependencies as indicated by Snyk #39372

Merged
merged 13 commits into from
Apr 10, 2024
Merged

fix(38312): Update dependencies as indicated by Snyk #39372

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e1251c6
update deps
allroundexperts Apr 1, 2024
86f0ce5
update storybook
allroundexperts Apr 1, 2024
5129cea
type error
allroundexperts Apr 1, 2024
a417d7c
type error
allroundexperts Apr 1, 2024
eb7c2bb
more finetunings
allroundexperts Apr 1, 2024
ff61a71
fix: storybook failure
allroundexperts Apr 1, 2024
510dead
prettier
allroundexperts Apr 1, 2024
0afe4eb
resolve conflicts
allroundexperts Apr 8, 2024
e13257f
remove un-needed extra lines
allroundexperts Apr 8, 2024
64e701c
re-add ts expect error checks
allroundexperts Apr 8, 2024
c013c72
update to latest again
allroundexperts Apr 8, 2024
7b9fa93
prettier
allroundexperts Apr 8, 2024
71b43c0
merge with main
allroundexperts Apr 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions .storybook/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
import type {StorybookConfig} from '@storybook/core-common';
import type {StorybookConfig} from '@storybook/types';

type Main = {
managerHead: (head: string) => string;
} & StorybookConfig;

const main: Main = {
stories: ['../src/**/*.stories.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)'],
addons: ['@storybook/addon-essentials', '@storybook/addon-a11y', '@storybook/addon-react-native-web'],
const main: StorybookConfig = {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would you like to share your consideration to remove this addon @storybook/addon-react-native-web? Is it because there's no entry command in package.json to run storybook on native platforms (no usage on native platforms) ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's correct. I wasn't able to find this being used anywhere.

stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)'],
addons: ['@storybook/addon-essentials', '@storybook/addon-a11y', '@storybook/addon-webpack5-compiler-babel'],
staticDirs: ['./public', {from: '../assets/css', to: 'css'}, {from: '../assets/fonts/web', to: 'fonts'}],
core: {
builder: 'webpack5',
},
managerHead: (head: string) => `
core: {},

managerHead: (head) => `
pecanoro marked this conversation as resolved.
Show resolved Hide resolved
${head}
${process.env.ENV === 'staging' ? '<meta name="robots" content="noindex">' : ''}
`,

framework: {
pecanoro marked this conversation as resolved.
Show resolved Hide resolved
name: '@storybook/react-webpack5',
options: {},
},
};

export default main;
1 change: 0 additions & 1 deletion .storybook/manager-head.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
<link rel="icon" type="image/png" href="logo.png" />
<link rel="stylesheet" type="text/css" href="css/fonts.css" />
<link rel="stylesheet" type="text/css" href="index.css" />
2 changes: 1 addition & 1 deletion .storybook/manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {addons} from '@storybook/addons';
import {addons} from '@storybook/manager-api';
import theme from './theme';

addons.setConfig({
Expand Down
2 changes: 1 addition & 1 deletion .storybook/preview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {PortalProvider} from '@gorhom/portal';
import type {Parameters} from '@storybook/addons';
import type {Parameters} from '@storybook/types';
import React from 'react';
import Onyx from 'react-native-onyx';
import {SafeAreaProvider} from 'react-native-safe-area-context';
Expand Down
11 changes: 11 additions & 0 deletions .storybook/public/favicon.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed .storybook/public/logo.png
View file
Open in desktop
Binary file not shown.
3 changes: 2 additions & 1 deletion .storybook/theme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type {ThemeVars} from '@storybook/theming';
import {create} from '@storybook/theming';
import {create} from '@storybook/theming/create';
// eslint-disable-next-line @dword-design/import-alias/prefer-alias
import colors from '../src/styles/theme/colors';

Expand All @@ -13,6 +13,7 @@ const theme: ThemeVars = create({
colorPrimary: colors.productDark400,
colorSecondary: colors.green,
appContentBg: colors.productDark100,
appPreviewBg: colors.productDark100,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When I build production storybook via npm run storybook-build and then cd to ./dist/docs and run npx serve to access the storybook, the No Preview message in the home page is not easy to read

Screenshot 2024-04-02 at 5 09 13 PM

The empty preview page looks like below if this is removed
image

But I agree with this style added, the preview looks prettier

Default background Background productDark100
image image

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I found that the dev cmd storybook dev automatically redirects to preview the first component. Maybe we can omit this if the production endpoint of storybook is also able to auto redirect to a preview of a component.

Copy link
Contributor

@eh2077 eh2077 Apr 2, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, I found that there's an option to change the background color of the preview area. So, I'm inclined not to incorporate this style.

Screen.Recording.2024-04-02.at.5.52.01.PM.mov

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@eh2077 This is an issue with the serve library. See more here. Using npx http-server works perfectly.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@allroundexperts Oh, yes, npx http-server works well!

textColor: colors.productDark900,
barTextColor: colors.productDark900,
barSelectedColor: colors.green,
Expand Down
6 changes: 6 additions & 0 deletions .storybook/webpack.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,12 @@ const webpackConfig = ({config}: {config: Configuration}) => {
loader: require.resolve('@svgr/webpack'),
});

config.plugins.push(
new DefinePlugin({
__DEV__: process.env.NODE_ENV === 'development',
}),
);

return config;
};

Expand Down
Loading
Loading