@lvce-editor/about-view 1.4.0 → 1.6.0

package/dist/aboutWorkerMain.js

@@ -65,7 +65,7 @@ const focusPrevious = state => {
 };
 
 const emptyObject = {};
-const RE_PLACEHOLDER = /\{(PH\d+)\}/g;
+const RE_PLACEHOLDER = /{(PH\d+)}/g;
 const i18nString = (key, placeholders = emptyObject) => {
   if (placeholders === emptyObject) {
     return key;
@@ -342,7 +342,7 @@ const formatDate = (date, now) => {
   return formatDateFuture(-seconds);
 };
 
-const formatAboutDate = isoDate => {
+const formatAboutDate = (isoDate, now) => {
   if (!isoDate) {
     return 'unknown';
   }
@@ -350,7 +350,6 @@ const formatAboutDate = isoDate => {
   if (isNaN(date)) {
     return `Invalid Date: ${isoDate}`;
   }
-  const now = Date.now();
   const ago = formatDate(date, now);
   return `${isoDate} (${ago})`;
 };
@@ -389,7 +388,8 @@ const productNameLong = 'Lvce Editor - OSS';
 
 const getDetailString = async () => {
   const [electronVersion, nodeVersion, chromeVersion, version, commit, v8Version, date] = await Promise.all([getElectronVersion(), getNodeVersion(), getChromeVersion(), getVersion(), getCommit(), getV8Version(), getDate()]);
-  const formattedDate = formatAboutDate(date);
+  const now = Date.now();
+  const formattedDate = formatAboutDate(date, now);
   const lines = [`Version: ${version}`, `Commit: ${commit}`, `Date: ${formattedDate}`, `Electron: ${electronVersion}`, `Chromium: ${chromeVersion}`, `Node: ${nodeVersion}`, `V8: ${v8Version}`];
   return joinLines$1(lines);
 };
@@ -402,34 +402,42 @@ const getDetailStringWeb = () => {
   const version$1 = version;
   const commit$1 = commit;
   const date$1 = date;
-  const formattedDate = formatAboutDate(date$1);
+  const now = Date.now();
+  const formattedDate = formatAboutDate(date$1, now);
   const browser = getBrowser();
   const lines = [`Version: ${version$1}`, `Commit: ${commit$1}`, `Date: ${formattedDate}`, `Browser: ${browser}`];
   return lines;
 };
 
-const HandleClickClose = 'handleClickClose';
-const HandleClickCopy = 'handleClickCopy';
-const HandleClickOk = 'handleClickOk';
-const HandleContextMenu = 'handleContextMenu';
-const HandleFocusIn = 'handleFocusIn';
-
-const Button$2 = 1;
-const Div = 4;
-const Text = 12;
-const Br = 55;
-
-const Button$1 = 'Button';
+const Button$2 = 'Button';
 const ButtonPrimary = 'ButtonPrimary';
 const ButtonSecondary = 'ButtonSecondary';
 const DialogButtonsRow = 'DialogButtonsRow';
 const DialogClose = 'DialogClose';
 const DialogContent = 'DialogContent';
 const DialogContentRight = 'DialogContentRight';
-const DialogHeading = 'DialogHeading';
+const DialogHeading$1 = 'DialogHeading';
 const DialogMessage = 'DialogMessage';
 const DialogMessageRow = 'DialogMessageRow';
+const About = 'About';
+const Viewlet = 'Viewlet';
 const DialogToolBarRow = 'DialogToolBarRow';
+const MaskIcon = 'MaskIcon';
+const MaskIconClose = 'MaskIconClose';
+const DialogIcon$1 = 'DialogIcon';
+const DialogInfoIcon = 'DialogInfoIcon';
+const MaskIconInfo = 'MaskIconInfo';
+
+const HandleClickClose = 'handleClickClose';
+const HandleClickCopy = 'handleClickCopy';
+const HandleClickOk = 'handleClickOk';
+const HandleContextMenu = 'handleContextMenu';
+const HandleFocusIn = 'handleFocusIn';
+
+const Button$1 = 1;
+const Div = 4;
+const Text = 12;
+const Br = 55;
 
 const text = data => {
   return {
@@ -458,26 +466,39 @@ const getAboutContentVirtualDom = lines => {
   return dom;
 };
 
+const True = 'true';
+
 const Button = 'button';
 const Dialog = 'dialog';
 
+const joinBySpace = (...items) => {
+  return items.join(' ');
+};
+
+const mergeClassNames = (...classNames) => {
+  return joinBySpace(...classNames.filter(Boolean));
+};
+
 const getPrimaryButtonVirtualDom = (message, onClick) => {
   return [{
-    type: Button$2,
-    className: `${Button$1} ${ButtonPrimary}`,
+    type: Button$1,
+    className: mergeClassNames(Button$2, ButtonPrimary),
     onClick,
     childCount: 1
   }, text(message)];
 };
 const getSecondaryButtonVirtualDom = (message, onClick) => {
   return [{
-    type: Button$2,
-    className: `${Button$1} ${ButtonSecondary}`,
+    type: Button$1,
+    className: mergeClassNames(Button$2, ButtonSecondary),
     onClick,
     childCount: 1
   }, text(message)];
 };
 
+const DialogIcon = 'DialogIcon';
+const DialogHeading = 'DialogHeading';
+
 const Focusable = -1;
 
 const getDialogVirtualDom = (content, closeMessage, infoMessage, okMessage, copyMessage, productName) => {
@@ -486,8 +507,8 @@ const getDialogVirtualDom = (content, closeMessage, infoMessage, okMessage, copy
     className: DialogContent,
     tabIndex: Focusable,
     role: Dialog,
-    ariaModal: 'true',
-    ariaLabelledBy: 'DialogIcon DialogHeading',
+    ariaModal: True,
+    ariaLabelledBy: joinBySpace(DialogIcon, DialogHeading),
     onFocusIn: HandleFocusIn,
     childCount: 3
   }, {
@@ -503,7 +524,7 @@ const getDialogVirtualDom = (content, closeMessage, infoMessage, okMessage, copy
     childCount: 1
   }, {
     type: Div,
-    className: 'MaskIcon MaskIconClose',
+    className: mergeClassNames(MaskIcon, MaskIconClose),
     childCount: 0
   }, {
     type: Div,
@@ -511,8 +532,8 @@ const getDialogVirtualDom = (content, closeMessage, infoMessage, okMessage, copy
     childCount: 2
   }, {
     type: Div,
-    className: 'DialogIcon DialogInfoIcon MaskIcon MaskIconInfo',
-    id: 'DialogIcon',
+    className: mergeClassNames(DialogIcon$1, DialogInfoIcon, MaskIcon, MaskIconInfo),
+    id: DialogIcon,
     ariaLabel: infoMessage,
     childCount: 0
   }, {
@@ -521,8 +542,8 @@ const getDialogVirtualDom = (content, closeMessage, infoMessage, okMessage, copy
     childCount: 2
   }, {
     type: Div,
-    id: 'DialogHeading',
-    className: DialogHeading,
+    id: DialogHeading,
+    className: DialogHeading$1,
     childCount: 1
   }, text(productName), ...content, {
     type: Div,
@@ -536,14 +557,14 @@ const getAboutVirtualDom = (productName, lines, closeMessage, okMessage, copyMes
   const content = getAboutContentVirtualDom(lines);
   return [{
     type: Div,
-    className: 'Viewlet About',
+    className: mergeClassNames(Viewlet, About),
     onContextMenu: HandleContextMenu,
     childCount: 1
   }, ...getDialogVirtualDom(content, closeMessage, infoMessage, okMessage, copyMessage, productName)];
 };
 
-const loadContent = async state => {
-  const lines = await getDetailStringWeb();
+const loadContent = state => {
+  const lines = getDetailStringWeb();
   return {
     ...state,
     productName: productNameLong,
@@ -639,7 +660,7 @@ class AssertionError extends Error {
     this.name = 'AssertionError';
   }
 }
-const getType$1 = value => {
+const getType = value => {
   switch (typeof value) {
     case 'number':
       return 'number';
@@ -662,7 +683,7 @@ const getType$1 = value => {
   }
 };
 const number = value => {
-  const type = getType$1(value);
+  const type = getType(value);
   if (type !== 'number') {
     throw new AssertionError('expected value to be of type number');
   }
@@ -699,7 +720,7 @@ class JsonRpcError extends Error {
 const MethodNotFound = -32601;
 const Custom = -32001;
 const E_COMMAND_NOT_FOUND = 'E_COMMAND_NOT_FOUND';
-const getType = prettyError => {
+const getErrorType = prettyError => {
   if (prettyError && prettyError.type) {
     return prettyError.type;
   }
@@ -722,7 +743,7 @@ const getErrorProperty = (error, prettyError) => {
     data: {
       stack: prettyError.stack,
       codeFrame: prettyError.codeFrame,
-      type: getType(prettyError),
+      type: getErrorType(prettyError),
       code: prettyError.code,
       name: prettyError.name
     }
@@ -823,7 +844,7 @@ const requiresSocket = () => {
 const preparePrettyError = error => {
   return error;
 };
-const logError = error => {
+const logError = () => {
   // handled by renderer worker
 };
 const handleMessage = event => {
@@ -834,22 +855,6 @@ const handleIpc = ipc => {
   ipc.addEventListener('message', handleMessage);
 };
 
-const MessagePort$1 = 1;
-const ModuleWorker = 2;
-const ReferencePort = 3;
-const ModuleWorkerAndMessagePort = 8;
-const Auto = () => {
-  // @ts-ignore
-  if (globalThis.acceptPort) {
-    return MessagePort$1;
-  }
-  // @ts-ignore
-  if (globalThis.acceptReferencePort) {
-    return ReferencePort;
-  }
-  return ModuleWorkerAndMessagePort;
-};
-
 const getData$1 = event => {
   return event.data;
 };
@@ -1239,6 +1244,23 @@ const IpcChildWithModuleWorkerAndMessagePort$1 = {
   wrap: wrap$5
 };
 
+const MessagePort$1 = 1;
+const ModuleWorker = 2;
+const ReferencePort = 3;
+const ModuleWorkerAndMessagePort = 8;
+const Auto = () => {
+  // @ts-expect-error
+  if (globalThis.acceptPort) {
+    return MessagePort$1;
+  }
+  // @ts-expect-error
+  if (globalThis.acceptReferencePort) {
+    return ReferencePort;
+  }
+  return ModuleWorkerAndMessagePort;
+};
+
+// @ts-ignore
 const getModule = method => {
   switch (method) {
     case ModuleWorker:
@@ -1253,7 +1275,7 @@ const getModule = method => {
 const listen$1 = async ({
   method
 }) => {
-  const module = await getModule(method);
+  const module = getModule(method);
   const rawIpc = await module.listen();
   if (module.signal) {
     module.signal(rawIpc);
@@ -1274,4 +1296,4 @@ const main = async () => {
   await listen();
 };
 
-main();
+await main();

package/package.json

@@ -1,10 +1,12 @@
 {
   "name": "@lvce-editor/about-view",
-  "version": "1.4.0",
+  "version": "1.6.0",
   "description": "",
   "main": "dist/aboutWorkerMain.js",
   "type": "module",
-  "keywords": [],
-  "author": "",
+  "keywords": [
+    "about"
+  ],
+  "author": "Lvce Editor",
   "license": "MIT"
 }