Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-27 08:02:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3315 from sumcumo/webpack-inline-loader-support

Browse Source 
fix(lib): ensure webpack inline loaders stay prefixed
This commit is contained in:
Sébastien Chopin 2018-05-14 09:06:19 +02:00 committed by GitHub
commit 2b9a87787b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/common/utils.js
View File

@ -153,6 +153,13 @@ export const relativeTo = function relativeTo() {
let args = Array.prototype.slice.apply(arguments)
let dir = args.shift()
// Keep webpack inline loader intact
if (args[0].indexOf('!') !== -1) {
const loaders = args.shift().split('!')
return loaders.concat(relativeTo(dir, loaders.pop(), ...args)).join('!')
}
// Resolve path
let _path = r(...args)

15
test/unit/utils.test.js
View File

@ -1,3 +1,4 @@
import path from 'path'
import { Utils } from '../utils'
describe('utils', () => {
@ -216,6 +217,20 @@ describe('utils', () => {
])
expect(routes).toMatchObject([ '/login', '/about', '', '/post' ])
})
describe('relativeTo', () => {
const path1 = path.join(path.sep, 'foo', 'bar')
const path2 = path.join(path.sep, 'foo', 'baz')
test('makes path relative to dir', () => {
expect(Utils.relativeTo(path1, path2)).toBe(Utils.wp(`..${path.sep}baz`))
})
test('keeps webpack inline loaders prepended', () => {
expect(Utils.relativeTo(path1, `loader1!loader2!${path2}`))
.toBe(Utils.wp(`loader1!loader2!..${path.sep}baz`))
})
})
})
test('createRoutes should allow snake case routes', () => {