build extension package progress

Author: ShMcK

.vscodeignore

@@ -1,26 +1,27 @@
 ## Common
 .gitignore
 
-## Docs
-DEV.md
-
 ## VSCode
 .vscode/**
 .vscode-test/**
 vsc-extension-quickstart.md
-*.vsix
+
+## TypeScript
+**/tsconfig.json
+**/tslint.json
+**/*.ts
 
 ## Dev Folders
 src/**
 web-app/**
+scripts/**
+docs/**
 .env
 .prettierrc.js
 jest.config.js
 
-## TypeScript
-**/tsconfig.json
-**/tslint.json
-**/*.ts
-
 ## Tests
-build/test/**
+build/test/**
+
+## Docs
+DEV.md

package-lock.json

@@ -17,16 +17,11 @@
   },
   "main": "./build/extension.js",
   "scripts": {
-    "build": "rm -rf build && npm run build:ext && npm run build:web",
-    "build:ext": "tsc -p ./",
-    "build:web": "cd web-app && npm run build",
-    "postbuild:web": "cp -R ./web-app/build/ ./build/ && node scripts/fixFontPaths.js",
+    "build": "./scripts/build.sh",
     "postinstall": "node ./node_modules/vscode/bin/install",
     "lint": "eslint src/**/*ts",
-    "machine": "node ./out/state/index.js",
     "storybook": "cd web-app && npm run storybook",
     "test": "jest",
-    "test:ext": "node ./build/test/runTest.js",
     "vscode:prepublish": "npm run build",
     "watch": "tsc -watch -p ./"
   },
@@ -38,8 +33,6 @@
   },
   "devDependencies": {
     "@types/assert": "^1.4.6",
-    "@types/chokidar": "^2.1.3",
-    "@types/dotenv": "^8.2.0",
     "@types/jest": "^25.1.4",
     "@types/jsdom": "^16.2.0",
     "@types/node": "^13.9.8",
@@ -48,7 +41,6 @@
     "eslint": "^6.8.0",
     "eslint-config-prettier": "^6.10.1",
     "eslint-plugin-prettier": "^3.1.2",
-    "graphql": "^14.6.0",
     "jest": "^25.2.4",
     "prettier": "^2.0.2",
     "ts-jest": "^25.2.1",

package.json

@@ -27,9 +27,9 @@
   "dependencies": {
     "@alifd/next": "^1.19.21",
     "@alifd/theme-4": "^0.2.3",
+    "@emotion/babel-preset-css-prop": "^10.0.27",
     "@emotion/core": "^10.0.28",
     "@sentry/browser": "^5.15.4",
-    "graphql": "^14.6.0",
     "markdown-it": "^10.0.0",
     "markdown-it-emoji": "^1.4.0",
     "markdown-it-prism": "^2.0.5",
@@ -39,12 +39,10 @@
     "react-addons-css-transition-group": "^15.6.2",
     "react-dom": "^16.13.1",
     "reselect": "^4.0.0",
-    "typescript": "^3.8.3",
     "xstate": "^4.8.0"
   },
   "devDependencies": {
     "@babel/core": "^7.5.4",
-    "@emotion/babel-preset-css-prop": "^10.0.27",
     "@storybook/addon-actions": "^5.3.17",
     "@storybook/addon-knobs": "^5.3.17",
     "@storybook/addon-links": "^5.3.17",
@@ -73,6 +71,7 @@
     "react-app-rewired": "^2.1.5",
     "react-scripts": "^3.4.1",
     "sass-loader": "^8.0.2",
+    "typescript": "^3.8.3",
     "typescript-eslint-parser": "^22.0.0"
   }
 }

web-app/package.json

@@ -10,7 +10,7 @@ interface PageProps {
 }
 
 const LevelSummaryPageContainer = (props: PageProps) => {
-  const { position, progress, processes, testStatus, error } = props.context
+  const { position, progress, processes, testStatus } = props.context
 
   const tutorial = selectors.currentTutorial(props.context)
   const levelData: TT.Level = selectors.currentLevel(props.context)

web-app/src/containers/Tutorial/LevelPage/index.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react'
 
-const useFetch = <T>(url: string, options?: object): { data: T | null; error: string | null; loading: boolean } => {
+const useFetch = <T>(url: string, options: object = {}): { data: T | null; error: string | null; loading: boolean } => {
   const [data, setData] = React.useState(null)
   const [error, setError] = React.useState(null)
   const [loading, setLoading] = React.useState(true)

web-app/src/services/hooks/useFetch.ts

@@ -1,5 +1,5 @@
 import * as CR from 'typings'
-import { assign, Machine, MachineOptions } from 'xstate'
+import { Machine, MachineOptions } from 'xstate'
 import createActions from './actions'
 
 const createOptions = ({ editorSend }: any): MachineOptions<CR.MachineContext, CR.MachineEvent> => ({