Skip to content

Commit 98234ed

Browse files
committed
chore(nf-core): update deps and remove npmlog
1 parent 8dbc749 commit 98234ed

File tree

10 files changed

+423
-436
lines changed

10 files changed

+423
-436
lines changed

libs/native-federation-core/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"license": "MIT",
66
"dependencies": {
77
"json5": "^2.2.0",
8-
"npmlog": "^6.0.2",
8+
"chalk": "^5.4.1",
99
"@softarc/native-federation-runtime": "2.0.26"
1010
}
1111
}
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,18 @@
11
/* eslint-disable @typescript-eslint/no-explicit-any */
22

3-
import log from 'npmlog';
4-
import { LogLevels } from 'npmlog';
3+
import chalk from 'chalk';
54

6-
const levels = (log as any).levels;
7-
8-
log.addLevel('error', levels.error, { fg: 'brightWhite', bg: 'red' }, ' ERR! ');
9-
log.addLevel(
10-
'warn',
11-
levels.info,
12-
{ fg: 'brightWhite', bg: 'yellow' },
13-
' WARN '
14-
);
15-
log.addLevel('info', levels.warn, { fg: 'brightWhite', bg: 'green' }, ' INFO ');
16-
log.addLevel(
17-
'notice',
18-
levels.notice,
19-
{ fg: 'black', bg: 'brightYellow' },
20-
' NOTE '
21-
);
22-
log.addLevel(
23-
'verbose',
24-
levels.verbose,
25-
{ fg: 'brightWhite', bg: 'brightBlue' },
26-
' VRB! '
27-
);
28-
log.addLevel('silly', levels.silly, { fg: 'black', bg: 'white' }, ' DBG! ');
29-
30-
// export const error = (msg: any) => log.error('', msg);
31-
// export const warn = (msg: any) => log.warn('', msg);
32-
// export const notice = (msg: any) => log.notice('', msg);
33-
// export const info = (msg: any) => log.info('', msg);
34-
// export const verbose = (msg: any) => log.verbose('', msg);
35-
// export const debug = (msg: any) => log.silly('', msg);
5+
let verbose = false;
366

377
export const logger = {
38-
error: (msg: any) => log.error('', msg),
39-
warn: (msg: any) => log.warn('', msg),
40-
notice: (msg: any) => log.notice('', msg),
41-
info: (msg: any) => log.info('', msg),
42-
verbose: (msg: any) => log.verbose('', msg),
43-
debug: (msg: any) => log.silly('', msg),
8+
warn: (msg: any) => console.warn(chalk.bgYellow.ansi256(15)(' WARN '), msg),
9+
error: (msg: any) => console.error(chalk.bgRed.ansi256(15)(' ERRR '), msg),
10+
notice: (msg: any) => console.log(chalk.bgYellowBright.black(' NOTE '), msg),
11+
info: (msg: any) => console.log(chalk.bgGreen.ansi256(15)(' INFO '), msg),
12+
verbose: (msg: any) => verbose && console.log(chalk.bgGreen.ansi256(15)(' DBG! '), msg),
13+
debug: (msg: any) => verbose && console.log(chalk.bgGreen.ansi256(15)(' DBG! '), msg),
4414
};
4515

46-
export const setLogLevel = (level: LogLevels | 'debug') => {
47-
log.level = level === 'debug' ? 'silly' : level;
16+
export const setLogLevel = (level: string) => {
17+
verbose = level === 'verbose';
4818
};
49-
50-
setLogLevel('info');
51-
52-
// log.error('', {x:1} as any);
53-
// log.warn('', 'bla');
54-
// log.notice('', 'bla');
55-
// log.info('', 'bla');
56-
// log.verbose('', 'bla');
57-
// log.silly('', 'bla');

libs/native-federation-esbuild/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"@rollup/plugin-replace": "^4.0.0",
99
"rollup": "^2.79.0",
1010
"rollup-plugin-node-externals": "^4.1.1",
11-
"esbuild": "^0.18.12",
12-
"npmlog": "^6.0.2",
11+
"esbuild": "^0.25.1",
12+
"signale": "^1.4.0",
1313
"acorn": "^8.8.1"
1414
}
1515
}

libs/native-federation/package.json

+2-4
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,10 @@
2222
"@babel/core": "^7.19.0",
2323
"@softarc/native-federation": "2.0.26",
2424
"@softarc/native-federation-runtime": "2.0.26",
25-
"@types/browser-sync": "^2.29.0",
2625
"@chialab/esbuild-plugin-commonjs": "^0.18.0",
27-
"browser-sync": "^3.0.2",
28-
"esbuild": "^0.19.5",
26+
"esbuild": "^0.25.1",
2927
"mrmime": "^1.0.1",
30-
"npmlog": "^6.0.2",
28+
"signale": "^1.4.0",
3129
"process": "0.11.10"
3230
},
3331
"peerDependencies": {}

libs/native-federation/src/builders/build/builder.ts

-9
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import { buildForFederation } from '@softarc/native-federation/build';
3030
import { targetFromTargetString } from '@angular-devkit/architect';
3131

3232
import { NfBuilderSchema } from './schema';
33-
import { reloadBrowser, setError } from '../../utils/dev-server';
3433
import { RebuildHubs } from '../../utils/rebuild-events';
3534
import { updateScriptTags } from '../../utils/updateIndexHtml';
3635
import { existsSync, mkdirSync, rmSync } from 'fs';
@@ -293,14 +292,6 @@ export async function* runBuilder(
293292
for await (const output of builderRun) {
294293
lastResult = output;
295294

296-
if (!output.success) {
297-
setError('Compilation Error');
298-
reloadBrowser();
299-
continue;
300-
} else {
301-
setError(null);
302-
}
303-
304295
if (!write && output.outputFiles) {
305296
memResults.add(output.outputFiles.map((file) => new EsBuildResult(file)));
306297
}

libs/native-federation/src/utils/dev-server.ts

-117
This file was deleted.

libs/native-federation/tsconfig.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
"noImplicitOverride": true,
1010
"noPropertyAccessFromIndexSignature": true,
1111
// "noImplicitReturns": true,
12-
"noFallthroughCasesInSwitch": true
12+
"noFallthroughCasesInSwitch": true,
13+
"types": ["node"]
1314
},
1415
"files": [],
1516
"include": [],

libs/native-federation/tsconfig.lib.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"composite": true,
55
"outDir": "../../dist/out-tsc",
66
"declaration": true,
7-
"types": []
7+
"types": ["node"]
88
},
99
"include": ["**/*.ts", "**/*.js"],
1010
"exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"]

0 commit comments

Comments
 (0)