@varlet/cli 2.16.1 → 2.16.3-alpha.1694267513697

package/lib/client/appType.js

@@ -2,6 +2,6 @@ import { defineComponent, h } from 'vue';
 export default defineComponent({
     name: 'AppType',
     setup(props, { slots }) {
-        return () => { var _a; return h('div', { class: 'app-type' }, [(_a = slots.default) === null || _a === void 0 ? void 0 : _a.call(slots)]); };
+        return () => h('div', { class: 'app-type' }, [slots.default?.()]);
     },
 });

package/lib/client/index.js

@@ -4,9 +4,8 @@ import { Themes, StyleProvider } from '@varlet/ui';
 import { onMounted, onUnmounted } from 'vue';
 import { get } from 'lodash-es';
 export function getPCLocationInfo() {
-    var _a;
     const [, language, path] = window.location.hash.split('/');
-    const [menuName, hash = ''] = (_a = path === null || path === void 0 ? void 0 : path.split('#')) !== null && _a !== void 0 ? _a : [];
+    const [menuName, hash = ''] = path?.split('#') ?? [];
     return {
         language,
         menuName,
@@ -19,7 +18,6 @@ function getHashSearch() {
     return new URLSearchParams(hashSearch);
 }
 export function getBrowserTheme() {
-    var _a;
     const themeKey = get(config, 'themeKey');
     const darkThemeConfig = get(config, 'darkTheme');
     if (!darkThemeConfig) {
@@ -27,7 +25,7 @@ export function getBrowserTheme() {
     }
     const storageTheme = window.localStorage.getItem(themeKey);
     if (!storageTheme) {
-        const preferTheme = ((_a = window.matchMedia) === null || _a === void 0 ? void 0 : _a.call(window, '(prefers-color-scheme: dark)').matches) ? 'darkTheme' : 'lightTheme';
+        const preferTheme = window.matchMedia?.('(prefers-color-scheme: dark)').matches ? 'darkTheme' : 'lightTheme';
         window.localStorage.setItem(themeKey, preferTheme);
         return preferTheme;
     }
@@ -35,8 +33,7 @@ export function getBrowserTheme() {
 }
 export function watchLang(cb, platform = 'mobile') {
     const handleHashchange = () => {
-        var _a;
-        const language = platform === 'mobile' ? (_a = getHashSearch().get('language')) !== null && _a !== void 0 ? _a : 'zh-CN' : getPCLocationInfo().language;
+        const language = platform === 'mobile' ? getHashSearch().get('language') ?? 'zh-CN' : getPCLocationInfo().language;
         cb(language);
     };
     useRouteListener(handleHashchange);
@@ -50,8 +47,7 @@ export function withSiteConfigNamespace(styleVars) {
 }
 export function watchPlatform(cb) {
     const handleHashchange = () => {
-        var _a;
-        const platform = (_a = getHashSearch().get('platform')) !== null && _a !== void 0 ? _a : 'mobile';
+        const platform = getHashSearch().get('platform') ?? 'mobile';
         cb(platform);
     };
     useRouteListener(handleHashchange);
@@ -70,10 +66,10 @@ export function useRouteListener(cb) {
 export function watchDarkMode(dark, cb) {
     watchTheme((theme) => {
         const siteStyleVars = withSiteConfigNamespace(get(config, theme, {}));
-        const darkStyleVars = Object.assign(Object.assign(Object.assign({}, siteStyleVars), Themes.dark), dark);
+        const darkStyleVars = { ...siteStyleVars, ...Themes.dark, ...dark };
         StyleProvider(theme === 'darkTheme' ? darkStyleVars : siteStyleVars);
         setColorScheme(theme);
-        cb === null || cb === void 0 ? void 0 : cb(theme);
+        cb?.(theme);
     });
 }
 export function setColorScheme(theme) {

package/lib/node/commands/checklist.js

@@ -9,13 +9,11 @@ const typeRE = /<h3>(.+)<\/h3>/;
 const childrenRE = /<ul>(.|\n|\r)+<\/ul>/;
 const childRE = /<li>(.|\n|\r)+?<\/li>/g;
 export function getCheckBlocks(html) {
-    var _a;
-    const blocks = (_a = html.match(blockRE)) !== null && _a !== void 0 ? _a : [];
+    const blocks = html.match(blockRE) ?? [];
     const checkBlocks = [];
     blocks.forEach((block) => {
-        var _a, _b;
-        const type = (_a = block.match(typeRE)) === null || _a === void 0 ? void 0 : _a[1];
-        const childrenBlock = (_b = block.match(childrenRE)) === null || _b === void 0 ? void 0 : _b[0];
+        const type = block.match(typeRE)?.[1];
+        const childrenBlock = block.match(childrenRE)?.[0];
         if (!type || !childrenBlock) {
             return;
         }
@@ -37,7 +35,6 @@ export function getCheckBlocks(html) {
     return checkBlocks;
 }
 export async function checklist(gitParams) {
-    var _a, _b, _c, _d, _e;
     const commitMessage = getCommitMessage(gitParams);
     if (isVersionCommitMessage(commitMessage) || !existsSync(CHECKLIST_FILE)) {
         return;
@@ -49,9 +46,9 @@ export async function checklist(gitParams) {
         logger.warning('Cannot find anything need to checked');
         return;
     }
-    const type = (_a = commitMessage.match(COMMIT_MESSAGE_RE)) === null || _a === void 0 ? void 0 : _a[1];
-    const typeChildren = (_c = (_b = checkBlocks.find((checkBlock) => checkBlock.type === type)) === null || _b === void 0 ? void 0 : _b.list) !== null && _c !== void 0 ? _c : [];
-    const commonChildren = (_e = (_d = checkBlocks.find((checkBlock) => checkBlock.type === 'common')) === null || _d === void 0 ? void 0 : _d.list) !== null && _e !== void 0 ? _e : [];
+    const type = commitMessage.match(COMMIT_MESSAGE_RE)?.[1];
+    const typeChildren = checkBlocks.find((checkBlock) => checkBlock.type === type)?.list ?? [];
+    const commonChildren = checkBlocks.find((checkBlock) => checkBlock.type === 'common')?.list ?? [];
     const list = [...commonChildren, ...typeChildren];
     if (!list.length) {
         return;

package/lib/node/commands/dev.js

@@ -11,14 +11,13 @@ const { ensureDirSync, pathExistsSync } = fse;
 let server;
 let watcher;
 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((_a = options.draft) !== null && _a !== void 0 ? _a : false);
+    await buildSiteEntry(options.draft ?? false);
     const varletConfig = await getVarletConfig();
     const devConfig = getDevConfig(varletConfig);
     const inlineConfig = merge(devConfig, options.force ? { optimizeDeps: { force: true } } : {});

package/lib/node/commands/preview.js

@@ -4,13 +4,12 @@ import execa from 'execa';
 import { SITE_OUTPUT_PATH } from '../shared/constant.js';
 const { pathExistsSync } = fse;
 export async function preview() {
-    var _a;
     if (!pathExistsSync(SITE_OUTPUT_PATH)) {
         logger.warning('Cannot find the site folder, you must first run the build command to build the document site');
         return;
     }
     try {
-        await ((_a = execa.command('live-server --port=5500', { cwd: SITE_OUTPUT_PATH }).stdout) === null || _a === void 0 ? void 0 : _a.pipe(process.stdout));
+        await execa.command('live-server --port=5500', { cwd: SITE_OUTPUT_PATH }).stdout?.pipe(process.stdout);
     }
     catch (e) {
         logger.error(e.toString());

package/lib/node/commands/release.js

@@ -73,10 +73,9 @@ async function confirmVersion(currentVersion, expectVersion) {
     return ret[name];
 }
 async function confirmRefs(remote = 'origin') {
-    var _a;
     const { stdout } = await execa('git', ['remote', '-v']);
     const reg = new RegExp(`${remote}\t(.*) \\(push`);
-    const repo = (_a = stdout.match(reg)) === null || _a === void 0 ? void 0 : _a[1];
+    const repo = stdout.match(reg)?.[1];
     const { stdout: branch } = await execa('git', ['branch', '--show-current']);
     const name = 'Refs confirm';
     const ret = await prompt([
@@ -138,7 +137,7 @@ export async function release(options) {
                 await execa('git', ['restore', '**/package.json']);
                 await execa('git', ['restore', 'package.json']);
             }
-            catch (_a) {
+            catch {
                 logger.error('Restore package.json has failed, please restore manually');
             }
         }

package/lib/node/compiler/compileSFC.js

@@ -32,7 +32,6 @@ export function injectRender(script, render) {
     return script;
 }
 export async function compileSFC(sfc) {
-    var _a;
     const sources = await readFile(sfc, 'utf-8');
     const id = hash(sources);
     const { descriptor } = parseSFC(sources, { sourceMap: false });
@@ -63,7 +62,7 @@ export async function compileSFC(sfc) {
             source: template.content,
             filename: sfc,
             compilerOptions: {
-                expressionPlugins: ((_a = descriptor.script) === null || _a === void 0 ? void 0 : _a.lang) === 'ts' ? ['typescript'] : undefined,
+                expressionPlugins: descriptor.script?.lang === 'ts' ? ['typescript'] : undefined,
                 scopeId,
                 bindingMetadata,
             },

package/lib/node/compiler/compileSiteEntry.js

@@ -10,22 +10,18 @@ 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_INDEX_RE)) === null || _a === void 0 ? void 0 : _a[1]); // eslint-disable-line
+    return '/' + examplePath.match(EXAMPLE_INDEX_RE)?.[1]; // eslint-disable-line
 }
 export function getComponentDocRoutePath(componentDocsPath) {
-    var _a;
-    const [, routePath, language] = (_a = componentDocsPath.match(COMPONENT_DOCS_RE)) !== null && _a !== void 0 ? _a : [];
+    const [, routePath, language] = componentDocsPath.match(COMPONENT_DOCS_RE) ?? [];
     return `/${language}/${routePath}`;
 }
 export function getRootDocRoutePath(rootDocsPath) {
-    var _a;
-    const [, routePath, language] = (_a = rootDocsPath.match(ROOT_DOCS_RE)) !== null && _a !== void 0 ? _a : [];
+    const [, routePath, language] = rootDocsPath.match(ROOT_DOCS_RE) ?? [];
     return `/${language}/${routePath}`;
 }
 export function getPageRoutePath(rootLocalePath) {
-    var _a;
-    const [, routePath, language] = (_a = rootLocalePath.match(PAGE_LOCALE_RE)) !== null && _a !== void 0 ? _a : [];
+    const [, routePath, language] = rootLocalePath.match(PAGE_LOCALE_RE) ?? [];
     return `/${language}/${routePath}`;
 }
 export function getPageFilePath(rootLocalePath) {
@@ -78,13 +74,11 @@ export async function findPageLocales() {
     // filter
     const filterMap = new Map();
     baseLocales.forEach((locale) => {
-        var _a;
-        const [, routePath, language] = (_a = locale.match(PAGE_LOCALE_RE)) !== null && _a !== void 0 ? _a : [];
+        const [, routePath, language] = locale.match(PAGE_LOCALE_RE) ?? [];
         filterMap.set(routePath + language, slash(`${SITE_PC_DIR}/pages/${routePath}/locale/${language}.ts`));
     });
     userLocales.forEach((locale) => {
-        var _a;
-        const [, routePath, language] = (_a = locale.match(PAGE_LOCALE_RE)) !== null && _a !== void 0 ? _a : [];
+        const [, routePath, language] = locale.match(PAGE_LOCALE_RE) ?? [];
         filterMap.set(routePath + language, locale);
     });
     return Promise.resolve(Array.from(filterMap.values()));

package/lib/node/compiler/compileStyle.js

@@ -22,8 +22,7 @@ export function normalizeStyleDependency(styleImport, reg) {
     return '../' + relativePath;
 }
 export function extractStyleDependencies(file, code, styleReg) {
-    var _a;
-    const styleImports = (_a = code.match(styleReg)) !== null && _a !== void 0 ? _a : [];
+    const styleImports = code.match(styleReg) ?? [];
     const cssFile = resolve(parse(file).dir, `./style/index${getScriptExtname()}`);
     styleImports.forEach((styleImport) => {
         const normalizedPath = normalizeStyleDependency(styleImport, styleReg);

package/lib/node/config/varlet.default.config.js

@@ -42,7 +42,7 @@ export default defineConfig({
                 'en-US': 'Get Started',
             },
             viewOnGithub: {
-                'zh-CN': '查看仓库',
+                'zh-CN': '查看源码',
                 'en-US': 'View On Github',
             },
             features: [

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

@@ -46,7 +46,10 @@ export function getDevConfig(varletConfig) {
 }
 export function getBuildConfig(varletConfig) {
     const devConfig = getDevConfig(varletConfig);
-    return Object.assign(Object.assign({}, devConfig), { base: './', build: {
+    return {
+        ...devConfig,
+        base: './',
+        build: {
             outDir: SITE_OUTPUT_PATH,
             reportCompressedSize: false,
             emptyOutDir: true,
@@ -57,7 +60,8 @@ export function getBuildConfig(varletConfig) {
                     mobile: resolve(SITE_DIR, 'mobile.html'),
                 },
             },
-        } });
+        },
+    };
 }
 export function getBundleConfig(varletConfig, buildOptions) {
     const plugins = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@varlet/cli",
-  "version": "2.16.1",
+  "version": "2.16.3-alpha.1694267513697",
   "type": "module",
   "description": "cli of varlet",
   "bin": {
@@ -67,8 +67,8 @@
     "vite": "4.3.5",
     "vue": "3.3.4",
     "webfont": "^9.0.0",
-    "@varlet/vite-plugins": "2.16.1",
-    "@varlet/shared": "2.16.1"
+    "@varlet/vite-plugins": "2.16.3-alpha.1694267513697",
+    "@varlet/shared": "2.16.3-alpha.1694267513697"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.1",
@@ -83,9 +83,9 @@
     "@types/semver": "^7.3.9",
     "@types/sharp": "0.31.1",
     "rimraf": "^5.0.1",
-    "@varlet/icons": "2.16.1",
-    "@varlet/touch-emulator": "2.16.1",
-    "@varlet/ui": "2.16.1"
+    "@varlet/touch-emulator": "2.16.3-alpha.1694267513697",
+    "@varlet/icons": "2.16.3-alpha.1694267513697",
+    "@varlet/ui": "2.16.3-alpha.1694267513697"
   },
   "peerDependencies": {
     "@vue/runtime-core": "3.3.4",
@@ -98,9 +98,9 @@
     "lodash-es": "^4.17.21",
     "vue": "3.3.4",
     "vue-router": "4.2.0",
-    "@varlet/icons": "2.16.1",
-    "@varlet/touch-emulator": "2.16.1",
-    "@varlet/ui": "2.16.1"
+    "@varlet/icons": "2.16.3-alpha.1694267513697",
+    "@varlet/touch-emulator": "2.16.3-alpha.1694267513697",
+    "@varlet/ui": "2.16.3-alpha.1694267513697"
   },
   "scripts": {
     "dev": "tsc --watch",

package/site/tsconfig.json

@@ -1,11 +1,16 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "es2017",
     "strict": true,
-    "downlevelIteration": true,
+    "declaration": true,
     "skipLibCheck": true,
     "esModuleInterop": true,
+    "downlevelIteration": true,
+    "resolveJsonModule": true,
     "jsx": "preserve",
-    "lib": ["esnext", "dom"]
+    "lib": ["esnext", "dom"],
+    "module": "esnext",
+    "moduleResolution": "node",
+    "outDir": "./lib"
   }
-}
+}

package/tsconfig.json

@@ -1,6 +1,7 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
+    "target": "esnext",
     "outDir": "./lib"
   },
   "include": ["src/**/*"]