Skip to content
This repository was archived by the owner on Jan 18, 2022. It is now read-only.

Fix 97, Import files in less #98

Merged
merged 4 commits into from
Jul 24, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/style/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { writeFile, mkdirSync as mkdir, existsSync as exists } from 'fs'
import { dirname, isAbsolute, resolve as resolvePath } from 'path'
import compileCSS from './css'
import compileSCSS from './scss'
import compileLESS from './less'
import compileLESS from './less/index'
import compileSTYLUS from './stylus'

const compilers = {
Expand Down
20 changes: 0 additions & 20 deletions src/style/less.js

This file was deleted.

27 changes: 27 additions & 0 deletions src/style/less/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import path from 'path'

export default async function (style, options) {
const less = require('less')
const config = {
plugins: [],
paths: [],
sourceMap: {
sourceMapFullFilename: style.id,
sourceMapFileInline: false
},
...options.less
}

config.paths.unshift(path.dirname(style.id))

const { css, map } = await less.render(
'data' in options.less ? `${options.less.data}\n${style.code}` : style.code, config
)

style.$compiled = {
code: css.toString(),
map: map.toString()
}

return style
}
3 changes: 3 additions & 0 deletions test/expects/import-less.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.hello {
color: red;
}
3 changes: 3 additions & 0 deletions test/expects/import-less.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
var importLess = { template: "<div class=\"hello\"></div>",};

export default importLess;
2 changes: 2 additions & 0 deletions test/expects/import-scss.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.hello {
color: red; }
3 changes: 3 additions & 0 deletions test/expects/import-scss.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
var importScss = { template: "<div class=\"hello\"></div>",};

export default importScss;
11 changes: 11 additions & 0 deletions test/fixtures/import-less.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<template>
<div class="hello"></div>
</template>

<script>
export default {}
</script>

<style lang="less">
@import './some.less';
</style>
11 changes: 11 additions & 0 deletions test/fixtures/import-scss.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<template>
<div class="hello"></div>
</template>

<script>
export default {}
</script>

<style lang="scss">
@import './some.scss';
</style>
5 changes: 5 additions & 0 deletions test/fixtures/some.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
@var: red;

.hello {
color: @var;
}
5 changes: 5 additions & 0 deletions test/fixtures/some.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
$var: red;

.hello {
color: $var;
}
8 changes: 5 additions & 3 deletions test/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,16 @@ function test(name) {

// Check css output
if ([
'style',
'css-modules',
'css-modules-static',
'import-scss',
'import-less',
'less',
'pug',
'scoped-css',
'scoped-css-with-no-auto-style',
'scss',
'pug',
'less',
'style',
'stylus'
].indexOf(name) > -1) {
var css = read('expects/' + name + '.css')
Expand Down