update tests to use Webpack 2

Author: yyx990803

lib/loader.js

@@ -129,7 +129,7 @@ module.exports = function (content) {
     var lang = part.lang || defaultLang[type]
     var loader = loaders[lang]
     var rewriter = type === 'styles' ? styleRewriter + (scoped ? '&scoped=true!' : '!') : ''
-    var injectString = (type === 'script' && query.inject) ? 'inject!' : ''
+    var injectString = (type === 'script' && query.inject) ? 'inject-loader!' : ''
     if (loader !== undefined) {
       // add css modules
       if (type === 'styles') {

package.json

@@ -53,27 +53,30 @@
     "chai": "^3.0.0",
     "coffee-loader": "^0.7.2",
     "coffee-script": "^1.10.0",
-    "css-loader": "^0.23.1",
+    "css-loader": "^0.26.0",
     "eslint": "^2.9.0",
     "eslint-config-vue": "^1.0.0",
     "eslint-plugin-html": "^1.5.2",
     "expose-loader": "^0.7.1",
-    "extract-text-webpack-plugin": "^1.0.1",
-    "file-loader": "^0.8.5",
-    "inject-loader": "^2.0.1",
+    "extract-text-webpack-plugin": "^2.0.0-beta.4",
+    "file-loader": "^0.9.0",
+    "inject-loader": "^2.0.0",
     "jsdom": "^9.2.1",
     "memory-fs": "^0.3.0",
     "mkdirp": "^0.5.1",
     "mocha": "^2.2.5",
     "node-libs-browser": "^1.0.0",
+    "mocha": "^3.2.0",
+    "node-libs-browser": "^2.0.0",
     "normalize-newline": "^3.0.0",
     "postcss": "^5.0.21",
     "pug": "^2.0.0-beta6",
     "rimraf": "^2.4.0",
     "stylus": "^0.54.5",
     "stylus-loader": "^2.0.0",
-    "sugarss": "^0.1.3",
-    "vue": "^2.0.4",
-    "webpack": "^1.12.2"
+    "sugarss": "^0.2.0",
+    "vue": "^2.1.0",
+    "vue-template-compiler": "^2.1.0",
+    "webpack": "^2.1.0-beta.27"
   }
 }

test/test.js

@@ -12,15 +12,15 @@ var ExtractTextPlugin = require("extract-text-webpack-plugin")
 var compiler = require('../lib/template-compiler')
 var normalizeNewline = require('normalize-newline')
 
-var loaderPath = 'expose?vueModule!' + path.resolve(__dirname, '../')
+var loaderPath = 'expose-loader?vueModule!' + path.resolve(__dirname, '../index.js')
 var mfs = new MemoryFS()
 var globalConfig = {
   output: {
     path: '/',
     filename: 'test.build.js'
   },
   module: {
-    loaders: [
+    rules: [
       {
         test: /\.vue$/,
         loader: loaderPath
@@ -30,7 +30,17 @@ var globalConfig = {
 }
 
 function bundle (options, cb) {
+  var vueOptions = options.vue
+  delete options.vue
   var config = Object.assign({}, globalConfig, options)
+
+  // assign vue Options
+  if (vueOptions) {
+    config.plugins = (config.plugins || []).concat(new webpack.LoaderOptionsPlugin({
+      vue: vueOptions
+    }))
+  }
+
   var webpackCompiler = webpack(config)
   webpackCompiler.outputFileSystem = mfs
   webpackCompiler.run(function (err, stats) {
@@ -250,8 +260,8 @@ describe('vue-loader', function () {
       entry: './test/fixtures/extract-css.vue',
       vue: {
         loaders: {
-          css: ExtractTextPlugin.extract('css'),
-          stylus: ExtractTextPlugin.extract('css?sourceMap!stylus')
+          css: ExtractTextPlugin.extract('css-loader'),
+          stylus: ExtractTextPlugin.extract('css-loader?sourceMap!stylus-loader')
         }
       },
       plugins: [
@@ -269,6 +279,7 @@ describe('vue-loader', function () {
     test({
       entry: './test/fixtures/inject.js'
     }, function (window) {
+      // console.log(window.injector.toString())
       var module = interopDefault(window.injector({
         './service': {
           msg: 'Hello from mocked service!'
@@ -292,7 +303,7 @@ describe('vue-loader', function () {
         }
       },
       module: {
-        loaders: [
+        rules: [
           { test: /\.vue$/, loader: loaderPath },
           { test: /\.png$/, loader: 'file-loader?name=[name].[hash:6].[ext]' }
         ]