From 42c3bf113ea1b372c785dc4ca0e93b85abfb4514 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=87=E5=A4=A9?= Date: Mon, 3 Dec 2018 10:57:30 +0800 Subject: [PATCH] update --- index.js | 97 ++++++++++++++++++++++++++++------------------------ package.json | 23 +++++++------ 2 files changed, 64 insertions(+), 56 deletions(-) diff --git a/index.js b/index.js index e477e7f..bd5a7ce 100644 --- a/index.js +++ b/index.js @@ -10,9 +10,11 @@ const vsc = require('vscode') const path = require('path') const cp = require('child_process') +const fs = require('iofs') const scss = require('node-sass') const postcss = require('postcss') const autoprefixer = require('autoprefixer') +const prefixer = postcss().use(autoprefixer()) const std = vsc.window.createOutputChannel('scss-to-css') std.out = function() { @@ -22,24 +24,47 @@ const log = function(...args) { console.log.apply(console, args) } -let compileOpts = { +const render = function(style, file) { + return new Promise((resolve, reject) => { + scss.render({ outputStyle: style, file }, (err, { css }) => { + if (err) { + reject(err) + } else { + resolve(css) + } + }) + }) +} + +let options = { compileOnSave: true, autoPrefixer: true, output: 'compressed', - sourcemap: false, exclude: '' } -const exec = function(arr, cb) { - let cmd = arr.join(' ') - return new Promise((yes, no) => { - cp.exec(cmd, (err, out) => { - if (err) { - no('err: ' + err) - } else { - yes(arr) - } - }) +// const exec = function(arr, cb) { +// let cmd = arr.join(' ') +// return new Promise((yes, no) => { +// cp.exec(cmd, (err, out) => { +// if (err) { +// no('err: ' + err) +// } else { +// yes(arr) +// } +// }) +// }) +// } + +const compileCss = (style, entry, output) => { + return render(style, entry).then(css => { + if (options.autoPrefixer) { + return prefixer.process(css, { from: '', to: '' }).then(result => { + return { css: result.css, output } + }) + } else { + return { css, output } + } }) } @@ -48,57 +73,40 @@ const Compiler = { let origin = doc.fileName || '' let target = origin.replace(/\.scss$/, '.') let task = [] - let postArgs = ['postcss', '--no-map', '-r', '-u', 'autoprefixer'] // 说明不是scss文件 if (origin === target) { return } - task = compileOpts.output.map(type => { - let cmd = ['scss', '-C', '-t', type] + task = options.output.map(style => { let ext = 'css' - if (compileOpts.sourcemap) { - cmd.push('--sourcemap=auto') - } else { - cmd.push('--sourcemap=none') - } - switch (type) { + switch (style) { case 'compressed': ext = 'min.' + ext break default: - ext = type.slice(0, 1) + '.' + ext + ext = style.slice(0, 1) + '.' + ext } - cmd.push(origin, target + ext) - return cmd + return { style, output: target + ext } }) // 编译单一类型, 则去掉文件名微调 if (task.length === 1) { - task[0].pop() - task[0].push(target + 'css') + task[0].output = target + 'css' } task = task.map(item => { - return exec(item) + return compileCss(item.style, origin, item.output) }) Promise.all(task) .then(list => { - if (compileOpts.autoPrefixer) { - let task2 = list.map(cmd => { - let arr = postArgs.concat() - arr.splice(1, 0, cmd.pop()) - return exec(arr) - }) - - return Promise.all(task2) - } else { - return true - } + list.forEach(it => { + fs.echo(it.css, it.output) + }) }) .catch(err => { log(err) @@ -110,9 +118,8 @@ const Compiler = { * 用于保存时编译的动作, 右键编译时, 不过滤这2项 */ filter(doc) { - log(doc) // 未开启保存时编译 - if (!compileOpts.compileOnSave) { + if (!options.compileOnSave) { return } @@ -124,8 +131,8 @@ const Compiler = { } // 过滤不编译的文件 - if (compileOpts.exclude) { - let exp = new RegExp(compileOpts.exclude, 'i') + if (options.exclude) { + let exp = new RegExp(options.exclude, 'i') if (exp.test(origin)) { return } @@ -137,10 +144,10 @@ const Compiler = { function activate(ctx) { // log('hello, the extend scss-compiler is running....') - let options = vsc.workspace.getConfiguration('ScssCompiler') - Object.assign(compileOpts, options) + let conf = vsc.workspace.getConfiguration('Scss2css') + Object.assign(options, conf) - compileOpts.output = compileOpts.output.split('|') + options.output = options.output.split('|').map(it => it.trim()) vsc.workspace.onDidSaveTextDocument(doc => { Compiler.filter(doc) diff --git a/package.json b/package.json index 85b0acd..e0fbc10 100644 --- a/package.json +++ b/package.json @@ -19,35 +19,30 @@ "contributes": { "context": [ { - "command": "ScssCompiler.compile", + "command": "Scss2css.compile", "title": "Compile this scss file" } ], "configuration": { "type": "object", - "title": "scss-compiler 配置", + "title": "Scss-to-css 配置", "properties": { - "ScssCompiler.compileOnSave": { + "Scss2css.compileOnSave": { "type": "boolean", "default": true, "description": "保存后自动编译" }, - "ScssCompiler.autoPrefixer": { + "Scss2css.autoPrefixer": { "type": "boolean", "default": true, "description": "是否自动补全浏览器前缀(可以手动在项目目录添加 .browserslistrc)" }, - "ScssCompiler.output": { + "Scss2css.output": { "type": "string", "default": "compressed", "description": "css 文件输出方式. 使用 \"nested\", \"expanded\", \"compact\" or \"compressed\" .\n PS. 如果需要同时编译多种, 可用'|' 分隔, 如 compact | compressed \n 注: 如果编译多种,会自动微调文件名, 编译单个则不微调。" }, - "ScssCompiler.sourcemap": { - "type": "boolean", - "default": false, - "description": "是否生成sourcemap,默认否" - }, - "ScssCompiler.exclude": { + "Scss2css.exclude": { "type": "string", "default": "", "description": "要忽略的文件的正则表达式(默认不编译var.scss文件)。" @@ -61,5 +56,11 @@ "license": "MIT", "devDependencies": { "vscode": "^1.1.21" + }, + "dependencies": { + "node-sass": "^4.10.0", + "iofs": "^1.1.0", + "postcss": "^7.0.6", + "autoprefixer": "^9.3.1" } }