From 46211e05b2f2aa84a0187b4a4de8cbaee62cc656 Mon Sep 17 00:00:00 2001 From: shmck Date: Sat, 14 Dec 2019 14:54:39 -0800 Subject: [PATCH 1/4] update deps --- package-lock.json | 52 +++++----- package.json | 20 ++-- web-app/package-lock.json | 213 ++++++++++++++++++++++++-------------- web-app/package.json | 11 +- 4 files changed, 178 insertions(+), 118 deletions(-) diff --git a/package-lock.json b/package-lock.json index fc23916c..8b08f2ef 100644 --- a/package-lock.json +++ b/package-lock.json @@ -147,9 +147,9 @@ "dev": true }, "@types/node": { - "version": "13.1.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-13.1.0.tgz", - "integrity": "sha512-zwrxviZS08kRX40nqBrmERElF2vpw4IUTd5khkhBTfFH8AOaeoLVx48EC4+ZzS2/Iga7NevncqnsUSYjM4OWYA==", + "version": "12.12.17", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.17.tgz", + "integrity": "sha512-Is+l3mcHvs47sKy+afn2O1rV4ldZFU7W8101cNlOd+MRbjM4Onida8jSZnJdTe/0Pcf25g9BNIUsuugmE6puHA==", "dev": true }, "@types/tough-cookie": { @@ -174,12 +174,12 @@ "dev": true }, "@typescript-eslint/eslint-plugin": { - "version": "2.13.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.13.0.tgz", - "integrity": "sha512-QoiANo0MMGNa8ej/yX3BrW5dZj5d8HYcKiM2fyYUlezECqn8Xc7T/e4EUdiGinn8jhBrn+9X47E9TWaaup3u1g==", + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.11.0.tgz", + "integrity": "sha512-G2HHA1vpMN0EEbUuWubiCCfd0R3a30BB+UdvnFkxwZIxYEGOrWEXDv8tBFO9f44CWc47Xv9lLM3VSn4ORLI2bA==", "dev": true, "requires": { - "@typescript-eslint/experimental-utils": "2.13.0", + "@typescript-eslint/experimental-utils": "2.11.0", "eslint-utils": "^1.4.3", "functional-red-black-tree": "^1.0.1", "regexpp": "^3.0.0", @@ -187,32 +187,32 @@ } }, "@typescript-eslint/experimental-utils": { - "version": "2.13.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.13.0.tgz", - "integrity": "sha512-+Hss3clwa6aNiC8ZjA45wEm4FutDV5HsVXPl/rDug1THq6gEtOYRGLqS3JlTk7mSnL5TbJz0LpEbzbPnKvY6sw==", + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.11.0.tgz", + "integrity": "sha512-YxcA/y0ZJaCc/fB/MClhcDxHI0nOBB7v2/WxBju2cOTanX7jO9ttQq6Fy4yW9UaY5bPd9xL3cun3lDVqk67sPQ==", "dev": true, "requires": { "@types/json-schema": "^7.0.3", - "@typescript-eslint/typescript-estree": "2.13.0", + "@typescript-eslint/typescript-estree": "2.11.0", "eslint-scope": "^5.0.0" } }, "@typescript-eslint/parser": { - "version": "2.13.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.13.0.tgz", - "integrity": "sha512-vbDeLr5QRJ1K7x5iRK8J9wuGwR9OVyd1zDAY9XFAQvAosHVjSVbDgkm328ayE6hx2QWVGhwvGaEhedcqAbfQcA==", + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.11.0.tgz", + "integrity": "sha512-DyGXeqhb3moMioEFZIHIp7oXBBh7dEfPTzGrlyP0Mi9ScCra4SWEGs3kPd18mG7Sy9Wy8z88zmrw5tSGL6r/6A==", "dev": true, "requires": { "@types/eslint-visitor-keys": "^1.0.0", - "@typescript-eslint/experimental-utils": "2.13.0", - "@typescript-eslint/typescript-estree": "2.13.0", + "@typescript-eslint/experimental-utils": "2.11.0", + "@typescript-eslint/typescript-estree": "2.11.0", "eslint-visitor-keys": "^1.1.0" } }, "@typescript-eslint/typescript-estree": { - "version": "2.13.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.13.0.tgz", - "integrity": "sha512-t21Mg5cc8T3ADEUGwDisHLIubgXKjuNRbkpzDMLb7/JMmgCe/gHM9FaaujokLey+gwTuLF5ndSQ7/EfQqrQx4g==", + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.11.0.tgz", + "integrity": "sha512-HGY4+d4MagO6cKMcKfIKaTMxcAv7dEVnji2Zi+vi5VV8uWAM631KjAB5GxFcexMYrwKT0EekRiiGK1/Sd7VFGA==", "dev": true, "requires": { "debug": "^4.1.1", @@ -610,9 +610,9 @@ "dev": true }, "concurrently": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-5.0.2.tgz", - "integrity": "sha512-iUNVI6PzKO0RVXV9pHWM0khvEbELxf3XLIoChaV6hHyoIaJuxQWZiOwlNysnJX5khsfvIK66+OJqRdbYrdsR1g==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-5.0.1.tgz", + "integrity": "sha512-fPKUlOAXEXpktp3z7RqIvzTSCowfDo8oQbdKoGKGZVm+G2hGFbIIAFm4qwWcGl/sIHmpMSgPqeCbjld3kdPXvA==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -622,7 +622,7 @@ "rxjs": "^6.5.2", "spawn-command": "^0.0.2-1", "supports-color": "^6.1.0", - "tree-kill": "^1.2.2", + "tree-kill": "^1.2.1", "yargs": "^13.3.0" }, "dependencies": { @@ -2868,9 +2868,9 @@ "dev": true }, "typescript": { - "version": "3.7.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.7.4.tgz", - "integrity": "sha512-A25xv5XCtarLwXpcDNZzCGvW2D1S3/bACratYBx2sax8PefsFhlYmkQicKHvpYflFS8if4zne5zT5kpJ7pzuvw==", + "version": "3.7.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.7.3.tgz", + "integrity": "sha512-Mcr/Qk7hXqFBXMN7p7Lusj1ktCBydylfQM/FZCk5glCNQJrCUKPkMHdo9R0MTFWsC/4kPFvDS0fDPvukfCkFsw==", "dev": true }, "uri-js": { diff --git a/package.json b/package.json index daf1139b..ec51a22a 100644 --- a/package.json +++ b/package.json @@ -32,35 +32,35 @@ }, "dependencies": { "@types/chokidar": "^2.1.3", - "chokidar": "^3.3.1", + "chokidar": "^3.3.0", "jsdom": "^15.2.1" }, "devDependencies": { "@types/assert": "^1.4.3", "@types/dotenv": "^8.2.0", "@types/glob": "^7.1.1", - "@types/jest": "^24.0.24", + "@types/jest": "^24.0.23", "@types/jsdom": "^12.2.4", - "@types/node": "^13.1.0", - "@typescript-eslint/eslint-plugin": "^2.13.0", - "@typescript-eslint/parser": "^2.13.0", + "@types/node": "^12.12.17", + "@typescript-eslint/eslint-plugin": "^2.11.0", + "@typescript-eslint/parser": "^2.11.0", "assert": "^2.0.0", - "concurrently": "^5.0.2", + "concurrently": "^5.0.1", "dotenv": "^8.2.0", - "eslint": "^6.8.0", + "eslint": "^6.7.2", "eslint-config-prettier": "^6.7.0", - "eslint-plugin-prettier": "^3.1.2", + "eslint-plugin-prettier": "^3.1.1", "glob": "^7.1.6", "graphql": "^14.5.8", "mocha": "^6.2.2", "prettier": "^1.19.1", "ts-jest": "^24.2.0", - "typescript": "^3.7.4", + "typescript": "^3.7.3", "vscode": "^1.1.36", "vscode-test": "^1.3.0" }, "engines": { - "vscode": "^1.41.1" + "vscode": "^1.40.0" }, "activationEvents": [ "onCommand:coderoad.start" diff --git a/web-app/package-lock.json b/web-app/package-lock.json index b2316aac..487f8598 100644 --- a/web-app/package-lock.json +++ b/web-app/package-lock.json @@ -3440,9 +3440,9 @@ "dev": true }, "@types/node": { - "version": "13.1.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-13.1.0.tgz", - "integrity": "sha512-zwrxviZS08kRX40nqBrmERElF2vpw4IUTd5khkhBTfFH8AOaeoLVx48EC4+ZzS2/Iga7NevncqnsUSYjM4OWYA==" + "version": "12.12.22", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.22.tgz", + "integrity": "sha512-r5i93jqbPWGXYXxianGATOxTelkp6ih/U0WVnvaqAvTqM+0U6J3kw6Xk6uq/dWNRkEVw/0SLcO5ORXbVNz4FMQ==" }, "@types/parse-json": { "version": "4.0.0", @@ -3450,12 +3450,6 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, - "@types/prismjs": { - "version": "1.16.0", - "resolved": "https://registry.npmjs.org/@types/prismjs/-/prismjs-1.16.0.tgz", - "integrity": "sha512-mEyuziLrfDCQ4juQP1k706BUU/c8OGn/ZFl69AXXY6dStHClKX4P+N8+rhqpul1vRDA2VOygzMRSJJZHyDEOfw==", - "dev": true - }, "@types/prop-types": { "version": "15.7.3", "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.3.tgz", @@ -9590,25 +9584,29 @@ "dependencies": { "abbrev": { "version": "1.1.1", - "bundled": true, + "resolved": false, + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", "dev": true, "optional": true }, "ansi-regex": { "version": "2.1.1", - "bundled": true, + "resolved": false, + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", "dev": true, "optional": true }, "aproba": { "version": "1.2.0", - "bundled": true, + "resolved": false, + "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", "dev": true, "optional": true }, "are-we-there-yet": { "version": "1.1.5", - "bundled": true, + "resolved": false, + "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", "dev": true, "optional": true, "requires": { @@ -9618,13 +9616,15 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true, + "resolved": false, + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", "dev": true, "optional": true }, "brace-expansion": { "version": "1.1.11", - "bundled": true, + "resolved": false, + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, "optional": true, "requires": { @@ -9634,37 +9634,43 @@ }, "chownr": { "version": "1.1.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz", + "integrity": "sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==", "dev": true, "optional": true }, "code-point-at": { "version": "1.1.0", - "bundled": true, + "resolved": false, + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", "dev": true, "optional": true }, "concat-map": { "version": "0.0.1", - "bundled": true, + "resolved": false, + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", "dev": true, "optional": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true, + "resolved": false, + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", "dev": true, "optional": true }, "core-util-is": { "version": "1.0.2", - "bundled": true, + "resolved": false, + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", "dev": true, "optional": true }, "debug": { "version": "3.2.6", - "bundled": true, + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", "dev": true, "optional": true, "requires": { @@ -9673,25 +9679,29 @@ }, "deep-extend": { "version": "0.6.0", - "bundled": true, + "resolved": false, + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", "dev": true, "optional": true }, "delegates": { "version": "1.0.0", - "bundled": true, + "resolved": false, + "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", "dev": true, "optional": true }, "detect-libc": { "version": "1.0.3", - "bundled": true, + "resolved": false, + "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=", "dev": true, "optional": true }, "fs-minipass": { "version": "1.2.7", - "bundled": true, + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz", + "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==", "dev": true, "optional": true, "requires": { @@ -9700,13 +9710,15 @@ }, "fs.realpath": { "version": "1.0.0", - "bundled": true, + "resolved": false, + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", "dev": true, "optional": true }, "gauge": { "version": "2.7.4", - "bundled": true, + "resolved": false, + "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", "dev": true, "optional": true, "requires": { @@ -9722,7 +9734,8 @@ }, "glob": { "version": "7.1.6", - "bundled": true, + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", "dev": true, "optional": true, "requires": { @@ -9736,13 +9749,15 @@ }, "has-unicode": { "version": "2.0.1", - "bundled": true, + "resolved": false, + "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", "dev": true, "optional": true }, "iconv-lite": { "version": "0.4.24", - "bundled": true, + "resolved": false, + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dev": true, "optional": true, "requires": { @@ -9751,7 +9766,8 @@ }, "ignore-walk": { "version": "3.0.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz", + "integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==", "dev": true, "optional": true, "requires": { @@ -9760,7 +9776,8 @@ }, "inflight": { "version": "1.0.6", - "bundled": true, + "resolved": false, + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, "optional": true, "requires": { @@ -9770,19 +9787,22 @@ }, "inherits": { "version": "2.0.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", "dev": true, "optional": true }, "ini": { "version": "1.3.5", - "bundled": true, + "resolved": false, + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", "dev": true, "optional": true }, "is-fullwidth-code-point": { "version": "1.0.0", - "bundled": true, + "resolved": false, + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, "optional": true, "requires": { @@ -9791,13 +9811,15 @@ }, "isarray": { "version": "1.0.0", - "bundled": true, + "resolved": false, + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", "dev": true, "optional": true }, "minimatch": { "version": "3.0.4", - "bundled": true, + "resolved": false, + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, "optional": true, "requires": { @@ -9806,13 +9828,15 @@ }, "minimist": { "version": "0.0.8", - "bundled": true, + "resolved": false, + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", "dev": true, "optional": true }, "minipass": { "version": "2.9.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz", + "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==", "dev": true, "optional": true, "requires": { @@ -9822,7 +9846,8 @@ }, "minizlib": { "version": "1.3.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz", + "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==", "dev": true, "optional": true, "requires": { @@ -9831,7 +9856,8 @@ }, "mkdirp": { "version": "0.5.1", - "bundled": true, + "resolved": false, + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "dev": true, "optional": true, "requires": { @@ -9840,13 +9866,15 @@ }, "ms": { "version": "2.1.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true, "optional": true }, "needle": { "version": "2.4.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/needle/-/needle-2.4.0.tgz", + "integrity": "sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg==", "dev": true, "optional": true, "requires": { @@ -9857,7 +9885,8 @@ }, "node-pre-gyp": { "version": "0.14.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz", + "integrity": "sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==", "dev": true, "optional": true, "requires": { @@ -9875,7 +9904,8 @@ }, "nopt": { "version": "4.0.1", - "bundled": true, + "resolved": false, + "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", "dev": true, "optional": true, "requires": { @@ -9885,7 +9915,8 @@ }, "npm-bundled": { "version": "1.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz", + "integrity": "sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==", "dev": true, "optional": true, "requires": { @@ -9894,13 +9925,15 @@ }, "npm-normalize-package-bin": { "version": "1.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz", + "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==", "dev": true, "optional": true }, "npm-packlist": { "version": "1.4.7", - "bundled": true, + "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.7.tgz", + "integrity": "sha512-vAj7dIkp5NhieaGZxBJB8fF4R0078rqsmhJcAfXZ6O7JJhjhPK96n5Ry1oZcfLXgfun0GWTZPOxaEyqv8GBykQ==", "dev": true, "optional": true, "requires": { @@ -9910,7 +9943,8 @@ }, "npmlog": { "version": "4.1.2", - "bundled": true, + "resolved": false, + "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", "dev": true, "optional": true, "requires": { @@ -9922,19 +9956,22 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true, + "resolved": false, + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", "dev": true, "optional": true }, "object-assign": { "version": "4.1.1", - "bundled": true, + "resolved": false, + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", "dev": true, "optional": true }, "once": { "version": "1.4.0", - "bundled": true, + "resolved": false, + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, "optional": true, "requires": { @@ -9943,19 +9980,22 @@ }, "os-homedir": { "version": "1.0.2", - "bundled": true, + "resolved": false, + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", "dev": true, "optional": true }, "os-tmpdir": { "version": "1.0.2", - "bundled": true, + "resolved": false, + "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", "dev": true, "optional": true }, "osenv": { "version": "0.1.5", - "bundled": true, + "resolved": false, + "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", "dev": true, "optional": true, "requires": { @@ -9965,19 +10005,22 @@ }, "path-is-absolute": { "version": "1.0.1", - "bundled": true, + "resolved": false, + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", "dev": true, "optional": true }, "process-nextick-args": { "version": "2.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", "dev": true, "optional": true }, "rc": { "version": "1.2.8", - "bundled": true, + "resolved": false, + "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", "dev": true, "optional": true, "requires": { @@ -9989,7 +10032,8 @@ "dependencies": { "minimist": { "version": "1.2.0", - "bundled": true, + "resolved": false, + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true, "optional": true } @@ -9997,7 +10041,8 @@ }, "readable-stream": { "version": "2.3.6", - "bundled": true, + "resolved": false, + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "optional": true, "requires": { @@ -10012,7 +10057,8 @@ }, "rimraf": { "version": "2.7.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", "dev": true, "optional": true, "requires": { @@ -10021,43 +10067,50 @@ }, "safe-buffer": { "version": "5.1.2", - "bundled": true, + "resolved": false, + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "dev": true, "optional": true }, "safer-buffer": { "version": "2.1.2", - "bundled": true, + "resolved": false, + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "dev": true, "optional": true }, "sax": { "version": "1.2.4", - "bundled": true, + "resolved": false, + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", "dev": true, "optional": true }, "semver": { "version": "5.7.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", "dev": true, "optional": true }, "set-blocking": { "version": "2.0.0", - "bundled": true, + "resolved": false, + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", "dev": true, "optional": true }, "signal-exit": { "version": "3.0.2", - "bundled": true, + "resolved": false, + "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", "dev": true, "optional": true }, "string-width": { "version": "1.0.2", - "bundled": true, + "resolved": false, + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, "optional": true, "requires": { @@ -10068,7 +10121,8 @@ }, "string_decoder": { "version": "1.1.1", - "bundled": true, + "resolved": false, + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "optional": true, "requires": { @@ -10077,7 +10131,8 @@ }, "strip-ansi": { "version": "3.0.1", - "bundled": true, + "resolved": false, + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "optional": true, "requires": { @@ -10086,13 +10141,15 @@ }, "strip-json-comments": { "version": "2.0.1", - "bundled": true, + "resolved": false, + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", "dev": true, "optional": true }, "tar": { "version": "4.4.13", - "bundled": true, + "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz", + "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==", "dev": true, "optional": true, "requires": { @@ -10107,13 +10164,15 @@ }, "util-deprecate": { "version": "1.0.2", - "bundled": true, + "resolved": false, + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", "dev": true, "optional": true }, "wide-align": { "version": "1.1.3", - "bundled": true, + "resolved": false, + "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", "dev": true, "optional": true, "requires": { @@ -10122,13 +10181,15 @@ }, "wrappy": { "version": "1.0.2", - "bundled": true, + "resolved": false, + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", "dev": true, "optional": true }, "yallist": { "version": "3.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", "dev": true, "optional": true } diff --git a/web-app/package.json b/web-app/package.json index 2afe41be..8bfec4b4 100644 --- a/web-app/package.json +++ b/web-app/package.json @@ -39,7 +39,7 @@ "react": "^16.12.0", "react-dom": "^16.12.0", "reselect": "^4.0.0", - "typescript": "^3.7.4", + "typescript": "^3.7.3", "xstate": "^4.7.3" }, "devDependencies": { @@ -53,12 +53,11 @@ "@types/highlight.js": "^9.12.3", "@types/jest": "^24.0.24", "@types/markdown-it": "0.0.9", - "@types/node": "^13.1.0", - "@types/prismjs": "^1.16.0", - "@types/react": "^16.9.17", + "@types/node": "^12.12.17", + "@types/react": "^16.9.16", "@types/react-dom": "^16.9.4", - "@typescript-eslint/eslint-plugin": "^2.13.0", - "@typescript-eslint/parser": "^2.13.0", + "@typescript-eslint/eslint-plugin": "^2.11.0", + "@typescript-eslint/parser": "^2.11.0", "babel-loader": "8.0.5", "babel-plugin-import": "^1.12.1", "eslint": "^6.8.0", From b1935cd178257814f4b982b67f02a79eb6bf71b5 Mon Sep 17 00:00:00 2001 From: shmck Date: Sat, 14 Dec 2019 14:54:53 -0800 Subject: [PATCH 2/4] update typings --- typings/graphql.d.ts | 972 +++++++++++++++++++++++-------------------- 1 file changed, 518 insertions(+), 454 deletions(-) diff --git a/typings/graphql.d.ts b/typings/graphql.d.ts index 9ae6adbf..7011ad73 100644 --- a/typings/graphql.d.ts +++ b/typings/graphql.d.ts @@ -1,637 +1,701 @@ -import { GraphQLResolveInfo, GraphQLScalarType, GraphQLScalarTypeConfig } from 'graphql' +import {GraphQLResolveInfo, GraphQLScalarType, GraphQLScalarTypeConfig} from 'graphql' export type Maybe = T | null -export type RequireFields = { [X in Exclude]?: T[X] } & - { [P in K]-?: NonNullable } +export type RequireFields = {[X in Exclude]?: T[X]} & + {[P in K]-?: NonNullable} /** All built-in and custom scalars, mapped to their actual values */ export type Scalars = { - ID: string - String: string - Boolean: boolean - Int: number - Float: number - DateTime: any - Sha1: any - JSON: any - JSONObject: any + ID: string + String: string + Boolean: boolean + Int: number + Float: number + DateTime: any + Sha1: any + JSON: any + JSONObject: any } /** Commits from a Git Repo */ export type Commit = { - __typename?: 'Commit' - id: Scalars['Sha1'] - message?: Maybe - username?: Maybe + __typename?: 'Commit' + id: Scalars['Sha1'] + message?: Maybe + username?: Maybe } -export type CreateTokenInput = { - accessToken: Scalars['String'] -} - -export type CreateTutorialSummaryInput = { - title: Scalars['String'] - description: Scalars['String'] +export type CreateTutorialInput = { + /** TODO: tutorial type */ + id: Scalars['ID'] } export type CreateTutorialVersionInput = { - data: Scalars['JSON'] -} - -export type CreateTutorialVersionOutput = { - __typename?: 'createTutorialVersionOutput' - success?: Maybe + /** TODO: tutorial version type */ + id: Scalars['ID'] } +/** Supported Editors */ export type Editor = 'VSCODE' +/** + * Login input from an editor extension/plugin + * Accepts a unique machineId from the editor + */ export type EditorLoginInput = { - editor: Editor - machineId: Scalars['String'] - sessionId: Scalars['String'] + editor: Editor + machineId: Scalars['String'] + sessionId: Scalars['String'] } export type EditorLoginOutput = { - __typename?: 'editorLoginOutput' - user: User - token: Scalars['String'] + __typename?: 'editorLoginOutput' + user: User + token: Scalars['String'] } +/** + * File formats supported by VSCode + * See a complete list at https://code.visualstudio.com/docs/languages/identifiers + */ export type FileFormat = - | 'GO' - | 'JS' - | 'JSON' - | 'JSX' - | 'LESS' - | 'LUA' - | 'PHP' - | 'PY' - | 'RB' - | 'SASS' - | 'SCSS' - | 'SQL' - | 'TS' - | 'TSX' - | 'YAML' + | 'CLOJURE' + | 'C' + | 'CPP' + | 'CSHARP' + | 'CSS' + | 'DIFF' + | 'DOCKERFILE' + | 'FSHARP' + | 'GO' + | 'HTML' + | 'INI' + | 'JAVA' + | 'JS' + | 'JSON' + | 'JSONC' + | 'JSX' + | 'LATEX' + | 'LESS' + | 'LUA' + | 'MARKDOWN' + | 'PHP' + | 'PY' + | 'R' + | 'RB' + | 'RUST' + | 'SASS' + | 'SCSS' + | 'SQL' + | 'SWIFT' + | 'TS' + | 'TSX' + | 'XML' + | 'YAML' /** Information linked from a GitHub account */ export type GithubUser = { - __typename?: 'GithubUser' - id: Scalars['ID'] - name?: Maybe - email?: Maybe - location?: Maybe - avatarUrl?: Maybe + __typename?: 'GithubUser' + id: Scalars['ID'] + name?: Maybe + email?: Maybe + location?: Maybe + avatarUrl?: Maybe } /** Logical groupings of tasks */ export type Level = { - __typename?: 'Level' - id: Scalars['ID'] - title: Scalars['String'] - /** A summary of the level */ - description: Scalars['String'] - /** The lesson content of the level, parsed as markdown */ - content: Scalars['String'] - /** A set of tasks for users linked to unit tests */ - steps: Array - /** Actions run on level start up for configuring setup */ - setup?: Maybe + __typename?: 'Level' + id: Scalars['ID'] + title: Scalars['String'] + /** A summary of the level */ + description: Scalars['String'] + /** The lesson content of the level, parsed as markdown */ + content: Scalars['String'] + /** A set of tasks for users linked to unit tests */ + steps: Array + /** Actions run on level start up for configuring setup */ + setup?: Maybe } export type Mutation = { - __typename?: 'Mutation' - /** Login used from a coding editor */ - editorLogin?: Maybe - /** Create a new tutorial */ - createTutorialVersion?: Maybe + __typename?: 'Mutation' + /** Login used from a coding editor */ + editorLogin?: Maybe + /** Update a users tutorial progress */ + updateTutorialProgress?: Maybe + /** Create a new tutorial */ + createTutorial?: Maybe + /** Create a new tutorial version */ + createTutorialVersion?: Maybe + /** Update a tutorial version */ + updateTutorialVersion?: Maybe + /** Publish a tutorial version */ + publishTutorialVersion?: Maybe + /** Deprecate a tutorial version */ + deprecateTutorialVersion?: Maybe } export type MutationEditorLoginArgs = { - input: EditorLoginInput + input: EditorLoginInput +} + +export type MutationUpdateTutorialProgressArgs = { + input: UpdateTutorialProgressInput +} + +export type MutationCreateTutorialArgs = { + input: CreateTutorialInput } export type MutationCreateTutorialVersionArgs = { - input: CreateTutorialVersionInput + input: CreateTutorialVersionInput +} + +export type MutationUpdateTutorialVersionArgs = { + input: UpdateTutorialVersionInput +} + +export type MutationPublishTutorialVersionArgs = { + tutorialId: Scalars['ID'] + versionID: Scalars['ID'] +} + +export type MutationDeprecateTutorialVersionArgs = { + tutorialId: Scalars['ID'] + versionID: Scalars['ID'] } export type Query = { - __typename?: 'Query' - tutorial?: Maybe - tutorials?: Maybe>> - viewer?: Maybe - /** TOOD: move inside of viewer */ - commits: Array> + __typename?: 'Query' + tutorial?: Maybe + tutorials: Array> + viewer?: Maybe + /** TOOD: move inside of viewer */ + commits: Array> } export type QueryTutorialArgs = { - id: Scalars['ID'] + id: Scalars['ID'] } export type QueryCommitsArgs = { - input: TutorialRepoInput + input: TutorialRepoInput } export type Role = 'ADMIN' | 'EDITOR_USER' /** A level task */ export type Step = { - __typename?: 'Step' - id: Scalars['ID'] - content: Scalars['String'] - setup: StepActions - solution: StepActions + __typename?: 'Step' + id: Scalars['ID'] + content: Scalars['String'] + setup: StepActions + solution: StepActions } /** Load commits, open files or run commands */ export type StepActions = { - __typename?: 'StepActions' - id: Scalars['ID'] - commits: Array - files?: Maybe> - commands?: Maybe> - watchers?: Maybe> + __typename?: 'StepActions' + id: Scalars['ID'] + commits: Array + files?: Maybe> + commands?: Maybe> + watchers?: Maybe> } /** A tutorial for use in VSCode CodeRoad */ export type Tutorial = { - __typename?: 'Tutorial' - id: Scalars['ID'] - createdBy: User - createdAt: Scalars['DateTime'] - version: TutorialVersion - versions: Array - completed?: Maybe + __typename?: 'Tutorial' + id: Scalars['ID'] + latestVersionId: Scalars['ID'] + version: TutorialVersion + versions: Array + summary: TutorialSummary } /** A tutorial for use in VSCode CodeRoad */ export type TutorialVersionArgs = { - version?: Maybe + version?: Maybe } /** Configure environment in editor for git, testing & parsing files */ export type TutorialConfig = { - __typename?: 'TutorialConfig' - testRunner: TutorialTestRunner - repo: TutorialRepo + __typename?: 'TutorialConfig' + testRunner: TutorialTestRunner + repo: TutorialRepo } /** Data for tutorial */ export type TutorialData = { - __typename?: 'TutorialData' - config: TutorialConfig - init?: Maybe - levels: Array + __typename?: 'TutorialData' + config: TutorialConfig + levels: Array } -/** Data that loads on startup */ -export type TutorialInit = { - __typename?: 'TutorialInit' - setup?: Maybe -} +export type TutorialProgressStatus = 'IN_PROGRESS' | 'COMPLETED' | 'SKIPPED' + +export type TutorialProgressType = 'LEVEL' | 'STEP' | 'TUTORIAL' /** Repo referenced by commmits in the tutorial */ export type TutorialRepo = { - __typename?: 'TutorialRepo' - uri: Scalars['String'] - branch: Scalars['String'] - name?: Maybe - owner?: Maybe + __typename?: 'TutorialRepo' + uri: Scalars['String'] + branch: Scalars['String'] + name?: Maybe + owner?: Maybe } export type TutorialRepoInput = { - uri: Scalars['String'] - branch: Scalars['String'] + uri: Scalars['String'] + branch: Scalars['String'] } /** Summary of tutorial used when selecting tutorial */ export type TutorialSummary = { - __typename?: 'TutorialSummary' - title: Scalars['String'] - description: Scalars['String'] + __typename?: 'TutorialSummary' + title: Scalars['String'] + description: Scalars['String'] } export type TutorialTestRunner = { - __typename?: 'TutorialTestRunner' - command: Scalars['String'] - fileFormats?: Maybe> + __typename?: 'TutorialTestRunner' + command: Scalars['String'] + fileFormats?: Maybe> } /** A version of a tutorial */ export type TutorialVersion = { - __typename?: 'TutorialVersion' - tutorialId: Scalars['ID'] - version: Scalars['String'] - createdAt: Scalars['DateTime'] - createdBy: User - updatedBy: User - updatedAt: Scalars['DateTime'] - publishedAt?: Maybe - publishedBy?: Maybe - summary: TutorialSummary - data: TutorialData - completed?: Maybe + __typename?: 'TutorialVersion' + version: Scalars['ID'] + createdAt: Scalars['DateTime'] + createdBy: User + updatedAt: Scalars['DateTime'] + updatedBy: User + publishedAt?: Maybe + publishedBy?: Maybe + data: TutorialData +} + +export type UpdateTutorialProgressInput = { + tutorialId: Scalars['ID'] + versionId: Scalars['ID'] + type: TutorialProgressType + entityId: Scalars['ID'] + status: TutorialProgressStatus +} + +export type UpdateTutorialVersionInput = { + /** TODO: tutorial version type */ + id: Scalars['ID'] } /** * Users is useful for tracking completion progress * & credit for tutorial creation/contributions - **/ + */ export type User = { - __typename?: 'User' - id: Scalars['ID'] - name?: Maybe - email?: Maybe - location?: Maybe - avatarUrl?: Maybe - createdAt: Scalars['DateTime'] - updatedAt: Scalars['DateTime'] - githubUser?: Maybe + __typename?: 'User' + id: Scalars['ID'] + name?: Maybe + email?: Maybe + createdAt: Scalars['DateTime'] + updatedAt: Scalars['DateTime'] + githubUser?: Maybe } export type ResolverTypeWrapper = Promise | T export type ResolverFn = ( - parent: TParent, - args: TArgs, - context: TContext, - info: GraphQLResolveInfo, + parent: TParent, + args: TArgs, + context: TContext, + info: GraphQLResolveInfo, ) => Promise | TResult export type StitchingResolver = { - fragment: string - resolve: ResolverFn + fragment: string + resolve: ResolverFn } export type Resolver = - | ResolverFn - | StitchingResolver + | ResolverFn + | StitchingResolver export type SubscriptionSubscribeFn = ( - parent: TParent, - args: TArgs, - context: TContext, - info: GraphQLResolveInfo, + parent: TParent, + args: TArgs, + context: TContext, + info: GraphQLResolveInfo, ) => AsyncIterator | Promise> export type SubscriptionResolveFn = ( - parent: TParent, - args: TArgs, - context: TContext, - info: GraphQLResolveInfo, + parent: TParent, + args: TArgs, + context: TContext, + info: GraphQLResolveInfo, ) => TResult | Promise export interface SubscriptionSubscriberObject { - subscribe: SubscriptionSubscribeFn<{ [key in TKey]: TResult }, TParent, TContext, TArgs> - resolve?: SubscriptionResolveFn + subscribe: SubscriptionSubscribeFn<{[key in TKey]: TResult}, TParent, TContext, TArgs> + resolve?: SubscriptionResolveFn } export interface SubscriptionResolverObject { - subscribe: SubscriptionSubscribeFn - resolve: SubscriptionResolveFn + subscribe: SubscriptionSubscribeFn + resolve: SubscriptionResolveFn } export type SubscriptionObject = - | SubscriptionSubscriberObject - | SubscriptionResolverObject + | SubscriptionSubscriberObject + | SubscriptionResolverObject export type SubscriptionResolver = - | ((...args: any[]) => SubscriptionObject) - | SubscriptionObject + | ((...args: any[]) => SubscriptionObject) + | SubscriptionObject export type TypeResolveFn = ( - parent: TParent, - context: TContext, - info: GraphQLResolveInfo, + parent: TParent, + context: TContext, + info: GraphQLResolveInfo, ) => Maybe export type NextResolverFn = () => Promise export type DirectiveResolverFn = ( - next: NextResolverFn, - parent: TParent, - args: TArgs, - context: TContext, - info: GraphQLResolveInfo, + next: NextResolverFn, + parent: TParent, + args: TArgs, + context: TContext, + info: GraphQLResolveInfo, ) => TResult | Promise /** Mapping between all available schema types and the resolvers types */ export type ResolversTypes = { - Query: ResolverTypeWrapper<{}> - ID: ResolverTypeWrapper - Tutorial: ResolverTypeWrapper - User: ResolverTypeWrapper - String: ResolverTypeWrapper - DateTime: ResolverTypeWrapper - GithubUser: ResolverTypeWrapper - TutorialVersion: ResolverTypeWrapper - TutorialSummary: ResolverTypeWrapper - TutorialData: ResolverTypeWrapper - TutorialConfig: ResolverTypeWrapper - TutorialTestRunner: ResolverTypeWrapper - FileFormat: FileFormat - TutorialRepo: ResolverTypeWrapper - TutorialInit: ResolverTypeWrapper - StepActions: ResolverTypeWrapper - Sha1: ResolverTypeWrapper - Level: ResolverTypeWrapper - Step: ResolverTypeWrapper - Boolean: ResolverTypeWrapper - tutorialRepoInput: TutorialRepoInput - Commit: ResolverTypeWrapper - Mutation: ResolverTypeWrapper<{}> - editorLoginInput: EditorLoginInput - Editor: Editor - editorLoginOutput: ResolverTypeWrapper - createTutorialVersionInput: CreateTutorialVersionInput - JSON: ResolverTypeWrapper - createTutorialVersionOutput: ResolverTypeWrapper - JSONObject: ResolverTypeWrapper - Role: Role - createTokenInput: CreateTokenInput - createTutorialSummaryInput: CreateTutorialSummaryInput + Query: ResolverTypeWrapper<{}> + ID: ResolverTypeWrapper + Tutorial: ResolverTypeWrapper + TutorialVersion: ResolverTypeWrapper + DateTime: ResolverTypeWrapper + User: ResolverTypeWrapper + String: ResolverTypeWrapper + GithubUser: ResolverTypeWrapper + TutorialData: ResolverTypeWrapper + TutorialConfig: ResolverTypeWrapper + TutorialTestRunner: ResolverTypeWrapper + FileFormat: FileFormat + TutorialRepo: ResolverTypeWrapper + Level: ResolverTypeWrapper + Step: ResolverTypeWrapper + StepActions: ResolverTypeWrapper + Sha1: ResolverTypeWrapper + TutorialSummary: ResolverTypeWrapper + tutorialRepoInput: TutorialRepoInput + Commit: ResolverTypeWrapper + Mutation: ResolverTypeWrapper<{}> + editorLoginInput: EditorLoginInput + Editor: Editor + editorLoginOutput: ResolverTypeWrapper + updateTutorialProgressInput: UpdateTutorialProgressInput + TutorialProgressType: TutorialProgressType + TutorialProgressStatus: TutorialProgressStatus + Boolean: ResolverTypeWrapper + createTutorialInput: CreateTutorialInput + createTutorialVersionInput: CreateTutorialVersionInput + updateTutorialVersionInput: UpdateTutorialVersionInput + JSON: ResolverTypeWrapper + JSONObject: ResolverTypeWrapper + Role: Role } /** Mapping between all available schema types and the resolvers parents */ export type ResolversParentTypes = { - Query: {} - ID: Scalars['ID'] - Tutorial: Tutorial - User: User - String: Scalars['String'] - DateTime: Scalars['DateTime'] - GithubUser: GithubUser - TutorialVersion: TutorialVersion - TutorialSummary: TutorialSummary - TutorialData: TutorialData - TutorialConfig: TutorialConfig - TutorialTestRunner: TutorialTestRunner - FileFormat: FileFormat - TutorialRepo: TutorialRepo - TutorialInit: TutorialInit - StepActions: StepActions - Sha1: Scalars['Sha1'] - Level: Level - Step: Step - Boolean: Scalars['Boolean'] - tutorialRepoInput: TutorialRepoInput - Commit: Commit - Mutation: {} - editorLoginInput: EditorLoginInput - Editor: Editor - editorLoginOutput: EditorLoginOutput - createTutorialVersionInput: CreateTutorialVersionInput - JSON: Scalars['JSON'] - createTutorialVersionOutput: CreateTutorialVersionOutput - JSONObject: Scalars['JSONObject'] - Role: Role - createTokenInput: CreateTokenInput - createTutorialSummaryInput: CreateTutorialSummaryInput + Query: {} + ID: Scalars['ID'] + Tutorial: Tutorial + TutorialVersion: TutorialVersion + DateTime: Scalars['DateTime'] + User: User + String: Scalars['String'] + GithubUser: GithubUser + TutorialData: TutorialData + TutorialConfig: TutorialConfig + TutorialTestRunner: TutorialTestRunner + FileFormat: FileFormat + TutorialRepo: TutorialRepo + Level: Level + Step: Step + StepActions: StepActions + Sha1: Scalars['Sha1'] + TutorialSummary: TutorialSummary + tutorialRepoInput: TutorialRepoInput + Commit: Commit + Mutation: {} + editorLoginInput: EditorLoginInput + Editor: Editor + editorLoginOutput: EditorLoginOutput + updateTutorialProgressInput: UpdateTutorialProgressInput + TutorialProgressType: TutorialProgressType + TutorialProgressStatus: TutorialProgressStatus + Boolean: Scalars['Boolean'] + createTutorialInput: CreateTutorialInput + createTutorialVersionInput: CreateTutorialVersionInput + updateTutorialVersionInput: UpdateTutorialVersionInput + JSON: Scalars['JSON'] + JSONObject: Scalars['JSONObject'] + Role: Role } export type AuthDirectiveResolver< - Result, - Parent, - ContextType = any, - Args = { requires?: Maybe> } -> = DirectiveResolverFn + Result, + Parent, + ContextType = any, + Args = {requires?: Maybe>} + > = DirectiveResolverFn export type CommitResolvers< - ContextType = any, - ParentType extends ResolversParentTypes['Commit'] = ResolversParentTypes['Commit'] -> = { - id?: Resolver - message?: Resolver, ParentType, ContextType> - username?: Resolver, ParentType, ContextType> -} - -export type CreateTutorialVersionOutputResolvers< - ContextType = any, - ParentType extends ResolversParentTypes['createTutorialVersionOutput'] = ResolversParentTypes['createTutorialVersionOutput'] -> = { - success?: Resolver, ParentType, ContextType> -} + ContextType = any, + ParentType extends ResolversParentTypes['Commit'] = ResolversParentTypes['Commit'] + > = { + id?: Resolver + message?: Resolver, ParentType, ContextType> + username?: Resolver, ParentType, ContextType> + } export interface DateTimeScalarConfig extends GraphQLScalarTypeConfig { - name: 'DateTime' + name: 'DateTime' } export type EditorLoginOutputResolvers< - ContextType = any, - ParentType extends ResolversParentTypes['editorLoginOutput'] = ResolversParentTypes['editorLoginOutput'] -> = { - user?: Resolver - token?: Resolver -} + ContextType = any, + ParentType extends ResolversParentTypes['editorLoginOutput'] = ResolversParentTypes['editorLoginOutput'] + > = { + user?: Resolver + token?: Resolver + } export type GithubUserResolvers< - ContextType = any, - ParentType extends ResolversParentTypes['GithubUser'] = ResolversParentTypes['GithubUser'] -> = { - id?: Resolver - name?: Resolver, ParentType, ContextType> - email?: Resolver, ParentType, ContextType> - location?: Resolver, ParentType, ContextType> - avatarUrl?: Resolver, ParentType, ContextType> -} + ContextType = any, + ParentType extends ResolversParentTypes['GithubUser'] = ResolversParentTypes['GithubUser'] + > = { + id?: Resolver + name?: Resolver, ParentType, ContextType> + email?: Resolver, ParentType, ContextType> + location?: Resolver, ParentType, ContextType> + avatarUrl?: Resolver, ParentType, ContextType> + } export interface JsonScalarConfig extends GraphQLScalarTypeConfig { - name: 'JSON' + name: 'JSON' } export interface JsonObjectScalarConfig extends GraphQLScalarTypeConfig { - name: 'JSONObject' + name: 'JSONObject' } export type LevelResolvers< - ContextType = any, - ParentType extends ResolversParentTypes['Level'] = ResolversParentTypes['Level'] -> = { - id?: Resolver - title?: Resolver - description?: Resolver - content?: Resolver - steps?: Resolver, ParentType, ContextType> - setup?: Resolver, ParentType, ContextType> -} + ContextType = any, + ParentType extends ResolversParentTypes['Level'] = ResolversParentTypes['Level'] + > = { + id?: Resolver + title?: Resolver + description?: Resolver + content?: Resolver + steps?: Resolver, ParentType, ContextType> + setup?: Resolver, ParentType, ContextType> + } export type MutationResolvers< - ContextType = any, - ParentType extends ResolversParentTypes['Mutation'] = ResolversParentTypes['Mutation'] -> = { - editorLogin?: Resolver< - Maybe, - ParentType, - ContextType, - RequireFields - > - createTutorialVersion?: Resolver< - Maybe, - ParentType, - ContextType, - RequireFields - > -} + ContextType = any, + ParentType extends ResolversParentTypes['Mutation'] = ResolversParentTypes['Mutation'] + > = { + editorLogin?: Resolver< + Maybe, + ParentType, + ContextType, + RequireFields + > + updateTutorialProgress?: Resolver< + Maybe, + ParentType, + ContextType, + RequireFields + > + createTutorial?: Resolver< + Maybe, + ParentType, + ContextType, + RequireFields + > + createTutorialVersion?: Resolver< + Maybe, + ParentType, + ContextType, + RequireFields + > + updateTutorialVersion?: Resolver< + Maybe, + ParentType, + ContextType, + RequireFields + > + publishTutorialVersion?: Resolver< + Maybe, + ParentType, + ContextType, + RequireFields + > + deprecateTutorialVersion?: Resolver< + Maybe, + ParentType, + ContextType, + RequireFields + > + } export type QueryResolvers< - ContextType = any, - ParentType extends ResolversParentTypes['Query'] = ResolversParentTypes['Query'] -> = { - tutorial?: Resolver< - Maybe, - ParentType, - ContextType, - RequireFields - > - tutorials?: Resolver>>, ParentType, ContextType> - viewer?: Resolver, ParentType, ContextType> - commits?: Resolver< - Array>, - ParentType, - ContextType, - RequireFields - > -} + ContextType = any, + ParentType extends ResolversParentTypes['Query'] = ResolversParentTypes['Query'] + > = { + tutorial?: Resolver< + Maybe, + ParentType, + ContextType, + RequireFields + > + tutorials?: Resolver>, ParentType, ContextType> + viewer?: Resolver, ParentType, ContextType> + commits?: Resolver< + Array>, + ParentType, + ContextType, + RequireFields + > + } export interface Sha1ScalarConfig extends GraphQLScalarTypeConfig { - name: 'Sha1' + name: 'Sha1' } export type StepResolvers< - ContextType = any, - ParentType extends ResolversParentTypes['Step'] = ResolversParentTypes['Step'] -> = { - id?: Resolver - content?: Resolver - setup?: Resolver - solution?: Resolver -} + ContextType = any, + ParentType extends ResolversParentTypes['Step'] = ResolversParentTypes['Step'] + > = { + id?: Resolver + content?: Resolver + setup?: Resolver + solution?: Resolver + } export type StepActionsResolvers< - ContextType = any, - ParentType extends ResolversParentTypes['StepActions'] = ResolversParentTypes['StepActions'] -> = { - id?: Resolver - commits?: Resolver, ParentType, ContextType> - files?: Resolver>, ParentType, ContextType> - commands?: Resolver>, ParentType, ContextType> - watchers?: Resolver>, ParentType, ContextType> -} + ContextType = any, + ParentType extends ResolversParentTypes['StepActions'] = ResolversParentTypes['StepActions'] + > = { + id?: Resolver + commits?: Resolver, ParentType, ContextType> + files?: Resolver>, ParentType, ContextType> + commands?: Resolver>, ParentType, ContextType> + watchers?: Resolver>, ParentType, ContextType> + } export type TutorialResolvers< - ContextType = any, - ParentType extends ResolversParentTypes['Tutorial'] = ResolversParentTypes['Tutorial'] -> = { - id?: Resolver - createdBy?: Resolver - createdAt?: Resolver - version?: Resolver - versions?: Resolver, ParentType, ContextType> - completed?: Resolver, ParentType, ContextType> -} + ContextType = any, + ParentType extends ResolversParentTypes['Tutorial'] = ResolversParentTypes['Tutorial'] + > = { + id?: Resolver + latestVersionId?: Resolver + version?: Resolver + versions?: Resolver, ParentType, ContextType> + summary?: Resolver + } export type TutorialConfigResolvers< - ContextType = any, - ParentType extends ResolversParentTypes['TutorialConfig'] = ResolversParentTypes['TutorialConfig'] -> = { - testRunner?: Resolver - repo?: Resolver -} + ContextType = any, + ParentType extends ResolversParentTypes['TutorialConfig'] = ResolversParentTypes['TutorialConfig'] + > = { + testRunner?: Resolver + repo?: Resolver + } export type TutorialDataResolvers< - ContextType = any, - ParentType extends ResolversParentTypes['TutorialData'] = ResolversParentTypes['TutorialData'] -> = { - config?: Resolver - init?: Resolver, ParentType, ContextType> - levels?: Resolver, ParentType, ContextType> -} - -export type TutorialInitResolvers< - ContextType = any, - ParentType extends ResolversParentTypes['TutorialInit'] = ResolversParentTypes['TutorialInit'] -> = { - setup?: Resolver, ParentType, ContextType> -} + ContextType = any, + ParentType extends ResolversParentTypes['TutorialData'] = ResolversParentTypes['TutorialData'] + > = { + config?: Resolver + levels?: Resolver, ParentType, ContextType> + } export type TutorialRepoResolvers< - ContextType = any, - ParentType extends ResolversParentTypes['TutorialRepo'] = ResolversParentTypes['TutorialRepo'] -> = { - uri?: Resolver - branch?: Resolver - name?: Resolver, ParentType, ContextType> - owner?: Resolver, ParentType, ContextType> -} + ContextType = any, + ParentType extends ResolversParentTypes['TutorialRepo'] = ResolversParentTypes['TutorialRepo'] + > = { + uri?: Resolver + branch?: Resolver + name?: Resolver, ParentType, ContextType> + owner?: Resolver, ParentType, ContextType> + } export type TutorialSummaryResolvers< - ContextType = any, - ParentType extends ResolversParentTypes['TutorialSummary'] = ResolversParentTypes['TutorialSummary'] -> = { - title?: Resolver - description?: Resolver -} + ContextType = any, + ParentType extends ResolversParentTypes['TutorialSummary'] = ResolversParentTypes['TutorialSummary'] + > = { + title?: Resolver + description?: Resolver + } export type TutorialTestRunnerResolvers< - ContextType = any, - ParentType extends ResolversParentTypes['TutorialTestRunner'] = ResolversParentTypes['TutorialTestRunner'] -> = { - command?: Resolver - fileFormats?: Resolver>, ParentType, ContextType> -} + ContextType = any, + ParentType extends ResolversParentTypes['TutorialTestRunner'] = ResolversParentTypes['TutorialTestRunner'] + > = { + command?: Resolver + fileFormats?: Resolver>, ParentType, ContextType> + } export type TutorialVersionResolvers< - ContextType = any, - ParentType extends ResolversParentTypes['TutorialVersion'] = ResolversParentTypes['TutorialVersion'] -> = { - tutorialId?: Resolver - version?: Resolver - createdAt?: Resolver - createdBy?: Resolver - updatedBy?: Resolver - updatedAt?: Resolver - publishedAt?: Resolver, ParentType, ContextType> - publishedBy?: Resolver, ParentType, ContextType> - summary?: Resolver - data?: Resolver - completed?: Resolver, ParentType, ContextType> -} + ContextType = any, + ParentType extends ResolversParentTypes['TutorialVersion'] = ResolversParentTypes['TutorialVersion'] + > = { + version?: Resolver + createdAt?: Resolver + createdBy?: Resolver + updatedAt?: Resolver + updatedBy?: Resolver + publishedAt?: Resolver, ParentType, ContextType> + publishedBy?: Resolver, ParentType, ContextType> + data?: Resolver + } export type UserResolvers< - ContextType = any, - ParentType extends ResolversParentTypes['User'] = ResolversParentTypes['User'] -> = { - id?: Resolver - name?: Resolver, ParentType, ContextType> - email?: Resolver, ParentType, ContextType> - location?: Resolver, ParentType, ContextType> - avatarUrl?: Resolver, ParentType, ContextType> - createdAt?: Resolver - updatedAt?: Resolver - githubUser?: Resolver, ParentType, ContextType> -} + ContextType = any, + ParentType extends ResolversParentTypes['User'] = ResolversParentTypes['User'] + > = { + id?: Resolver + name?: Resolver, ParentType, ContextType> + email?: Resolver, ParentType, ContextType> + createdAt?: Resolver + updatedAt?: Resolver + githubUser?: Resolver, ParentType, ContextType> + } export type Resolvers = { - Commit?: CommitResolvers - createTutorialVersionOutput?: CreateTutorialVersionOutputResolvers - DateTime?: GraphQLScalarType - editorLoginOutput?: EditorLoginOutputResolvers - GithubUser?: GithubUserResolvers - JSON?: GraphQLScalarType - JSONObject?: GraphQLScalarType - Level?: LevelResolvers - Mutation?: MutationResolvers - Query?: QueryResolvers - Sha1?: GraphQLScalarType - Step?: StepResolvers - StepActions?: StepActionsResolvers - Tutorial?: TutorialResolvers - TutorialConfig?: TutorialConfigResolvers - TutorialData?: TutorialDataResolvers - TutorialInit?: TutorialInitResolvers - TutorialRepo?: TutorialRepoResolvers - TutorialSummary?: TutorialSummaryResolvers - TutorialTestRunner?: TutorialTestRunnerResolvers - TutorialVersion?: TutorialVersionResolvers - User?: UserResolvers + Commit?: CommitResolvers + DateTime?: GraphQLScalarType + editorLoginOutput?: EditorLoginOutputResolvers + GithubUser?: GithubUserResolvers + JSON?: GraphQLScalarType + JSONObject?: GraphQLScalarType + Level?: LevelResolvers + Mutation?: MutationResolvers + Query?: QueryResolvers + Sha1?: GraphQLScalarType + Step?: StepResolvers + StepActions?: StepActionsResolvers + Tutorial?: TutorialResolvers + TutorialConfig?: TutorialConfigResolvers + TutorialData?: TutorialDataResolvers + TutorialRepo?: TutorialRepoResolvers + TutorialSummary?: TutorialSummaryResolvers + TutorialTestRunner?: TutorialTestRunnerResolvers + TutorialVersion?: TutorialVersionResolvers + User?: UserResolvers } /** @@ -640,7 +704,7 @@ export type Resolvers = { */ export type IResolvers = Resolvers export type DirectiveResolvers = { - auth?: AuthDirectiveResolver + auth?: AuthDirectiveResolver } /** @@ -650,13 +714,13 @@ export type DirectiveResolvers = { export type IDirectiveResolvers = DirectiveResolvers export interface IntrospectionResultData { - __schema: { - types: { - kind: string - name: string - possibleTypes: { - name: string - }[] - }[] - } + __schema: { + types: { + kind: string + name: string + possibleTypes: { + name: string + }[] + }[] + } } From f3329cf455a29beeb88814217d1205425a160f8e Mon Sep 17 00:00:00 2001 From: shmck Date: Sat, 14 Dec 2019 14:56:04 -0800 Subject: [PATCH 3/4] remove data.init script --- src/channel/index.ts | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/channel/index.ts b/src/channel/index.ts index 6715793c..c268710c 100644 --- a/src/channel/index.ts +++ b/src/channel/index.ts @@ -88,14 +88,6 @@ class Channel implements Channel { await tutorialConfig({ config: data.config }, onError) - // run init setup actions - if (data.init) { - const setup: G.StepActions | null | undefined = data.init.setup - if (setup) { - setupActions(this.workspaceRoot, setup, this.send) - } - } - // report back to the webview that setup is complete this.send({ type: 'TUTORIAL_CONFIGURED' }) return From 21ecc86120a1178deaf03a2d420c111824b351e1 Mon Sep 17 00:00:00 2001 From: shmck Date: Sat, 14 Dec 2019 14:57:16 -0800 Subject: [PATCH 4/4] update summary changes --- web-app/src/containers/Continue/index.tsx | 4 ++-- web-app/src/containers/New/TutorialList/index.tsx | 4 ++-- web-app/src/containers/Overview/index.tsx | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/web-app/src/containers/Continue/index.tsx b/web-app/src/containers/Continue/index.tsx index ce941055..072e4c30 100644 --- a/web-app/src/containers/Continue/index.tsx +++ b/web-app/src/containers/Continue/index.tsx @@ -31,8 +31,8 @@ export const ContinuePage = (props: Props) => (
-

{props.tutorial.version.summary.title}

-

{props.tutorial.version.summary.description}

+

{props.tutorial.summary.title}

+

{props.tutorial.summary.description}

 diff --git a/web-app/src/containers/New/TutorialList/index.tsx b/web-app/src/containers/New/TutorialList/index.tsx index b95d6deb..f337d5ca 100644 --- a/web-app/src/containers/New/TutorialList/index.tsx +++ b/web-app/src/containers/New/TutorialList/index.tsx @@ -22,8 +22,8 @@ const TutorialList = (props: Props) => { onSelect(tutorial)} - title={tutorial.version.summary.title || ''} - description={tutorial.version.summary.description || ''} + title={tutorial.summary.title || ''} + description={tutorial.summary.description || ''} /> ))} diff --git a/web-app/src/containers/Overview/index.tsx b/web-app/src/containers/Overview/index.tsx index e462b87e..4fa37ee3 100644 --- a/web-app/src/containers/Overview/index.tsx +++ b/web-app/src/containers/Overview/index.tsx @@ -54,7 +54,7 @@ const Overview = (props: PageProps) => { }, }) - const { title, description } = data.tutorial.version.summary + const { title, description } = data.tutorial.summary const { levels } = data.tutorial.version.data return