This commit is contained in:
Nathan Bierema 2020-10-31 07:28:25 -05:00
parent 4448ac51ce
commit 930cf3c833
16 changed files with 72 additions and 60 deletions

View File

@ -170,21 +170,29 @@ gulp.task('test:electron', () => {
.on('end', () => crdv.stop()); .on('end', () => crdv.stop());
}); });
gulp.task('default', gulp.parallel( gulp.task(
'default',
gulp.parallel(
'replace-webpack-code', 'replace-webpack-code',
'webpack:dev', 'webpack:dev',
'views:dev', 'views:dev',
'copy:dev', 'copy:dev',
'views:watch', 'views:watch',
'copy:watch', 'copy:watch'
)); )
gulp.task('build:extension', gulp.parallel( );
gulp.task(
'build:extension',
gulp.parallel(
'replace-webpack-code', 'replace-webpack-code',
'webpack:build:extension', 'webpack:build:extension',
'views:build:extension', 'views:build:extension',
'copy:build:extension', 'copy:build:extension'
)); )
gulp.task('copy:build:firefox', gulp.series('build:extension', (done) => { );
gulp.task(
'copy:build:firefox',
gulp.series('build:extension', (done) => {
gulp gulp
.src([ .src([
'./build/extension/**', './build/extension/**',
@ -198,5 +206,6 @@ gulp.task('copy:build:firefox', gulp.series('build:extension', (done) => {
}); });
copy('./build/firefox'); copy('./build/firefox');
done(); done();
})); })
);
gulp.task('build:firefox', gulp.series('copy:build:firefox')); gulp.task('build:firefox', gulp.series('copy:build:firefox'));

View File

@ -70,8 +70,7 @@ export function filterState(
) { ) {
if (type === 'ACTION') { if (type === 'ACTION') {
return !stateSanitizer ? state : stateSanitizer(state, nextActionId - 1); return !stateSanitizer ? state : stateSanitizer(state, nextActionId - 1);
} } else if (type !== 'STATE') return state;
else if (type !== 'STATE') return state;
if (predicate || !noFiltersApplied(localFilter)) { if (predicate || !noFiltersApplied(localFilter)) {
const filteredStagedActionIds = []; const filteredStagedActionIds = [];

View File

@ -299,7 +299,11 @@ const __REDUX_DEVTOOLS_EXTENSION__ = function(
const filteredActionIds = []; // simple circular buffer of non-excluded actions with fixed maxAge-1 length const filteredActionIds = []; // simple circular buffer of non-excluded actions with fixed maxAge-1 length
const getMaxAge = (liftedAction, liftedState) => { const getMaxAge = (liftedAction, liftedState) => {
let m = (config && config.maxAge) || window.devToolsOptions.maxAge || 50; let m = (config && config.maxAge) || window.devToolsOptions.maxAge || 50;
if (!liftedAction || noFiltersApplied(localFilter) || !liftedAction.action) { if (
!liftedAction ||
noFiltersApplied(localFilter) ||
!liftedAction.action
) {
return m; return m;
} }
if (!maxAge || maxAge < m) maxAge = m; // it can be modified in process on options page if (!maxAge || maxAge < m) maxAge = m; // it can be modified in process on options page