mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-11-03 04:25:55 +01:00
Merge branch 'master' into patch-pitaj
This commit is contained in:
@@ -88,6 +88,7 @@ module.exports = function (Meta) {
|
||||
'mousetrap.js': './node_modules/mousetrap/mousetrap.min.js',
|
||||
'cropper.js': './node_modules/cropperjs/dist/cropper.min.js',
|
||||
'jqueryui.js': 'public/vendor/jquery/js/jquery-ui.js',
|
||||
'zxcvbn.js': './node_modules/zxcvbn/dist/zxcvbn.js',
|
||||
ace: './node_modules/ace-builds/src-min',
|
||||
},
|
||||
},
|
||||
@@ -376,7 +377,9 @@ module.exports = function (Meta) {
|
||||
/**
|
||||
* otherwise, just clean up --debug/--debug-brk options which are set up by default from the parent one
|
||||
*/
|
||||
forkProcessParams = { execArgv: [] };
|
||||
forkProcessParams = {
|
||||
execArgv: [],
|
||||
};
|
||||
}
|
||||
|
||||
return forkProcessParams;
|
||||
|
||||
Reference in New Issue
Block a user