mirror of
https://gitee.com/vant-contrib/vant.git
synced 2025-04-06 03:57:59 +08:00
fix(vant-cli): pnpm compatibility (#10214)
* fix(vant-cli): pnpm compatibility * chore: clean code, semantic naming
This commit is contained in:
parent
34d958f1a1
commit
2f978ad75c
@ -36,11 +36,7 @@ export const SITE_SRC_DIR = join(__dirname, '..', '..', 'site');
|
|||||||
// Dist files
|
// Dist files
|
||||||
export const PACKAGE_ENTRY_FILE = join(DIST_DIR, 'package-entry.js');
|
export const PACKAGE_ENTRY_FILE = join(DIST_DIR, 'package-entry.js');
|
||||||
export const PACKAGE_STYLE_FILE = join(DIST_DIR, 'package-style.css');
|
export const PACKAGE_STYLE_FILE = join(DIST_DIR, 'package-style.css');
|
||||||
export const SITE_MOBILE_SHARED_FILE = join(DIST_DIR, 'site-mobile-shared.js');
|
|
||||||
export const SITE_DESKTOP_SHARED_FILE = join(
|
|
||||||
DIST_DIR,
|
|
||||||
'site-desktop-shared.js'
|
|
||||||
);
|
|
||||||
export const STYLE_DEPS_JSON_FILE = join(DIST_DIR, 'style-deps.json');
|
export const STYLE_DEPS_JSON_FILE = join(DIST_DIR, 'style-deps.json');
|
||||||
|
|
||||||
// Config files
|
// Config files
|
||||||
|
@ -5,27 +5,18 @@ import {
|
|||||||
getViteConfigForSiteDev,
|
getViteConfigForSiteDev,
|
||||||
getViteConfigForSiteProd,
|
getViteConfigForSiteProd,
|
||||||
} from '../config/vite.site.js';
|
} from '../config/vite.site.js';
|
||||||
import { mergeCustomViteConfig, replaceExt } from '../common/index.js';
|
import { mergeCustomViteConfig } from '../common/index.js';
|
||||||
import { CSS_LANG } from '../common/css.js';
|
|
||||||
import { genPackageEntry } from './gen-package-entry.js';
|
import { genPackageEntry } from './gen-package-entry.js';
|
||||||
import { genPackageStyle } from './gen-package-style.js';
|
|
||||||
import { genSiteMobileShared } from './gen-site-mobile-shared.js';
|
|
||||||
import { genSiteDesktopShared } from './gen-site-desktop-shared.js';
|
|
||||||
import { genStyleDepsMap } from './gen-style-deps-map.js';
|
import { genStyleDepsMap } from './gen-style-deps-map.js';
|
||||||
import { PACKAGE_ENTRY_FILE, PACKAGE_STYLE_FILE } from '../common/constant.js';
|
import { PACKAGE_ENTRY_FILE } from '../common/constant.js';
|
||||||
|
|
||||||
export async function genSiteEntry(): Promise<void> {
|
export function genSiteEntry(): Promise<void> {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
genStyleDepsMap()
|
genStyleDepsMap()
|
||||||
.then(() => {
|
.then(() => {
|
||||||
genPackageEntry({
|
genPackageEntry({
|
||||||
outputPath: PACKAGE_ENTRY_FILE,
|
outputPath: PACKAGE_ENTRY_FILE,
|
||||||
});
|
});
|
||||||
genPackageStyle({
|
|
||||||
outputPath: replaceExt(PACKAGE_STYLE_FILE, `.${CSS_LANG}`),
|
|
||||||
});
|
|
||||||
genSiteMobileShared();
|
|
||||||
genSiteDesktopShared();
|
|
||||||
resolve();
|
resolve();
|
||||||
})
|
})
|
||||||
.catch((err) => {
|
.catch((err) => {
|
||||||
|
@ -6,11 +6,11 @@ import { CSS_LANG, getCssBaseFile } from '../common/css.js';
|
|||||||
import { SRC_DIR, STYLE_DEPS_JSON_FILE } from '../common/constant.js';
|
import { SRC_DIR, STYLE_DEPS_JSON_FILE } from '../common/constant.js';
|
||||||
|
|
||||||
type Options = {
|
type Options = {
|
||||||
outputPath: string;
|
outputPath?: string;
|
||||||
pathResolver?: (path: string) => string;
|
pathResolver?: (path: string) => string;
|
||||||
};
|
};
|
||||||
|
|
||||||
export function genPackageStyle(options: Options) {
|
export function genPackageStyle(options: Options = {}) {
|
||||||
const require = createRequire(import.meta.url);
|
const require = createRequire(import.meta.url);
|
||||||
const styleDepsJson = require(STYLE_DEPS_JSON_FILE);
|
const styleDepsJson = require(STYLE_DEPS_JSON_FILE);
|
||||||
const ext = '.' + CSS_LANG;
|
const ext = '.' + CSS_LANG;
|
||||||
@ -43,5 +43,9 @@ export function genPackageStyle(options: Options) {
|
|||||||
.filter((item: string) => !!item)
|
.filter((item: string) => !!item)
|
||||||
.join('\n');
|
.join('\n');
|
||||||
|
|
||||||
smartOutputFile(options.outputPath, content);
|
if (options.outputPath) {
|
||||||
|
smartOutputFile(options.outputPath, content);
|
||||||
|
} else {
|
||||||
|
return content;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -5,7 +5,6 @@ import {
|
|||||||
isDev,
|
isDev,
|
||||||
pascalize,
|
pascalize,
|
||||||
getVantConfig,
|
getVantConfig,
|
||||||
smartOutputFile,
|
|
||||||
normalizePath,
|
normalizePath,
|
||||||
} from '../common/index.js';
|
} from '../common/index.js';
|
||||||
import {
|
import {
|
||||||
@ -13,7 +12,6 @@ import {
|
|||||||
DOCS_DIR,
|
DOCS_DIR,
|
||||||
getPackageJson,
|
getPackageJson,
|
||||||
VANT_CONFIG_FILE,
|
VANT_CONFIG_FILE,
|
||||||
SITE_DESKTOP_SHARED_FILE,
|
|
||||||
} from '../common/constant.js';
|
} from '../common/constant.js';
|
||||||
|
|
||||||
type DocumentItem = {
|
type DocumentItem = {
|
||||||
@ -122,5 +120,5 @@ ${genExportDocuments(documents)}
|
|||||||
${genExportVersion()}
|
${genExportVersion()}
|
||||||
`;
|
`;
|
||||||
|
|
||||||
smartOutputFile(SITE_DESKTOP_SHARED_FILE, code);
|
return code;
|
||||||
}
|
}
|
||||||
|
@ -1,12 +1,11 @@
|
|||||||
import { join } from 'path';
|
import { join } from 'path';
|
||||||
import { existsSync, readdirSync } from 'fs';
|
import { existsSync, readdirSync } from 'fs';
|
||||||
import { SRC_DIR, SITE_MOBILE_SHARED_FILE } from '../common/constant.js';
|
import { SRC_DIR } from '../common/constant.js';
|
||||||
import {
|
import {
|
||||||
pascalize,
|
pascalize,
|
||||||
removeExt,
|
removeExt,
|
||||||
decamelize,
|
decamelize,
|
||||||
getVantConfig,
|
getVantConfig,
|
||||||
smartOutputFile,
|
|
||||||
normalizePath,
|
normalizePath,
|
||||||
} from '../common/index.js';
|
} from '../common/index.js';
|
||||||
import { CSS_LANG } from '../common/css.js';
|
import { CSS_LANG } from '../common/css.js';
|
||||||
@ -68,7 +67,7 @@ function genCode(components: string[]) {
|
|||||||
}))
|
}))
|
||||||
.filter((item) => existsSync(item.path));
|
.filter((item) => existsSync(item.path));
|
||||||
|
|
||||||
return `import './package-style.${CSS_LANG}';
|
return `import 'package-style.${CSS_LANG}';
|
||||||
${genImports(demos)}
|
${genImports(demos)}
|
||||||
|
|
||||||
${genExports(demos)}
|
${genExports(demos)}
|
||||||
@ -80,5 +79,5 @@ export function genSiteMobileShared() {
|
|||||||
const dirs = readdirSync(SRC_DIR);
|
const dirs = readdirSync(SRC_DIR);
|
||||||
const code = genCode(dirs);
|
const code = genCode(dirs);
|
||||||
|
|
||||||
smartOutputFile(SITE_MOBILE_SHARED_FILE, code);
|
return code;
|
||||||
}
|
}
|
||||||
|
@ -5,15 +5,14 @@ import vitePluginMd from 'vite-plugin-md';
|
|||||||
import vitePluginVue from '@vitejs/plugin-vue';
|
import vitePluginVue from '@vitejs/plugin-vue';
|
||||||
import vitePluginJsx from '@vitejs/plugin-vue-jsx';
|
import vitePluginJsx from '@vitejs/plugin-vue-jsx';
|
||||||
import { setBuildTarget, getVantConfig, isDev } from '../common/index.js';
|
import { setBuildTarget, getVantConfig, isDev } from '../common/index.js';
|
||||||
import {
|
import { SITE_DIST_DIR, SITE_SRC_DIR } from '../common/constant.js';
|
||||||
SITE_DIST_DIR,
|
|
||||||
SITE_MOBILE_SHARED_FILE,
|
|
||||||
SITE_DESKTOP_SHARED_FILE,
|
|
||||||
SITE_SRC_DIR,
|
|
||||||
} from '../common/constant.js';
|
|
||||||
import { injectHtml } from 'vite-plugin-html';
|
import { injectHtml } from 'vite-plugin-html';
|
||||||
import type { InlineConfig } from 'vite';
|
import type { InlineConfig, PluginOption } from 'vite';
|
||||||
import type MarkdownIt from 'markdown-it';
|
import type MarkdownIt from 'markdown-it';
|
||||||
|
import { genSiteMobileShared } from '../compiler/gen-site-mobile-shared.js';
|
||||||
|
import { genSiteDesktopShared } from '../compiler/gen-site-desktop-shared.js';
|
||||||
|
import { genPackageStyle } from '../compiler/gen-package-style.js';
|
||||||
|
import { CSS_LANG } from '../common/css.js';
|
||||||
|
|
||||||
function markdownHighlight(str: string, lang: string) {
|
function markdownHighlight(str: string, lang: string) {
|
||||||
if (lang && hljs.getLanguage(lang)) {
|
if (lang && hljs.getLanguage(lang)) {
|
||||||
@ -92,6 +91,46 @@ function getHTMLMeta(vantConfig: any) {
|
|||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function vitePluginGenVantBaseCode(): PluginOption {
|
||||||
|
const virtualMobileModuleId = 'site-mobile-shared';
|
||||||
|
const resolvedMobileVirtualModuleId = `vant-cli:${virtualMobileModuleId}`;
|
||||||
|
|
||||||
|
const virtualDesktopModuleId = 'site-desktop-shared';
|
||||||
|
const resolvedDesktopVirtualModuleId = `vant-cli:${virtualDesktopModuleId}`;
|
||||||
|
|
||||||
|
const virtualPackageStyleModuleId = /package-style/;
|
||||||
|
const resolvedPackageStyleVirtualModuleId = `vant-cli${virtualPackageStyleModuleId}index.${CSS_LANG}`;
|
||||||
|
|
||||||
|
return {
|
||||||
|
name: 'vite-plugin(vant-cli):gen-site-base-code',
|
||||||
|
resolveId(id) {
|
||||||
|
if (id === virtualMobileModuleId) {
|
||||||
|
return resolvedMobileVirtualModuleId;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (id === virtualDesktopModuleId) {
|
||||||
|
return resolvedDesktopVirtualModuleId;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (virtualPackageStyleModuleId.test(id)) {
|
||||||
|
return resolvedPackageStyleVirtualModuleId;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
load(id) {
|
||||||
|
switch (id) {
|
||||||
|
case resolvedMobileVirtualModuleId:
|
||||||
|
return genSiteMobileShared();
|
||||||
|
case resolvedDesktopVirtualModuleId:
|
||||||
|
return genSiteDesktopShared();
|
||||||
|
case resolvedPackageStyleVirtualModuleId:
|
||||||
|
return genPackageStyle();
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
export function getViteConfigForSiteDev(): InlineConfig {
|
export function getViteConfigForSiteDev(): InlineConfig {
|
||||||
setBuildTarget('site');
|
setBuildTarget('site');
|
||||||
|
|
||||||
@ -105,6 +144,7 @@ export function getViteConfigForSiteDev(): InlineConfig {
|
|||||||
root: SITE_SRC_DIR,
|
root: SITE_SRC_DIR,
|
||||||
|
|
||||||
plugins: [
|
plugins: [
|
||||||
|
vitePluginGenVantBaseCode(),
|
||||||
vitePluginVue({
|
vitePluginVue({
|
||||||
include: [/\.vue$/, /\.md$/],
|
include: [/\.vue$/, /\.md$/],
|
||||||
}),
|
}),
|
||||||
@ -145,13 +185,6 @@ export function getViteConfigForSiteDev(): InlineConfig {
|
|||||||
}),
|
}),
|
||||||
],
|
],
|
||||||
|
|
||||||
resolve: {
|
|
||||||
alias: {
|
|
||||||
'site-mobile-shared': SITE_MOBILE_SHARED_FILE,
|
|
||||||
'site-desktop-shared': SITE_DESKTOP_SHARED_FILE,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
|
|
||||||
server: {
|
server: {
|
||||||
host: '0.0.0.0',
|
host: '0.0.0.0',
|
||||||
},
|
},
|
||||||
|
Loading…
x
Reference in New Issue
Block a user