From cbaea46504850a398adf11e63d6ec0fa90754dbc Mon Sep 17 00:00:00 2001 From: Mrugesh Mohapatra Date: Tue, 2 Apr 2019 22:10:07 +0530 Subject: [PATCH] fix: rollback gatsby-remark-prismjs & more updates --- client/package-lock.json | 132 +++++++----------- client/package.json | 10 +- .../components/profile/components/Camper.js | 2 +- .../profile/components/SocialIcons.js | 2 +- client/src/pages/index.js | 2 +- package-lock.json | 16 +-- 6 files changed, 67 insertions(+), 97 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 575cec4231..549ebb261b 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -1018,12 +1018,12 @@ } }, "@fortawesome/react-fontawesome": { - "version": "0.0.20", - "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.0.20.tgz", - "integrity": "sha512-0a1VYxlCU1oQZzxXK2KIlVArQJSGG3BgBwelLNbR5f2CD6+zQhXXMC9Vm8V4VLO1ZWDeGdjAJZmf7VL/zuuBGQ==", + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.4.tgz", + "integrity": "sha512-GwmxQ+TK7PEdfSwvxtGnMCqrfEm0/HbRHArbUudsYiy9KzVCwndxa2KMcfyTQ8El0vROrq8gOOff09RF1oQe8g==", "requires": { "humps": "^2.0.1", - "prop-types": "^15.5.7" + "prop-types": "^15.5.10" } }, "@freecodecamp/react-bootstrap": { @@ -4285,15 +4285,6 @@ "parse-json": "^4.0.0" }, "dependencies": { - "js-yaml": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz", - "integrity": "sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==", - "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - } - }, "parse-json": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", @@ -5718,15 +5709,6 @@ "resolve-from": "^4.0.0" } }, - "js-yaml": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz", - "integrity": "sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==", - "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - } - }, "json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", @@ -7393,9 +7375,9 @@ "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=" }, "gatsby": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/gatsby/-/gatsby-2.3.4.tgz", - "integrity": "sha512-H23UIbrYtjpSnzzE8VxW3U25fP9eM5CY/RQs4obv1sYaHI6sFUN3S97v+hvdMRg64zfkAnTGRZ2gsjHQUOTHlA==", + "version": "2.3.5", + "resolved": "https://registry.npmjs.org/gatsby/-/gatsby-2.3.5.tgz", + "integrity": "sha512-9p10OOs2gU84Ch270tJEL/tKZAuHWxhAuRskUfRLjhWWp7Iks0BJNU7JhiI22B1sCQGpmeoJdFArVjnm+OThQg==", "requires": { "@babel/code-frame": "^7.0.0", "@babel/core": "^7.0.0", @@ -8053,16 +8035,6 @@ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz", "integrity": "sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==" }, - "readdirp": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz", - "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", - "requires": { - "graceful-fs": "^4.1.11", - "micromatch": "^3.1.10", - "readable-stream": "^2.0.2" - } - }, "semver": { "version": "5.7.0", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz", @@ -8846,16 +8818,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" - }, - "readdirp": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz", - "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", - "requires": { - "graceful-fs": "^4.1.11", - "micromatch": "^3.1.10", - "readable-stream": "^2.0.2" - } } } }, @@ -8889,9 +8851,9 @@ } }, "gatsby-remark-prismjs": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/gatsby-remark-prismjs/-/gatsby-remark-prismjs-3.2.6.tgz", - "integrity": "sha512-XpNVBf46I2lPX5SotgkGzPymR6UV49h8YXOAHHq+A9p5WecNBsmkqUDy24yGgMrakKfiBEsdSm/gxucaUhr3kw==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/gatsby-remark-prismjs/-/gatsby-remark-prismjs-3.2.4.tgz", + "integrity": "sha512-xWmVMygN2m6TVN5rkRvg1KRLnBkSmDjjsew6kbP0e2tpK56gDr69KG0I/c57t2MW9l0EUXaRnjS/btlJSMpJqw==", "requires": { "@babel/runtime": "^7.0.0", "parse-numeric-range": "^0.0.2", @@ -9825,9 +9787,9 @@ } }, "graphql-compose": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/graphql-compose/-/graphql-compose-6.1.0.tgz", - "integrity": "sha512-SHyRuamg3BD6E9Gg4uemWrywJuzEsgggNcFFAVM6N7Y7dLiqtkS5s6rEf37hqYM0lpGikc8XyzMt6cHscXAQgA==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/graphql-compose/-/graphql-compose-6.1.1.tgz", + "integrity": "sha512-54ZRGrbuCsCZw9NCe4k1IScVV0p1c7lkDXXBca0e1KVo80e8LT5+T4fUHaG6R0uXEcMlSijKZmRrbcj+eITNkg==", "requires": { "graphql-type-json": "^0.2.2", "object-path": "^0.11.4" @@ -12491,9 +12453,9 @@ "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=" }, "js-yaml": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz", - "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==", + "version": "3.13.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz", + "integrity": "sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==", "requires": { "argparse": "^1.0.7", "esprima": "^4.0.0" @@ -13424,9 +13386,9 @@ "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==" }, "monaco-editor": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.14.3.tgz", - "integrity": "sha512-RhaO4xXmWn/p0WrkEOXe4PoZj6xOcvDYjoAh0e1kGUrQnP1IOpc0m86Ceuaa2CLEMDINqKijBSmqhvBQnsPLHQ==" + "version": "0.16.2", + "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.16.2.tgz", + "integrity": "sha512-NtGrFzf54jADe7qsWh3lazhS7Kj0XHkJUGBq9fA/Jbwc+sgVcyfsYF6z2AQ7hPqDC+JmdOt/OwFjBnRwqXtx6w==" }, "monaco-editor-webpack-plugin": { "version": "1.7.0", @@ -13662,9 +13624,9 @@ } }, "node-releases": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.12.tgz", - "integrity": "sha512-Y+AQ1xdjcgaEzpL65PBEF3fnl1FNKnDh9Zm+AUQLIlyyqtSc4u93jyMN4zrjMzdwKQ10RTr3tgY1x7qpsfF/xg==", + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.13.tgz", + "integrity": "sha512-fKZGviSXR6YvVPyc011NHuJDSD8gFQvLPmc2d2V3BS4gr52ycyQ1Xzs7a8B+Ax3Ni/W+5h1h4SqmzeoA8WZRmA==", "requires": { "semver": "^5.3.0" } @@ -14089,8 +14051,7 @@ "p-is-promise": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.0.0.tgz", - "integrity": "sha512-pzQPhYMCAgLAKPWD2jC3Se9fEfrD9npNos0y150EeqZll7akhEgGhTW/slB6lHku8AvYGiJ+YJ5hfHKePPgFWg==", - "dev": true + "integrity": "sha512-pzQPhYMCAgLAKPWD2jC3Se9fEfrD9npNos0y150EeqZll7akhEgGhTW/slB6lHku8AvYGiJ+YJ5hfHKePPgFWg==" }, "p-limit": { "version": "1.3.0", @@ -16007,23 +15968,37 @@ } }, "react-monaco-editor": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/react-monaco-editor/-/react-monaco-editor-0.18.0.tgz", - "integrity": "sha512-azMSMDF3eS9XFd9RWfujDInYvSQtdipozmEXSJRuJqsq3JmJlToOjMRSNEkTPmxnR6ZcI9DVhMImCLGNgUk5bQ==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/react-monaco-editor/-/react-monaco-editor-0.25.1.tgz", + "integrity": "sha512-VLksQjt8fmeIZoET9fQgmR0sdCCBFaiss92MwW5JvgO3JfrnhHtrLBqrSQRjtbUmef1EmEKi4gZp5Mh0oidvVg==", "requires": { "@types/react": "*", - "monaco-editor": "^0.14.2", - "prop-types": "^15.6.2" + "monaco-editor": "^0.16.0", + "prop-types": "^15.7.2" }, "dependencies": { - "prop-types": { - "version": "15.6.2", - "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.2.tgz", - "integrity": "sha512-3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ==", + "loose-envify": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", + "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", "requires": { - "loose-envify": "^1.3.1", - "object-assign": "^4.1.1" + "js-tokens": "^3.0.0 || ^4.0.0" } + }, + "prop-types": { + "version": "15.7.2", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz", + "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==", + "requires": { + "loose-envify": "^1.4.0", + "object-assign": "^4.1.1", + "react-is": "^16.8.1" + } + }, + "react-is": { + "version": "16.8.6", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz", + "integrity": "sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==" } } }, @@ -16172,9 +16147,9 @@ } }, "react-testing-library": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/react-testing-library/-/react-testing-library-6.0.3.tgz", - "integrity": "sha512-tN0A6nywSOoL8kriqru3rSdw31PxuquL7xnW6xBI0aTNw0VO3kZQtaEa0npUH9dX0MIsSunB0nbElRrc4VtAzw==", + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/react-testing-library/-/react-testing-library-6.0.4.tgz", + "integrity": "sha512-7D6/hIvyOr8c51UHgH9CL2ZlzYPFI2Jmjm9hMuUvKR9mIiOEaWr5A7CZ9r7zO9tCK5D15r4uj71BHfJ7Zus3qw==", "dev": true, "requires": { "@babel/runtime": "^7.4.2", @@ -19859,11 +19834,6 @@ "mem": "^4.0.0" } }, - "p-is-promise": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.0.0.tgz", - "integrity": "sha512-pzQPhYMCAgLAKPWD2jC3Se9fEfrD9npNos0y150EeqZll7akhEgGhTW/slB6lHku8AvYGiJ+YJ5hfHKePPgFWg==" - }, "p-limit": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz", diff --git a/client/package.json b/client/package.json index c598af819b..8b853c823b 100644 --- a/client/package.json +++ b/client/package.json @@ -12,7 +12,7 @@ "@fortawesome/free-brands-svg-icons": "^5.8.1", "@fortawesome/free-regular-svg-icons": "^5.8.1", "@fortawesome/free-solid-svg-icons": "^5.8.1", - "@fortawesome/react-fontawesome": "0.0.20", + "@fortawesome/react-fontawesome": "^0.1.4", "@freecodecamp/react-bootstrap": "^0.32.3", "@reach/router": "^1.2.1", "axios": "^0.18.0", @@ -22,7 +22,7 @@ "entities": "^1.1.2", "enzyme": "^3.9.0", "enzyme-adapter-react-16": "^1.11.2", - "gatsby": "^2.3.4", + "gatsby": "^2.3.5", "gatsby-cli": "^2.5.4", "gatsby-link": "^2.0.16", "gatsby-plugin-create-client-paths": "^2.0.5", @@ -30,7 +30,7 @@ "gatsby-plugin-manifest": "^2.0.26", "gatsby-plugin-react-helmet": "^3.0.11", "gatsby-plugin-sitemap": "^2.0.11", - "gatsby-remark-prismjs": "^3.2.6", + "gatsby-remark-prismjs": "^3.2.4", "gatsby-source-filesystem": "^2.0.28", "gatsby-transformer-remark": "^2.3.8", "jquery": "3.3.1", @@ -46,7 +46,7 @@ "react-freecodecamp-search": "^2.0.2", "react-ga": "^2.5.7", "react-helmet": "^5.2.0", - "react-monaco-editor": "^0.18.0", + "react-monaco-editor": "^0.25.1", "react-redux": "^5.0.7", "react-reflex": "^3.0.13", "react-responsive": "^6.1.1", @@ -89,7 +89,7 @@ "jest": "^23.6.0", "jest-dom": "^3.1.3", "react-test-renderer": "^16.8.6", - "react-testing-library": "^6.0.3", + "react-testing-library": "^6.0.4", "webpack-cli": "^3.3.0" }, "repository": { diff --git a/client/src/components/profile/components/Camper.js b/client/src/components/profile/components/Camper.js index 43ac80e1d2..3ba9e8df4e 100644 --- a/client/src/components/profile/components/Camper.js +++ b/client/src/components/profile/components/Camper.js @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { Col, Row, Image } from '@freecodecamp/react-bootstrap'; -import FontAwesomeIcon from '@fortawesome/react-fontawesome'; +import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { faAward } from '@fortawesome/free-solid-svg-icons'; import SocialIcons from './SocialIcons'; diff --git a/client/src/components/profile/components/SocialIcons.js b/client/src/components/profile/components/SocialIcons.js index 54a4ff7e8b..c79588698a 100644 --- a/client/src/components/profile/components/SocialIcons.js +++ b/client/src/components/profile/components/SocialIcons.js @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { Row, Col } from '@freecodecamp/react-bootstrap'; -import FontAwesomeIcon from '@fortawesome/react-fontawesome'; +import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { faLinkedin, faGithub, diff --git a/client/src/pages/index.js b/client/src/pages/index.js index a3b2f50302..21784a964f 100644 --- a/client/src/pages/index.js +++ b/client/src/pages/index.js @@ -1,6 +1,6 @@ import React, { Fragment } from 'react'; import { Grid, Row, Col, Image } from '@freecodecamp/react-bootstrap'; -import FontAwesomeIcon from '@fortawesome/react-fontawesome'; +import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { faHtml5, faCss3Alt, diff --git a/package-lock.json b/package-lock.json index 4dc058a499..61201db64f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3061,7 +3061,7 @@ }, "duplexer": { "version": "0.1.1", - "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz", + "resolved": "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz", "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=", "dev": true }, @@ -4853,7 +4853,7 @@ }, "load-json-file": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, "requires": { @@ -4890,7 +4890,7 @@ }, "minimist": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true }, @@ -7250,9 +7250,9 @@ "dev": true }, "js-yaml": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz", - "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==", + "version": "3.13.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz", + "integrity": "sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==", "dev": true, "requires": { "argparse": "^1.0.7", @@ -8011,7 +8011,7 @@ "dependencies": { "minimist": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true } @@ -10530,7 +10530,7 @@ "dependencies": { "minimist": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true }