Merge pull request #364 from GSA/ss_update_production_deploymnet

Changed production branch from 'federalist-prod' to 'production' for …
GSA · Mar 22, 2020 · 450cf33 · 450cf33
2 parents cad6267 + 55f70af
commit 450cf33
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/config/webpack/webpack.shared.js b/config/webpack/webpack.shared.js
@@ -121,10 +121,7 @@ const patterns = [
   }
 ]
 
-if (
-  process.env.OUTPUT_RELATIVE_PATH &&
-  process.env.OUTPUT_RELATIVE_PATH.includes('federalist-prod')
-) {
+if (process.env.BRANCH && process.env.BRANCH.includes('production')) {
   // only include sitemap if building for production on code.gov
   patterns.push({
     from: 'node_modules/@code.gov/site-map-generator/sitemap.xml',
@@ -226,12 +223,12 @@ module.exports = {
   },
   plugins: [
     new DefinePlugin({
-      ENABLE_GOOGLE_ANALYTICS: process.env.CODE_GOV_BRANCH === 'federalist-prod',
+      ENABLE_GOOGLE_ANALYTICS: process.env.CODE_GOV_BRANCH === 'production',
       PUBLIC_PATH: JSON.stringify(PUBLIC_PATH),
       SITE_CONFIG: JSON.stringify(SITE_CONFIG)
     }),
     new EnvironmentPlugin(['CODE_GOV_API_BASE', 'CODE_GOV_API_KEY', 'CODE_GOV_TASKS_URL']),
-    //new CleanWebpackPlugin([OUTPUT_PATH], { root: rootDir }),
+    // new CleanWebpackPlugin([OUTPUT_PATH], { root: rootDir }),
     new CopyWebpackPlugin(patterns),
     new ImageminPlugin({ test: /\.(jpe?g|png|gif|svg)$/i }),
     new HtmlWebpackPlugin({