From 4424b77cbc9f2a632ddc6013aa48d846a09807e4 Mon Sep 17 00:00:00 2001 From: jczzq <1195262383@qq.com> Date: Sun, 5 Jan 2020 09:48:49 +0800 Subject: [PATCH] fix(vant-cli): replace \ to / in path #5431 (#5473) --- packages/vant-cli/src/common/index.ts | 4 ++++ packages/vant-cli/src/compiler/gen-package-entry.ts | 4 ++-- packages/vant-cli/src/compiler/gen-package-style.ts | 6 +++--- .../vant-cli/src/compiler/gen-site-desktop-shared.ts | 11 ++++++----- .../vant-cli/src/compiler/gen-site-mobile-shared.ts | 5 +++-- 5 files changed, 18 insertions(+), 12 deletions(-) diff --git a/packages/vant-cli/src/common/index.ts b/packages/vant-cli/src/common/index.ts index a4bf6cf67..54204c045 100644 --- a/packages/vant-cli/src/common/index.ts +++ b/packages/vant-cli/src/common/index.ts @@ -91,6 +91,10 @@ export function decamelize(str: string, sep = '-') { .toLowerCase(); } +export function normalizePath(path: string): string { + return path.replace(/\\/g, '/'); +} + export function getWebpackConfig(): object { if (existsSync(WEBPACK_CONFIG_FILE)) { const config = require(WEBPACK_CONFIG_FILE); diff --git a/packages/vant-cli/src/compiler/gen-package-entry.ts b/packages/vant-cli/src/compiler/gen-package-entry.ts index e14dff1c3..b8a242256 100644 --- a/packages/vant-cli/src/compiler/gen-package-entry.ts +++ b/packages/vant-cli/src/compiler/gen-package-entry.ts @@ -1,6 +1,6 @@ import { get } from 'lodash'; import { join } from 'path'; -import { pascalize, getComponents, smartOutputFile } from '../common'; +import { pascalize, getComponents, smartOutputFile, normalizePath } from '../common'; import { SRC_DIR, getPackageJson, getVantConfig } from '../common/constant'; type Options = { @@ -16,7 +16,7 @@ function genImports(components: string[], options: Options): string { path = options.pathResolver(path); } - return `import ${pascalize(name)} from '${path}';`; + return `import ${pascalize(name)} from '${normalizePath(path)}';`; }) .join('\n'); } diff --git a/packages/vant-cli/src/compiler/gen-package-style.ts b/packages/vant-cli/src/compiler/gen-package-style.ts index 07293caa6..7a87d156b 100644 --- a/packages/vant-cli/src/compiler/gen-package-style.ts +++ b/packages/vant-cli/src/compiler/gen-package-style.ts @@ -1,6 +1,6 @@ import { join } from 'path'; import { existsSync } from 'fs-extra'; -import { smartOutputFile } from '../common'; +import { smartOutputFile, normalizePath } from '../common'; import { CSS_LANG, getCssBaseFile } from '../common/css'; import { SRC_DIR, STYPE_DEPS_JSON_FILE } from '../common/constant'; @@ -21,7 +21,7 @@ export function genPacakgeStyle(options: Options) { baseFile = options.pathResolver(baseFile); } - content += `@import "${baseFile}";\n`; + content += `@import "${normalizePath(baseFile)}";\n`; } content += styleDepsJson.sequence @@ -36,7 +36,7 @@ export function genPacakgeStyle(options: Options) { path = options.pathResolver(path); } - return `@import "${path}";`; + return `@import "${normalizePath(path)}";`; }) .filter((item: string) => !!item) .join('\n'); diff --git a/packages/vant-cli/src/compiler/gen-site-desktop-shared.ts b/packages/vant-cli/src/compiler/gen-site-desktop-shared.ts index 1219374e0..6df436955 100644 --- a/packages/vant-cli/src/compiler/gen-site-desktop-shared.ts +++ b/packages/vant-cli/src/compiler/gen-site-desktop-shared.ts @@ -5,7 +5,8 @@ import { pascalize, removeExt, getVantConfig, - smartOutputFile + smartOutputFile, + normalizePath } from '../common'; import { SRC_DIR, @@ -65,19 +66,19 @@ function resolveDocuments(components: string[]): DocumentItem[] { } const staticDocs = glob.sync(join(DOCS_DIR, '**/*.md')).map(path => { - const pairs = parse(path).name.split('.'); + const pairs = parse(path.toString()).name.split('.'); return { name: formatName(pairs[0], pairs[1] || defaultLang), path }; }); - return [...staticDocs, ...docs.filter(item => existsSync(item.path))]; + return [...staticDocs, ...docs.filter(item => existsSync(item.path))] as DocumentItem[]; } function genImportDocuments(items: DocumentItem[]) { return items - .map(item => `import ${item.name} from '${item.path}';`) + .map(item => `import ${item.name} from '${normalizePath(item.path)}';`) .join('\n'); } @@ -88,7 +89,7 @@ function genExportDocuments(items: DocumentItem[]) { } function genImportConfig() { - return `import config from '${removeExt(VANT_CONFIG_FILE)}';`; + return `import config from '${removeExt(normalizePath(VANT_CONFIG_FILE))}';`; } function genExportConfig() { diff --git a/packages/vant-cli/src/compiler/gen-site-mobile-shared.ts b/packages/vant-cli/src/compiler/gen-site-mobile-shared.ts index 2a632daac..3fc0bbd01 100644 --- a/packages/vant-cli/src/compiler/gen-site-mobile-shared.ts +++ b/packages/vant-cli/src/compiler/gen-site-mobile-shared.ts @@ -6,7 +6,8 @@ import { removeExt, decamelize, getVantConfig, - smartOutputFile + smartOutputFile, + normalizePath } from '../common'; type DemoItem = { @@ -24,7 +25,7 @@ import './package-style'; function genImports(demos: DemoItem[]) { return demos - .map(item => `import ${item.name} from '${removeExt(item.path)}';`) + .map(item => `import ${item.name} from '${removeExt(normalizePath(item.path))}';`) .join('\n'); }