@varlet/cli 2.0.0-alpha.1665387432577 → 2.0.1-alpha.1665643639034

package/README.en-US.md

@@ -42,7 +42,7 @@ Also refer to `@varlet/ui` [varlet.config.js](https://github.com/varletjs/varlet
 | -- | -------------- | -------- | ---------- |
 | `name` | The full name of the component library, which will be used as the package name | _string_ | `Varlet` |
 | `namespace` | Component library namespace, which will be used as a component prefix | _string_ | `var` |
-| `host` | Development server host | _number_ | `localhost` |
+| `host` | Development server host | _string_ | `localhost` |
 | `port` | Development server port | _number_ | `8080` |
 | `title` | The title of the component library in the documentation | _string_ | `VARLET` |
 | `logo` | The logo of the component library in the documentation | _string_ | `-` |

package/README.md

@@ -40,7 +40,7 @@ varlet-cli gen
 | ----- | -------------- | -------- | ---------- |
 | `name` | 组件库全名，会作为包名 | _string_ | `Varlet` |
 | `namespace` | 组件库命名空间, 会作为组件前缀 | _string_ | `var` |
-| `host` | 开发服务器主机 | _number_ | `localhost` |
+| `host` | 开发服务器主机 | _string_ | `localhost` |
 | `port` | 开发服务器端口 | _number_ | `8080` |
 | `title` | 文档中组件库的标题 | _string_ | `VARLET` |
 | `logo` | 文档中组件库的logo | _string_ | `-` |

package/lib/bin.d.ts

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+export {};

package/lib/bin.js

@@ -0,0 +1,102 @@
+#!/usr/bin/env node
+"use strict";
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var logger_1 = __importDefault(require("./shared/logger"));
+var commander_1 = require("commander");
+var dev_1 = require("./commands/dev");
+var build_1 = require("./commands/build");
+var vite_1 = require("./commands/vite");
+var compile_1 = require("./commands/compile");
+var create_1 = require("./commands/create");
+var jest_1 = require("./commands/jest");
+var lint_1 = require("./commands/lint");
+var gen_1 = require("./commands/gen");
+var preview_1 = require("./commands/preview");
+var changelog_1 = require("./commands/changelog");
+var release_1 = require("./commands/release");
+var commitLint_1 = require("./commands/commitLint");
+var program = new commander_1.Command();
+program.version("varlet-cli ".concat(require('../package.json').version)).usage('<command> [options]');
+program
+    .command('dev')
+    .option('-f --force', 'Force dep pre-optimization regardless of whether deps have changed')
+    .description('Run varlet development environment')
+    .action(dev_1.dev);
+program.command('build').description('Build varlet site for production').action(build_1.build);
+program
+    .command('build:vite')
+    .description('Use vite build app for production')
+    .action(function () { return (0, vite_1.vite)('build'); });
+program
+    .command('dev:vite')
+    .description('Use vite start server for development')
+    .action(function () { return (0, vite_1.vite)('dev'); });
+program.command('preview').description('Preview varlet site for production').action(preview_1.preview);
+program
+    .command('compile')
+    .description('Compile varlet components library code')
+    .option('-nu, --noUmd', 'Do not compile umd target code')
+    .action(compile_1.compile);
+program.command('lint').description('Lint code').action(lint_1.lint);
+program
+    .command('create')
+    .description('Create a component directory')
+    .option('-n, --name <componentName>', 'Component name')
+    .option('-s, --sfc', 'Generate files in sfc format')
+    .option('-t, --tsx', 'Generate files in tsx format')
+    .option('-l, --locale', 'Generator internationalized files')
+    .action(create_1.create);
+program
+    .command('jest')
+    .description('Run Jest in work directory')
+    .option('-w, --watch', 'Watch files for changes and rerun tests related to changed files')
+    .option('-wa, --watchAll', 'Watch files for changes and rerun all tests when something changes')
+    .option('-c, --component <componentName>', 'Test a specific component')
+    .option('-cc --clearCache', 'Clear test cache')
+    .action(jest_1.jest);
+program
+    .command('gen')
+    .description('Generate cli application')
+    .option('-n, --name <applicationName>', 'Application name')
+    .option('-s, --sfc', 'Generate files in sfc format')
+    .option('-t, --tsx', 'Generate files in tsx format')
+    .option('-l, --locale', 'Generator internationalized files')
+    .action(gen_1.gen);
+program
+    .command('changelog')
+    .option('-rc --releaseCount <releaseCount>', 'Release count')
+    .option('-f --file <file>', 'Changelog filename')
+    .description('Generate changelog')
+    .action(changelog_1.changelog);
+program
+    .command('release')
+    .option('-r --remote <remote>', 'Remote name')
+    .description('Release all packages and generate changelogs')
+    .action(release_1.release);
+program.command('commit-lint <gitParams>').description('Lint commit message').action(commitLint_1.commitLint);
+program.on('command:*', function (_a) {
+    var _b = __read(_a, 1), cmd = _b[0];
+    program.outputHelp();
+    logger_1.default.error("\nUnknown command ".concat(cmd, ".\n"));
+    process.exitCode = 1;
+});
+program.parse();

package/lib/commands/release.js

@@ -199,70 +199,68 @@ function release(options) {
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
-                    _b.trys.push([0, 14, , 15]);
+                    _b.trys.push([0, 13, , 14]);
                     currentVersion = require((0, path_1.resolve)(constant_1.CWD, 'package.json')).version;
                     if (!currentVersion) {
                         logger_1.default.error('Your package is missing the version field');
                         return [2 /*return*/];
                     }
-                    return [4 /*yield*/, isWorktreeEmpty()];
-                case 1:
-                    if (!(_b.sent())) {
-                        logger_1.default.error('Git worktree is not empty, please commit changed');
-                        return [2 /*return*/];
-                    }
                     return [4 /*yield*/, confirmRegistry()];
-                case 2:
+                case 1:
+                    // if (!(await isWorktreeEmpty())) {
+                    //   logger.error('Git worktree is not empty, please commit changed')
+                    //   return
+                    // }
                     if (!(_b.sent())) {
                         return [2 /*return*/];
                     }
                     return [4 /*yield*/, getReleaseType()];
-                case 3:
+                case 2:
                     type = _b.sent();
                     isPreRelease = type.startsWith('pre');
                     expectVersion = semver_1.default.inc(currentVersion, type, "alpha.".concat(Date.now()));
                     expectVersion = isPreRelease ? expectVersion.slice(0, -2) : expectVersion;
                     return [4 /*yield*/, confirmVersion(currentVersion, expectVersion)];
-                case 4:
+                case 3:
                     if (!(_b.sent())) {
                         return [2 /*return*/];
                     }
                     updateVersion(expectVersion);
                     return [4 /*yield*/, publish(isPreRelease)];
-                case 5:
+                case 4:
                     _b.sent();
-                    if (!!isPreRelease) return [3 /*break*/, 8];
+                    if (!!isPreRelease) return [3 /*break*/, 7];
                     return [4 /*yield*/, (0, changelog_1.changelog)()];
-                case 6:
+                case 5:
                     _b.sent();
                     return [4 /*yield*/, pushGit(expectVersion, options.remote)];
-                case 7:
+                case 6:
                     _b.sent();
+                    _b.label = 7;
+                case 7:
+                    logger_1.default.success("Release version ".concat(expectVersion, " successfully!"));
+                    if (!isPreRelease) return [3 /*break*/, 12];
                     _b.label = 8;
                 case 8:
-                    logger_1.default.success("Release version ".concat(expectVersion, " successfully!"));
-                    if (!isPreRelease) return [3 /*break*/, 13];
-                    _b.label = 9;
-                case 9:
-                    _b.trys.push([9, 12, , 13]);
+                    _b.trys.push([8, 11, , 12]);
                     return [4 /*yield*/, (0, execa_1.default)('git', ['restore', '**/package.json'])];
-                case 10:
+                case 9:
                     _b.sent();
                     return [4 /*yield*/, (0, execa_1.default)('git', ['restore', 'package.json'])];
-                case 11:
+                case 10:
                     _b.sent();
-                    return [3 /*break*/, 13];
-                case 12:
+                    return [3 /*break*/, 12];
+                case 11:
                     _a = _b.sent();
                     logger_1.default.error('Restore package.json has failed, please restore manually');
-                    return [3 /*break*/, 13];
-                case 13: return [3 /*break*/, 15];
-                case 14:
+                    return [3 /*break*/, 12];
+                case 12: return [3 /*break*/, 14];
+                case 13:
                     error_1 = _b.sent();
                     logger_1.default.error(error_1.toString());
                     process.exit(1);
-                    return [3 /*break*/, 15];
-                case 15: return [2 /*return*/];
+                    return [3 /*break*/, 14];
+                case 14: return [2 /*return*/];
             }
         });
     });

package/lib/config/varlet.config.d.ts

@@ -1 +1,43 @@
-export declare function getVarletConfig(emit?: boolean): Record<string, any>;
+interface VarletConfig {
+    /**
+     * @default `Varlet`
+     * UI library name.
+     */
+    name?: string;
+    /**
+     * @default `var`
+     * Component class name preffix
+     */
+    namespace?: string;
+    /**
+     * @default `localhost`
+     * Local dev server host
+     */
+    host?: string;
+    /**
+     * @default `8080`
+     * Local dev server protcol
+     */
+    port?: number;
+    logo?: string;
+    defaultLanguage?: 'zh-CN' | 'en-US';
+    /**
+     * @default `false`
+     * Show mobile component on the right.
+     */
+    useMobile?: boolean;
+    lightTheme?: Record<string, string>;
+    darkTheme?: Record<string, string>;
+    highlight?: {
+        style: string;
+    };
+    analysis?: {
+        baidu: string;
+    };
+    pc?: Record<string, any>;
+    mobile?: Record<string, any>;
+    moduleCompatible?: Record<string, string>;
+}
+export declare const defineConfig: (conf: VarletConfig) => VarletConfig;
+export declare function getVarletConfig(emit?: boolean): any;
+export {};

package/lib/config/varlet.config.js

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVarletConfig = void 0;
+exports.getVarletConfig = exports.defineConfig = void 0;
 var fs_extra_1 = require("fs-extra");
 var lodash_1 = require("lodash");
 var constant_1 = require("../shared/constant");
 var fsUtils_1 = require("../shared/fsUtils");
+var defineConfig = function (conf) { return conf; };
+exports.defineConfig = defineConfig;
 function getVarletConfig(emit) {
     if (emit === void 0) { emit = false; }
     var config = {};

package/lib/index.d.ts

@@ -1,2 +1 @@
-#!/usr/bin/env node
-export {};
+export { defineConfig } from './config/varlet.config';

package/lib/index.js

@@ -1,102 +1,5 @@
-#!/usr/bin/env node
 "use strict";
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var logger_1 = __importDefault(require("./shared/logger"));
-var commander_1 = require("commander");
-var dev_1 = require("./commands/dev");
-var build_1 = require("./commands/build");
-var vite_1 = require("./commands/vite");
-var compile_1 = require("./commands/compile");
-var create_1 = require("./commands/create");
-var jest_1 = require("./commands/jest");
-var lint_1 = require("./commands/lint");
-var gen_1 = require("./commands/gen");
-var preview_1 = require("./commands/preview");
-var changelog_1 = require("./commands/changelog");
-var release_1 = require("./commands/release");
-var commitLint_1 = require("./commands/commitLint");
-var program = new commander_1.Command();
-program.version("varlet-cli ".concat(require('../package.json').version)).usage('<command> [options]');
-program
-    .command('dev')
-    .option('-f --force', 'Force dep pre-optimization regardless of whether deps have changed')
-    .description('Run varlet development environment')
-    .action(dev_1.dev);
-program.command('build').description('Build varlet site for production').action(build_1.build);
-program
-    .command('build:vite')
-    .description('Use vite build app for production')
-    .action(function () { return (0, vite_1.vite)('build'); });
-program
-    .command('dev:vite')
-    .description('Use vite start server for development')
-    .action(function () { return (0, vite_1.vite)('dev'); });
-program.command('preview').description('Preview varlet site for production').action(preview_1.preview);
-program
-    .command('compile')
-    .description('Compile varlet components library code')
-    .option('-nu, --noUmd', 'Do not compile umd target code')
-    .action(compile_1.compile);
-program.command('lint').description('Lint code').action(lint_1.lint);
-program
-    .command('create')
-    .description('Create a component directory')
-    .option('-n, --name <componentName>', 'Component name')
-    .option('-s, --sfc', 'Generate files in sfc format')
-    .option('-t, --tsx', 'Generate files in tsx format')
-    .option('-l, --locale', 'Generator internationalized files')
-    .action(create_1.create);
-program
-    .command('jest')
-    .description('Run Jest in work directory')
-    .option('-w, --watch', 'Watch files for changes and rerun tests related to changed files')
-    .option('-wa, --watchAll', 'Watch files for changes and rerun all tests when something changes')
-    .option('-c, --component <componentName>', 'Test a specific component')
-    .option('-cc --clearCache', 'Clear test cache')
-    .action(jest_1.jest);
-program
-    .command('gen')
-    .description('Generate cli application')
-    .option('-n, --name <applicationName>', 'Application name')
-    .option('-s, --sfc', 'Generate files in sfc format')
-    .option('-t, --tsx', 'Generate files in tsx format')
-    .option('-l, --locale', 'Generator internationalized files')
-    .action(gen_1.gen);
-program
-    .command('changelog')
-    .option('-rc --releaseCount <releaseCount>', 'Release count')
-    .option('-f --file <file>', 'Changelog filename')
-    .description('Generate changelog')
-    .action(changelog_1.changelog);
-program
-    .command('release')
-    .option('-r --remote <remote>', 'Remote name')
-    .description('Release all packages and generate changelogs')
-    .action(release_1.release);
-program.command('commit-lint <gitParams>').description('Lint commit message').action(commitLint_1.commitLint);
-program.on('command:*', function (_a) {
-    var _b = __read(_a, 1), cmd = _b[0];
-    program.outputHelp();
-    logger_1.default.error("\nUnknown command ".concat(cmd, ".\n"));
-    process.exitCode = 1;
-});
-program.parse();
+exports.defineConfig = void 0;
+var varlet_config_1 = require("./config/varlet.config");
+Object.defineProperty(exports, "defineConfig", { enumerable: true, get: function () { return varlet_config_1.defineConfig; } });

package/package.json

@@ -1,10 +1,12 @@
 {
   "name": "@varlet/cli",
-  "version": "2.0.0-alpha.1665387432577",
+  "version": "2.0.1-alpha.1665643639034",
   "description": "cli of varlet",
   "bin": {
-    "varlet-cli": "./lib/index.js"
+    "varlet-cli": "./lib/bin.js"
   },
+  "main": "./lib/index.js",
+  "module": "./lib/index.js",
   "keywords": [
     "cli",
     "varlet"
@@ -32,10 +34,10 @@
     "@babel/helper-plugin-utils": "^7.14.5",
     "@babel/preset-env": "^7.14.8",
     "@babel/preset-typescript": "^7.14.5",
-    "@varlet/icons": "2.0.0-alpha.1665387432577",
-    "@varlet/markdown-vite-plugin": "2.0.0-alpha.1665387432577",
-    "@varlet/shared": "2.0.0-alpha.1665387432577",
-    "@varlet/touch-emulator": "2.0.0-alpha.1665387432577",
+    "@varlet/icons": "2.0.1-alpha.1665643639034",
+    "@varlet/markdown-vite-plugin": "2.0.1-alpha.1665643639034",
+    "@varlet/shared": "2.0.1-alpha.1665643639034",
+    "@varlet/touch-emulator": "2.0.1-alpha.1665643639034",
     "@vitejs/plugin-vue": "3.0.1",
     "@vitejs/plugin-vue-jsx": "2.0.0",
     "@vue/babel-plugin-jsx": "1.1.1",
@@ -80,7 +82,7 @@
     "@types/semver": "^7.3.9"
   },
   "peerDependencies": {
-    "@varlet/touch-emulator": "2.0.0-alpha.1665387432577",
+    "@varlet/touch-emulator": "2.0.1-alpha.1665643639034",
     "@vue/runtime-core": "3.2.16",
     "@vue/test-utils": "^2.0.2",
     "clipboard": "^2.0.6",

package/site/pc/Layout.vue

@@ -50,10 +50,16 @@ const handleSidebarChange = (menu: Menu) => {
 }
 
 const confirmClose = () => {
-  if (!window.confirm('The code will no longer be saved after closing. Are you sure you want to close?')) {
+  const key = 'VARLET_UI_PLAYGROUND_HAS_BEEN_CLOSED'
+
+  if (
+    !localStorage.getItem(key) &&
+    !window.confirm('The code will no longer be saved after closing. Are you sure you want to close?')
+  ) {
     return
   }
 
+  localStorage.setItem(key, 'true')
   context.showPlayground = false
 }
 

package/template/generators/config/default/base/package.json

@@ -19,11 +19,8 @@
     "es/**/style/*",
     "lib/**/style/*",
     "es/style.js",
-    "es/less.js",
     "lib/style.js",
-    "lib/less.js",
-    "*.css",
-    "*.less"
+    "*.css"
   ],
   "scripts": {
     "preinstall": "npx only-allow pnpm",

package/template/generators/config/default/base/varlet.config.js

@@ -1,4 +1,6 @@
-module.exports = {
+const { defineConfig } = require('@varlet/cli')
+
+module.exports = defineConfig({
   logo: './logo.svg',
   useMobile: true,
   pc: {
@@ -41,5 +43,5 @@ module.exports = {
       i18n: null,
       darkMode: null,
     },
-  },
-}
+  }
+})

package/template/generators/config/i18n/base/package.json

@@ -19,11 +19,8 @@
     "es/**/style/*",
     "lib/**/style/*",
     "es/style.js",
-    "es/less.js",
     "lib/style.js",
-    "lib/less.js",
-    "*.css",
-    "*.less"
+    "*.css"
   ],
   "scripts": {
     "preinstall": "npx only-allow pnpm",

package/template/generators/config/i18n/base/varlet.config.js

@@ -1,4 +1,6 @@
-module.exports = {
+const { defineConfig } = require('@varlet/cli')
+
+module.exports = defineConfig({
   logo: './logo.svg',
   useMobile: true,
   pc: {
@@ -44,4 +46,4 @@ module.exports = {
       darkMode: null,
     },
   },
-}
+})

package/varlet.default.config.js

@@ -152,7 +152,7 @@ module.exports = {
       },
       versions: null,
       github: 'https://github.com/varletjs/varlet',
-      playground: 'https://varlet-ui-playground-git-dev-varletjs.vercel.app',
+      playground: 'https://varlet.gitee.io/varlet-ui-playground',
       darkMode: true,
     },
     clipboard: {