Skip to content

Commit

Permalink
Deps - Upgrade v2-mst-aptd-at-lcz-sty packages (January 2021) (atte…
Browse files Browse the repository at this point in the history
…mpt N°2) (#245)
  • Loading branch information
Vadorequest authored Jan 11, 2021
1 parent d6326d8 commit a05b6f5
Show file tree
Hide file tree
Showing 17 changed files with 1,478 additions and 2,686 deletions.
9 changes: 9 additions & 0 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
/**
* Babel configuration for Next.js
*
* The official documentation uses a ".babelrc" file, but we prefer using "babel.config.js" for better documentation support.
*
* @see https://nextjs.org/docs/advanced-features/customizing-babel-config Official doc reference v10
* @see https://github.com/vercel/next.js/blob/canary/packages/next/build/babel/preset.ts You can take a look at this file to learn about the presets included by next/babel.
* @example https://github.com/vercel/next.js/tree/canary/examples/with-custom-babel-config Next.js official example of customizing Babel
*/
module.exports = {
presets: ['next/babel', '@emotion/babel-preset-css-prop'],
};
3 changes: 2 additions & 1 deletion cypress/config-customer-ci-cd.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
"screenshotsFolder": "cypress/screenshots/customer",
"videosFolder": "cypress/videos/customer",
"env": {},
"ignoreTestFiles": "*.md"
"ignoreTestFiles": "*.md",
"experimentalComponentTesting": true
}
3 changes: 2 additions & 1 deletion cypress/config-customer1.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
"screenshotsFolder": "cypress/screenshots/customer1",
"videosFolder": "cypress/videos/customer1",
"env": {},
"ignoreTestFiles": "*.md"
"ignoreTestFiles": "*.md",
"experimentalComponentTesting": true
}
3 changes: 2 additions & 1 deletion cypress/config-customer2.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
"screenshotsFolder": "cypress/screenshots/customer2",
"videosFolder": "cypress/videos/customer2",
"env": {},
"ignoreTestFiles": "*.md"
"ignoreTestFiles": "*.md",
"experimentalComponentTesting": true
}
2 changes: 1 addition & 1 deletion cypress/support/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
// ***********************************************************

// See https://dev.to/cuichenli/how-do-i-setup-my-nextjs-development-environment-2kao
import 'cypress-react-unit-test/support';
import '@cypress/react/support';
import './commands';

// See https://docs.cypress.io/api/events/catalog-of-events.html#Uncaught-Exceptions
Expand Down
2 changes: 1 addition & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module.exports = {
// can see this setting in tsconfig.jest.json -> "jsx": "react"
// See https://github.com/vercel/next.js/issues/8663
'ts-jest': {
tsConfig: 'tsconfig.jest.json',
tsconfig: 'tsconfig.jest.json',
},
},
modulePathIgnorePatterns: [
Expand Down
102 changes: 50 additions & 52 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"build:profiler": ". ./scripts/populate-git-env.sh && next build --profile --debug",
"analyse:bundle": "yarn analyse:bundle:production",
"analyse:bundle:development": "ANALYZE_BUNDLE=true yarn start",
"analyse:bundle:production": "ANALYZE_BUNDLE=true next build",
"analyse:bundle:production": ". ./scripts/populate-git-env.sh && ANALYZE_BUNDLE=true next build",
"analyse:unused": "next-unused",
"svg": "npx svgr -d src/svg src/svg --ext tsx --template src/utils/svg/svgTemplate.ts",
"deploy": "yarn deploy:customer1",
Expand Down Expand Up @@ -93,35 +93,35 @@
"@amplitude/react-amplitude": "1.0.0",
"@emotion/core": "10.0.35",
"@emotion/styled": "10.0.27",
"@fortawesome/fontawesome-svg-core": "1.2.30",
"@fortawesome/free-brands-svg-icons": "5.14.0",
"@fortawesome/free-regular-svg-icons": "5.14.0",
"@fortawesome/free-solid-svg-icons": "5.14.0",
"@fortawesome/react-fontawesome": "0.1.11",
"@sentry/browser": "5.22.3",
"@sentry/node": "5.22.3",
"@fortawesome/fontawesome-svg-core": "1.2.32",
"@fortawesome/free-brands-svg-icons": "5.15.1",
"@fortawesome/free-regular-svg-icons": "5.15.1",
"@fortawesome/free-solid-svg-icons": "5.15.1",
"@fortawesome/react-fontawesome": "0.1.14",
"@sentry/browser": "5.29.2",
"@sentry/node": "5.29.2",
"@unly/universal-language-detector": "2.0.3",
"@unly/utils": "1.0.3",
"@unly/utils-simple-logger": "1.4.0",
"amplitude-js": "7.1.1",
"amplitude-js": "7.4.0",
"animate.css": "4.1.1",
"append-query": "2.1.0",
"bootstrap": "4.5.2",
"bootstrap": "4.5.3",
"classnames": "2.2.6",
"cookieconsent": "3.1.1",
"cookies": "0.8.0",
"css-to-react-native": "3.0.0",
"csstype": "3.0.3",
"csstype": "3.0.6",
"deepmerge": "4.2.2",
"emotion-theming": "10.0.27",
"flatted": "3.1.0",
"i18next": "19.7.0",
"i18next-locize-backend": "4.1.5",
"i18next": "19.8.4",
"i18next-locize-backend": "4.1.8",
"is-circular": "1.0.2",
"js-cookie": "2.2.1",
"json-stringify-safe": "5.0.1",
"locize-editor": "3.0.2",
"locize-lastused": "3.0.9",
"locize-editor": "3.1.1",
"locize-lastused": "3.0.10",
"lodash.clonedeep": "4.5.0",
"lodash.endswith": "4.2.1",
"lodash.filter": "4.6.0",
Expand All @@ -141,31 +141,32 @@
"lodash.some": "4.6.0",
"lodash.startswith": "4.2.1",
"lodash.xorby": "4.7.0",
"markdown-to-jsx": "6.11.2",
"next": "10.0.0",
"markdown-to-jsx": "7.1.1",
"next": "10.0.3",
"next-cookies": "2.0.3",
"prop-types": "15.7.2",
"rc-tooltip": "5.0.0",
"rc-tooltip": "5.0.1",
"react": "17.0.1",
"react-code-blocks": "0.0.8",
"react-dom": "17.0.1",
"react-i18next": "11.7.2",
"reactstrap": "8.5.1",
"react-i18next": "11.8.5",
"reactstrap": "8.8.1",
"recompose": "0.30.0",
"tinycolor2": "1.4.2",
"type-fest": "0.16.0",
"uuid": "8.3.0",
"type-fest": "0.20.2",
"uuid": "8.3.2",
"webfontloader": "1.6.28",
"winston": "3.2.1"
"winston": "3.3.3"
},
"devDependencies": {
"@cypress/react": "4.16.3",
"@emotion/babel-preset-css-prop": "10.0.27",
"@next/bundle-analyzer": "9.5.3",
"@svgr/cli": "5.4.0",
"@types/amplitude-js": "5.11.0",
"@types/cookies": "0.7.4",
"@types/jest": "26.0.13",
"@types/jest-expect-message": "1.0.2",
"@next/bundle-analyzer": "10.0.5",
"@svgr/cli": "5.5.0",
"@types/amplitude-js": "7.0.0",
"@types/cookies": "0.7.6",
"@types/jest": "26.0.20",
"@types/jest-expect-message": "1.0.3",
"@types/js-cookie": "2.2.6",
"@types/lodash.clonedeep": "4.5.6",
"@types/lodash.endswith": "4.2.6",
Expand All @@ -185,43 +186,40 @@
"@types/lodash.some": "4.6.6",
"@types/lodash.startswith": "4.2.6",
"@types/lodash.xorby": "4.7.6",
"@types/markdown-to-jsx": "6.11.2",
"@types/popper.js": "1.11.0",
"@types/react": "16.9.49",
"@types/react-test-renderer": "16.9.3",
"@types/reactstrap": "8.5.1",
"@types/react": "17.0.0",
"@types/react-test-renderer": "17.0.0",
"@types/uuid": "8.3.0",
"@types/webfontloader": "1.6.32",
"@types/webpack-env": "1.15.2",
"@typescript-eslint/eslint-plugin": "4.1.0",
"@typescript-eslint/parser": "4.1.0",
"@welldone-software/why-did-you-render": "4.2.2",
"@types/webpack-env": "1.16.0",
"@typescript-eslint/eslint-plugin": "4.12.0",
"@typescript-eslint/parser": "4.12.0",
"@welldone-software/why-did-you-render": "6.0.5",
"@zeit/next-source-maps": "0.0.4-canary.1",
"concurrently": "5.3.0",
"cross-env": "7.0.2",
"cross-env": "7.0.3",
"current-git-branch": "1.1.0",
"cypress": "6.0.1",
"cypress-react-unit-test": "4.17.1",
"cypress": "6.2.1",
"del-cli": "3.0.1",
"dotenv": "8.2.0",
"eslint": "7.8.1",
"eslint-plugin-jest": "24.0.0",
"eslint-plugin-jsx-a11y": "6.3.1",
"eslint-plugin-react": "7.20.6",
"eslint-plugin-react-hooks": "4.1.0",
"eslint": "7.17.0",
"eslint-plugin-jest": "24.1.3",
"eslint-plugin-jsx-a11y": "6.4.1",
"eslint-plugin-react": "7.22.0",
"eslint-plugin-react-hooks": "4.2.0",
"eslint-watch": "7.0.0",
"jest": "26.4.2",
"jest": "26.6.3",
"jest-expect-message": "1.0.2",
"jest-extended": "0.11.5",
"jest-runner-groups": "2.0.1",
"jest-to-match-shape-of": "1.3.0",
"jest-to-match-shape-of": "1.3.1",
"next-unused": "0.0.3",
"ngrok": "3.3.0",
"ngrok": "3.4.0",
"node-mocks-http": "1.9.0",
"open-cli": "6.0.1",
"react-test-renderer": "16.13.1",
"ts-jest": "26.3.0",
"typescript": "4.0.2",
"vercel": "21.0.0"
"react-test-renderer": "17.0.1",
"ts-jest": "26.4.4",
"typescript": "4.1.3",
"vercel": "21.0.1"
}
}
2 changes: 0 additions & 2 deletions src/components/doc/BuiltInFeaturesSection.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
import React from 'react';
import {
Alert,
Button,
Card,
CardBody,
CardSubtitle,
CardText,
CardTitle,
} from 'reactstrap';

import I18nLink from '../i18n/I18nLink';
import Btn from '../utils/Btn';
import Cards from '../utils/Cards';
Expand Down
65 changes: 34 additions & 31 deletions src/components/pageLayouts/Footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,49 +63,52 @@ const Footer: React.FunctionComponent<Props> = (props) => {
padding: 20px;
height: 40vh;
}
}
img {
max-width: 300px;
}
#footer-logo {
max-width: 200px; // Opinionated limit
}
.column-center {
align-self: flex-end;
}
img {
max-width: 300px;
}
.column-right {
display: flex;
flex-direction: column;
justify-content: space-between;
}
.column-center {
align-self: flex-end;
}
.credits {
opacity: 0.35;
margin-left: 20px
}
.column-right {
display: flex;
flex-direction: column;
justify-content: space-between;
}
.credits-container {
display: flex;
align-items: center;
justify-content: center;
.credits {
opacity: 0.35;
margin-left: 20px
}
@media (max-width: 991.98px) {
display: block;
.credits-container {
display: flex;
align-items: center;
justify-content: center;
text-align: center;
@media (max-width: 991.98px) {
display: block;
align-items: center;
justify-content: center;
text-align: center;
}
}
}
.links {
color: ${onBackgroundColor};
.links {
color: ${onBackgroundColor};
@media (max-width: 991.98px) {
align-items: center;
justify-content: center;
text-align: center;
@media (max-width: 991.98px) {
align-items: center;
justify-content: center;
text-align: center;
}
}
}
`}
>
<section className="credits-container">
Expand Down
12 changes: 6 additions & 6 deletions src/components/utils/Markdown.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import * as Sentry from '@sentry/node';
import { createLogger } from '@unly/utils-simple-logger';
import classnames from 'classnames';
import deepmerge from 'deepmerge';
import MarkdownToJSX, { MarkdownOptions } from 'markdown-to-jsx';
import MarkdownToJSXLib, { MarkdownToJSX } from 'markdown-to-jsx';
import React, { Fragment } from 'react';
import {
Alert,
Expand All @@ -21,7 +22,6 @@ import { Markdown as MarkdownType } from '../../types/Markdown';
import I18nBtnChangeLocale from '../i18n/I18nBtnChangeLocale';
import I18nLink from '../i18n/I18nLink';
import Tooltip from './SimpleTooltip';
import classnames from 'classnames';

const fileLabel = 'components/utils/Markdown';
const logger = createLogger({ // eslint-disable-line no-unused-vars,@typescript-eslint/no-unused-vars
Expand All @@ -30,12 +30,12 @@ const logger = createLogger({ // eslint-disable-line no-unused-vars,@typescript-

type Props = {
text: MarkdownType;
markdownOptions?: MarkdownOptions;
markdownOptions?: MarkdownToJSX.Options;
style?: CSSStyles;
className?: string;
}

const defaultMarkdownOptions: MarkdownOptions = {
const defaultMarkdownOptions: MarkdownToJSX.Options = {
// Make some of our own components available
overrides: { // See https://github.com/probablyup/markdown-to-jsx#optionsoverrides---override-any-html-tags-representation
// All links should open in a new tab, and ensure proper security by default
Expand Down Expand Up @@ -88,11 +88,11 @@ const Markdown: React.FunctionComponent<Props> = (props): JSX.Element => {
style={style}
className={classnames('markdown-container', className)}
>
<MarkdownToJSX
<MarkdownToJSXLib
options={markdownOptions}
>
{text}
</MarkdownToJSX>
</MarkdownToJSXLib>
</div>
);

Expand Down
Loading

1 comment on commit a05b6f5

@github-actions
Copy link

Choose a reason for hiding this comment

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

Please sign in to comment.