@varlet/cli 2.7.0-alpha.1673617166404 → 2.7.0-alpha.1673623558342

package/lib/node/bin.js

@@ -42,10 +42,9 @@ program
 program
     .command('compile')
     .description('Compile varlet components library code')
-    .option('-nu, --noUmd', 'Do not compile umd target code')
-    .action(async (options) => {
+    .action(async () => {
     const { compile } = await import('./commands/compile.js');
-    return compile(options);
+    return compile();
 });
 program
     .command('lint')

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

@@ -1,7 +1,3 @@
 export declare function removeDir(): Promise<[void, void, void, void]>;
 export declare function runTask(taskName: string, task: () => any): Promise<void>;
-interface CompileCommandOptions {
-    noUmd?: boolean;
-}
-export declare function compile(options: CompileCommandOptions): Promise<void>;
-export {};
+export declare function compile(): Promise<void>;

package/lib/node/commands/compile.js

@@ -20,18 +20,17 @@ export async function runTask(taskName, task) {
         logger.error(e.toString());
     }
 }
-export async function compile(options) {
+export async function compile() {
     process.env.NODE_ENV = 'compile';
     await removeDir();
     await Promise.all([runTask('types', compileTypes), runTask('template highlight', compileTemplateHighlight)]);
     process.env.TARGET_MODULE = 'module';
     process.env.BABEL_MODULE = 'module';
     await runTask('module', compileModule);
-    process.env.TARGET_MODULE = 'esm-bundle';
-    await runTask('esm bundle', compileModule);
     process.env.TARGET_MODULE = 'commonjs';
     process.env.BABEL_MODULE = 'commonjs';
     await runTask('commonjs', compileModule);
-    process.env.TARGET_MODULE = 'umd';
-    !options.noUmd && (await runTask('umd', compileModule));
+    process.env.BABEL_MODULE = '';
+    process.env.TARGET_MODULE = 'bundle';
+    await runTask('bundle', compileModule);
 }

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

@@ -1,5 +1,4 @@
-export declare function compileUMD(): Promise<void>;
-export declare function compileESMBundle(): Promise<void>;
+export declare function compileBundle(): Promise<void>;
 export declare function compileDir(dir: string): Promise<void>;
 export declare function compileFile(file: string): Promise<void>;
 export declare function compileModule(): Promise<void>;

package/lib/node/compiler/compileModule.js

@@ -1,22 +1,42 @@
 import fse from 'fs-extra';
 import { build } from 'vite';
 import { resolve } from 'path';
-import { EXAMPLE_DIR_NAME, TESTS_DIR_NAME, DOCS_DIR_NAME, SRC_DIR, ES_DIR, STYLE_DIR_NAME, LIB_DIR, } from '../shared/constant.js';
+import { EXAMPLE_DIR_NAME, TESTS_DIR_NAME, DOCS_DIR_NAME, SRC_DIR, ES_DIR, STYLE_DIR_NAME, LIB_DIR, UMD_DIR, } from '../shared/constant.js';
 import { getPublicDirs, isDir, isDTS, isLess, isScript, isSFC } from '../shared/fsUtils.js';
 import { compileSFC } from './compileSFC.js';
 import { compileESEntry, compileCommonJSEntry, compileScriptFile, getScriptExtname } from './compileScript.js';
 import { clearLessFiles, compileLess } from './compileStyle.js';
-import { getESMBundleConfig, getUMDConfig } from '../config/vite.config.js';
+import { getBundleConfig } from '../config/vite.config.js';
 import { getVarletConfig } from '../config/varlet.config.js';
 import { generateReference } from './compileTypes.js';
+import { get } from 'lodash-es';
+import { kebabCase } from '@varlet/shared';
 const { copy, ensureFileSync, readdir, removeSync } = fse;
-export async function compileUMD() {
+export async function compileBundle() {
     const varletConfig = await getVarletConfig();
-    await build(getUMDConfig(varletConfig));
-}
-export async function compileESMBundle() {
-    const varletConfig = await getVarletConfig();
-    await build(getESMBundleConfig(varletConfig));
+    const name = kebabCase(get(varletConfig, 'name'));
+    const buildOptions = [
+        {
+            format: 'es',
+            fileName: `${name}.esm.js`,
+            output: ES_DIR,
+            emptyOutDir: false,
+        },
+        {
+            format: 'cjs',
+            fileName: `${name}.cjs.js`,
+            output: LIB_DIR,
+            emptyOutDir: false,
+        },
+        {
+            format: 'umd',
+            fileName: `${name}.js`,
+            output: UMD_DIR,
+            emptyOutDir: true,
+        },
+    ];
+    const tasks = buildOptions.map((options) => build(getBundleConfig(varletConfig, options)));
+    await Promise.all(tasks);
 }
 export async function compileDir(dir) {
     const dirs = await readdir(dir);
@@ -37,12 +57,8 @@ export async function compileFile(file) {
 }
 export async function compileModule() {
     const targetModule = process.env.TARGET_MODULE;
-    if (targetModule === 'umd') {
-        await compileUMD();
-        return;
-    }
-    if (targetModule === 'esm-bundle') {
-        await compileESMBundle();
+    if (targetModule === 'bundle') {
+        await compileBundle();
         return;
     }
     const dest = targetModule === 'commonjs' ? LIB_DIR : ES_DIR;

package/lib/node/compiler/compileTypes.js

@@ -35,6 +35,7 @@ declare module 'vue' {
     const template = `\
 import type { App } from 'vue'
 
+export const version: string
 export const install: (app: App) => void
 
 ${exports.join('\n')}

package/lib/node/config/vite.config.d.ts

@@ -2,5 +2,10 @@ import { InlineConfig } from 'vite';
 import { VarletConfig } from './varlet.config';
 export declare function getDevConfig(varletConfig: Required<VarletConfig>): InlineConfig;
 export declare function getBuildConfig(varletConfig: Required<VarletConfig>): InlineConfig;
-export declare function getESMBundleConfig(varletConfig: Required<VarletConfig>): InlineConfig;
-export declare function getUMDConfig(varletConfig: Required<VarletConfig>): InlineConfig;
+export interface BundleBuildOptions {
+    fileName: string;
+    output: string;
+    format: 'es' | 'cjs' | 'umd';
+    emptyOutDir: boolean;
+}
+export declare function getBundleConfig(varletConfig: Required<VarletConfig>, buildOptions: BundleBuildOptions): InlineConfig;

package/lib/node/config/vite.config.js

@@ -2,8 +2,7 @@ import fse from 'fs-extra';
 import vue from '@vitejs/plugin-vue';
 import jsx from '@vitejs/plugin-vue-jsx';
 import { markdown, html, inlineCss } from '@varlet/vite-plugins';
-import { kebabCase } from '@varlet/shared';
-import { ES_DIR, LIB_DIR, SITE_CONFIG, SITE_DIR, SITE_MOBILE_ROUTES, SITE_OUTPUT_PATH, SITE_PC_ROUTES, SITE_PUBLIC_PATH, UMD_DIR, VITE_RESOLVE_EXTENSIONS, } from '../shared/constant.js';
+import { ES_DIR, SITE_CONFIG, SITE_DIR, SITE_MOBILE_ROUTES, SITE_OUTPUT_PATH, SITE_PC_ROUTES, SITE_PUBLIC_PATH, VITE_RESOLVE_EXTENSIONS, } from '../shared/constant.js';
 import { get } from 'lodash-es';
 import { resolve } from 'path';
 const { copyFileSync, removeSync } = fse;
@@ -57,24 +56,32 @@ export function getBuildConfig(varletConfig) {
             },
         } });
 }
-export function getESMBundleConfig(varletConfig) {
+export function getBundleConfig(varletConfig, buildOptions) {
+    const plugins = [];
     const name = get(varletConfig, 'name');
-    const fileName = `${kebabCase(name)}.esm.js`;
+    const { fileName, output, format, emptyOutDir } = buildOptions;
+    if (format === 'umd') {
+        plugins.push(inlineCss({
+            jsFile: resolve(output, fileName),
+            cssFile: resolve(output, 'style.css'),
+        }));
+    }
     return {
         logLevel: 'silent',
         build: {
-            emptyOutDir: false,
+            minify: format === 'cjs' ? false : 'esbuild',
+            emptyOutDir,
             copyPublicDir: false,
             lib: {
                 name,
-                formats: ['es'],
+                formats: [format],
                 fileName: () => fileName,
                 entry: resolve(ES_DIR, 'index.umd.mjs'),
             },
             rollupOptions: {
                 external: ['vue'],
                 output: {
-                    dir: ES_DIR,
+                    dir: output,
                     exports: 'named',
                     globals: {
                         vue: 'Vue',
@@ -84,42 +91,3 @@ export function getESMBundleConfig(varletConfig) {
         },
     };
 }
-export function getUMDConfig(varletConfig) {
-    const name = get(varletConfig, 'name');
-    const fileName = `${kebabCase(name)}.js`;
-    const jsFile = resolve(UMD_DIR, fileName);
-    const cssFile = resolve(UMD_DIR, 'style.css');
-    return {
-        logLevel: 'silent',
-        build: {
-            emptyOutDir: true,
-            copyPublicDir: false,
-            lib: {
-                name,
-                formats: ['umd'],
-                fileName: () => fileName,
-                entry: resolve(ES_DIR, 'index.umd.mjs'),
-            },
-            rollupOptions: {
-                external: ['vue'],
-                output: {
-                    dir: UMD_DIR,
-                    exports: 'named',
-                    globals: {
-                        vue: 'Vue',
-                    },
-                },
-            },
-        },
-        plugins: [
-            inlineCss({
-                jsFile,
-                cssFile,
-                onEnd() {
-                    copyFileSync(cssFile, resolve(LIB_DIR, 'style.css'));
-                    removeSync(cssFile);
-                },
-            }),
-        ],
-    };
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@varlet/cli",
-  "version": "2.7.0-alpha.1673617166404",
+  "version": "2.7.0-alpha.1673623558342",
   "type": "module",
   "description": "cli of varlet",
   "bin": {
@@ -66,8 +66,8 @@
     "vite": "4.0.4",
     "vue": "3.2.25",
     "vue-jest": "^5.0.0-alpha.8",
-    "@varlet/vite-plugins": "2.7.0-alpha.1673617166404",
-    "@varlet/shared": "2.7.0-alpha.1673617166404"
+    "@varlet/vite-plugins": "2.7.0-alpha.1673623558342",
+    "@varlet/shared": "2.7.0-alpha.1673623558342"
   },
   "devDependencies": {
     "@types/babel__core": "^7.1.12",
@@ -79,8 +79,8 @@
     "@types/node": "^18.7.20",
     "@types/semver": "^7.3.9",
     "@types/inquirer": "^9.0.2",
-    "@varlet/touch-emulator": "2.7.0-alpha.1673617166404",
-    "@varlet/icons": "2.7.0-alpha.1673617166404"
+    "@varlet/icons": "2.7.0-alpha.1673623558342",
+    "@varlet/touch-emulator": "2.7.0-alpha.1673623558342"
   },
   "peerDependencies": {
     "@vue/runtime-core": "3.2.16",
@@ -90,8 +90,8 @@
     "lodash-es": "^4.17.21",
     "vue": "3.2.25",
     "vue-router": "4.0.12",
-    "@varlet/icons": "2.7.0-alpha.1673617166404",
-    "@varlet/touch-emulator": "2.7.0-alpha.1673617166404"
+    "@varlet/icons": "2.7.0-alpha.1673623558342",
+    "@varlet/touch-emulator": "2.7.0-alpha.1673623558342"
   },
   "scripts": {
     "dev": "tsc --watch",