Merge pull request #32 from NetCZ/feature/fs-import

feat: import node fs library instead of relying on webpack passed one

Author: NetCZ

index.js

@@ -1,6 +1,7 @@
 var loaderUtils = require('loader-utils'),
   _ = require('lodash'),
   path = require('path'),
+  fs = require('fs'),
   helper = require('./src/helper');
 
 var defaultOptions = {
@@ -19,7 +20,7 @@ module.exports = function (content, map) {
   var inputFile = map.file || path.basename(this.resourcePath),
     options = _.assign({}, _.cloneDeep(defaultOptions), loaderOptions),
     dirPath = this.context,
-    fileNames = this.fs.readdirSync(dirPath).filter(function (file) {
+    fileNames = fs.readdirSync(dirPath).filter(function (file) {
       return !file.match(/^\./);
     });
 

plugin.js

@@ -14,6 +14,12 @@ function VueSeparateFilesWebpackLoaderPlugin(options) {
   this.testString = this.options.test.source.replace(/\\\./g, '.');
 }
 
+function matcher(item) {
+  return _.findIndex(item.use, function (use) {
+    return use.loader === 'vue-separate-files-webpack-loader';
+  }) !== -1;
+}
+
 VueSeparateFilesWebpackLoaderPlugin.prototype.apply = function (compiler) {
   var plugins = _.filter(compiler.options.plugins, function (plugin) {
     var name = plugin.constructor.name;
@@ -36,7 +42,7 @@ VueSeparateFilesWebpackLoaderPlugin.prototype.apply = function (compiler) {
     throw new Error('[VueSeparateFilesWebpackLoaderPlugin] No matching rule for ' + this.testString + ' files found.\n' +
       'Make sure there is at least one root-level rule that matches ' + this.testString + ' files.\n' +
       'Also make sure you pass options.test property when not using default one.'
-    )
+    );
   }
 
   var ruleUse = _.concat([], rule.use);
@@ -57,10 +63,4 @@ VueSeparateFilesWebpackLoaderPlugin.prototype.apply = function (compiler) {
   compiler.options.module.rules.push(rule);
 };
 
-function matcher(item) {
-  return _.findIndex(item.use, function (use) {
-    return use.loader === 'vue-separate-files-webpack-loader';
-  }) !== -1;
-}
-
 module.exports = VueSeparateFilesWebpackLoaderPlugin;

src/helper.js

@@ -4,6 +4,17 @@ var _ = require('lodash'),
 
 var exports = {};
 
+function checkTagExistence(file, parts, settings) {
+  if (_.has(parts, settings.tagName) || _.has(parts, settings.fileType)) {
+    var type = settings.tagName || settings.fileType;
+    throw new TypeError(`File "${ file }" can't be used as "${ type }", because it was already defined in "${ _.get(parts[type], 'file', null) }".`);
+  }
+}
+
+function prepareTag() {
+
+}
+
 exports.addTag = function addTag(tags, tagName, attributes) {
   tags.push(tag({
     name: tagName,
@@ -62,16 +73,18 @@ exports.resolveOptions = function resolveOptions(options, defaultOptions) {
 };
 
 exports.createPart = function createPart(settings, options) {
+  var attributes = _.assign({}, {
+    separated: true,
+    src: path.join(settings.dirPath, settings.file),
+    scoped: settings.tagName === 'style' && settings.scoped,
+    lang: settings.tagName ? settings.fileType : false
+  }, options.global, options[settings.fileType] || {}, options[settings.tagName] || {});
+
   return {
     name: settings.tagName || settings.fileType,
     file: settings.file,
     fileName: settings.fileName,
-    attributes: _.assign({}, {
-      separated: true,
-      src: path.join(settings.dirPath, settings.file),
-      scoped: settings.tagName === 'style' && settings.scoped,
-      lang: settings.tagName ? settings.fileType : false
-    }, options.global, options[settings.fileType] || {}, options[settings.tagName] || {})
+    attributes: attributes
   };
 };
 
@@ -87,10 +100,7 @@ exports.createParts = function createParts(options, dirPath, inputFile, fileName
 
     var settings = that.parseFile(options, dirPath, file);
 
-    if (_.has(parts, settings.tagName) || _.has(parts, settings.fileType)) {
-      var type = settings.tagName || settings.fileType;
-      throw new TypeError(`File "${ file }" can't be used as "${ type }", because it was already defined in "${ _.get(parts[type], 'file', null) }".`);
-    }
+    checkTagExistence(file, parts, settings);
 
     parts[settings.tagName || settings.fileType] = that.createPart(settings, options);
   });

test/plugin.js

@@ -243,8 +243,7 @@ describe('plugin: success', function () {
     var expected = {
       resource: {
         test: /\.vue\./
-      },
-      resourceQuery: undefined
+      }
     };
 
     plugin.apply(compiler);
@@ -255,7 +254,7 @@ describe('plugin: success', function () {
     assert.deepEqual(rule.resource, expected.resource);
     assert.equal(rule.resourceQuery, expected.resourceQuery);
     assert.isFunction(rule.use);
-    assert.deepEqual(rule.use({ resourceQuery: undefined }), defaultLoaderRuleDefinition.use)
+    assert.deepEqual(rule.use({}), defaultLoaderRuleDefinition.use)
   });
 
   it('should apply loader rule with custom plugin options', function () {
@@ -279,8 +278,7 @@ describe('plugin: success', function () {
     var expected = {
       resource: {
         test: /\.condition/
-      },
-      resourceQuery: undefined
+      }
     };
 
     plugin.apply(compiler);
@@ -291,7 +289,7 @@ describe('plugin: success', function () {
     assert.deepEqual(rule.resource, expected.resource);
     assert.equal(rule.resourceQuery, expected.resourceQuery);
     assert.isFunction(rule.use);
-    assert.deepEqual(rule.use({ resourceQuery: undefined }), defaultLoaderRuleDefinition.use)
+    assert.deepEqual(rule.use({}), defaultLoaderRuleDefinition.use)
   });
 
   it('should contain exactly one rule for loader', function () {
@@ -310,8 +308,7 @@ describe('plugin: success', function () {
     var expected = {
       resource: {
         test: /\.vue\./
-      },
-      resourceQuery: undefined
+      }
     };
 
     plugin.apply(compiler);
@@ -323,6 +320,6 @@ describe('plugin: success', function () {
     assert.deepEqual(rule.resource, expected.resource);
     assert.equal(rule.resourceQuery, expected.resourceQuery);
     assert.isFunction(rule.use);
-    assert.deepEqual(rule.use({ resourceQuery: undefined }), defaultLoaderRuleDefinition.use)
+    assert.deepEqual(rule.use({}), defaultLoaderRuleDefinition.use)
   });
 });