From 4cd48f392740e8f567413660e02e62247deebf2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sat, 20 May 2017 11:36:35 +0200
Subject: [PATCH] Support ts

---
 lib/app/store.js           | 13 +++++--------
 lib/webpack/base.config.js | 14 +++++++-------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/lib/app/store.js b/lib/app/store.js
index 54b68a18c4..d5a5059e44 100644
--- a/lib/app/store.js
+++ b/lib/app/store.js
@@ -11,8 +11,9 @@ const filenames = files.keys()
 let storeData = {}
 
 // Check if store/index.js exists
-if (filenames.indexOf('./index.js') !== -1) {
-  storeData = getModule('./index.js')
+const indexFilename = filenames.find((filename) => filename.includes('./index.'))
+if (indexFilename) {
+  storeData = getModule(indexFilename)
 }
 
 // Store modules
@@ -44,14 +45,10 @@ function getModule (filename) {
   const file = files(filename)
   const module = file.default || file
   if (module.state && typeof module.state !== 'function') {
-    // eslint-disable-next-line no-console
-    console.error('[nuxt] store state should be a function.')
-    return
+    throw new Error('[nuxt] store state should be a function.')
   }
   if (module.commit) {
-    // eslint-disable-next-line no-console
-    console.error('[nuxt] store should export raw store options instead of an instance.')
-    return
+    throw new Error('[nuxt] store should export raw store options instead of an instance.')
   }
   return module
 }
diff --git a/lib/webpack/base.config.js b/lib/webpack/base.config.js
index ae163e5914..47e3dc0ee6 100644
--- a/lib/webpack/base.config.js
+++ b/lib/webpack/base.config.js
@@ -31,7 +31,7 @@ export default function ({ isClient, isServer }) {
       hints: (this.dev ? false : 'warning')
     },
     resolve: {
-      extensions: ['.js', '.json', '.vue'],
+      extensions: ['.js', '.json', '.vue', '.ts'],
       // Disable for now
       alias: {
         '~': join(this.srcDir),
@@ -46,14 +46,14 @@ export default function ({ isClient, isServer }) {
         '~components': join(this.srcDir, 'components')
       },
       modules: [
-        nodeModulesDir,
-        join(this.dir, 'node_modules')
+        join(this.dir, 'node_modules'),
+        nodeModulesDir
       ]
     },
     resolveLoader: {
       modules: [
-        nodeModulesDir,
-        join(this.dir, 'node_modules')
+        join(this.dir, 'node_modules'),
+        nodeModulesDir
       ]
     },
     module: {
@@ -75,8 +75,8 @@ export default function ({ isClient, isServer }) {
         },
         { test: /\.css$/, use: styleLoader.call(this, 'css') },
         { test: /\.less$/, use: styleLoader.call(this, 'less', 'less-loader') },
-        { test: /\.sass$/, use: styleLoader.call(this, 'sass', 'sass-loader?indentedSyntax') },
-        { test: /\.scss$/, use: styleLoader.call(this, 'sass', 'sass-loader') },
+        { test: /\.sass$/, use: styleLoader.call(this, 'sass', 'sass-loader?indentedSyntax&sourceMap') },
+        { test: /\.scss$/, use: styleLoader.call(this, 'sass', 'sass-loader?sourceMap') },
         { test: /\.styl(us)?$/, use: styleLoader.call(this, 'stylus', 'stylus-loader') }
       ]
     },