Test for the full path - closes #222

laravel-mix · Jan 30, 2017 · 9d9c52f · 9d9c52f
1 parent b2808ca
commit 9d9c52f
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/setup/webpack.config.js b/setup/webpack.config.js
@@ -125,7 +125,7 @@ if (Mix.preprocessors) {
         let sourceMap = Mix.sourcemaps ? '?sourceMap' : '';
 
         module.exports.module.rules.push({
-            test: new RegExp(toCompile.src.fileWithDir.replace(/\\/g, '\\\\') + '$'),
+            test: new RegExp(toCompile.src.path.replace(/\\/g, '\\\\') + '$'),
             loader: extractPlugin.extract({
                 fallbackLoader: 'style-loader',
                 loader: [

diff --git a/src/File.js b/src/File.js
@@ -105,7 +105,6 @@ class File {
             hashedPath: path.join(outputSegments.dir, `${outputSegments.name}.[hash]${outputSegments.ext}`),
             base: outputSegments.dir,
             file: outputSegments.base,
-            fileWithDir: path.join(outputSegments.dir.split('/').pop(), outputSegments.base),
             hashedFile: `${outputSegments.name}.[hash]${outputSegments.ext}`,
             name: outputSegments.name,
             isDir: ! outputSegments.ext,

diff --git a/test/file.js b/test/file.js
@@ -11,7 +11,6 @@ test('that it parses a path into segments', t => {
         hashedPath: 'some/path/to/a/file.[hash].txt',
         base: 'some/path/to/a',
         file: 'file.txt',
-        fileWithDir: 'a/file.txt',
         hashedFile: 'file.[hash].txt',
         name: 'file',
         isDir: false,