Skip to content

Commit ad605d2

Browse files
2heal12heal1
authored
chore: unify logger (#3121)
1 parent 86b4cdc commit ad605d2

File tree

39 files changed

+229
-199
lines changed

39 files changed

+229
-199
lines changed

‎.changeset/fast-apples-double.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
'@module-federation/bridge-shared': patch
3+
'@module-federation/bridge-react': patch
4+
'@module-federation/bridge-vue3': patch
5+
'@module-federation/rsbuild-plugin': patch
6+
'@module-federation/data-prefetch': patch
7+
'@module-federation/retry-plugin': patch
8+
'@module-federation/dts-plugin': patch
9+
'@module-federation/enhanced': patch
10+
'@module-federation/managers': patch
11+
'@module-federation/manifest': patch
12+
'@module-federation/modern-js': patch
13+
'@module-federation/runtime': patch
14+
'@module-federation/sdk': patch
15+
---
16+
17+
chore: unified logger

‎packages/bridge/bridge-react/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
"dependencies": {
4141
"@loadable/component": "^5.16.4",
4242
"@module-federation/bridge-shared": "workspace:*",
43+
"@module-federation/sdk": "workspace:*",
4344
"react-error-boundary": "^4.0.13"
4445
},
4546
"peerDependencies": {

‎packages/bridge/bridge-react/src/utils.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import React from 'react';
2-
import { Logger } from '@module-federation/bridge-shared';
2+
import { createLogger } from '@module-federation/sdk';
33

4-
export const LoggerInstance = new Logger('bridge-react');
4+
export const LoggerInstance = createLogger(
5+
'[ Module Federation Bridge React ]',
6+
);
57

68
type typeReact = typeof React;
79

‎packages/bridge/bridge-shared/src/index.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
export type { RenderFnParams, ProviderParams } from './type';
2-
export { Logger } from './logger';
32
export { dispatchPopstateEnv } from './env';

‎packages/bridge/bridge-shared/src/logger.ts‎

Lines changed: 0 additions & 52 deletions
This file was deleted.

‎packages/bridge/vue3-bridge/package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131
"vue-router": "=3"
3232
},
3333
"dependencies": {
34-
"@module-federation/bridge-shared": "workspace:*"
34+
"@module-federation/bridge-shared": "workspace:*",
35+
"@module-federation/sdk": "workspace:*"
3536
},
3637
"devDependencies": {
3738
"@vitejs/plugin-vue": "^5.0.4",

‎packages/bridge/vue3-bridge/src/utils.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
import { Logger } from '@module-federation/bridge-shared';
1+
import { createLogger } from '@module-federation/sdk';
22

3-
export const LoggerInstance = new Logger('vue3-bridge');
3+
export const LoggerInstance = createLogger('[ Module Federation Bridge Vue3 ]');

‎packages/data-prefetch/src/logger/index.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
import { Logger } from '@module-federation/sdk';
1+
import { createLogger } from '@module-federation/sdk';
22

3-
export default new Logger('[Module Federation Data Prefetch]');
3+
const logger = createLogger('[ Module Federation Data Prefetch ]');
4+
5+
export default logger;

‎packages/dts-plugin/src/core/lib/DTSManager.ts‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import {
2727
REMOTE_ALIAS_IDENTIFIER,
2828
HOST_API_TYPES_FILE_NAME,
2929
} from '../constant';
30-
import { fileLog } from '../../server';
30+
import { fileLog, logger } from '../../server';
3131
import { axiosGet, cloneDeepOptions, isDebugMode } from './utils';
3232
import { UpdateMode } from '../../server/constant';
3333

@@ -163,12 +163,10 @@ class DTSManager {
163163
console.error(err);
164164
}
165165
}
166-
console.log(ansiColors.green('Federated types created correctly'));
166+
logger.success('Federated types created correctly');
167167
} catch (error) {
168168
if (this.options.remote?.abortOnError === false) {
169-
console.error(
170-
ansiColors.red(`Unable to compile federated types, ${error}`),
171-
);
169+
logger.error(`Unable to compile federated types, ${error}`);
172170
} else {
173171
throw error;
174172
}
@@ -406,7 +404,7 @@ class DTSManager {
406404
this.consumeAPITypes(hostOptions);
407405
}
408406

409-
console.log(ansiColors.green('Federated types extraction completed'));
407+
logger.success('Federated types extraction completed');
410408
} catch (err) {
411409
if (this.options.host?.abortOnError === false) {
412410
fileLog(

‎packages/dts-plugin/src/plugins/DevPlugin.ts‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import {
1010
WEB_CLIENT_OPTIONS_IDENTIFIER,
1111
WebClientOptions,
1212
getIPV4,
13+
logger,
1314
} from '../server';
1415
import type { Compiler, WebpackPluginInstance } from 'webpack';
1516
import path from 'path';
@@ -56,32 +57,32 @@ export class DevPlugin implements WebpackPluginInstance {
5657

5758
private _stopWhenSIGTERMOrSIGINT(): void {
5859
process.on('SIGTERM', () => {
59-
console.log(
60-
chalk`{cyan ${this._options.name} Process(${process.pid}) SIGTERM, mf server will exit...}`,
60+
logger.info(
61+
`${this._options.name} Process(${process.pid}) SIGTERM, mf server will exit...`,
6162
);
6263
this._exit(PROCESS_EXIT_CODE.SUCCESS);
6364
});
6465

6566
process.on('SIGINT', () => {
66-
console.log(
67-
chalk`{cyan ${this._options.name} Process(${process.pid}) SIGINT, mf server will exit...}`,
67+
logger.info(
68+
`${this._options.name} Process(${process.pid}) SIGINT, mf server will exit...`,
6869
);
6970
this._exit(PROCESS_EXIT_CODE.SUCCESS);
7071
});
7172
}
7273

7374
private _handleUnexpectedExit(): void {
7475
process.on('unhandledRejection', (error) => {
75-
console.error('Unhandled Rejection Error: ', error);
76-
console.log(
77-
chalk`{cyan ${this._options.name} Process(${process.pid}) unhandledRejection, mf server will exit...}`,
76+
logger.error(error);
77+
logger.error(
78+
`Process(${process.pid}) unhandledRejection, mf server will exit...`,
7879
);
7980
this._exit(PROCESS_EXIT_CODE.FAILURE);
8081
});
8182
process.on('uncaughtException', (error) => {
82-
console.error('Unhandled Rejection Error: ', error);
83-
console.log(
84-
chalk`{cyan ${this._options.name} Process(${process.pid}) uncaughtException, mf server will exit...}`,
83+
logger.error(error);
84+
logger.error(
85+
`Process(${process.pid}) uncaughtException, mf server will exit...`,
8586
);
8687
this._exit(PROCESS_EXIT_CODE.FAILURE);
8788
});

0 commit comments

Comments
 (0)