From 29d2024348bf2ec24ea1fd06f0dec94264e6de29 Mon Sep 17 00:00:00 2001 From: neverland Date: Mon, 17 Dec 2018 22:33:33 +0800 Subject: [PATCH] [bugfix] gulp-less import (#2319) --- build/build-style.js | 5 ++++- build/webpack.dev.js | 7 ++++++- packages/icon/index.less | 2 +- packages/icon/local.less | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/build/build-style.js b/build/build-style.js index 9c0fd1263..90a3dd30c 100644 --- a/build/build-style.js +++ b/build/build-style.js @@ -1,3 +1,4 @@ +const path = require('path'); const gulp = require('gulp'); const less = require('gulp-less'); const csso = require('gulp-csso'); @@ -7,7 +8,9 @@ const postcss = require('gulp-postcss'); gulp.task('compile', () => ( gulp .src(['../es/**/*.less', '../lib/**/*.less']) - .pipe(less()) + .pipe(less({ + paths: [path.resolve(__dirname, 'node_modules')] + })) .pipe(postcss()) .pipe(csso()) .pipe(gulp.dest(file => file.base.replace('.less', '.css'))) diff --git a/build/webpack.dev.js b/build/webpack.dev.js index 3d680abb4..60264077c 100644 --- a/build/webpack.dev.js +++ b/build/webpack.dev.js @@ -61,7 +61,12 @@ module.exports = { 'style-loader', 'css-loader', 'postcss-loader', - 'less-loader' + { + loader: 'less-loader', + options: { + paths: [path.resolve(__dirname, 'node_modules')] + } + } ] }, { diff --git a/packages/icon/index.less b/packages/icon/index.less index 2c7e557ec..0ff68fc56 100644 --- a/packages/icon/index.less +++ b/packages/icon/index.less @@ -1,5 +1,5 @@ @import '../style/var'; -@import '~@vant/icons/src/index.less'; +@import '@vant/icons/src/index.less'; .van-icon { &--image { diff --git a/packages/icon/local.less b/packages/icon/local.less index 8232ecf08..22d07dda6 100644 --- a/packages/icon/local.less +++ b/packages/icon/local.less @@ -1 +1 @@ -@import '~@vant/icons/src/encode.less'; +@import '@vant/icons/src/encode.less';