chore: use workspaces, fix deps

react-monaco-editor needed rolling back due to an incompatibility with
react 16
monaco-editor then needed rolling back and the editor config, too.

Some @types needed to be added, some lint deps needed updating.
This commit is contained in:
Oliver Eyton-Williams
2021-11-24 12:02:30 +01:00
committed by Mrugesh Mohapatra
parent 13b880c97b
commit a3e05ab45e
5 changed files with 124134 additions and 18342 deletions

View File

@ -20,11 +20,11 @@
"main": "none",
"scripts": {
"prebuild": "tsc -p ../tools/ && node ../tools/scripts/build/ensure-env.js && npm run build:workers -- --env production",
"build": "node --max_old_space_size=7168 node_modules/gatsby-cli build --prefix-paths",
"build:workers": "node --max_old_space_size=7168 node_modules/webpack-cli/bin/cli --config ./webpack-workers.js",
"build": "gatsby build --prefix-paths",
"build:workers": "NODE_OPTIONS=\"--max-old-space-size=7168\" webpack --config ./webpack-workers.js",
"clean": "gatsby clean",
"predevelop": "tsc -p ../tools/ && node ../tools/scripts/build/ensure-env.js && npm run build:workers -- --env development",
"develop": "node --max_old_space_size=4000 node_modules/gatsby-cli develop --inspect=9230",
"develop": "gatsby develop --inspect=9230",
"lint": "node ./i18n/schema-validation.js",
"serve": "gatsby serve -p 8000",
"serve-ci": "serve -l 8000 -c ../serve.json public",
@ -82,7 +82,7 @@
"jquery": "3.6.0",
"lodash": "4.17.21",
"lodash-es": "4.17.21",
"monaco-editor": "0.29.1",
"monaco-editor": "0.28.1",
"nanoid": "3.1.30",
"normalize-url": "4.5.1",
"path-browserify": "1.0.1",
@ -101,7 +101,7 @@
"react-i18next": "11.14.3",
"react-instantsearch-dom": "6.16.0",
"react-lazy-load": "3.1.13",
"react-monaco-editor": "0.46.0",
"react-monaco-editor": "0.40.0",
"react-redux": "5.1.2",
"react-reflex": "4.0.3",
"react-responsive": "6.1.2",

View File

@ -226,9 +226,7 @@ const Editor = (props: EditorProps): JSX.Element => {
selectionHighlight: false,
overviewRulerBorder: false,
hideCursorInOverviewRuler: true,
guides: {
indentation: false
},
renderIndentGuides: false,
minimap: {
enabled: false
},

View File

@ -62,7 +62,7 @@ module.exports = (env = {}) => {
},
plugins: [
new CopyWebpackPlugin({
patterns: ['node_modules/sass.js/dist/sass.sync.js']
patterns: ['../node_modules/sass.js/dist/sass.sync.js']
}),
new webpack.ProvidePlugin({
process: 'process/browser'

142434
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -18,11 +18,28 @@
"homepage": "https://github.com/freeCodeCamp/freeCodeCamp#readme",
"author": "freeCodeCamp <team@freecodecamp.org>",
"main": "none",
"workspaces": [
"api-server",
"client",
"client/plugins/fcc-source-challenges",
"client/plugins/gatsby-remark-node-identity",
"curriculum",
"tools/challenge-helper-scripts",
"tools/challenge-parser",
"tools/contributor",
"tools/contributor/dashboard-app/client",
"tools/contributor/dashboard-app/server",
"tools/contributor/lib/",
"tools/contributor/one-off-scripts",
"tools/crowdin",
"tools/scripts/build",
"tools/scripts/seed",
"tools/ui-components"
],
"scripts": {
"analyze-bundle": "webpack-bundle-analyzer",
"audit": "npm audit & npx lerna exec --no-bail --concurrency 1 --stream -- npm audit",
"audit:fix": "npm audit fix & npx lerna exec --no-bail --concurrency 1 --stream -- npm audit fix",
"bootstrap": "lerna bootstrap --ci",
"prebuild": "npm run ensure-env",
"build": "npm-run-all -p build:*",
"build-workers": "cd ./client && npm run prebuild",
@ -67,7 +84,6 @@
"lint:js": "eslint --max-warnings 0 .",
"lint:ts": "tsc && tsc -p tools/ui-components && tsc -p tools",
"lint:prettier": "prettier --list-different .",
"postinstall": "npm run bootstrap",
"seed": "cross-env DEBUG=fcc:* node ./tools/scripts/seed/seedAuthUser",
"seed:certified-user": "cross-env DEBUG=fcc:* node ./tools/scripts/seed/seedAuthUser certUser",
"serve:client": "cd ./client && npm run serve",
@ -105,6 +121,8 @@
"@types/chai": "4.2.22",
"@types/enzyme": "3.10.10",
"@types/enzyme-adapter-react-16": "1.0.6",
"@types/eslint": "^7.29.0",
"@types/estree": "^0.0.50",
"@types/faker": "5.5.9",
"@types/inquirer": "8.1.3",
"@types/jest": "27.0.3",
@ -129,8 +147,8 @@
"@types/sanitize-html": "2.5.0",
"@types/store": "2.0.2",
"@types/validator": "13.7.0",
"@typescript-eslint/eslint-plugin": "4.33.0",
"@typescript-eslint/parser": "4.33.0",
"@typescript-eslint/eslint-plugin": "^5.4.0",
"@typescript-eslint/parser": "^5.4.0",
"babel-eslint": "10.1.0",
"babel-plugin-transform-imports": "2.0.0",
"cross-env": "7.0.3",