diff --git a/env.sample b/env.sample index fa6aaa12..7a3ac922 100644 --- a/env.sample +++ b/env.sample @@ -44,8 +44,8 @@ export SECURE_COOKIES=true # needed before anything insecure can be used (e.g. insecure cookies.) # export LOCAL_CF=0 -# Which skin to use (defaults to cg) -# export CF_SKIN=cg +# The name of the skin to use (defaults to cg) +# export SKIN_NAME=cg # The SMTP HOST for mailcatcher export SMTP_HOST=localhost diff --git a/webpack.config.js b/webpack.config.js index 0f9a0af8..dc731f5b 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -3,10 +3,11 @@ const webpack = require('webpack'); const ExtractTextPlugin = require('extract-text-webpack-plugin'); -const PRODUCTION = (process.env.NODE_ENV === 'prod'); -const TEST = (process.env.NODE_ENV === 'test'); +const PRODUCTION = process.env.NODE_ENV === 'prod'; +const TEST = process.env.NODE_ENV === 'test'; const CG_STYLE_PATH = process.env.CG_STYLE_PATH; -const CF_SKIN = process.env.CF_SKIN || 'cg'; + +const SKIN_NAME = process.env.SKIN_NAME || 'cg'; const srcDir = './static_src'; const compiledDir = './static/assets'; @@ -14,10 +15,7 @@ const compiledDir = './static/assets'; const config = { bail: false, - entry: [ - 'babel-polyfill', - `${srcDir}/main.js` - ], + entry: ['babel-polyfill', `${srcDir}/main.js`], output: { path: path.resolve(compiledDir), @@ -49,7 +47,8 @@ const config = { test: /\.(svg|ico|png|gif|jpe?g)$/, loader: 'url-loader?limit=1024&name=img/[name].[ext]' }, - { test: /\.(ttf|woff2?|eot)$/, + { + test: /\.(ttf|woff2?|eot)$/, loader: 'url-loader?limit=1024&name=font/[name].[ext]' } ] @@ -59,7 +58,7 @@ const config = { alias: { 'cloudgov-style': 'cloudgov-style', dashboard: path.resolve(__dirname, 'static_src'), - skin: path.resolve(__dirname, `static_src/skins/${CF_SKIN}`) + skin: path.resolve(__dirname, `static_src/skins/${SKIN_NAME}`) }, modules: ['node_modules'], @@ -95,12 +94,18 @@ if (TEST) { }; } +const processEnv = { + SKIN_NAME: JSON.stringify(SKIN_NAME) +}; + if (PRODUCTION) { - config.plugins.push(new webpack.DefinePlugin({ - 'process.env': { - NODE_ENV: JSON.stringify('production') - } - })); + processEnv.NODE_ENV = JSON.stringify('production'); } +config.plugins.push( + new webpack.DefinePlugin({ + 'process.env': processEnv + }) +); + module.exports = config;