@varlet/cli 2.9.5 → 2.9.6-alpha.1680971883189

package/lib/node/bin.js

@@ -6,6 +6,7 @@ program.version(`varlet-cli ${getCliVersion()}`).usage('<command> [options]');
 program
     .command('dev')
     .option('-f --force', 'Force dep pre-optimization regardless of whether deps have changed')
+    .option('-d --draft', 'Start the service in draft mode')
     .description('Run varlet development environment')
     .action(async (options) => {
     const { dev } = await import('./commands/dev.js');

package/lib/node/commands/build.js

@@ -8,7 +8,7 @@ const { ensureDirSync } = fse;
 export async function build() {
     process.env.NODE_ENV = 'production';
     ensureDirSync(SRC_DIR);
-    await buildSiteEntry();
+    await buildSiteEntry(false);
     const varletConfig = await getVarletConfig();
     const buildConfig = getBuildConfig(varletConfig);
     await buildVite(buildConfig);

package/lib/node/commands/dev.d.ts

@@ -1,5 +1,6 @@
 interface DevCommandOptions {
     force?: boolean;
+    draft?: boolean;
 }
 export declare function dev(options: DevCommandOptions): Promise<void>;
 export {};

package/lib/node/commands/dev.js

@@ -10,29 +10,33 @@ import { merge } from 'lodash-es';
 const { ensureDirSync, pathExistsSync } = fse;
 let server;
 let watcher;
-async function startServer(force) {
+async function startServer(options) {
+    var _a;
     const isRestart = Boolean(server);
     logger.info(`${isRestart ? 'Res' : 'S'}tarting server...`);
     // close all instance
     server && (await server.close());
     watcher && (await watcher.close());
     // build all config
-    await buildSiteEntry();
+    await buildSiteEntry((_a = options.draft) !== null && _a !== void 0 ? _a : false);
     const varletConfig = await getVarletConfig();
     const devConfig = getDevConfig(varletConfig);
-    const inlineConfig = merge(devConfig, force ? { optimizeDeps: { force: true } } : {});
+    const inlineConfig = merge(devConfig, options.force ? { optimizeDeps: { force: true } } : {});
     // create all instance
     server = await createServer(inlineConfig);
     await server.listen();
     server.printUrls();
     if (pathExistsSync(VARLET_CONFIG)) {
         watcher = chokidar.watch(VARLET_CONFIG);
-        watcher.on('change', () => startServer(force));
+        watcher.on('change', () => startServer(options));
     }
     logger.success(`\n${isRestart ? 'Res' : 'S'}tart successfully!!!`);
+    if (options.draft) {
+        logger.title('Server in draft mode!!!');
+    }
 }
 export async function dev(options) {
     process.env.NODE_ENV = 'development';
     ensureDirSync(SRC_DIR);
-    await startServer(options.force);
+    await startServer(options);
 }

package/lib/node/commands/jest.js

@@ -13,7 +13,7 @@ export async function jest(cmd) {
         config: JEST_CONFIG,
         testRegex: cmd.component && `${cmd.component}/__tests__/.*.spec.[jt]s?$`,
     };
-    await buildSiteEntry();
+    await buildSiteEntry(false);
     try {
         const response = await runCLI(config, [CWD]);
         if (!response.results.success && !cmd.watch) {

package/lib/node/compiler/compileSiteEntry.d.ts

@@ -1,13 +1,18 @@
 export declare function getExampleRoutePath(examplePath: string): string;
 export declare function getComponentDocRoutePath(componentDocsPath: string): string;
 export declare function getRootDocRoutePath(rootDocsPath: string): string;
-export declare function getRootRoutePath(rootLocalePath: string): string;
-export declare function getRootFilePath(rootLocalePath: string): string;
-export declare function findExamples(): Promise<string[]>;
-export declare function findComponentDocs(): Promise<string[]>;
-export declare function findRootDocs(): Promise<string[]>;
-export declare function findRootLocales(): Promise<string[]>;
-export declare function buildMobileSiteRoutes(): Promise<void>;
-export declare function buildPcSiteRoutes(): Promise<void>;
+export declare function getPageRoutePath(rootLocalePath: string): string;
+export declare function getPageFilePath(rootLocalePath: string): string;
+export declare function isDraftExample(example: string): boolean;
+export declare function hasDraftExample(examples: string[], example: string): boolean;
+export declare function isDraftDoc(doc: string): boolean;
+export declare function hasDraftDoc(docs: string[], doc: string): boolean;
+export declare function findExamples(draftMode: boolean): Promise<string[]>;
+export declare function filterDraftDocs(docs: string[], draftMode: boolean): string[];
+export declare function findComponentDocs(draftMode: boolean): Promise<string[]>;
+export declare function findRootDocs(draftMode: boolean): Promise<string[]>;
+export declare function findPageLocales(): Promise<string[]>;
+export declare function buildMobileSiteRoutes(draftMode: boolean): Promise<void>;
+export declare function buildPcSiteRoutes(draftMode: boolean): Promise<void>;
 export declare function buildSiteSource(): Promise<void>;
-export declare function buildSiteEntry(): Promise<void>;
+export declare function buildSiteEntry(draftMode: boolean): Promise<void>;

package/lib/node/compiler/compileSiteEntry.js

@@ -1,17 +1,17 @@
 import slash from 'slash';
 import fse from 'fs-extra';
-import { DOCS_DIR_NAME, DIR_INDEX, EXAMPLE_DIR_NAME, LOCALE_DIR_NAME, ROOT_DOCS_DIR, ROOT_PAGES_DIR, SITE, SITE_DIR, SITE_MOBILE_ROUTES, SITE_PC_DIR, SITE_PC_ROUTES, SRC_DIR, } from '../shared/constant.js';
+import { DOCS_DIR_NAME, EXAMPLE_DIR_NAME, LOCALE_DIR_NAME, ROOT_DOCS_DIR, ROOT_PAGES_DIR, SITE, SITE_DIR, SITE_MOBILE_ROUTES, SITE_PC_DIR, SITE_PC_ROUTES, SRC_DIR, } from '../shared/constant.js';
 import { glob, isDir, outputFileSyncOnChange } from '../shared/fsUtils.js';
 import { getVarletConfig } from '../config/varlet.config.js';
 import { get } from 'lodash-es';
 const { copy } = fse;
-const EXAMPLE_COMPONENT_NAME_RE = /\/([-\w]+)\/example\/index.vue/;
-const COMPONENT_DOCS_RE = /\/([-\w]+)\/docs\/([-\w]+)\.md/;
-const ROOT_DOCS_RE = /\/docs\/([-\w]+)\.([-\w]+)\.md/;
-const ROOT_LOCALE_RE = /\/pages\/([-\w]+)\/locale\/([-\w]+)\.ts/;
+const ROOT_DOCS_RE = /\/docs\/([-\w]+)\.([-\w]+)(?:.draft)?\.md/;
+const PAGE_LOCALE_RE = /\/pages\/([-\w]+)\/locale\/([-\w]+)\.ts/;
+const EXAMPLE_INDEX_RE = /\/([-\w]+)\/example\/index(?:.draft)?\.vue/;
+const COMPONENT_DOCS_RE = /\/([-\w]+)\/docs\/([-\w]+)(?:.draft)?\.md/;
 export function getExampleRoutePath(examplePath) {
     var _a;
-    return '/' + ((_a = examplePath.match(EXAMPLE_COMPONENT_NAME_RE)) === null || _a === void 0 ? void 0 : _a[1]);
+    return '/' + ((_a = examplePath.match(EXAMPLE_INDEX_RE)) === null || _a === void 0 ? void 0 : _a[1]);
 }
 export function getComponentDocRoutePath(componentDocsPath) {
     var _a;
@@ -23,24 +23,50 @@ export function getRootDocRoutePath(rootDocsPath) {
     const [, routePath, language] = (_a = rootDocsPath.match(ROOT_DOCS_RE)) !== null && _a !== void 0 ? _a : [];
     return `/${language}/${routePath}`;
 }
-export function getRootRoutePath(rootLocalePath) {
+export function getPageRoutePath(rootLocalePath) {
     var _a;
-    const [, routePath, language] = (_a = rootLocalePath.match(ROOT_LOCALE_RE)) !== null && _a !== void 0 ? _a : [];
+    const [, routePath, language] = (_a = rootLocalePath.match(PAGE_LOCALE_RE)) !== null && _a !== void 0 ? _a : [];
     return `/${language}/${routePath}`;
 }
-export function getRootFilePath(rootLocalePath) {
-    return rootLocalePath.replace(/locale\/.+/, DIR_INDEX);
+export function getPageFilePath(rootLocalePath) {
+    return rootLocalePath.replace(/locale\/.+/, 'index.vue');
 }
-export function findExamples() {
-    return glob(`${SRC_DIR}/**/${EXAMPLE_DIR_NAME}/${DIR_INDEX}`);
+export function isDraftExample(example) {
+    return example.endsWith('index.draft.vue');
 }
-export function findComponentDocs() {
-    return glob(`${SRC_DIR}/**/${DOCS_DIR_NAME}/*.md`);
+export function hasDraftExample(examples, example) {
+    return examples.includes(example.replace('index.vue', 'index.draft.vue'));
 }
-export function findRootDocs() {
-    return glob(`${ROOT_DOCS_DIR}/*.md`);
+export function isDraftDoc(doc) {
+    return doc.endsWith('.draft.md');
 }
-export async function findRootLocales() {
+export function hasDraftDoc(docs, doc) {
+    return docs.includes(doc.replace('.md', '.draft.md'));
+}
+export async function findExamples(draftMode) {
+    const [examples, draftExamples] = await Promise.all([
+        glob(`${SRC_DIR}/**/${EXAMPLE_DIR_NAME}/index.vue`),
+        glob(`${SRC_DIR}/**/${EXAMPLE_DIR_NAME}/index.draft.vue`),
+    ]);
+    const mergedExamples = [...examples, ...draftExamples];
+    return mergedExamples.filter((example) => {
+        return draftMode ? isDraftExample(example) || !hasDraftExample(mergedExamples, example) : !isDraftExample(example);
+    });
+}
+export function filterDraftDocs(docs, draftMode) {
+    return docs.filter((doc) => {
+        return draftMode ? isDraftDoc(doc) || !hasDraftDoc(docs, doc) : !isDraftDoc(doc);
+    });
+}
+export async function findComponentDocs(draftMode) {
+    const componentDocs = await glob(`${SRC_DIR}/**/${DOCS_DIR_NAME}/*.md`);
+    return filterDraftDocs(componentDocs, draftMode);
+}
+export async function findRootDocs(draftMode) {
+    const rootDocs = await glob(`${ROOT_DOCS_DIR}/*.md`);
+    return filterDraftDocs(rootDocs, draftMode);
+}
+export async function findPageLocales() {
     const defaultLanguage = get(await getVarletConfig(), 'defaultLanguage');
     const userPages = await glob(`${ROOT_PAGES_DIR}/*`);
     const baseLocales = await glob(`${SITE}/pc/pages/**/${LOCALE_DIR_NAME}/*.ts`);
@@ -57,18 +83,18 @@ export async function findRootLocales() {
     const filterMap = new Map();
     baseLocales.forEach((locale) => {
         var _a;
-        const [, routePath, language] = (_a = locale.match(ROOT_LOCALE_RE)) !== null && _a !== void 0 ? _a : [];
+        const [, routePath, language] = (_a = locale.match(PAGE_LOCALE_RE)) !== null && _a !== void 0 ? _a : [];
         filterMap.set(routePath + language, slash(`${SITE_PC_DIR}/pages/${routePath}/locale/${language}.ts`));
     });
     userLocales.forEach((locale) => {
         var _a;
-        const [, routePath, language] = (_a = locale.match(ROOT_LOCALE_RE)) !== null && _a !== void 0 ? _a : [];
+        const [, routePath, language] = (_a = locale.match(PAGE_LOCALE_RE)) !== null && _a !== void 0 ? _a : [];
         filterMap.set(routePath + language, locale);
     });
     return Promise.resolve(Array.from(filterMap.values()));
 }
-export async function buildMobileSiteRoutes() {
-    const examples = await findExamples();
+export async function buildMobileSiteRoutes(draftMode) {
+    const examples = await findExamples(draftMode);
     const routes = examples.map((example) => `
   {
     path: '${getExampleRoutePath(example)}',
@@ -80,17 +106,17 @@ export async function buildMobileSiteRoutes() {
 ]`;
     await outputFileSyncOnChange(SITE_MOBILE_ROUTES, source);
 }
-export async function buildPcSiteRoutes() {
+export async function buildPcSiteRoutes(draftMode) {
     const [componentDocs, rootDocs, rootLocales] = await Promise.all([
-        findComponentDocs(),
-        findRootDocs(),
-        findRootLocales(),
+        findComponentDocs(draftMode),
+        findRootDocs(draftMode),
+        findPageLocales(),
     ]);
-    const rootPagesRoutes = rootLocales.map((rootLocale) => `
+    const pageRoutes = rootLocales.map((locale) => `
   {
-    path: '${getRootRoutePath(rootLocale)}',
+    path: '${getPageRoutePath(locale)}',
     // @ts-ignore
-    component: () => import('${getRootFilePath(rootLocale)}')
+    component: () => import('${getPageFilePath(locale)}')
   }\
 `);
     const componentDocsRoutes = componentDocs.map((componentDoc) => `
@@ -114,7 +140,7 @@ export async function buildPcSiteRoutes() {
     ]
   }`;
     const source = `export default [\
-  ${rootPagesRoutes.join(',')},
+  ${pageRoutes.join(',')},
   ${layoutRoutes}
 ]`;
     outputFileSyncOnChange(SITE_PC_ROUTES, source);
@@ -122,7 +148,7 @@ export async function buildPcSiteRoutes() {
 export async function buildSiteSource() {
     return copy(SITE, SITE_DIR);
 }
-export async function buildSiteEntry() {
+export async function buildSiteEntry(draftMode) {
     await getVarletConfig(true);
-    await Promise.all([buildMobileSiteRoutes(), buildPcSiteRoutes(), buildSiteSource()]);
+    await Promise.all([buildMobileSiteRoutes(draftMode), buildPcSiteRoutes(draftMode), buildSiteSource()]);
 }

package/lib/node/shared/constant.d.ts

@@ -16,7 +16,6 @@ export declare const STYLE_DIR_NAME = "style";
 export declare const EXAMPLE_DIR_NAME = "example";
 export declare const LOCALE_DIR_NAME = "locale";
 export declare const DOCS_DIR_NAME = "docs";
-export declare const DIR_INDEX = "index.vue";
 export declare const TESTS_DIR_NAME = "__tests__";
 export declare const GENERATORS_DIR: string;
 export declare const UI_PACKAGE_JSON: string;

package/lib/node/shared/constant.js

@@ -18,7 +18,6 @@ export const STYLE_DIR_NAME = 'style';
 export const EXAMPLE_DIR_NAME = 'example';
 export const LOCALE_DIR_NAME = 'locale';
 export const DOCS_DIR_NAME = 'docs';
-export const DIR_INDEX = 'index.vue';
 export const TESTS_DIR_NAME = '__tests__';
 export const GENERATORS_DIR = resolve(dirname, '../../../template/generators');
 export const UI_PACKAGE_JSON = resolve(CWD, 'package.json');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@varlet/cli",
-  "version": "2.9.5",
+  "version": "2.9.6-alpha.1680971883189",
   "type": "module",
   "description": "cli of varlet",
   "bin": {
@@ -70,8 +70,8 @@
     "vue-jest": "^5.0.0-alpha.8",
     "webfont": "^9.0.0",
     "markdown-it": "^12.2.3",
-    "@varlet/vite-plugins": "2.9.5",
-    "@varlet/shared": "2.9.5"
+    "@varlet/shared": "2.9.6-alpha.1680971883189",
+    "@varlet/vite-plugins": "2.9.6-alpha.1680971883189"
   },
   "devDependencies": {
     "@types/babel__core": "^7.1.12",
@@ -85,8 +85,8 @@
     "@types/semver": "^7.3.9",
     "@types/sharp": "0.31.1",
     "@types/markdown-it": "^12.2.3",
-    "@varlet/touch-emulator": "2.9.5",
-    "@varlet/icons": "2.9.5"
+    "@varlet/touch-emulator": "2.9.6-alpha.1680971883189",
+    "@varlet/icons": "2.9.6-alpha.1680971883189"
   },
   "peerDependencies": {
     "@vue/runtime-core": "3.2.47",
@@ -96,8 +96,8 @@
     "lodash-es": "^4.17.21",
     "vue": "3.2.47",
     "vue-router": "4.1.6",
-    "@varlet/icons": "2.9.5",
-    "@varlet/touch-emulator": "2.9.5"
+    "@varlet/icons": "2.9.6-alpha.1680971883189",
+    "@varlet/touch-emulator": "2.9.6-alpha.1680971883189"
   },
   "scripts": {
     "dev": "tsc --watch",

package/template/generators/base/_gitignore

@@ -5,6 +5,8 @@ node_modules
 .vscode
 *.log
 .DS_Store
+index.draft.vue
+*.draft.md
 
 site
 lib