v1.0.0

Author: cenzhende

lib/loader.js

@@ -1,10 +1,11 @@
 var fs = require('fs')
 var path = require('path')
 var parse = require('./parse')
+var loaderUtils = require('loader-utils')
 
 module.exports = function (content) {
   var filePath = this.resourcePath
-  var options = resolveOptions(this.options)
+  var options = resolveOptions(loaderUtils.getOptions(this))
   var parts = parse(content, filePath)
   var output = content
 
@@ -76,7 +77,7 @@ function fileExistsSync (filePath) {
 }
 
 function resolveOptions (config) {
-  var options = config.vueAutoImport || {}
+  var options = config || {}
 
   options.scoped = !!options.scoped
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-auto-import-loader",
-  "version": "0.1.2",
+  "version": "1.0.0",
   "description": "Auto import template / style / script for *.vue file.",
   "main": "index.js",
   "scripts": {
@@ -23,6 +23,7 @@
   "homepage": "https://github.com/WEBuster/vue-auto-import-loader#readme",
   "dependencies": {
     "hash-sum": "^1.0.2",
+    "loader-utils": "^1.0.2",
     "lru-cache": "^4.0.1",
     "parse5": "^2.2.0"
   },
@@ -31,6 +32,6 @@
     "mocha": "^3.0.2",
     "raw-loader": "^0.5.1",
     "rimraf": "^2.5.4",
-    "webpack": "^1.13.2"
+    "webpack": "^2.2.1"
   }
 }

test/test.js

@@ -8,17 +8,22 @@ var expect = require('chai').expect
 describe('vue-auto-import-loader', function () {
 
   var outputDir = path.resolve(__dirname, './output')
-  var loaderPath = 'raw!' + path.resolve(__dirname, '../')
+  var loaderPath = path.resolve(__dirname, '..')
   var globalConfig = {
     output: {
       path: outputDir,
       filename: 'test.build.vue'
     },
+    resolveLoader: {
+      alias: {
+        'vue-auto-import-loader': loaderPath
+      }
+    },
     module: {
-      loaders: [
+      rules: [
         {
           test: /\.vue$/,
-          loader: loaderPath
+          use: ['raw-loader', 'vue-auto-import-loader']
         }
       ]
     }
@@ -98,12 +103,25 @@ describe('vue-auto-import-loader', function () {
   it('blank-specific-name', function (done) {
     test({
       entry: './test/fixtures/blank-specific-name/blank.vue',
-      vueAutoImport: {
-        files: {
-          template: 'template.html',
-          style: 'style.css',
-          script: 'script.js'
-        }
+      module: {
+        rules: [
+          {
+            test: /\.vue$/,
+            use: [
+              'raw-loader',
+              {
+                loader: 'vue-auto-import-loader',
+                options: {
+                  files: {
+                    template: 'template.html',
+                    style: 'style.css',
+                    script: 'script.js'
+                  }
+                }
+              }
+            ]
+          }
+        ]
       }
     }, function (fragment) {
       var typeList = []
@@ -166,8 +184,21 @@ describe('vue-auto-import-loader', function () {
   it('scoped', function (done) {
     test({
       entry: './test/fixtures/scoped/scoped.vue',
-      vueAutoImport: {
-        scoped: true
+      module: {
+        rules: [
+          {
+            test: /\.vue$/,
+            use: [
+              'raw-loader',
+              {
+                loader: 'vue-auto-import-loader',
+                options: {
+                  scoped: true
+                }
+              }
+            ]
+          }
+        ]
       }
     }, function (fragment) {
       var node = fragment.childNodes[0]