Merge pull request #64 from ShMcK/feature/update-api-changes

Feature/update api changes

Author: ShMcK

package-lock.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"

package.json

@@ -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

src/channel/index.ts

@@ -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",

typings/graphql.d.ts

@@ -31,8 +31,8 @@ export const ContinuePage = (props: Props) => (
     </div>
     <Card>
       <div>
-        <h2>{props.tutorial.version.summary.title}</h2>
-        <p>{props.tutorial.version.summary.description}</p>
+        <h2>{props.tutorial.summary.title}</h2>
+        <p>{props.tutorial.summary.description}</p>
         <Button onClick={props.onContinue}>Resume</Button>
       </div>
     </Card>

web-app/package-lock.json

@@ -22,8 +22,8 @@ const TutorialList = (props: Props) => {
         <TutorialItem
           key={tutorial.id}
           onSelect={() => onSelect(tutorial)}
-          title={tutorial.version.summary.title || ''}
-          description={tutorial.version.summary.description || ''}
+          title={tutorial.summary.title || ''}
+          description={tutorial.summary.description || ''}
         />
       ))}
     </div>

web-app/package.json

@@ -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 <OverviewPage title={title} description={description} levels={levels} onNext={onNext} />