Merge pull request #13 from NYPL/master

Merge latest from Master to Production
NYPL · Dec 18, 2018 · 6df03ae · 6df03ae
2 parents d7c02ed + 30c67bd
commit 6df03ae
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,20 @@
 ## CHANGE LOG
 
+### v0.4.16
+- Updating @nypl/dgx-header-component to 2.4.15 and checking for QA in APP_ENV.
+
+### v0.4.15
+- Updating @nypl/dgx-header-component to 2.4.14 and setting APP_ENV.
+
+### v0.4.14
+- Updating @nypl/dgx-header-component to 2.4.13.
+
+### v0.4.13
+- Updating @nypl/dgx-header-component to 2.4.12.
+
+### v0.4.12
+- Update to use green from Design Toolkit
+
 ### v0.4.11
 - Updates to form: add radio button, change ptype selection logic from query parameter to radio button
 - Copy updates

diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ a patron record.
 https://www.nypl.org/library-card/new/
 
 ## Version
-> 0.4.10
+> 0.4.16
 
 | Branch        | Status                                                                                                                                                   |
 |:--------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------|

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nypl-library-card-app",
-  "version": "0.4.10",
+  "version": "0.4.16",
   "description": "NYPL Get A Library Card App",
   "main": "index.js",
   "scripts": {
@@ -56,7 +56,7 @@
   },
   "dependencies": {
     "@nypl/design-toolkit": "0.1.36",
-    "@nypl/dgx-header-component": "2.4.11",
+    "@nypl/dgx-header-component": "2.4.15",
     "@nypl/dgx-react-footer": "0.5.1",
     "axios": "0.15.3",
     "babel-core": "6.24.0",

diff --git a/webpack.config.js b/webpack.config.js
@@ -2,13 +2,13 @@ const path = require('path');
 const webpack = require('webpack');
 const CleanBuild = require('clean-webpack-plugin');
 const ExtractTextPlugin = require('extract-text-webpack-plugin');
-
+// Sets appEnv so the the header component will point to the search app on either Dev or Prod
+const appEnv = process.env.APP_ENV ? process.env.APP_ENV : 'production';
 const rootPath = path.resolve(__dirname);
 const sassPaths = require('@nypl/design-toolkit').includePaths.map((sassPath) =>
   `includePaths[]=${sassPath}`
 ).join('&');
 
-// PRODUCTION ENVIRONMENT CONFIG
 if (process.env.NODE_ENV === 'production') {
   module.exports = {
     devtool: 'source-map',
@@ -44,6 +44,7 @@ if (process.env.NODE_ENV === 'production') {
       new CleanBuild(['dist']),
       new webpack.DefinePlugin({
         'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV),
+        appEnv: JSON.stringify(appEnv),
       }),
       new webpack.optimize.DedupePlugin(),
       new webpack.optimize.OccurenceOrderPlugin(),
@@ -92,6 +93,7 @@ if (process.env.NODE_ENV === 'production') {
       new CleanBuild(['dist']),
       new webpack.DefinePlugin({
         'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV),
+        appEnv: JSON.stringify(appEnv),
       }),
       new webpack.HotModuleReplacementPlugin(),
     ],