From 51416b7d39a4aab49f7eaeeefce5c11097bfbe69 Mon Sep 17 00:00:00 2001
From: Luk Lu <luk.lu@faronear.org>
Date: Wed, 5 Oct 2022 13:10:23 +0800
Subject: [PATCH] [.prettierrc.js] update jsxBracketSameLine:false to
 bracketSameLine:true so that HTML closing bracket not in a seperate line;
 [package.json] delete standardx

---
 .prettierrc.js | 16 +++++++---------
 package.json   |  1 -
 webserver.js   | 16 ++++++++--------
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/.prettierrc.js b/.prettierrc.js
index e001ecd..0eba6fc 100644
--- a/.prettierrc.js
+++ b/.prettierrc.js
@@ -1,16 +1,14 @@
-/* 
-对 VSCode Prettier 有效；建议一直要有本配置文件，否则不同版本的 Prettier 的默认配置会不同，例如 TrailingComma
-对 VSCode Prettier Standard 无效，似乎是集成了不能修改的配置。
-*/
+/* 对 VSCode Prettier 有效；建议一直要有本配置文件，否则不同版本的 Prettier 的默认配置会不同，例如 TrailingComma
+对 VSCode Prettier Standard 无效，似乎是集成了不能修改的配置。 */
 module.exports = {
   printWidth: 160, // default 80
   tabWidth: 2, // default 2
   useTabs: false,
   semi: false, // default true
   singleQuote: true, // default false
-  trailingComma: 'es5', // none (default in v 1.*), es5 (default in v2.0.0), all
+  trailingComma: "es5", // none (default in v 1.*), es5 (default in v2.0.0), all
   bracketSpacing: true, // default true
-  jsxBracketSameLine: false, // default false
-  arrowParens: 'always', // avoid (default in v1.9.0), always (default since v2.0.0)
-  quoteProps: 'as-needed', // as-needed (default), consistent, preserve
-}
+  bracketSameLine: true, // default false
+  arrowParens: "always", // avoid (default in v1.9.0), always (default since v2.0.0)
+  quoteProps: "as-needed" // as-needed (default), consistent, preserve
+};
diff --git a/package.json b/package.json
index 4f89d8f..3458908 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,6 @@
     "cross-env": "^7.0.2",
     "nodemon": "^2.0.2",
     "pm2": "^5.1.2",
-    "standardx": "^6.0.0",
     "supervisor": "^0.12.0"
   }
 }
diff --git a/webserver.js b/webserver.js
index 5244150..21b8cc7 100644
--- a/webserver.js
+++ b/webserver.js
@@ -15,22 +15,22 @@ const wo = (global.wo = {
         ['webSsl', '--webSsl <string>', 'SSL options in JSON string.'],
       ],
       // 最基础的必须的默认配置，如果用户什么也没有提供
-      webProtocol: process.env.NODE_ENV !== 'production' ? 'http' : 'httpall',
-      webHostname: process.env.NODE_ENV !== 'production' ? 'localhost' : 'unknownhost',
-      webPort: process.env.NODE_ENV !== 'production' ? coretool.PORT_WEB_SERVER_DEV : undefined,
-      webRoot: process.env.NODE_ENV !== 'production' ? 'unpackage/dist/build/h5' : '_webroot', // local path to serve as webroot
+      webProtocol: process.env.NODE_ENV === 'production' ? 'httpall' : 'http',
+      webHostname: process.env.NODE_ENV === 'production' ? 'unknownhost' : 'localhost',
+      webPort: process.env.NODE_ENV === 'production' ? coretool.PORT_WEB_SERVER_DEV : undefined,
+      webRoot: process.env.NODE_ENV === 'production' ? '_webroot' : '_webroot', // local path to serve as webroot. 'unpackage/dist/build/h5'
       webIndex: 'index.html',
       webSsl:
-        process.env.NODE_ENV !== 'production'
-          ? undefined
-          : {
+        process.env.NODE_ENV === 'production'
+          ? {
               type: 'file', // greenlock or file
               file: {
                 key: './ssl/privkey.pem', // ssl key file,
                 cert: './ssl/fullchain.pem', // ssl cert file,
                 ca: './ssl/chain.pem', // ssl ca file,
               },
-            },
+            }
+          : undefined,
       // 如果使用虚拟主机
       /*
       vhosts: [