@varlet/cli 2.0.6 → 2.1.0-alpha.1667210582672

package/site/utils.ts

@@ -1,43 +1,5 @@
-import { onMounted, onUnmounted } from 'vue'
 import { get } from 'lodash-es'
-import { formatStyleVars } from './components/utils/elements'
-import config from '@config'
-
-export * from './components/utils/components'
-export * from './components/utils/elements'
-
-export type StyleVars = Record<string, string>
-
-const mountedVarKeys: string[] = []
-
-function StyleProvider(styleVars: StyleVars | null = {}) {
-  mountedVarKeys.forEach((key) => document.documentElement.style.removeProperty(key))
-  mountedVarKeys.length = 0
-
-  const styles: StyleVars = formatStyleVars(styleVars)
-  Object.entries(styles).forEach(([key, value]) => {
-    document.documentElement.style.setProperty(key, value)
-    mountedVarKeys.push(key)
-  })
-}
-
-export interface PCLocationInfo {
-  language: string
-  menuName: string
-}
-
-export function getPCLocationInfo(): PCLocationInfo {
-  const [, language, menuName] = window.location.hash.split('/')
-
-  return {
-    language,
-    menuName,
-  }
-}
-
-export function isPhone() {
-  return /Android|webOS|iPhone|iPod|BlackBerry|Pad/i.test(navigator.userAgent)
-}
+import { StyleProvider, type Theme, withSiteConfigNamespace } from '@varlet/cli/client'
 
 export interface Menu {
   doc: string
@@ -51,10 +13,6 @@ export enum MenuTypes {
   DOCUMENTATION = 3,
 }
 
-export function inIframe() {
-  return window.self !== window.top
-}
-
 export function removeEmpty(object: Record<string, string> = {}) {
   return Object.keys(object).reduce((record: Record<string, string>, key) => {
     const value = object[key]
@@ -63,109 +21,20 @@ export function removeEmpty(object: Record<string, string> = {}) {
   }, {})
 }
 
-export function getHashSearch() {
-  const { href } = window.location
-  const hashSearch = href.slice(href.indexOf('?'))
-
-  return new URLSearchParams(hashSearch)
-}
-
-export function watchLang(cb: (lang: string) => void, platform: 'pc' | 'mobile' = 'mobile') {
-  const handleHashchange = () => {
-    const language = platform === 'mobile' ? getHashSearch().get('language') ?? 'zh-CN' : getPCLocationInfo().language
-
-    cb(language)
-  }
-
-  addRouteListener(handleHashchange)
-
-  handleHashchange()
-}
-
-export function watchPlatform(cb: (platform: string) => void) {
-  const handleHashchange = () => {
-    const platform = getHashSearch().get('platform') ?? 'mobile'
-    cb(platform)
-  }
-
-  addRouteListener(handleHashchange)
-
-  handleHashchange()
-}
-
-export function watchTheme(
-  cb: (theme: Theme, from: 'pc' | 'mobile' | 'default' | 'playground') => void,
-  shouldUnmount = true
-) {
-  const handleThemeChange = (event: MessageEvent) => {
-    const { data } = event
-    if (data.action === 'theme-change') {
-      cb(data.data, data.from)
-    }
-  }
-
-  window.addEventListener('message', handleThemeChange)
-
-  if (shouldUnmount) {
-    onUnmounted(() => {
-      window.removeEventListener('message', handleThemeChange)
-    })
-  }
-
-  cb(getBrowserTheme(), 'default')
+export function isPhone() {
+  return /Android|webOS|iPhone|iPod|BlackBerry|Pad/i.test(navigator.userAgent)
 }
 
-export function addRouteListener(cb: () => void) {
-  onMounted(() => {
-    window.addEventListener('hashchange', cb)
-    window.addEventListener('popstate', cb)
-  })
-  onUnmounted(() => {
-    window.removeEventListener('hashchange', cb)
-    window.removeEventListener('popstate', cb)
-  })
+export function inIframe() {
+  return window.self !== window.top
 }
 
-export type Theme = 'lightTheme' | 'darkTheme'
-
 export function setTheme(config: Record<string, any>, name: Theme) {
-  const themeConfig = get(config, name, {})
-  const styleVars = Object.entries(themeConfig).reduce((styleVars, [key, value]) => {
-    styleVars[`--site-config-${key}`] = value as string
-    return styleVars
-  }, {} as StyleVars)
+  const styleVars = withSiteConfigNamespace(get(config, name, {}))
 
   StyleProvider(styleVars)
 }
 
-export function getBrowserTheme(): Theme {
-  const themeKey = get(config, 'themeKey')
-  const darkThemeConfig = get(config, 'darkTheme')
-
-  if (!darkThemeConfig) {
-    return 'lightTheme'
-  }
-
-  const storageTheme = window.localStorage.getItem(themeKey) as Theme
-
-  if (!storageTheme) {
-    const preferTheme = window.matchMedia?.('(prefers-color-scheme: dark)').matches ? 'darkTheme' : 'lightTheme'
-    window.localStorage.setItem(themeKey, preferTheme)
-
-    return preferTheme
-  }
-
-  return storageTheme
-}
-
-export function watchDarkMode(dark: StyleVars, cb?: (theme: Theme) => void) {
-  watchTheme((theme) => {
-    StyleProvider(theme === 'darkTheme' ? dark : null)
-
-    cb?.(theme)
-  })
-}
-
 export function utoa(data: string): string {
   return btoa(unescape(encodeURIComponent(data)))
 }

package/template/create/index.ts.ejs

@@ -1,5 +1,5 @@
 // Component entry, the folder where the file exists will be exposed to the user
-import <%- bigCamelizeName %> from './<%- bigCamelizeName %>.vue'
+import <%- bigCamelizeName %> from './<%- bigCamelizeName %><%- style === 'vue' ? '.vue' : '' %>'
 import type { App } from 'vue'
 
 <%- bigCamelizeName %>.install = function(app: App) {

package/template/generators/config/default/base/{varlet.config.js → varlet.config.mjs}

@@ -1,6 +1,6 @@
-const { defineConfig } = require('@varlet/cli')
+import { defineConfig } from '@varlet/cli'
 
-module.exports = defineConfig({
+export default defineConfig({
   logo: './logo.svg',
   useMobile: true,
   pc: {

package/template/generators/config/i18n/base/{varlet.config.js → varlet.config.mjs}

@@ -1,6 +1,6 @@
-const { defineConfig } = require('@varlet/cli')
+import { defineConfig } from '@varlet/cli'
 
-module.exports = defineConfig({
+export default defineConfig({
   logo: './logo.svg',
   useMobile: true,
   pc: {

package/tsconfig.json

@@ -1,14 +1,7 @@
 {
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "outDir": "./lib",
-    "target": "es5",
-    "strict": true,
-    "downlevelIteration": true,
-    "declaration": true,
-    "skipLibCheck": true,
-    "esModuleInterop": true,
-    "jsx": "preserve",
-    "lib": ["esnext", "dom"]
+    "outDir": "./lib"
   },
   "include": ["src/**/*"]
 }

package/lib/bin.js

@@ -1,102 +0,0 @@
-#!/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/build.js

@@ -1,67 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.build = void 0;
-var fs_extra_1 = require("fs-extra");
-var constant_1 = require("../shared/constant");
-var vite_1 = require("vite");
-var vite_config_1 = require("../config/vite.config");
-var varlet_config_1 = require("../config/varlet.config");
-var compileSiteEntry_1 = require("../compiler/compileSiteEntry");
-function build() {
-    return __awaiter(this, void 0, void 0, function () {
-        var varletConfig, buildConfig;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    process.env.NODE_ENV = 'production';
-                    (0, fs_extra_1.ensureDirSync)(constant_1.SRC_DIR);
-                    return [4 /*yield*/, (0, compileSiteEntry_1.buildSiteEntry)()];
-                case 1:
-                    _a.sent();
-                    varletConfig = (0, varlet_config_1.getVarletConfig)();
-                    buildConfig = (0, vite_config_1.getBuildConfig)(varletConfig);
-                    return [4 /*yield*/, (0, vite_1.build)(buildConfig)];
-                case 2:
-                    _a.sent();
-                    return [2 /*return*/];
-            }
-        });
-    });
-}
-exports.build = build;

package/lib/commands/changelog.js

@@ -1,27 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.changelog = void 0;
-var ora_1 = __importDefault(require("ora"));
-var conventional_changelog_1 = __importDefault(require("conventional-changelog"));
-var fs_extra_1 = require("fs-extra");
-var path_1 = require("path");
-var constant_1 = require("../shared/constant");
-function changelog(_a) {
-    var _b = _a === void 0 ? {} : _a, _c = _b.releaseCount, releaseCount = _c === void 0 ? 0 : _c, _d = _b.file, file = _d === void 0 ? 'CHANGELOG.md' : _d;
-    var s = (0, ora_1.default)().start("Generating changelog");
-    return new Promise(function (resolve) {
-        (0, conventional_changelog_1.default)({
-            preset: 'angular',
-            releaseCount: releaseCount,
-        })
-            .pipe((0, fs_extra_1.createWriteStream)((0, path_1.resolve)(constant_1.CWD, file)))
-            .on('close', function () {
-            s.succeed("Changelog generated success!");
-            resolve();
-        });
-    });
-}
-exports.changelog = changelog;

package/lib/commands/commitLint.js

@@ -1,21 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.commitLint = void 0;
-var logger_1 = __importDefault(require("../shared/logger"));
-var semver_1 = __importDefault(require("semver"));
-function isVersion(message) {
-    return message.startsWith('v') && semver_1.default.valid(message.slice(1));
-}
-function commitLint(gitParams) {
-    var message = require('fs').readFileSync(gitParams, 'utf-8').trim();
-    var COMMIT_MESSAGE_RE = /^(revert|fix|feat|docs|perf|test|types|style|build|chore|release|refactor)(\(.+\))?!?: (.|\n)+/;
-    if (!isVersion(message) && !COMMIT_MESSAGE_RE.test(message)) {
-        logger_1.default.error("Commit message invalid");
-        logger_1.default.warning("The rules for commit messages are as follows\n\nExample:\n\nfeat: add a new feature\nfeat(ui/button): add a new feature in the ui/button scope\n\nfix: fix a bug\nfix(ui/button): fix a bug in the ui/button scope\n\ndocs: fix an error in the documentation\ndocs(ui/button): fix a documentation error in the ui/button scope\n\nAllowed types:\n- fix\n- feat\n- docs\n- perf\n- test\n- types\n- style\n- build\n- chore\n- release\n- refactor\n- revert\n\nCommit message reference: https://docs.google.com/document/d/1QrDFcIiPjSLDn3EL15IJygNPiHORgU1_OOAqWjiDU5Y\n\u53C2\u8003\u962E\u4E00\u5CF0Commit message\u7F16\u5199\u6307\u5357: https://www.ruanyifeng.com/blog/2016/01/commit_message_change_log.html");
-        process.exit(1);
-    }
-}
-exports.commitLint = commitLint;

package/lib/commands/compile.js

@@ -1,119 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.compile = exports.runTask = exports.removeDir = void 0;
-var ora_1 = __importDefault(require("ora"));
-var logger_1 = __importDefault(require("../shared/logger"));
-var fs_extra_1 = require("fs-extra");
-var constant_1 = require("../shared/constant");
-var compileModule_1 = require("../compiler/compileModule");
-var compileTemplateHighlight_1 = require("../compiler/compileTemplateHighlight");
-var compileTypes_1 = require("../compiler/compileTypes");
-function removeDir() {
-    return Promise.all([(0, fs_extra_1.remove)(constant_1.ES_DIR), (0, fs_extra_1.remove)(constant_1.LIB_DIR), (0, fs_extra_1.remove)(constant_1.HL_DIR), (0, fs_extra_1.remove)(constant_1.UMD_DIR)]);
-}
-exports.removeDir = removeDir;
-function runTask(taskName, task) {
-    return __awaiter(this, void 0, void 0, function () {
-        var s, e_1;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    s = (0, ora_1.default)().start("Compiling ".concat(taskName));
-                    _a.label = 1;
-                case 1:
-                    _a.trys.push([1, 3, , 4]);
-                    return [4 /*yield*/, task()];
-                case 2:
-                    _a.sent();
-                    s.succeed("Compilation ".concat(taskName, " completed!"));
-                    return [3 /*break*/, 4];
-                case 3:
-                    e_1 = _a.sent();
-                    s.fail("Compilation ".concat(taskName, " failed!"));
-                    logger_1.default.error(e_1.toString());
-                    return [3 /*break*/, 4];
-                case 4: return [2 /*return*/];
-            }
-        });
-    });
-}
-exports.runTask = runTask;
-function compile(options) {
-    return __awaiter(this, void 0, void 0, function () {
-        var _a;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    process.env.NODE_ENV = 'compile';
-                    return [4 /*yield*/, removeDir()];
-                case 1:
-                    _b.sent();
-                    return [4 /*yield*/, Promise.all([runTask('types', compileTypes_1.compileTypes), runTask('template highlight', compileTemplateHighlight_1.compileTemplateHighlight)])];
-                case 2:
-                    _b.sent();
-                    process.env.TARGET_MODULE = 'module';
-                    return [4 /*yield*/, runTask('module', compileModule_1.compileModule)];
-                case 3:
-                    _b.sent();
-                    process.env.TARGET_MODULE = 'esm-bundle';
-                    return [4 /*yield*/, runTask('esm bundle', function () { return (0, compileModule_1.compileModule)('esm-bundle'); })];
-                case 4:
-                    _b.sent();
-                    process.env.TARGET_MODULE = 'commonjs';
-                    return [4 /*yield*/, runTask('commonjs', function () { return (0, compileModule_1.compileModule)('commonjs'); })];
-                case 5:
-                    _b.sent();
-                    process.env.TARGET_MODULE = 'umd';
-                    _a = !options.noUmd;
-                    if (!_a) return [3 /*break*/, 7];
-                    return [4 /*yield*/, runTask('umd', function () { return (0, compileModule_1.compileModule)('umd'); })];
-                case 6:
-                    _a = (_b.sent());
-                    _b.label = 7;
-                case 7:
-                    _a;
-                    return [2 /*return*/];
-            }
-        });
-    });
-}
-exports.compile = compile;