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

update dependencies #1273

Merged
merged 4 commits into from
Oct 6, 2020
Merged

update dependencies #1273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
60992b2
update dependencies
kylemh Oct 6, 2020
e031b41
downgrade and pin autoprefixer
kylemh Oct 6, 2020
2220248
move page styles folder
kylemh Oct 6, 2020
6fc1139
update lockfile and remove @storybook/addon-controls
kylemh Oct 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .storybook/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const postCSSConfig = require('../postcss.config');
// Export a function. Accept the base config as the only param.
module.exports = {
stories: ['../components/**/__stories__/*.stories.js'],
addons: ['@storybook/addon-controls', '@storybook/addon-essentials'],
addons: ['@storybook/addon-essentials'],
webpackFinal: async (config, { configType }) => {
// 'configType' has a value of 'DEVELOPMENT' or 'PRODUCTION'
// You can change the configuration based on that.
Expand Down
1 change: 1 addition & 0 deletions jsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"public/*": ["./public/*"],
"scripts/*": ["./scripts/*"],
"static/*": ["./public/static/*"],
"styles/*": ["./styles/*"],
"test-utils/*": ["./test-utils/*"]
}
},
Expand Down
71 changes: 34 additions & 37 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@
"@innocuous/components": "^2.1.1",
"@innocuous/functions": "^2.1.1",
"@next/bundle-analyzer": "^9.5.3",
"@sentry/browser": "^5.22.3",
"@storybook/addon-controls": "^6.0.22",
"@sentry/browser": "^5.25.0",
"axios": "^0.20.0",
"classnames": "^2.2.6",
"date-fns": "^2.16.1",
Expand All @@ -59,13 +58,13 @@
"history": "^5.0.0",
"intersection-observer": "^0.11.0",
"js-cookie": "^2.2.1",
"jwt-decode": "^2.2.0",
"jwt-decode": "^3.0.0",
"lodash": "^4.17.20",
"logrocket": "^1.0.12",
"logrocket": "^1.0.13",
"logrocket-react": "^4.0.1",
"next": "^9.5.3",
"next-cookies": "^2.0.3",
"nuka-carousel": "^4.7.0",
"nuka-carousel": "^4.7.1",
"object-hash": "^2.0.3",
"path": "^0.12.7",
"prop-types": "^15.6.2",
Expand All @@ -76,7 +75,7 @@
"react-google-login": "^5.1.21",
"react-modal": "^3.11.2",
"react-on-screen": "^2.1.1",
"react-player": "^2.6.1",
"react-player": "^2.6.2",
"react-scroll": "^1.8.1",
"react-scroll-up-button": "^1.6.4",
"react-select": "^3.1.0",
Expand All @@ -89,24 +88,24 @@
"@babel/preset-env": "^7.11.5",
"@cypress/code-coverage": "3.8.1",
"@cypress/webpack-preprocessor": "^5.4.6",
"@mdx-js/loader": "^1.6.16",
"@mdx-js/loader": "^1.6.18",
"@next/mdx": "^9.5.3",
"@operation_code/eslint-plugin-custom-rules": "^1.0.1",
"@storybook/addon-actions": "^6.0.21",
"@storybook/addon-essentials": "^6.0.21",
"@storybook/addon-links": "^6.0.21",
"@storybook/addons": "^6.0.21",
"@storybook/react": "^6.0.21",
"@storybook/theming": "^6.0.21",
"@storybook/addon-actions": "^6.0.26",
"@storybook/addon-essentials": "^6.0.26",
"@storybook/addon-links": "^6.0.26",
"@storybook/addons": "^6.0.26",
"@storybook/react": "^6.0.26",
"@storybook/theming": "^6.0.26",
"@svgr/webpack": "^5.4.0",
"@testing-library/cypress": "^7.0.0",
"@testing-library/cypress": "^7.0.1",
"@testing-library/jest-dom": "^5.11.4",
"@testing-library/react": "^11.0.2",
"autoprefixer": "^9.8.6",
"@testing-library/react": "^11.0.4",
"autoprefixer": "9.8.6",
"axios-mock-adapter": "^1.18.2",
"babel-core": "7.0.0-bridge.0",
"babel-eslint": "^10.1.0",
"babel-jest": "^26.3.0",
"babel-jest": "^26.5.0",
"babel-loader": "^8.1.0",
"babel-plugin-add-react-displayname": "^0.0.5",
"babel-plugin-istanbul": "^6.0.0",
Expand All @@ -115,51 +114,49 @@
"babel-plugin-react-remove-properties": "^0.3.0",
"chromatic": "^5.2.0",
"cross-env": "^7.0.2",
"cypress": "5.1.0",
"css-loader": "^3.5.3",
"cypress": "^5.3.0",
"cypress-image-snapshot": "^3.1.1",
"eslint": "^7.8.1",
"eslint": "^7.10.0",
"eslint-config-airbnb": "^18.2.0",
"eslint-config-prettier": "^6.11.0",
"eslint-plugin-cypress": "^2.11.1",
"eslint-plugin-import": "^2.22.0",
"eslint-plugin-jest": "^24.0.0",
"eslint-config-prettier": "^6.12.0",
"eslint-plugin-cypress": "^2.11.2",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-jest": "^24.1.0",
"eslint-plugin-jsx-a11y": "^6.3.1",
"eslint-plugin-mdx": "^1.8.2",
"eslint-plugin-prettier": "^3.1.4",
"eslint-plugin-react": "^7.20.6",
"eslint-plugin-unicorn": "^21.0.0",
"eslint-plugin-react": "^7.21.3",
"eslint-plugin-unicorn": "^22.0.0",
"express": "^4.17.1",
"faker": "^5.1.0",
"file-loader": "^6.1.0",
"husky": "^4.2.5",
"husky": "^4.3.0",
"identity-obj-proxy": "^3.0.0",
"jest": "25",
"jest": "26.5.0",
"jest-prop-type-error": "^1.1.0",
"lint-staged": "^10.3.0",
"lint-staged": "^10.4.0",
"postcss-custom-media": "^7.0.8",
"postcss-custom-properties": "^9.1.1",
"postcss-custom-properties": "^10.0.0",
"postcss-export-custom-variables": "^1.0.0",
"postcss-import": "^12.0.1",
"postcss-prepend-imports": "^1.0.1",
"prettier": "^2.1.1",
"prettier": "^2.1.2",
"react-addons-test-utils": "^15.6.2",
"react-is": "^16.13.1",
"react-test-renderer": "^16.13.1",
"remark-cli": "^8.0.1",
"remark-lint-are-links-valid": "^1.0.3",
"remark-preset-lint-recommended": "^4.0.1",
"require-context.macro": "^1.2.2",
"start-server-and-test": "^1.11.3",
"style-loader": "^1.2.1",
"stylelint": "^13.7.0",
"start-server-and-test": "^1.11.5",
"style-loader": "^1.3.0",
"stylelint": "^13.7.2",
"stylelint-config-prettier": "^8.0.2",
"stylelint-config-standard": "^20.0.0",
"stylelint-prettier": "^1.1.2",
"url-loader": "^4.1.0",
"webpack": "^4.44.1",
"webpack": "^4.44.2",
"webpack-filter-warnings-plugin": "^1.2.1"
},
"resolutions": {
"cypress": "5.1.0"
}
}
2 changes: 1 addition & 1 deletion pages/about.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import Content from 'components/Content/Content';
import ImageCard from 'components/Cards/ImageCard/ImageCard';
import ValueCard from 'components/Cards/ValueCard/ValueCard';
import { s3 } from 'common/constants/urls';
import styles from './styles/about.module.css';
import styles from 'styles/about.module.css';

const pageTitle = 'About Us';

Expand Down
2 changes: 1 addition & 1 deletion pages/branding.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import ColorSection from 'components/Branding/ColorSection/ColorSection';
import FontSection from 'components/Branding/FontSection/FontSection';
import OutboundLink from 'components/OutboundLink/OutboundLink';
import { s3 } from 'common/constants/urls';
import styles from './styles/branding.module.css';
import styles from 'styles/branding.module.css';

const pageTitle = 'Branding';

Expand Down
2 changes: 1 addition & 1 deletion pages/challenge.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import Content from 'components/Content/Content';
import OutboundLink from 'components/OutboundLink/OutboundLink';
import challengers from 'static/operationcode_challenge/names';
import range from 'lodash/range';
import styles from './styles/challenge.module.css';
import styles from 'styles/challenge.module.css';

const pageTitle = 'Challenge';

Expand Down
2 changes: 1 addition & 1 deletion pages/chapter_leader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Head from 'components/head';
import HeroBanner from 'components/HeroBanner/HeroBanner';
import Content from 'components/Content/Content';
import OutboundLink from 'components/OutboundLink/OutboundLink';
import styles from './styles/chapter_leader.module.css';
import styles from 'styles/chapter_leader.module.css';

const pageTitle = 'Chapter Leaders';

Expand Down
2 changes: 1 addition & 1 deletion pages/code_schools.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { SCHOOL_LOCATION_LIST_ITEM } from 'common/constants/testIDs';
import edx from 'static/images/moocs/edx.jpg';
import treehouse from 'static/images/moocs/treehouse.jpg';
import udacity from 'static/images/moocs/udacity.jpg';
import styles from './styles/code_schools.module.css';
import styles from 'styles/code_schools.module.css';

const pageTitle = 'Code Schools';

Expand Down
2 changes: 1 addition & 1 deletion pages/contact.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Link from 'next/link';
import Head from 'components/head';
import HeroBanner from 'components/HeroBanner/HeroBanner';
import OutboundLink from 'components/OutboundLink/OutboundLink';
import styles from './styles/contact.module.css';
import styles from 'styles/contact.module.css';

const pageTitle = 'Contact Us';

Expand Down
2 changes: 1 addition & 1 deletion pages/events.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import BullhornIcon from 'static/images/icons/FontAwesome/bullhorn-solid.svg';
import UserIcon from 'static/images/icons/FontAwesome/user-solid.svg';
import DiversityIcon from 'static/images/icons/FontAwesome/users-solid.svg';
import { s3 } from 'common/constants/urls';
import styles from './styles/events.module.css';
import styles from 'styles/events.module.css';

const pageTitle = 'Events';

Expand Down
2 changes: 1 addition & 1 deletion pages/faq.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import HeroBanner from 'components/HeroBanner/HeroBanner';
import Content from 'components/Content/Content';
import Accordion from 'components/Accordion/Accordion';
import OutboundLink from 'components/OutboundLink/OutboundLink';
import styles from './styles/faq.module.css';
import styles from 'styles/faq.module.css';

const questions = {
general: [
Expand Down
2 changes: 1 addition & 1 deletion pages/get_involved.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import NetworkingIcon from 'static/images/icons/Custom/networked_people.svg';
import ChartIcon from 'static/images/icons/Custom/chart.svg';
import PeopleMeetingIcon from 'static/images/icons/Custom/people_meeting.svg';
import { s3 } from 'common/constants/urls';
import styles from './styles/get_involved.module.css';
import styles from 'styles/get_involved.module.css';

const VISIBILITY_OFFSET = 400;

Expand Down
2 changes: 1 addition & 1 deletion pages/history.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Head from 'components/head';
import HeroBanner from 'components/HeroBanner/HeroBanner';
import Timeline from 'components/Timeline/Timeline';
import TimelineNav from 'components/Timeline/TimelineNav/TimelineNav';
import styles from './styles/history.module.css';
import styles from 'styles/history.module.css';

const pageTitle = 'History';

Expand Down
2 changes: 1 addition & 1 deletion pages/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import OutboundLink from 'components/OutboundLink/OutboundLink';
import ScreenReaderOnly from 'components/ScreenReaderOnly/ScreenReaderOnly';
import successStories from 'common/constants/successStories';
import { s3 } from 'common/constants/urls';
import styles from './styles/index.module.css';
import styles from 'styles/index.module.css';

const featuredLinksArray = [
{
Expand Down
2 changes: 1 addition & 1 deletion pages/leadership_circle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import LinkButton from 'components/Buttons/LinkButton/LinkButton';
import Card from 'components/Cards/Card/Card';
import { leadershipCircleLink } from 'common/constants/urls';
import { leadershipCircleMembers } from 'common/constants/leadershipCircleMembers';
import styles from './styles/leadership_circle.module.css';
import styles from 'styles/leadership_circle.module.css';

const pageTitle = 'Leadership Circle';

Expand Down
2 changes: 1 addition & 1 deletion pages/password_reset/confirm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import Content from 'components/Content/Content';
import ChangePasswordForm from 'components/ChangePasswordForm/ChangePasswordForm';
import Alert from 'components/Alert/Alert';
import { passwordResetSubmit } from 'common/constants/api';
import styles from '../styles/password_reset.module.css';
import styles from 'styles/password_reset.module.css';

PasswordResetConfirm.propTypes = {
uid: string,
Expand Down
2 changes: 1 addition & 1 deletion pages/podcast.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import HeroBanner from 'components/HeroBanner/HeroBanner';
import Card from 'components/Cards/Card/Card';
import Content from 'components/Content/Content';
import Heading from 'components/Heading/Heading';
import styles from './styles/podcast.module.css';
import styles from 'styles/podcast.module.css';

const pageTitle = 'Podcast';

Expand Down
2 changes: 1 addition & 1 deletion pages/policy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Head from 'components/head';
import HeroBanner from 'components/HeroBanner/HeroBanner';
import { s3 } from 'common/constants/urls';
import styles from './styles/policy.module.css';
import styles from 'styles/policy.module.css';

function Policy() {
return (
Expand Down
2 changes: 1 addition & 1 deletion pages/press.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Head from 'components/head';
import HeroBanner from 'components/HeroBanner/HeroBanner';
import Content from 'components/Content/Content';
import { Videos, Photos, CivicXBadge, Links } from 'components/Press';
import styles from './styles/press.module.css';
import styles from 'styles/press.module.css';

const pageTitle = 'Press';

Expand Down
2 changes: 1 addition & 1 deletion pages/profile/change_password.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import Head from 'components/head';
import HeroBanner from 'components/HeroBanner/HeroBanner';
import Content from 'components/Content/Content';
import ChangePasswordForm from 'components/ChangePasswordForm/ChangePasswordForm';
import styles from '../styles/password_reset.module.css';
import styles from 'styles/password_reset.module.css';

function ChangePassword() {
const [didChange, setDidChange] = React.useState(false);
Expand Down
2 changes: 1 addition & 1 deletion pages/profile/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import withAuthSync from 'decorators/withAuthSync/withAuthSync';
import { getUserPromise } from 'common/constants/api';
import { capitalize, startCase, toLower } from 'lodash';
import { format } from 'date-fns';
import styles from '../styles/profile.module.css';
import styles from 'styles/profile.module.css';
import { PROFILE_GREETING } from '../../common/constants/testIDs';

const pageTitle = 'Profile';
Expand Down
2 changes: 1 addition & 1 deletion pages/resources/[page].js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import {
RESOURCE_SEARCH_BUTTON,
RESOURCE_RESET_BUTTON,
} from 'common/constants/testIDs';
import styles from '../styles/resources.module.css';
import styles from 'styles/resources.module.css';

const pageTitle = 'Resources';

Expand Down
2 changes: 1 addition & 1 deletion pages/sponsorship.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import FlatCard from 'components/Cards/FlatCard/FlatCard';
import LinkButton from 'components/Buttons/LinkButton/LinkButton';
import SponsorsSection from 'components/ReusableSections/SponsorsSection/SponsorsSection';
import MedalSolid from 'static/images/icons/FontAwesome/medal-solid.svg';
import styles from './styles/sponsorship.module.css';
import styles from 'styles/sponsorship.module.css';

const pageTitle = 'Corporate Sponsorship';

Expand Down
2 changes: 1 addition & 1 deletion pages/team.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { s3 } from 'common/constants/urls';
import { TWO_WEEKS } from 'common/constants/unitsOfTime';
import Content from 'components/Content/Content';
import FlatCard from 'components/Cards/FlatCard/FlatCard';
import styles from './styles/team.module.css';
import styles from 'styles/team.module.css';

export async function getStaticProps() {
try {
Expand Down
2 changes: 1 addition & 1 deletion pages/thank_you.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { useEffect } from 'react';
import Head from 'components/head';
import HeroBanner from 'components/HeroBanner/HeroBanner';
import { gtag } from 'common/utils/thirdParty/gtag';
import styles from './styles/thank_you.module.css';
import styles from 'styles/thank_you.module.css';

const pageTitle = 'Thank You';

Expand Down
2 changes: 1 addition & 1 deletion pages/who_we_serve.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import ScholarshipsIcon from 'static/images/icons/Custom/scholarships.svg';
import { ONE_WEEK } from 'common/constants/unitsOfTime';
import { s3 } from 'common/constants/urls';
import { slackMembersAPIUrl, slackGeneralChannelId } from 'common/config/environment';
import styles from './styles/who_we_serve.module.css';
import styles from 'styles/who_we_serve.module.css';

const VISIBILITY_OFFSET = 400;

Expand Down
1 change: 1 addition & 0 deletions scripts/createPage/builders.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ const builder = {

return `import Head from 'components/head';
import HeroBanner from 'components/HeroBanner/HeroBanner';
// customize styles by creating and importing a stylesheet in the ~/styles folder

const pageTitle = '${pageTitle}';

Expand Down
0 pages/styles/about.module.css → styles/about.module.css
View file
Open in desktop
File renamed without changes.
0 pages/styles/branding.module.css → styles/branding.module.css
View file
Open in desktop
File renamed without changes.
0 pages/styles/challenge.module.css → styles/challenge.module.css
View file
Open in desktop
File renamed without changes.
0 pages/styles/chapter_leader.module.css → styles/chapter_leader.module.css
View file
Open in desktop
File renamed without changes.
0 pages/styles/code_schools.module.css → styles/code_schools.module.css
View file
Open in desktop
File renamed without changes.
0 pages/styles/contact.module.css → styles/contact.module.css
View file
Open in desktop
File renamed without changes.
0 pages/styles/events.module.css → styles/events.module.css
View file
Open in desktop
File renamed without changes.
0 pages/styles/faq.module.css → styles/faq.module.css
View file
Open in desktop
File renamed without changes.
0 pages/styles/get_involved.module.css → styles/get_involved.module.css
View file
Open in desktop
File renamed without changes.
0 pages/styles/history.module.css → styles/history.module.css
View file
Open in desktop
File renamed without changes.
0 pages/styles/index.module.css → styles/index.module.css
View file
Open in desktop
File renamed without changes.
0 pages/styles/leadership_circle.module.css → styles/leadership_circle.module.css
View file
Open in desktop
File renamed without changes.
0 pages/styles/password_reset.module.css → styles/password_reset.module.css
View file
Open in desktop
File renamed without changes.
0 pages/styles/podcast.module.css → styles/podcast.module.css
View file
Open in desktop
File renamed without changes.
0 pages/styles/policy.module.css → styles/policy.module.css
View file
Open in desktop
File renamed without changes.
0 pages/styles/press.module.css → styles/press.module.css
View file
Open in desktop
File renamed without changes.
0 pages/styles/profile.module.css → styles/profile.module.css
View file
Open in desktop
File renamed without changes.
0 pages/styles/resources.module.css → styles/resources.module.css
View file
Open in desktop
File renamed without changes.
0 pages/styles/sponsorship.module.css → styles/sponsorship.module.css
View file
Open in desktop
File renamed without changes.
0 pages/styles/team.module.css → styles/team.module.css
View file
Open in desktop
File renamed without changes.
0 pages/styles/thank_you.module.css → styles/thank_you.module.css
View file
Open in desktop
File renamed without changes.
0 pages/styles/who_we_serve.module.css → styles/who_we_serve.module.css
View file
Open in desktop
File renamed without changes.