fix: fix similar component names load

NetCZ · Mar 19, 2019 · a4db849 · a4db849
1 parent 805d69b
commit a4db849
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 2 deletions.
diff --git a/src/helper.js b/src/helper.js
@@ -76,7 +76,7 @@ exports.createPart = function createPart(settings, options) {
 };
 
 exports.createParts = function createParts(options, dirPath, inputFile, fileNames) {
-  var inputFileName = inputFile.split(options.test)[0];
+  var inputFileName = new RegExp(`^${ inputFile.split(options.test)[0] }`);
   var parts = {},
     that = this;
 

diff --git a/test/files/similar-component-names/Component.vue.html b/test/files/similar-component-names/Component.vue.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>Title</title>
+</head>
+<body>
+
+</body>
+</html>
diff --git a/test/files/similar-component-names/Component.vue.js b/test/files/similar-component-names/Component.vue.js
diff --git a/test/files/similar-component-names/SimilarComponent.vue.html b/test/files/similar-component-names/SimilarComponent.vue.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>Title</title>
+</head>
+<body>
+
+</body>
+</html>
diff --git a/test/files/similar-component-names/SimilarComponent.vue.js b/test/files/similar-component-names/SimilarComponent.vue.js
diff --git a/test/loader.js b/test/loader.js
@@ -14,7 +14,8 @@ var twoPartsDir = path.resolve(dir + '/files/two-parts') + path.sep,
   emptyDir = path.resolve(dir + '/files/empty') + path.sep,
   twoComponentsSameDir = path.resolve(dir + '/files/two-components-same-dir') + path.sep,
   twoComponentsDuplicateSameDir = path.resolve(dir + '/files/two-components-duplicate-same-dir') + path.sep,
-  twoPartsDirCustomScript = path.resolve(dir + '/files/two-parts-custom-script') + path.sep;
+  twoPartsDirCustomScript = path.resolve(dir + '/files/two-parts-custom-script') + path.sep,
+  similarComponentNamesDir = path.resolve(dir + '/files/similar-component-names') + path.sep;
 
 beforeEach(function () {
   loader = require('../index');
@@ -257,4 +258,26 @@ describe('loader: success', function () {
 
     assert.strictEqual(result, expected);
   });
+
+  it('should has two parts even when similar component names occurs - first component', function () {
+    var content = require(similarComponentNamesDir + 'Component.vue');
+
+    var expected = '<template separated src="' + similarComponentNamesDir + 'Component.vue.html" lang="html"></template>' +
+      '<script separated src="' + similarComponentNamesDir + 'Component.vue.js" lang="js"></script>';
+
+    var result = loader.apply(_.assign({}, webpack, { context: similarComponentNamesDir }), [content, { file: 'Component.vue.js' }]);
+
+    assert.strictEqual(result, expected);
+  });
+
+  it('should has two parts even when similar component names occurs - second component', function () {
+    var content = require(similarComponentNamesDir + 'SimilarComponent.vue');
+
+    var expected = '<template separated src="' + similarComponentNamesDir + 'SimilarComponent.vue.html" lang="html"></template>' +
+      '<script separated src="' + similarComponentNamesDir + 'SimilarComponent.vue.js" lang="js"></script>';
+
+    var result = loader.apply(_.assign({}, webpack, { context: similarComponentNamesDir }), [content, { file: 'SimilarComponent.vue.js' }]);
+
+    assert.strictEqual(result, expected);
+  });
 });