Merge branch 'tapable' of github.com:Atinux/nuxt.js into tapable

package.json

@@ -44,9 +44,9 @@
   },
   "nyc": {
     "exclude": [
-      "index.js",
-      "node_mdoules/**/*.js",
-      "test/**/*.js"
+      "test/**",
+      "node_modules/**",
+      "index.js"
     ]
   },
   "scripts": {

rollup.config.js

@@ -4,7 +4,7 @@ const rollupBabel = require('rollup-plugin-babel')
 const rollupAlias = require('rollup-plugin-alias')
 const rollupCommonJS = require('rollup-plugin-commonjs')
 const rollupReplace = require('rollup-plugin-replace')
-const rollupResolve = require('rollup-plugin-node-resolve')
+const rollupNodeResolve = require('rollup-plugin-node-resolve')
 const packageJson = require('./package.json')
 
 const dependencies = Object.keys(packageJson.dependencies)
@@ -65,13 +65,8 @@ function genConfig (opts) {
         resolve: ['.js', '.json', '.jsx', '.ts']
       }, aliases, opts.alias)),
 
-      rollupCommonJS(),
-
-      rollupResolve({ jsnext: true }),
-
       rollupBabel(Object.assign({
         exclude: 'node_modules/**',
-        runtimeHelpers: true,
         plugins: [
           ['transform-runtime', { 'helpers': false, 'polyfill': false }],
           'transform-async-to-generator',
@@ -82,6 +77,10 @@ function genConfig (opts) {
         ]
       }, opts.babel)),
 
+      rollupNodeResolve({ main: true, jsnext: true }),
+
+      rollupCommonJS(),
+
       rollupReplace({
         __VERSION__: version
       })