Skip to content
This repository has been archived by the owner on Oct 11, 2022. It is now read-only.

Commit

Permalink
Merge branch 'master' into ablaze
Browse files Browse the repository at this point in the history
  • Loading branch information
mxstbr committed Oct 3, 2017
2 parents c9b7496 + 9aa4cc9 commit c93c92f
Show file tree
Hide file tree
Showing 37 changed files with 898 additions and 84 deletions.
4 changes: 3 additions & 1 deletion .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
"transform-flow-strip-types",
"transform-object-rest-spread",
"babel-plugin-transform-react-jsx",
"syntax-dynamic-import"
"syntax-dynamic-import",
"preval",
"babel-macros"
]
}
6 changes: 3 additions & 3 deletions chronos/queues/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

// counts for processing
// the thread must have at least # total messages
export const MIN_TOTAL_MESSAGE_COUNT = 1;
export const MIN_TOTAL_MESSAGE_COUNT = 5;
// # of the total messages must have been sent in the past week
export const MIN_NEW_MESSAGE_COUNT = 1;
export const MIN_NEW_MESSAGE_COUNT = 5;
// # only show the top # threads per channel
export const MAX_THREAD_COUNT_PER_CHANNEL = 10;
// don't send the digest if the email will have less than # total threads to show
export const MIN_THREADS_REQUIRED_FOR_DIGEST = 1;
export const MIN_THREADS_REQUIRED_FOR_DIGEST = 5;
// cap the digest at # threads
export const MAX_THREAD_COUNT_PER_DIGEST = 10;
// upsell communities to join if the user has joined less than # communities
Expand Down
5 changes: 5 additions & 0 deletions config-overrides.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

const rewireStyledComponents = require('react-app-rewire-styled-components');
const swPrecachePlugin = require('sw-precache-webpack-plugin');
const { injectBabelPlugin } = require('react-app-rewired');
const fs = require('fs');
const match = require('micromatch');
const WriteFilePlugin = require('write-file-webpack-plugin');
Expand All @@ -31,5 +32,9 @@ const setCustomSwPrecacheOptions = config => {
module.exports = function override(config, env) {
setCustomSwPrecacheOptions(config);
config.plugins.push(WriteFilePlugin());
injectBabelPlugin('babel-macros', config);
injectBabelPlugin('preval', config);
// Necessary for babel-macros to work
config.node.module = 'empty';
return rewireStyledComponents(config, env, { ssr: true });
};
Loading

0 comments on commit c93c92f

Please sign in to comment.