From 29a799cae685dd38835d84edb887d33a867a30da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Fri, 10 Jan 2020 14:20:57 +0800 Subject: [PATCH] chore(cli): move replaceCssImport fn --- packages/vant-cli/src/common/css.ts | 9 +++++++++ packages/vant-cli/src/compiler/compile-js.ts | 14 ++------------ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/packages/vant-cli/src/common/css.ts b/packages/vant-cli/src/common/css.ts index a5192ff71..72cd04011 100644 --- a/packages/vant-cli/src/common/css.ts +++ b/packages/vant-cli/src/common/css.ts @@ -34,3 +34,12 @@ export function getCssBaseFile() { return null; } + +const IMPORT_STYLE_RE = /import\s+?(?:(?:".*?")|(?:'.*?'))[\s]*?(?:;|$|)/g; + +// "import 'a.less';" => "import 'a.css';" +export function replaceCssImport(code: string) { + return code.replace(IMPORT_STYLE_RE, str => + str.replace(`.${CSS_LANG}`, '.css') + ); +} diff --git a/packages/vant-cli/src/compiler/compile-js.ts b/packages/vant-cli/src/compiler/compile-js.ts index b5895ee74..cc603bd57 100644 --- a/packages/vant-cli/src/compiler/compile-js.ts +++ b/packages/vant-cli/src/compiler/compile-js.ts @@ -1,23 +1,13 @@ -// @ts-ignore import { transformAsync } from '@babel/core'; import { readFileSync, removeSync, outputFileSync } from 'fs-extra'; import { replaceExt } from '../common'; -import { CSS_LANG } from '../common/css'; - -const IMPORT_STYLE_RE = /import\s+?(?:(?:".*?")|(?:'.*?'))[\s]*?(?:;|$|)/g; - -// "import 'a.less';" => "import 'a.css';" -function replaceStyleImport(code: string) { - return code.replace(IMPORT_STYLE_RE, str => - str.replace(`.${CSS_LANG}`, '.css') - ); -} +import { replaceCssImport } from '../common/css'; export function compileJs(filePath: string): Promise { return new Promise((resolve, reject) => { let code = readFileSync(filePath, 'utf-8'); - code = replaceStyleImport(code); + code = replaceCssImport(code); transformAsync(code, { filename: filePath }) .then(result => {