diff --git a/lib/app/middleware.js b/lib/app/middleware.js
index 3669e0545b..4ef5b98954 100644
--- a/lib/app/middleware.js
+++ b/lib/app/middleware.js
@@ -1,5 +1,5 @@
 <% if (middleware) { %>
-let files = require.context('~/middleware', false, /^\.\/.*\.js$/)
+let files = require.context('~/middleware', false, /^\.\/.*\.(js|ts)$/)
 let filenames = files.keys()
 
 function getModule (filename) {
@@ -12,7 +12,7 @@ let middleware = {}
 
 // Generate the middleware
 for (let filename of filenames) {
-  let name = filename.replace(/^\.\//, '').replace(/\.js$/, '')
+  let name = filename.replace(/^\.\//, '').replace(/\.(js|ts)$/, '')
   middleware[name] = getModule(filename)
 }
 
diff --git a/lib/app/store.js b/lib/app/store.js
index 0bad41e6e2..b0679c84af 100644
--- a/lib/app/store.js
+++ b/lib/app/store.js
@@ -2,7 +2,7 @@ import Vue from 'vue'
 import Vuex from 'vuex'
 Vue.use(Vuex)
 
-let files = require.context('~/store', true, /^\.\/.*\.js$/)
+let files = require.context('~/store', true, /^\.\/.*\.(js|ts)$/)
 let filenames = files.keys()
 
 function getModule (filename) {
@@ -30,7 +30,7 @@ let storeData = {}
 if (filenames.indexOf('./index.js') !== -1) {
   let mainModule = getModule('./index.js')
   if (mainModule.commit) {
-    console.error('[nuxt.js] store/index.js should export raw store options instead of an instance.')
+    console.error('[nuxt.js] store/index should export raw store options instead of an instance.')
   } else {
     if (mainModule.state && typeof mainModule.state !== 'function') {
       console.error('[nuxt.js] store state should be a function.')
@@ -43,7 +43,7 @@ if (filenames.indexOf('./index.js') !== -1) {
 if (store == null) {
   storeData.modules = storeData.modules || {}
   for (let filename of filenames) {
-    let name = filename.replace(/^\.\//, '').replace(/\.js$/, '')
+    let name = filename.replace(/^\.\//, '').replace(/\.(js|ts)$/, '')
     if (name === 'index') continue
 
     let namePath = name.split(/\//)