Skip to content
This repository was archived by the owner on Nov 8, 2018. It is now read-only.

Workable API Proxy #39

Merged
merged 22 commits into from
Jan 19, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .babelrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"presets": [ "es2015", "react", "stage-1" ]
"presets": [ "node5", "react" ]
}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ coverage/
build/
.eslintcache
npm-debug.log
.env
98 changes: 51 additions & 47 deletions config/common.webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const ExtractTextPlugin = require('extract-text-webpack-plugin');
const glob = require('glob');
const webpack = require('webpack');

const tests = glob.sync('./src/**/*.spec.js');
const serverTests = glob.sync('./src/*(shared|server)/**/*.spec.js');
const postcss = () => [ cssnext, dedupe ];

const plugins = [
Expand All @@ -17,52 +17,47 @@ const plugins = [
new webpack.optimize.DedupePlugin()
];

if (process.env.NODE_ENV === 'production') {
plugins.push(new webpack.optimize.UglifyJsPlugin({
compress: {
warnings: false
function loaders (preset) {
return [
{
test: /\.json$/,
loader: 'json-loader'
},
{
test: /\.js$/,
exclude: /node_modules/,
loader: 'babel-loader',
query: {
cacheDirectory: true,
presets: [ preset, 'react', 'stage-1' ]
}
},
{
test: /\.css$/,
exclude: /node_modules/,
loader: ExtractTextPlugin.extract(
[
'css-loader?' + [
'modules',
// 'minimize',
'importLoaders=1',
'localIdentName=[name]__[local]_[hash:base64:15]'
],
'postcss-loader'
].join('!')
)
},
{
test: /\.(png|jpe?g|eot|ttf|woff|svg)$/,
exclude: /node_modules/,
loader: 'file-loader?name=[hash].[ext]'
}
}));
];
}

const loaders = [
{
test: /\.json$/,
loader: 'json-loader'
},
{
test: /\.js$/,
exclude: /node_modules/,
loader: 'babel-loader',
query: {
cacheDirectory: true
}
},
{
test: /\.css$/,
exclude: /node_modules/,
loader: ExtractTextPlugin.extract(
[
'css-loader?' + [
'modules',
// 'minimize',
'importLoaders=1',
'localIdentName=[name]__[local]_[hash:base64:15]'
],
'postcss-loader'
].join('!')
)
},
{
test: /\.(png|jpe?g|eot|ttf|woff|svg)$/,
exclude: /node_modules/,
loader: 'file-loader?name=[hash].[ext]'
}
];

const commonClient = {
module: {
loaders: loaders
loaders: loaders('es2015')
},
plugins: [
...plugins,
Expand All @@ -75,17 +70,26 @@ const commonClient = {
postcss: postcss
};

if (process.env.NODE_ENV === 'production') {
commonClient.plugins.push(new webpack.optimize.UglifyJsPlugin({
compress: {
warnings: false
}
}));
}

const commonServer = {
devtool: 'source-map',
module: {
loaders: loaders
loaders: loaders('node5')
},
target: 'node',
externals: /^[a-z\-0-9]+$/,
plugins: [
...plugins,
new webpack.BannerPlugin(
'require("source-map-support/register");',
`require("dotenv").load({ silent: true });
require("source-map-support/register");`,
{
raw: true,
entryOnly: false
Expand All @@ -100,7 +104,7 @@ module.exports = {
name: 'client',
devtool: 'source-map',
target: 'web',
entry: ['./src/client.js'],
entry: ['./src/client/index.js'],
output: {
path: 'build/client',
filename: 'index.js'
Expand All @@ -123,7 +127,7 @@ module.exports = {
server: {
...commonServer,
name: 'server',
entry: ['./src/server.js'],
entry: ['./src/server/index.js'],
output: {
path: 'build/server',
filename: 'index.js',
Expand All @@ -133,7 +137,7 @@ module.exports = {
serverTests: {
...commonServer,
name: 'test',
entry: tests,
entry: serverTests,
output: {
path: 'build/test',
filename: 'index.js',
Expand Down
4 changes: 2 additions & 2 deletions config/tests.webpack.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
* require.context all src to instrument the code coverage tool
*/

const componentsContext = require.context('../src/components/', true, /\.js$/);
const sharedContext = require.context('../src/shared/', true, /\.js$/);

componentsContext.keys().forEach(componentsContext);
sharedContext.keys().forEach(sharedContext);
Loading