fix: node config fatal tip message

searchfe · Oct 29, 2022 · 793fbc1 · 793fbc1
1 parent a8ed692
commit 793fbc1
Show file tree

Hide file tree

Showing 16 changed files with 2,758 additions and 2,321 deletions.
diff --git a/README.md b/README.md
@@ -52,9 +52,10 @@ npm run dev
 ```sh
 npm i lerna -g
 
-lerna bootstrap
+lerna bootstrap --registry https://registry.npmmirror.com
 lerna link
 
+# global link
 cd packages/cli
 npm link
 ```
@@ -63,6 +64,11 @@ npm link
 ```sh
 # watch @hoth/cli
 lerna exec "tsc --build -w tsconfig.json" --scope @hoth/cli
+lerna exec "tsc --build -w tsconfig.json" --scope @hoth/decorators
+lerna exec "tsc --build -w tsconfig.json" --scope @hoth/app-autoload
+lerna exec "tsc --build -w tsconfig.json" --scope @hoth/logger
+
+lerna add config-enhanced --scope @hoth/app-autoload --registry https://registry.npmmirror.com
 
 # debug for "hoth start"
 cd example/hoth-quickstart

diff --git a/commitlint.config.js b/commitlint.config.js
@@ -2,4 +2,7 @@ module.exports = {
     extends: [
         "@commitlint/config-conventional",
     ],
+    rules: {
+        'body-max-line-length': [0, 'always'] // Make sure there is never a max-line-length by disabling the rule
+    },
 };
diff --git a/packages/app-autoload/.npmignore b/packages/app-autoload/.npmignore
@@ -0,0 +1,2 @@
+tsconfig.json
+src
diff --git a/packages/app-autoload/package.json b/packages/app-autoload/package.json
@@ -27,7 +27,7 @@
     "@hoth/logger": "^1.1.7",
     "@hoth/molecule": "^1.1.2",
     "@hoth/utils": "^1.1.4",
-    "config": "^3.3.3",
+    "config-enhanced": "^3.3.7",
     "fastify-plugin": "^3.0.0",
     "fastify-warmup": "0.1.1",
     "resolve-from": "^5.0.0",

diff --git a/packages/app-autoload/src/index.ts b/packages/app-autoload/src/index.ts
@@ -6,7 +6,7 @@
 process.env.SUPPRESS_NO_CONFIG_WARNING = 'y';
 process.env.ALLOW_CONFIG_MUTATIONS = 'false';
 
-import Config from 'config';
+import Config from 'config-enhanced';
 import {resolve, join, isAbsolute} from 'path';
 import {existsSync, readdirSync} from 'fs';
 import {FastifyInstance, FastifyPluginAsync} from 'fastify';
@@ -183,6 +183,7 @@ export async function getApps(opts: AppAutoload): Promise<AppConfig[]> {
             const dirPath = resolve(appRoot, dir.name);
             if (dir.isDirectory() && existsSync(join(dirPath, 'app.js'))) {
                 const configs = await loadConfig(dirPath);
+
                 let appPrefix = prefix;
                 if (configs.pluginConfig && configs.pluginConfig['@hoth/app-autoload']) {
                     appPrefix = configs.pluginConfig['@hoth/app-autoload'].prefix || appPrefix;

diff --git a/packages/app-autoload/src/module.d.ts b/packages/app-autoload/src/module.d.ts
@@ -1,2 +1,2 @@
-declare module 'config';
+declare module 'config-enhanced';
 declare module '@hoth/molecule';
diff --git a/packages/cli/.npmignore b/packages/cli/.npmignore
@@ -0,0 +1 @@
+tsconfig.json
diff --git a/packages/cli/hoth-template/templates/normal/nodemon.json b/packages/cli/hoth-template/templates/normal/nodemon.json
@@ -1,6 +1,6 @@
 {
     "watch": ["*.ts", "*.tpl"],
-    "ignore": ["*.test.ts", "node_modules/*", "*.d.ts"],
+    "ignore": ["*.test.ts", "node_modules/*", "*.d.ts", "dist"],
     "ext": "ts,js,tpl",
     "exec": "npm run build && NODE_ENV=development hoth start --app-dir='dist' --app-name='__appName__' --app-prefix='/__appName__'",
     "legacyWatch": true

diff --git a/packages/cli/hoth-template/templates/san-ssr-app/nodemon.json b/packages/cli/hoth-template/templates/san-ssr-app/nodemon.json
@@ -1,6 +1,6 @@
 {
     "watch": ["*.ts", "*.html", "*.san"],
-    "ignore": ["*.test.ts", "node_modules/*", "*.d.ts"],
+    "ignore": ["*.test.ts", "node_modules/*", "*.d.ts", "dist"],
     "ext": "ts,js,tpl",
     "exec": "npm run build && NODE_ENV=development hoth start --app-dir='dist' --app-name='__appName__' --app-prefix='/__appName__'",
     "legacyWatch": true

diff --git a/packages/cli/hoth-template/templates/vue-ssr-app/nodemon.json b/packages/cli/hoth-template/templates/vue-ssr-app/nodemon.json
@@ -1,6 +1,6 @@
 {
     "watch": ["*.ts", "*.html", "*.vue"],
-    "ignore": ["*.test.ts", "node_modules/*", "*.d.ts"],
+    "ignore": ["*.test.ts", "node_modules/*", "*.d.ts", "dist"],
     "ext": "ts,js,tpl",
     "exec": "npm run build && NODE_ENV=development hoth start --app-dir='dist' --app-name='__appName__' --app-prefix='/__appName__'",
     "legacyWatch": true

diff --git a/packages/decorators/.npmignore b/packages/decorators/.npmignore
@@ -0,0 +1 @@
+tsconfig.json
diff --git a/packages/logger/.npmignore b/packages/logger/.npmignore
@@ -0,0 +1 @@
+tsconfig.json
diff --git a/packages/logger/CHANGELOG.md b/packages/logger/CHANGELOG.md
@@ -1,8 +1,10 @@
-# [@hoth/logger-v1.5.0](https://github.com/searchfe/hoth/compare/@hoth/logger-v1.4.0...@hoth/logger-v1.5.0) (2022-10-10)
+
 
 
 ### Features
 
+# [@hoth/logger-v1.5.0](https://github.com/searchfe/hoth/compare/@hoth/logger-v1.4.0...@hoth/logger-v1.5.0) (2022-10-10)
+
 * product取值优化 ([b857005](https://github.com/searchfe/hoth/commit/b85700587d7f208e06698ce88e7069e770729be4))
 
 # [@hoth/logger-v1.4.0](https://github.com/searchfe/hoth/compare/@hoth/logger-v1.3.0...@hoth/logger-v1.4.0) (2022-03-29)

diff --git a/packages/logger/package.json b/packages/logger/package.json
@@ -23,6 +23,7 @@
   },
   "homepage": "https://github.com/cxtom/hoth#readme",
   "dependencies": {
+    "chalk": "4.1.2",
     "file-stream-rotator": "^0.5.7",
     "flatstr": "^1.0.12",
     "lodash": "^4.17.21",

diff --git a/packages/logger/src/stream.ts b/packages/logger/src/stream.ts
@@ -3,6 +3,7 @@
  * @author cxtom
  */
 
+import chalk from 'chalk';
 import format from './format';
 import {defaultLevels} from './constants';
 
@@ -56,7 +57,13 @@ export default function (streamsArray) {
 
         /* istanbul ignore else */
         if (isDevelopment) {
-            console.log(data);
+            const arr = info.result.split(':');
+            arr[0] = (['FATAL', 'ERROR'].includes(arr[0]))
+                ? chalk.red(arr[0]) : (arr[0] === 'WARN')
+                    ? chalk.yellow(arr[0]) : chalk.green(arr[0]);
+
+            // with \n
+            process.stdout.write(arr.join(':'));
         }
 
         stream.write(info.result);