fix: Fixes typescript version and related warnings

Author: ChristianKienle

docs/package.json

@@ -36,7 +36,7 @@
     "markdown-loader": "^5.0.0",
     "node-sass": "^4.11.0",
     "sass-loader": "^7.1.0",
-    "typescript": "^3.3.3",
+    "typescript": ">=3.2.1 <3.4.0",
     "vue": "^2.6.7",
     "vue-loader": "^15.6.2",
     "vue-template-compiler": "^2.6.7"

docs/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "allowJs": true,
     "resolveJsonModule": true,
     "target": "esnext",
     "module": "esnext",

docs/yarn.lock

@@ -8394,10 +8394,10 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@^3.3.3:
-  version "3.3.3333"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.3.3333.tgz#171b2c5af66c59e9431199117a3bcadc66fdcfd6"
-  integrity sha512-JjSKsAfuHBE/fB2oZ8NxtRTk5iGcg6hkYXMnZ3Wc+b2RSqejEqTaem11mHASMnFilHrax3sLK0GDzcJrekZYLw==
+"typescript@>=3.2.1 <3.4.0":
+  version "3.3.4000"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.3.4000.tgz#76b0f89cfdbf97827e1112d64f283f1151d6adf0"
+  integrity sha512-jjOcCZvpkl2+z7JFn0yBOoLQyLoIkNZAs/fYJkUG6VKy6zLPHJGfQJYFHzibB6GJaF/8QrcECtlQ5cpvRHSMEA==
 
 [email protected]:
   version "3.4.9"

ui/package.json

@@ -30,7 +30,7 @@
       "chai": "^4.2.0",
       "eslint": "^5.15.0",
       "eslint-plugin-vue": "^5.2.2",
-      "typescript": "^3.3.3",
+      "typescript": ">=3.2.1 <3.4.0",
       "vue": "^2.6.7",
       "ts-jest": "^23.0.0",
       "babel-core": "7.0.0-bridge.0",

ui/src/components/SideNav/SideNavLink.vue

@@ -22,12 +22,12 @@
   </router-link>
 </template>
 
-<script lang="ts">
+<script>
 import { ModeType, Config, Store } from "./Model";
 import { withTargetLocation, mixins } from "@/mixins";
-
-export default mixins(withTargetLocation("#")).extend({
+export default {
   name: "FdSideNavLink",
+  mixins: [withTargetLocation("#")],
   inject: {
     sideNavStore: { default: null },
     sideNavItem: { default: null },
@@ -37,36 +37,33 @@ export default mixins(withTargetLocation("#")).extend({
     ariaSelected() {
       return this.selected ? "true" : null;
     },
-    parentItemId(): string {
-      // @ts-ignore
+    parentItemId() {
       return this.sideNavItem.uid;
     },
-    store(): Store {
-      // @ts-ignore
+    store() {
       return this.sideNavStore;
     },
-    config(): Config {
-      // @ts-ignore
+    config() {
       return this.$config;
     },
-    manualModeEnabled(): boolean {
+    manualModeEnabled() {
       return this.mode === "manual";
     },
-    mode(): ModeType {
+    mode() {
       return this.config.mode;
     },
-    hasChildren(): boolean {
+    hasChildren() {
       return this.store.hasSubItems(this.parentItemId);
     },
-    selected(): boolean {
+    selected() {
       return this.store.selected(this.parentItemId);
     },
     routerLinkClasses() {
       return {
         "has-child": this.hasChildren
       };
     },
-    classes(): object {
+    classes() {
       return {
         "has-child": this.hasChildren,
         "is-selected": this.selected
@@ -78,16 +75,16 @@ export default mixins(withTargetLocation("#")).extend({
       this.store.selectedId = this.parentItemId;
       this.store.toggleExpanded(this.parentItemId);
     },
-    onRouterLinkClick(): void {
+    onRouterLinkClick() {
       this.selectSelf();
       this.pushLocation();
     },
-    onClick(event: Event): void {
+    onClick(event) {
       event.preventDefault();
       event.stopPropagation();
       this.selectSelf();
       this.pushLocation();
     }
   }
-});
+};
 </script>

ui/src/components/SideNav/SideNavSubLink.vue

@@ -21,13 +21,14 @@
   </router-link>
 </template>
 
-<script lang="ts">
-import { withTargetLocation, mixins } from "@/mixins";
+<script>
+import { withTargetLocation } from "@/mixins";
 import { Store, ModeType, Config } from "./Model";
 
 // TODO: Refactor so that SideNavSubLink uses SideNavLink
-export default mixins(withTargetLocation("#")).extend({
+export default {
   name: "FdSideNavSubLink",
+  mixins: [withTargetLocation("#")],
   inject: {
     sideNavStore: { default: null },
     sideNavSubItem: { default: null },
@@ -37,42 +38,40 @@ export default mixins(withTargetLocation("#")).extend({
     ariaSelected() {
       return this.selected ? "true" : null;
     },
-    selected(): boolean {
+    selected() {
       return this.store.selected(this.parentId);
     },
-    classes(): object {
+    classes() {
       return { "is-selected": this.selected };
     },
-    store(): Store {
-      // @ts-ignore
+    store() {
       return this.sideNavStore;
     },
-    parentId(): string {
-      // @ts-ignore
+    parentId() {
       return this.sideNavSubItem.uid;
     },
-    config(): Config {
+    config() {
       // @ts-ignore
       return this.$config;
     },
-    manualModeEnabled(): boolean {
+    manualModeEnabled() {
       return this.mode === "manual";
     },
-    mode(): ModeType {
+    mode() {
       return this.config.mode;
     }
   },
   methods: {
-    onRouterLinkClick(): void {
+    onRouterLinkClick() {
       this.store.selectedId = this.parentId;
       this.pushLocation();
     },
-    onClick(event: Event): void {
+    onClick(event) {
       event.preventDefault();
       event.stopPropagation();
       this.store.selectedId = this.parentId;
       this.pushLocation();
     }
   }
-});
+};
 </script>

ui/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "allowJs": true,
     "noUnusedLocals": true,
     "noUnusedParameters": true,
     "resolveJsonModule": true,

ui/yarn.lock

@@ -9120,10 +9120,10 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@^3.3.3:
-  version "3.3.3333"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.3.3333.tgz#171b2c5af66c59e9431199117a3bcadc66fdcfd6"
-  integrity sha512-JjSKsAfuHBE/fB2oZ8NxtRTk5iGcg6hkYXMnZ3Wc+b2RSqejEqTaem11mHASMnFilHrax3sLK0GDzcJrekZYLw==
+"typescript@>=3.2.1 <3.4.0":
+  version "3.3.4000"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.3.4000.tgz#76b0f89cfdbf97827e1112d64f283f1151d6adf0"
+  integrity sha512-jjOcCZvpkl2+z7JFn0yBOoLQyLoIkNZAs/fYJkUG6VKy6zLPHJGfQJYFHzibB6GJaF/8QrcECtlQ5cpvRHSMEA==
 
 [email protected], uglify-js@^3.1.4:
   version "3.4.9"