diff --git a/Jenkinsfile b/Jenkinsfile index 4778b8c309a9..0e33977391e8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,7 +9,6 @@ VETSGOV_BUILDTYPES = [ ] VAGOV_BUILDTYPES = [ - 'preview', 'vagovdev', 'vagovstaging', 'vagovprod' diff --git a/assets/js/foresee/preview.js b/assets/js/foresee/preview.js deleted file mode 100644 index 90dc098d892e..000000000000 --- a/assets/js/foresee/preview.js +++ /dev/null @@ -1,14 +0,0 @@ -// ForeSee Production Embed Script v2.01 -// DO NOT MODIFY BELOW THIS LINE ***************************************** -;(function (g) { - var d = document, am = d.createElement('script'), h = d.head || d.getElementsByTagName("head")[0], fsr = 'fsReady', - aex = { - "src": "//gateway.foresee.com/sites/va-gov/production/gateway.min.js", - "type": "text/javascript", - "async": "true", - "data-vendor": "fs", - "data-role": "gateway" - }; - for (var attr in aex) { am.setAttribute(attr, aex[attr]); } h.appendChild(am); g[fsr] || (g[fsr] = function () { var aT = '__' + fsr + '_stk__'; g[aT] = g[aT] || []; g[aT].push(arguments); }); - })(window); - // DO NOT MODIFY ABOVE THIS LINE ***************************************** diff --git a/assets/js/foresee/production.js b/assets/js/foresee/production.js deleted file mode 100644 index c1ec06cabc2a..000000000000 --- a/assets/js/foresee/production.js +++ /dev/null @@ -1,14 +0,0 @@ -// ForeSee Production Embed Script v2.01 -// DO NOT MODIFY BELOW THIS LINE ***************************************** -;(function (g) { - var d = document, am = d.createElement('script'), h = d.head || d.getElementsByTagName("head")[0], fsr = 'fsReady', - aex = { - "src": "//gateway.foresee.com/sites/vets-gov/production/gateway.min.js", - "type": "text/javascript", - "async": "true", - "data-vendor": "fs", - "data-role": "gateway" - }; - for (var attr in aex) { am.setAttribute(attr, aex[attr]); } h.appendChild(am); g[fsr] || (g[fsr] = function () { var aT = '__' + fsr + '_stk__'; g[aT] = g[aT] || []; g[aT].push(arguments); }); - })(window); - // DO NOT MODIFY ABOVE THIS LINE ***************************************** diff --git a/assets/js/foresee/staging.js b/assets/js/foresee/staging.js deleted file mode 100644 index 0a216cdcda46..000000000000 --- a/assets/js/foresee/staging.js +++ /dev/null @@ -1,14 +0,0 @@ -// ForeSee Staging Embed Script v2.01 -// DO NOT MODIFY BELOW THIS LINE ***************************************** -;(function (g) { - var d = document, am = d.createElement('script'), h = d.head || d.getElementsByTagName("head")[0], fsr = 'fsReady', - aex = { - "src": "//gateway.foresee.com/sites/vets-gov/staging/gateway.min.js", - "type": "text/javascript", - "async": "true", - "data-vendor": "fs", - "data-role": "gateway" - }; - for (var attr in aex) { am.setAttribute(attr, aex[attr]); } h.appendChild(am); g[fsr] || (g[fsr] = function () { var aT = '__' + fsr + '_stk__'; g[aT] = g[aT] || []; g[aT].push(arguments); }); - })(window); - // DO NOT MODIFY ABOVE THIS LINE ***************************************** diff --git a/config/webpack.config.js b/config/webpack.config.js index 6bdde493b1b2..7191478feff1 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -91,7 +91,7 @@ const configGenerator = (options, apps) => { { loader: 'css-loader', options: { - minimize: ['production', 'staging', 'preview'].includes( + minimize: ['vagovprod', 'vagovstaging'].includes( options.buildtype, ), }, @@ -200,33 +200,18 @@ const configGenerator = (options, apps) => { ], }; - if ( - ['production', 'staging', 'preview', 'vagovstaging', 'vagovprod'].includes( - options.buildtype, - ) - ) { + if (['vagovstaging', 'vagovprod'].includes(options.buildtype)) { let sourceMap = null; switch (options.buildtype) { - case 'production': - sourceMap = 'https://s3-us-gov-west-1.amazonaws.com/www.vets.gov'; - break; - - case 'staging': - sourceMap = 'https://s3-us-gov-west-1.amazonaws.com/staging.vets.gov'; - break; - case 'vagovstaging': sourceMap = 'https://s3-us-gov-west-1.amazonaws.com/staging.va.gov'; break; case 'vagovprod': + default: sourceMap = 'https://s3-us-gov-west-1.amazonaws.com/www.va.gov'; break; - - case 'preview': - default: - sourceMap = 'https://s3-us-gov-west-1.amazonaws.com/preview.va.gov'; } baseConfig.plugins.push( diff --git a/script/constants/environments.js b/script/constants/environments.js index d60493530a2d..2d5af22aa383 100644 --- a/script/constants/environments.js +++ b/script/constants/environments.js @@ -6,5 +6,4 @@ module.exports = { VAGOVDEV: 'vagovdev', VAGOVSTAGING: 'vagovstaging', VAGOVPROD: 'vagovprod', - PREVIEW: 'preview', }; diff --git a/src/platform/monitoring/frontend-metrics/feature-flag.js b/src/platform/monitoring/frontend-metrics/feature-flag.js index 9e3c2431ab2e..c61f299057ba 100644 --- a/src/platform/monitoring/frontend-metrics/feature-flag.js +++ b/src/platform/monitoring/frontend-metrics/feature-flag.js @@ -4,7 +4,7 @@ * @module platform/monitoring/frontend-metrics/feature-flag */ export default function isMetricsEnabled() { - const environments = ['vagovdev', 'vagovstaging', 'vagovprod', 'preview']; + const environments = ['vagovdev', 'vagovstaging', 'vagovprod']; return !!environments.includes(__BUILDTYPE__); } diff --git a/src/platform/site-wide/announcements/components/VAPlusVetsModal.jsx b/src/platform/site-wide/announcements/components/VAPlusVetsModal.jsx index 543321b2ed6a..d7915930a420 100644 --- a/src/platform/site-wide/announcements/components/VAPlusVetsModal.jsx +++ b/src/platform/site-wide/announcements/components/VAPlusVetsModal.jsx @@ -6,19 +6,10 @@ export default class VAPlusVetsModal extends React.Component { static isEnabled() { if (!brandConsolidation.isEnabled()) return false; - if (__BUILDTYPE__ === 'preview') return false; - - let wasRedirectedFromVets = /^https:\/\/((dev|staging|www)\.)?vets\.gov/.test( + const wasRedirectedFromVets = /^https:\/\/((dev|staging|www)\.)?vets\.gov/.test( document.referrer, ); - // Allow an override on the URL to force the Onboarding Modal to appear for testing purposes. - if (__BUILDTYPE__ !== 'preview' && !wasRedirectedFromVets) { - wasRedirectedFromVets = window.location.search.includes( - 'onboarding-modal', - ); - } - return wasRedirectedFromVets; } diff --git a/src/platform/utilities/environment/isProduction.js b/src/platform/utilities/environment/isProduction.js index 1089a4f346e1..5ac9f5a10c6f 100644 --- a/src/platform/utilities/environment/isProduction.js +++ b/src/platform/utilities/environment/isProduction.js @@ -1,10 +1,4 @@ const prodEnvironments = [ - // www.vets.gov - 'production', - - // preview.va.gov - 'preview', - // www.va.gov 'vagovprod', ]; diff --git a/src/platform/utilities/environment/stagingDomains.js b/src/platform/utilities/environment/stagingDomains.js index 8dc8a1c46e36..a7f5b8e62fd1 100644 --- a/src/platform/utilities/environment/stagingDomains.js +++ b/src/platform/utilities/environment/stagingDomains.js @@ -5,10 +5,6 @@ if (__BUILDTYPE__.includes('staging')) { currentEnv = 'staging'; } -if (__BUILDTYPE__ === 'preview') { - currentEnv = 'preview'; -} - if (__BUILDTYPE__ === 'production' || __BUILDTYPE__ === 'vagovprod') { currentEnv = 'www'; } diff --git a/src/platform/utilities/tests/environment/stagingDomains.unit.spec.js b/src/platform/utilities/tests/environment/stagingDomains.unit.spec.js index f9f98ae621c7..5d01f7e08b5e 100644 --- a/src/platform/utilities/tests/environment/stagingDomains.unit.spec.js +++ b/src/platform/utilities/tests/environment/stagingDomains.unit.spec.js @@ -3,13 +3,10 @@ import { expect } from 'chai'; import { replaceDomainsInData } from '../../environment/stagingDomains'; let currentEnv = ''; -if ( - global.__BUILDTYPE__.includes('staging') || - global.__BUILDTYPE__ === 'preview' -) { +if (global.__BUILDTYPE__.includes('staging')) { currentEnv = 'https://staging.va.gov'; } -if (['production', 'vagovprod'].includes(global.__BUILDTYPE__)) { +if (['vagovprod'].includes(global.__BUILDTYPE__)) { currentEnv = 'https://www.va.gov'; } diff --git a/va-gov/includes/header.html b/va-gov/includes/header.html index 26389abee7f1..8b058d34983e 100644 --- a/va-gov/includes/header.html +++ b/va-gov/includes/header.html @@ -100,16 +100,6 @@ Skip to Content -{% if buildtype == 'preview' %} -
-
-

You're viewing a preview of the new VA.gov

-

We're building a new online experience to make it easier for Veterans to find, access, and manage the benefits they've earned. And we're building it with input from Veterans at every step. Please note: We work iteratively using agile development - practices, so you'll see new content, features, and functionality added to the site every day.

-
-
-{% endif %} - {% if !noHeader %} {% include "va-gov/includes/top-nav.html" %} {% endif %} diff --git a/va-gov/includes/survey-tools.html b/va-gov/includes/survey-tools.html index e12d60ea0164..d4ef258aa418 100644 --- a/va-gov/includes/survey-tools.html +++ b/va-gov/includes/survey-tools.html @@ -1,3 +1,3 @@ -{% if buildtype == 'vagovprod' or buildtype == 'vagovstaging' or buildtype == 'preview' %} +{% if buildtype == 'vagovprod' or buildtype == 'vagovstaging' %} {% endif %}