From d6646ac3e97e4723bf781b9fcd560b13b6704d3a Mon Sep 17 00:00:00 2001 From: Tilman Vatteroth Date: Wed, 19 Aug 2020 22:07:26 +0200 Subject: [PATCH] Add resolution for cypress Signed-off-by: Tilman Vatteroth --- package.json | 297 ++++++++++++++++++++++++++------------------------- yarn.lock | 28 ++--- 2 files changed, 164 insertions(+), 161 deletions(-) diff --git a/package.json b/package.json index d00c80f7e..0bccaef52 100644 --- a/package.json +++ b/package.json @@ -1,150 +1,153 @@ { - "name": "react_client", - "license": "AGPL-3.0", - "version": "0.1.0", - "dependencies": { - "@testing-library/jest-dom": "5.11.3", - "@testing-library/react": "10.4.8", - "@testing-library/user-event": "12.1.1", - "@types/codemirror": "0.0.97", - "@types/deep-equal": "1.0.1", - "@types/emoji-mart": "3.0.2", - "@types/highlight.js": "9.12.4", - "@types/jest": "26.0.10", - "@types/js-yaml": "3.12.5", - "@types/markdown-it": "10.0.2", - "@types/markdown-it-anchor": "4.0.4", - "@types/markdown-it-container": "2.0.3", - "@types/node": "12.12.53", - "@types/node-sass": "4.11.1", - "@types/react": "16.9.46", - "@types/react-bootstrap": "1.0.1", - "@types/react-bootstrap-typeahead": "3.4.6", - "@types/react-dom": "16.9.8", - "@types/react-html-parser": "2.0.1", - "@types/react-mathjax": "1.0.0", - "@types/react-redux": "7.1.9", - "@types/react-router": "5.1.8", - "@types/react-router-bootstrap": "0.24.5", - "@types/react-router-dom": "5.1.5", - "@typescript-eslint/eslint-plugin": "3.9.0", - "@typescript-eslint/parser": "3.9.0", - "bootstrap": "4.5.2", - "codemirror": "5.56.0", - "deep-equal": "2.0.3", - "emoji-mart": "3.0.0", - "eslint-config-react-app": "5.2.1", - "eslint-config-standard": "14.1.1", - "eslint-plugin-flowtype": "5.2.0", - "eslint-plugin-import": "2.22.0", - "eslint-plugin-jsx-a11y": "6.3.1", - "eslint-plugin-node": "11.1.0", - "eslint-plugin-promise": "4.2.1", - "eslint-plugin-standard": "4.0.1", - "fork-awesome": "1.1.7", - "github-markdown-css": "4.0.0", - "highlight.js": "10.1.2", - "i18next": "19.6.3", - "i18next-browser-languagedetector": "6.0.0", - "i18next-http-backend": "1.0.18", - "js-yaml": "3.14.0", - "markdown-it": "11.0.0", - "markdown-it-abbr": "1.0.4", - "markdown-it-anchor": "5.3.0", - "markdown-it-container": "3.0.0", - "markdown-it-deflist": "2.0.3", - "markdown-it-emoji": "1.4.0", - "markdown-it-footnote": "3.0.2", - "markdown-it-front-matter": "0.2.1", - "markdown-it-imsize": "2.0.1", - "markdown-it-ins": "3.0.0", - "markdown-it-mark": "3.0.0", - "markdown-it-mathjax": "2.0.0", - "markdown-it-plantuml": "1.4.1", - "markdown-it-regex": "0.2.0", - "markdown-it-sub": "1.0.0", - "markdown-it-sup": "1.0.0", - "markdown-it-task-lists": "2.1.1", - "markdown-it-toc-done-right": "4.1.0", - "mathjax": "3.0.5", - "moment": "2.27.0", - "node-sass": "4.14.1", - "react": "16.13.1", - "react-bootstrap": "1.3.0", - "react-bootstrap-typeahead": "5.1.1", - "react-codemirror2": "7.2.1", - "react-dom": "16.13.1", - "react-html-parser": "2.0.2", - "react-i18next": "11.7.0", - "react-mathjax": "1.0.1", - "react-redux": "7.2.1", - "react-router": "5.2.0", - "react-router-bootstrap": "0.25.0", - "react-router-dom": "5.2.0", - "react-scripts": "3.4.3", - "react-use": "15.3.3", - "redux": "4.0.5", - "ts-mockery": "1.2.0", - "typescript": "3.9.7", - "use-media": "1.4.0", - "use-resize-observer": "6.1.0" - }, - "scripts": { - "start": "PORT=3001 react-scripts start", - "start:dev": "REACT_APP_BACKEND=http://localhost:3000 yarn start", - "build": "react-scripts build", - "test": "react-scripts test", - "eject": "react-scripts eject", - "cy:open": "cypress open", - "cy:run:chrome": "cypress run --browser chrome", - "cy:run:firefox": "cypress run --browser firefox", - "e2e:chrome": "start-server-and-test start http-get://localhost:3001 cy:run:chrome", - "e2e:firefox": "start-server-and-test start http-get://localhost:3001 cy:run:firefox" - }, - "eslintConfig": { - "parserOptions": { - "tsconfigRootDir": "", - "project": [ - "./tsconfig.json" - ] + "name": "react_client", + "license": "AGPL-3.0", + "version": "0.1.0", + "dependencies": { + "@testing-library/jest-dom": "5.11.3", + "@testing-library/react": "10.4.8", + "@testing-library/user-event": "12.1.1", + "@types/codemirror": "0.0.97", + "@types/deep-equal": "1.0.1", + "@types/emoji-mart": "3.0.2", + "@types/highlight.js": "9.12.4", + "@types/jest": "26.0.10", + "@types/js-yaml": "3.12.5", + "@types/markdown-it": "10.0.2", + "@types/markdown-it-anchor": "4.0.4", + "@types/markdown-it-container": "2.0.3", + "@types/node": "12.12.53", + "@types/node-sass": "4.11.1", + "@types/react": "16.9.46", + "@types/react-bootstrap": "1.0.1", + "@types/react-bootstrap-typeahead": "3.4.6", + "@types/react-dom": "16.9.8", + "@types/react-html-parser": "2.0.1", + "@types/react-mathjax": "1.0.0", + "@types/react-redux": "7.1.9", + "@types/react-router": "5.1.8", + "@types/react-router-bootstrap": "0.24.5", + "@types/react-router-dom": "5.1.5", + "@typescript-eslint/eslint-plugin": "3.9.0", + "@typescript-eslint/parser": "3.9.0", + "bootstrap": "4.5.2", + "codemirror": "5.56.0", + "deep-equal": "2.0.3", + "emoji-mart": "3.0.0", + "eslint-config-react-app": "5.2.1", + "eslint-config-standard": "14.1.1", + "eslint-plugin-flowtype": "5.2.0", + "eslint-plugin-import": "2.22.0", + "eslint-plugin-jsx-a11y": "6.3.1", + "eslint-plugin-node": "11.1.0", + "eslint-plugin-promise": "4.2.1", + "eslint-plugin-standard": "4.0.1", + "fork-awesome": "1.1.7", + "github-markdown-css": "4.0.0", + "highlight.js": "10.1.2", + "i18next": "19.6.3", + "i18next-browser-languagedetector": "6.0.0", + "i18next-http-backend": "1.0.18", + "js-yaml": "3.14.0", + "markdown-it": "11.0.0", + "markdown-it-abbr": "1.0.4", + "markdown-it-anchor": "5.3.0", + "markdown-it-container": "3.0.0", + "markdown-it-deflist": "2.0.3", + "markdown-it-emoji": "1.4.0", + "markdown-it-footnote": "3.0.2", + "markdown-it-front-matter": "0.2.1", + "markdown-it-imsize": "2.0.1", + "markdown-it-ins": "3.0.0", + "markdown-it-mark": "3.0.0", + "markdown-it-mathjax": "2.0.0", + "markdown-it-plantuml": "1.4.1", + "markdown-it-regex": "0.2.0", + "markdown-it-sub": "1.0.0", + "markdown-it-sup": "1.0.0", + "markdown-it-task-lists": "2.1.1", + "markdown-it-toc-done-right": "4.1.0", + "mathjax": "3.0.5", + "moment": "2.27.0", + "node-sass": "4.14.1", + "react": "16.13.1", + "react-bootstrap": "1.3.0", + "react-bootstrap-typeahead": "5.1.1", + "react-codemirror2": "7.2.1", + "react-dom": "16.13.1", + "react-html-parser": "2.0.2", + "react-i18next": "11.7.0", + "react-mathjax": "1.0.1", + "react-redux": "7.2.1", + "react-router": "5.2.0", + "react-router-bootstrap": "0.25.0", + "react-router-dom": "5.2.0", + "react-scripts": "3.4.3", + "react-use": "15.3.3", + "redux": "4.0.5", + "ts-mockery": "1.2.0", + "typescript": "3.9.7", + "use-media": "1.4.0", + "use-resize-observer": "6.1.0" }, - "plugins": [ - "@typescript-eslint" - ], - "extends": [ - "react-app", - "standard", - "eslint:recommended", - "plugin:@typescript-eslint/eslint-recommended", - "plugin:@typescript-eslint/recommended", - "plugin:@typescript-eslint/recommended-requiring-type-checking", - "plugin:import/recommended", - "plugin:import/typescript" - ] - }, - "browserslist": { - "production": [ - ">0.2%", - "not dead", - "not op_mini all" - ], - "development": [ - "last 1 chrome version", - "last 1 firefox version", - "last 1 safari version" - ] - }, - "devDependencies": { - "@cypress/webpack-preprocessor": "5.4.4", - "@testing-library/cypress": "6.0.0", - "@types/redux-devtools": "3.0.47", - "@types/redux-devtools-extension": "2.13.2", - "@types/testing-library__cypress": "5.0.6", - "cypress": "4.12.1", - "eslint-plugin-chai-friendly": "0.6.0", - "eslint-plugin-cypress": "2.11.1", - "redux-devtools": "3.6.1", - "redux-devtools-extension": "2.13.8", - "ts-loader": "8.0.2" - } + "scripts": { + "start": "PORT=3001 react-scripts start", + "start:dev": "REACT_APP_BACKEND=http://localhost:3000 yarn start", + "build": "react-scripts build", + "test": "react-scripts test", + "eject": "react-scripts eject", + "cy:open": "cypress open", + "cy:run:chrome": "cypress run --browser chrome", + "cy:run:firefox": "cypress run --browser firefox", + "e2e:chrome": "start-server-and-test start http-get://localhost:3001 cy:run:chrome", + "e2e:firefox": "start-server-and-test start http-get://localhost:3001 cy:run:firefox" + }, + "eslintConfig": { + "parserOptions": { + "tsconfigRootDir": "", + "project": [ + "./tsconfig.json" + ] + }, + "plugins": [ + "@typescript-eslint" + ], + "extends": [ + "react-app", + "standard", + "eslint:recommended", + "plugin:@typescript-eslint/eslint-recommended", + "plugin:@typescript-eslint/recommended", + "plugin:@typescript-eslint/recommended-requiring-type-checking", + "plugin:import/recommended", + "plugin:import/typescript" + ] + }, + "browserslist": { + "production": [ + ">0.2%", + "not dead", + "not op_mini all" + ], + "development": [ + "last 1 chrome version", + "last 1 firefox version", + "last 1 safari version" + ] + }, + "devDependencies": { + "@cypress/webpack-preprocessor": "5.4.4", + "@testing-library/cypress": "6.0.0", + "@types/redux-devtools": "3.0.47", + "@types/redux-devtools-extension": "2.13.2", + "@types/testing-library__cypress": "5.0.6", + "cypress": "4.12.1", + "eslint-plugin-chai-friendly": "0.6.0", + "eslint-plugin-cypress": "2.11.1", + "redux-devtools": "3.6.1", + "redux-devtools-extension": "2.13.8", + "ts-loader": "8.0.2" + }, + "resolutions": { + "cypress": "4.12.1" + } } diff --git a/yarn.lock b/yarn.lock index 8fc4846ac..66610edc3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1799,7 +1799,7 @@ dependencies: "@types/markdown-it" "*" -"@types/markdown-it@10.0.2": +"@types/markdown-it@*", "@types/markdown-it@10.0.2": version "10.0.2" resolved "https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-10.0.2.tgz#f93334b9c7821ddb19865dfd91ecf688094c2626" integrity sha512-FGKiVW1UgeIEAChYAuHcfCd0W4LsMEyrSyTVaZiuJhwR4BwSVUD8JKnzmWAMK2FHNLZSPGUaEkpa/dkZj2uq1w== @@ -1825,9 +1825,9 @@ "@types/node" "*" "@types/node@*": - version "14.0.27" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.27.tgz#a151873af5a5e851b51b3b065c9e63390a9e0eb1" - integrity sha512-kVrqXhbclHNHGu9ztnAwSncIgJv/FaxmzXJvGXNdcCpV1b8u1/Mi6z6m0vwy0LzKeXFTPLH0NzwmoJ3fNCIq0g== + version "14.6.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.6.0.tgz#7d4411bf5157339337d7cff864d9ff45f177b499" + integrity sha512-mikldZQitV94akrc4sCcSjtJfsTKt4p+e/s0AGscVA6XArQ9kFclP+ZiYUMnq987rc6QlYxXv/EivqlfSLxpKA== "@types/node@12.12.53": version "12.12.53" @@ -3313,9 +3313,9 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001111: - version "1.0.30001114" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001114.tgz#2e88119afb332ead5eaa330e332e951b1c4bfea9" - integrity sha512-ml/zTsfNBM+T1+mjglWRPgVsu2L76GAaADKX5f4t0pbhttEp0WMawJsHDYlFkVZkoA+89uvBRrVrEE4oqenzXQ== + version "1.0.30001116" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001116.tgz#f3a3dea347f9294a3bdc4292309039cc84117fb8" + integrity sha512-f2lcYnmAI5Mst9+g0nkMIznFGsArRmZ0qU+dnq8l91hymdc2J3SFbiPhOJEeDqC1vtE8nc1qNQyklzB8veJefQ== capture-exit@^2.0.0: version "2.0.0" @@ -4186,7 +4186,7 @@ cyclist@^1.0.1: resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9" integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk= -cypress@4.12.1: +cypress@*, cypress@4.12.1: version "4.12.1" resolved "https://registry.yarnpkg.com/cypress/-/cypress-4.12.1.tgz#0ead1b9f4c0917d69d8b57f996b6e01fe693b6ec" integrity sha512-9SGIPEmqU8vuRA6xst2CMTYd9sCFCxKSzrHt0wr+w2iAQMCIIsXsQ5Gplns1sT6LDbZcmLv6uehabAOl3fhc9Q== @@ -4623,9 +4623,9 @@ ee-first@1.1.1: integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= electron-to-chromium@^1.3.378, electron-to-chromium@^1.3.523: - version "1.3.533" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.533.tgz#d7e5ca4d57e9bc99af87efbe13e7be5dde729b0f" - integrity sha512-YqAL+NXOzjBnpY+dcOKDlZybJDCOzgsq4koW3fvyty/ldTmsb4QazZpOWmVvZ2m0t5jbBf7L0lIGU3BUipwG+A== + version "1.3.539" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.539.tgz#9952fb0bf3fb4295282e7df35f6e7a2a8b89d3fd" + integrity sha512-rM0LWDIstdqfaRUADZetNrL6+zd/0NBmavbMEhBXgc2u/CC1d1GaDyN5hho29fFvBiOVFwrSWZkzmNcZnCEDog== elegant-spinner@^1.0.1: version "1.0.1" @@ -10161,9 +10161,9 @@ querystring@0.2.0: integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA= querystringify@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e" - integrity sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA== + version "2.2.0" + resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" + integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== raf@^3.4.1: version "3.4.1"