Merge pull request #266 from ComputerScienceHouse/ts4-eslint7

Updating eslint and typescript

Author: devinmatte

assets/src/modules/sm/App/providers/formatTimeFilter.ts

@@ -1,8 +1,8 @@
 angular.module('sm').filter('courseNum', function () {
   return function (course: Course) {
     if (course) {
-      return (course.department.code ? course.department.code
-        : course.department.number) + '-' + course.course
+      const coursePrefix = course.department.code ? course.department.code : course.department.number
+      return coursePrefix + '-' + course.course
     }
   }
 })

assets/src/modules/sm/global.d.ts

@@ -1,25 +1,25 @@
+/* eslint-disable no-unused-vars */
 /* eslint-disable camelcase */
 declare let angular: any
 
-declare interface Course {
-    id: string
-    sections: Section[]
-    title: string
-    courseNum: string
-    course: string
-    department: Department
-    times: Time[]
-    fromSelect: boolean
-    selected: boolean
-    description: string
-    search
-}
-
 declare interface Department {
     code: string
     number: null
 }
 
+declare interface Bldg {
+    code: string;
+    number: string;
+}
+
+declare interface Time {
+    bldg: Bldg;
+    room: string;
+    day: string;
+    start: string;
+    end: string;
+    off_campus: boolean;
+}
 declare interface Section {
     title: string;
     instructor: string;
@@ -35,19 +35,18 @@ declare interface Section {
     isError?: boolean
     selected?: boolean
 }
-
-declare interface Time {
-    bldg: Bldg;
-    room: string;
-    day: string;
-    start: string;
-    end: string;
-    off_campus: boolean;
-}
-
-declare interface Bldg {
-    code: string;
-    number: string;
+declare interface Course {
+    id: string
+    sections: Section[]
+    title: string
+    courseNum: string
+    course: string
+    department: Department
+    times: Time[]
+    fromSelect: boolean
+    selected: boolean
+    description: string
+    search
 }
 
 declare interface ResponseError {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "schedulemaker",
-  "version": "3.2.3",
+  "version": "3.2.4",
   "private": true,
   "description": "A course database lookup tool and schedule building web application for use at Rochester Institute of Technology.",
   "main": "index.php",
@@ -53,15 +53,15 @@
     "@types/angular": "1.5",
     "@types/google.analytics": "0.0.42",
     "@types/mousetrap": "^1.6.8",
-    "@typescript-eslint/eslint-plugin": "^2.30.0",
-    "@typescript-eslint/parser": "^2.30.0",
+    "@typescript-eslint/eslint-plugin": "^4.33.0",
+    "@typescript-eslint/parser": "^4.33.0",
     "del": "^6.0.0",
-    "eslint": "^6.5.1",
-    "eslint-config-standard": "^14.1.0",
-    "eslint-plugin-import": "^2.18.2",
-    "eslint-plugin-node": "^10.0.0",
-    "eslint-plugin-promise": "^4.2.1",
-    "eslint-plugin-standard": "^4.0.1",
+    "eslint": "^7.32.0",
+    "eslint-config-standard": "^16.0.3",
+    "eslint-plugin-import": "^2.24.2",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-promise": "^5.1.0",
+    "eslint-plugin-standard": "^5.0.0",
     "event-stream": "^4.0.1",
     "gulp": "^4.0.2",
     "gulp-concat": "^2.6.1",
@@ -77,7 +77,7 @@
     "gulp-typescript": "^5.0.1",
     "gulp-uglify": "^2.0.0",
     "install": "^0.13.0",
-    "typescript": "^3.8.3",
+    "typescript": "^4.4.3",
     "vinyl-paths": "^3.0.0"
   }
 }