Merge pull request #549 from game-loading-ts

bemusic · Sep 2, 2019 · ade20dd · ade20dd
2 parents 17dbf15 + d1ffd9d
commit ade20dd
Show file tree

Hide file tree

Showing 20 changed files with 601 additions and 344 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -40,6 +40,10 @@ jobs:
             then
               yarn danger ci
             fi
+      - run:
+          name: typecheck
+          command: |
+            yarn tsc
   test:
     working_directory: ~/bemuse
     environment:

diff --git a/.eslintrc.yml b/.eslintrc.yml
@@ -28,7 +28,7 @@ globals:
   xit: false
   sinon: false
   BemuseLogger: false
-parser: typescript-eslint-parser
+parser: '@typescript-eslint/parser'
 plugins:
   - react
 rules:

diff --git a/package.json b/package.json
@@ -58,7 +58,11 @@
     "@types/bluebird-global": "3",
     "@types/chai": "^4.2.0",
     "@types/eslint": "^4.16.4",
+    "@types/invariant": "^2.2.30",
     "@types/minimatch": "^3.0.3",
+    "@types/react": "^16.9.2",
+    "@types/webpack-env": "^1.14.0",
+    "@typescript-eslint/parser": "^2.0.0",
     "autoprefixer": "^9.1.5",
     "body-parser": "^1.18.3",
     "brfs": "^1.6.1",
@@ -135,8 +139,7 @@
     "transform-loader": "^0.2.4",
     "ts-loader": "^5.3.1",
     "ts-node": "^7.0.1",
-    "typescript": "^3.2.1",
-    "typescript-eslint-parser": "^21.0.1",
+    "typescript": "^3.6.2",
     "url-loader": "^1.1.2",
     "val-loader": "^1.1.1",
     "web-audio-test-api": "^0.5.2",

diff --git a/packages/bmson/package.json b/packages/bmson/package.json
@@ -35,9 +35,6 @@
     "mocha": "^5.2.0",
     "power-assert": "^1.6.1"
   },
-  "peerDependencies": {
-    "bms": "^3.0.0"
-  },
   "dependencies": {
     "lodash": "^4.17.11"
   }

diff --git a/packages/bmson/src/utils.ts b/packages/bmson/src/utils.ts
@@ -36,9 +36,9 @@ export function slicesForNotesAndTiming(
 ) {
   const { beatForPulse } = options
 
-  let all = new Set()
-  let play = new Set()
-  let restart = new Set()
+  let all = new Set<number>()
+  let play = new Set<number>()
+  let restart = new Set<number>()
 
   for (let { x, y, c } of notes) {
     all.add(y)

diff --git a/src/app/game-launcher.js b/src/app/game-launcher.js