Skip to content

Commit 509c62a

Browse files
committed
fix(pack): fix bundling error not throwed
1 parent 80ee950 commit 509c62a

File tree

2 files changed

+48
-35
lines changed

2 files changed

+48
-35
lines changed

lib/models/Project.js

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -421,9 +421,29 @@ var Project = function () {
421421
});
422422

423423
if (err) {
424+
spinner.text = '';
425+
spinner.stop();
424426
logError(err);
425-
} else {
426-
logInfo('no packing error');
427+
process.exit(1);
428+
}
429+
430+
var statsInfo = stats.toJson({ errorDetails: false });
431+
if (statsInfo.warnings.length > 0) {
432+
spinner.text = '';
433+
spinner.stop();
434+
logLinefeed();
435+
statsInfo.warnings.map(function (warning) {
436+
logWarn(warning + '\n');
437+
});
438+
}
439+
440+
if (statsInfo.errors.length > 0) {
441+
spinner.text = '';
442+
spinner.stop();
443+
statsInfo.errors.map(function (err) {
444+
logError(err + '\n');
445+
});
446+
process.exit(1);
427447
}
428448

429449
// 压缩
@@ -458,7 +478,7 @@ var Project = function () {
458478
spinner.text = '';
459479
spinner.stop();
460480
info('\n');
461-
spinner.text = 'error occured while minifying ' + resErr.assetName;
481+
spinner.text = 'Error occured while minifying ' + resErr.assetName;
462482
spinner.fail();
463483
info(('line: ' + resErr.line + ', col: ' + resErr.col + ' ' + resErr.message + ' \n').red);
464484

@@ -517,23 +537,9 @@ var Project = function () {
517537
process.exit(1);
518538
}
519539

520-
var statsInfo = stats.toJson({ errorDetails: false });
521-
522-
if (statsInfo.warnings.length > 0) {
523-
statsInfo.warnings.map(function (warning) {
524-
logWarn(warning + '\n');
525-
});
526-
}
527-
528-
if (statsInfo.errors.length > 0) {
529-
statsInfo.errors.map(function (err) {
530-
logError(err + '\n');
531-
});
532-
process.exit(1);
533-
}
534-
535540
process.stdout.write('\n--------------------- YKIT EMITTED ASSETS ---------------------\n\n');
536541

542+
var statsInfo = stats.toJson({ errorDetails: false });
537543
var assetsInfo = self.config._config.assetsInfo || statsInfo.assets;
538544
assetsInfo.map(function (asset) {
539545
if (sysPath.extname(asset.name) !== '.cache') {

src/models/Project.js

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -414,9 +414,29 @@ class Project {
414414
});
415415

416416
if(err) {
417+
spinner.text = '';
418+
spinner.stop();
417419
logError(err);
418-
} else {
419-
logInfo('no packing error');
420+
process.exit(1);
421+
}
422+
423+
const statsInfo = stats.toJson({ errorDetails: false });
424+
if (statsInfo.warnings.length > 0) {
425+
spinner.text = '';
426+
spinner.stop();
427+
logLinefeed();
428+
statsInfo.warnings.map(warning => {
429+
logWarn(warning + '\n');
430+
});
431+
}
432+
433+
if (statsInfo.errors.length > 0) {
434+
spinner.text = '';
435+
spinner.stop();
436+
statsInfo.errors.map(err => {
437+
logError(err + '\n');
438+
});
439+
process.exit(1);
420440
}
421441

422442
// 压缩
@@ -453,7 +473,7 @@ class Project {
453473
spinner.text = '';
454474
spinner.stop();
455475
info('\n');
456-
spinner.text = `error occured while minifying ${resErr.assetName}`;
476+
spinner.text = `Error occured while minifying ${resErr.assetName}`;
457477
spinner.fail();
458478
info(
459479
`line: ${resErr.line}, col: ${resErr.col} ${resErr.message} \n`.red
@@ -520,25 +540,12 @@ class Project {
520540
process.exit(1);
521541
}
522542

523-
let statsInfo = stats.toJson({ errorDetails: false });
524-
525-
if (statsInfo.warnings.length > 0) {
526-
statsInfo.warnings.map(warning => {
527-
logWarn(warning + '\n');
528-
});
529-
}
530-
531-
if (statsInfo.errors.length > 0) {
532-
statsInfo.errors.map(err => {
533-
logError(err + '\n');
534-
});
535-
process.exit(1);
536-
}
537543

538544
process.stdout.write(
539545
'\n--------------------- YKIT EMITTED ASSETS ---------------------\n\n'
540546
);
541547

548+
const statsInfo = stats.toJson({ errorDetails: false });
542549
const assetsInfo = self.config._config.assetsInfo || statsInfo.assets;
543550
assetsInfo.map(asset => {
544551
if (sysPath.extname(asset.name) !== '.cache') {

0 commit comments

Comments
 (0)