diff --git a/package.json b/package.json
index 59eb94ebde..09e7b1e064 100644
--- a/package.json
+++ b/package.json
@@ -143,6 +143,7 @@
           "src/controllers/shows/tvrecommended.js",
           "src/controllers/shows/tvshows.js",
           "src/controllers/shows/tvstudios.js",
+          "src/controllers/shows/tvupcoming.js",
           "src/plugins/bookPlayer/plugin.js",
           "src/plugins/bookPlayer/tableOfContents.js",
           "src/plugins/photoPlayer/plugin.js",
diff --git a/src/controllers/shows/tvupcoming.js b/src/controllers/shows/tvupcoming.js
index d57a5ae3cd..a2016279b8 100644
--- a/src/controllers/shows/tvupcoming.js
+++ b/src/controllers/shows/tvupcoming.js
@@ -1,9 +1,19 @@
-define(['layoutManager', 'loading', 'datetime', 'libraryBrowser', 'cardBuilder', 'apphost', 'imageLoader', 'globalize', 'scrollStyles', 'emby-itemscontainer'], function (layoutManager, loading, datetime, libraryBrowser, cardBuilder, appHost, imageLoader, globalize) {
-    'use strict';
+import layoutManager from 'layoutManager';
+import loading from 'loading';
+import datetime from 'datetime';
+import libraryBrowser from 'libraryBrowser';
+import cardBuilder from 'cardBuilder';
+import appHost from 'apphost';
+import imageLoader from 'imageLoader';
+import globalize from 'globalize';
+import 'scrollStyles';
+import 'emby-itemscontainer';
+
+/* eslint-disable indent */
 
     function getUpcomingPromise(context, params) {
         loading.show();
-        var query = {
+        const query = {
             Limit: 48,
             Fields: 'AirTime,UserData',
             UserId: ApiClient.getCurrentUserId(),
@@ -17,7 +27,7 @@ define(['layoutManager', 'loading', 'datetime', 'libraryBrowser', 'cardBuilder',
 
     function loadUpcoming(context, params, promise) {
         promise.then(function (result) {
-            var items = result.Items;
+            const items = result.Items;
 
             if (items.length) {
                 context.querySelector('.noItemsMessage').style.display = 'none';
@@ -39,19 +49,17 @@ define(['layoutManager', 'loading', 'datetime', 'libraryBrowser', 'cardBuilder',
     }
 
     function renderUpcoming(elem, items) {
-        var i;
-        var length;
-        var groups = [];
-        var currentGroupName = '';
-        var currentGroup = [];
+        const groups = [];
+        let currentGroupName = '';
+        let currentGroup = [];
 
-        for (i = 0, length = items.length; i < length; i++) {
-            var item = items[i];
-            var dateText = '';
+        for (let i = 0, length = items.length; i < length; i++) {
+            const item = items[i];
+            let dateText = '';
 
             if (item.PremiereDate) {
                 try {
-                    var premiereDate = datetime.parseISO8601Date(item.PremiereDate, true);
+                    const premiereDate = datetime.parseISO8601Date(item.PremiereDate, true);
                     dateText = datetime.isRelativeDay(premiereDate, -1) ? globalize.translate('Yesterday') : datetime.toLocaleDateString(premiereDate, {
                         weekday: 'long',
                         month: 'short',
@@ -77,17 +85,17 @@ define(['layoutManager', 'loading', 'datetime', 'libraryBrowser', 'cardBuilder',
             }
         }
 
-        var html = '';
+        let html = '';
 
-        for (i = 0, length = groups.length; i < length; i++) {
-            var group = groups[i];
+        for (let i = 0, length = groups.length; i < length; i++) {
+            const group = groups[i];
             html += '<div class="verticalSection">';
             html += '<h2 class="sectionTitle sectionTitle-cards padded-left">' + group.name + '</h2>';
-            var allowBottomPadding = true;
+            let allowBottomPadding = true;
 
             if (enableScrollX()) {
                 allowBottomPadding = false;
-                var scrollXClass = 'scrollX hiddenScrollX';
+                let scrollXClass = 'scrollX hiddenScrollX';
 
                 if (layoutManager.tv) {
                     scrollXClass += ' smoothScrollX';
@@ -98,7 +106,7 @@ define(['layoutManager', 'loading', 'datetime', 'libraryBrowser', 'cardBuilder',
                 html += '<div is="emby-itemscontainer" class="itemsContainer vertical-wrap padded-left padded-right">';
             }
 
-            var supportsImageAnalysis = appHost.supports('imageanalysis');
+            let supportsImageAnalysis = appHost.supports('imageanalysis');
             supportsImageAnalysis = false;
             html += cardBuilder.getCardsHtml({
                 items: group.items,
@@ -124,9 +132,9 @@ define(['layoutManager', 'loading', 'datetime', 'libraryBrowser', 'cardBuilder',
         imageLoader.lazyChildren(elem);
     }
 
-    return function (view, params, tabContent) {
-        var upcomingPromise;
-        var self = this;
+    export default function (view, params, tabContent) {
+        let upcomingPromise;
+        const self = this;
 
         self.preRender = function () {
             upcomingPromise = getUpcomingPromise(view, params);
@@ -135,5 +143,6 @@ define(['layoutManager', 'loading', 'datetime', 'libraryBrowser', 'cardBuilder',
         self.renderTab = function () {
             loadUpcoming(tabContent, params, upcomingPromise);
         };
-    };
-});
+    }
+
+/* eslint-enable indent */