Skip to content

Commit 7ba35c6

Browse files
committed
Merge branch 'release/v1.0.0'
2 parents e790c25 + 10ac27d commit 7ba35c6

File tree

122 files changed

+3271
-1203
lines changed

Some content is hidden

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

122 files changed

+3271
-1203
lines changed

.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ module.exports = {
4242
'react/function-component-definition': 'off',
4343
'react/require-default-props': 'off',
4444
'no-plusplus': 'off',
45-
'no-param-reassign': 'off,',
45+
'no-param-reassign': 'off',
4646
},
4747
};

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,4 +215,6 @@ sketch
215215
firebaseConfig.ts
216216
.firebaserc
217217
firebase.json
218-
.firebase
218+
.firebase
219+
# Sentry
220+
.sentryclirc

.storybook/main.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@ const setRootPath = (_path) => path.resolve(process.cwd(), _path);
33

44
module.exports = {
55
stories: ['../src/**/*.stories.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)'],
6+
staticDirs: ['../public'],
67
addons: [
78
'@storybook/addon-links',
89
'@storybook/addon-essentials',
910
'@storybook/addon-interactions',
1011
'@storybook/addon-a11y',
12+
'storybook-addon-next-router',
1113
],
1214
framework: '@storybook/react',
1315

.storybook/preview-body.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
<div id="__next"></div>
12
<div id="loading-start" aria-live="assertive"></div>
23
<div id="loading-end" aria-live="assertive"></div>
3-
<div id="dialog"></div>
4+
<div id="dialog"></div>
5+
<div id="toast"></div>

.storybook/preview.js

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,27 @@
11
import ko from 'axe-core/locales/ko.json';
22
import React from 'react';
3+
import { RouterContext } from 'next/dist/shared/lib/router-context';
34
import { GlobalStyle } from 'styles/GlobalStyle';
45
import { ThemeProvider } from '@emotion/react';
56
import { theme } from 'theme/theme';
7+
import * as NextImage from 'next/image';
8+
import { StoreProvider } from 'store';
69

710
export const decorators = [
811
(Story) => (
912
<ThemeProvider theme={theme}>
10-
<GlobalStyle />
11-
<Story />
13+
<StoreProvider>
14+
<GlobalStyle />
15+
<Story />
16+
</StoreProvider>
1217
</ThemeProvider>
1318
),
1419
];
1520

1621
export const parameters = {
22+
nextRouter: {
23+
Provider: RouterContext.Provider,
24+
},
1725
a11y: {
1826
config: { locale: ko },
1927
},
@@ -25,3 +33,17 @@ export const parameters = {
2533
},
2634
},
2735
};
36+
37+
const OriginalNextImage = NextImage.default;
38+
39+
Object.defineProperty(NextImage, 'default', {
40+
configurable: true,
41+
value: (props) => (
42+
<OriginalNextImage
43+
{...props}
44+
unoptimized
45+
// this is new!
46+
// blurDataURL="/images/no-image.jpg"
47+
/>
48+
),
49+
});

next.config.js

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
/** @type {import('next').NextConfig} */
2+
const { withSentryConfig } = require('@sentry/nextjs');
3+
24
const nextConfig = {
35
reactStrictMode: true,
46
webpack(config) {
@@ -10,6 +12,13 @@ const nextConfig = {
1012

1113
return config;
1214
},
15+
images: {
16+
domains: ['spoonacular.com'],
17+
},
18+
};
19+
20+
const sentryWebpackPluginOptions = {
21+
silent: true,
1322
};
1423

15-
module.exports = nextConfig;
24+
module.exports = withSentryConfig(nextConfig, sentryWebpackPluginOptions);

next.config.wizardcopy.js

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
// This file sets a custom webpack configuration to use your Next.js app
2+
// with Sentry.
3+
// https://nextjs.org/docs/api-reference/next.config.js/introduction
4+
// https://docs.sentry.io/platforms/javascript/guides/nextjs/
5+
6+
const { withSentryConfig } = require('@sentry/nextjs');
7+
8+
const moduleExports = {
9+
reactStrictMode: true,
10+
webpack(config) {
11+
config.module.rules.push({
12+
test: /\.svg$/i,
13+
issuer: /\.[jt]sx?$/,
14+
use: ['@svgr/webpack'],
15+
});
16+
17+
return config;
18+
},
19+
};
20+
21+
const sentryWebpackPluginOptions = {
22+
// Additional config options for the Sentry Webpack plugin. Keep in mind that
23+
// the following options are set automatically, and overriding them is not
24+
// recommended:
25+
// release, url, org, project, authToken, configFile, stripPrefix,
26+
// urlPrefix, include, ignore
27+
28+
silent: true, // Suppresses all logs
29+
// For all available options, see:
30+
// https://github.com/getsentry/sentry-webpack-plugin#options.
31+
};
32+
33+
// Make sure adding Sentry options is the last code to run before exporting, to
34+
// ensure that your source maps include changes from all other Webpack plugins
35+
module.exports = withSentryConfig(moduleExports, sentryWebpackPluginOptions);

package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@
1515
"@emotion/react": "^11.8.2",
1616
"@emotion/styled": "^11.8.1",
1717
"@reduxjs/toolkit": "^1.8.0",
18+
"@sentry/nextjs": "^6.19.2",
1819
"@svgr/webpack": "^5.5.0",
1920
"@types/react-redux": "^7.1.23",
2021
"@types/yup": "^0.29.13",
22+
"axios": "^0.26.1",
2123
"emotion-normalize": "^11.0.1",
2224
"firebase": "^9.6.8",
2325
"formik": "^2.2.9",
@@ -44,6 +46,7 @@
4446
"@storybook/testing-library": "^0.0.9",
4547
"@types/node": "17.0.21",
4648
"@types/react": "17.0.40",
49+
"@types/react-dom": "^17.0.14",
4750
"@typescript-eslint/eslint-plugin": "^5.15.0",
4851
"@typescript-eslint/parser": "^5.15.0",
4952
"babel-loader": "^8.2.3",
@@ -59,6 +62,7 @@
5962
"firebase-tools": "^10.3.0",
6063
"prettier": "^2.5.1",
6164
"redux-logger": "^3.0.6",
65+
"storybook-addon-next-router": "^3.1.1",
6266
"typescript": "4.6.2"
6367
}
6468
}

public/images/default.jpg

2.27 MB
Loading

public/images/food-image-temp.jpg

325 KB
Loading

0 commit comments

Comments
 (0)