Merge pull request #179 from postmanlabs/MKTG-1081-PROD

Mktg 1081 prod

Author: oswish

.github/workflows/ci.yml

@@ -14,13 +14,13 @@ jobs:
     - uses: actions/checkout@v1
     - uses: actions/setup-node@master
       with:
-        node-version: '14'
+        node-version: '18.20.5'
     - name: lint all markdownfiles
       env:
         PM_TECH: ${{secrets.PM_TECH}}
       run: |
         npm config set //registry.npmjs.org/:_authToken=${{secrets.NPM_TOKEN}}
-        npm install
+        npm run npm
         node_modules/.bin/markdownlint ./ --ignore node_modules
     - name: check for image url
       run: |
@@ -34,7 +34,7 @@ jobs:
         PM_TECH: ${{secrets.PM_TECH}}
       run: |
         npm config set //registry.npmjs.org/:_authToken=${{secrets.NPM_TOKEN}}
-        npm install
+        npm run npm
         npm run clean
         npm run test:update
 

.github/workflows/deploy-beta.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@master
         with:
-          node-version: '14'
+          node-version: '18.20.5'
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v1
@@ -41,7 +41,7 @@ jobs:
           DOMAIN_NAME: ${{secrets.BETA_DOMAIN_NAME}}
         run: |
           npm config set //registry.npmjs.org/:_authToken=${{secrets.NPM_TOKEN}}
-          npm install
+          npm run npm
           npm run clean
           npm run build:dev
           aws s3 sync ./public/ s3://${{secrets.BETA_BUCKET_NAME}}/${{ github.ref_name }}/labs --delete

.github/workflows/deploy-prod.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@master
         with:
-          node-version: '14'
+          node-version: '18.20.5'
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v1
@@ -37,7 +37,7 @@ jobs:
           SITE_URL: ${{secrets.PROD_SITE_URL}}
           DOMAIN_NAME: ${{secrets.PROD_DOMAIN_NAME}}
         run: |
-          npm install
+          npm run npm
           npm run clean
           npm run build:prod
           aws s3 sync ./public/ s3://${{secrets.PROD_BUCKET_NAME}}/main/labs --delete

bff.js

@@ -5,10 +5,8 @@ const pingWebHook = require('./build/pingWebHook');
 const fetchBlogPosts = require('./build/fetchBlogPosts');
 const fetchFooter = require('./build/fetchFooter');
 const fetchNavbar = require('./build/fetchNavbar');
-const { allow } = require('./package.json');
 const fetchNavtopicsdropdown = require('./build/fetchNavtopicsdropdown');
 
-const { pmTech: allowedPmTech } = allow;
 const delay = 1000;
 const runtime = {
   pm: [''],
@@ -46,11 +44,11 @@ const prefetch = async () => {
   fetchNavbar();
   fetchNavtopicsdropdown();
 
-  let pmTech = '';
+  let runtimeScript = '';
 
   if (process.env.PM_TECH_RT) {
     sh.config.silent = true;
-    pmTech = sh.exec('cat build/pmt.js').stdout;
+    runtimeScript = sh.exec('cat build/runtime.js').stdout;
     sh.config.silent = false;
 
     sh.exec('mkdir -p public');
@@ -88,40 +86,28 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
 
   const script = (process.env.PM_TECH_RT
       && `
-${pmTech}
+${runtimeScript}
 setTimeout(function(){
-  var propertyName = 'labs-docs';
-  if (window.pmt) {
-    window.pmt('setScalp', [{
-      property: propertyName
-    }]);
-    window.pmt('scalp', [
-      'pm-analytics',
-      'load',
-      document.location.pathname
-    ]);
-    window.pmt('trackClicks');
-    var dnt = (parseInt(navigator.doNotTrack) === 1 || parseInt(window.doNotTrack) === 1 || parseInt(navigator.msDoNotTrack) === 1 || navigator.doNotTrack === "yes");
-    window.pmt('log', ['navigator.doNotTrack: ' + dnt]);
-    if(!dnt) {
-      ${googleTagManager}
-      window.pmt('log', ['attached googletagmanager: ' + '${GTMCode}']);
-      var d = 1000, int;
-      var int = setInterval(function(){
-        if (window.ga) {
-          var sitename = document.location.hostname;
-          window.dataLayer = window.dataLayer || [];
-          function gtag(){dataLayer.push(arguments);}
-          window.gtag = gtag;
-          gtag('js', new Date());
-          gtag('config', '${UACode}');
-          window.pmt('ga', ['${UACode}', sitename]);
-          window.pmt('log', ['initialized GA: ' + sitename + ' (' + '${UACode}' + ')']);
-          window._iaq = window._iaq || {};
-          clearInterval(int);
-        }
-      }, d);
-    }
+  var dnt = (parseInt(navigator.doNotTrack) === 1 || parseInt(window.doNotTrack) === 1 || parseInt(navigator.msDoNotTrack) === 1 || navigator.doNotTrack === "yes");
+  window.pmt('log', ['navigator.doNotTrack: ' + dnt]);
+  if(!dnt) {
+    ${googleTagManager}
+    window.pmt('log', ['attached googletagmanager: ' + '${GTMCode}']);
+    var d = 1000, int;
+    var int = setInterval(function(){
+      if (window.ga) {
+        var sitename = document.location.hostname;
+        window.dataLayer = window.dataLayer || [];
+        function gtag(){dataLayer.push(arguments);}
+        window.gtag = gtag;
+        gtag('js', new Date());
+        gtag('config', '${UACode}');
+        window.pmt('ga', ['${UACode}', sitename]);
+        window.pmt('log', ['initialized GA: ' + sitename + ' (' + '${UACode}' + ')']);
+        window._iaq = window._iaq || {};
+        clearInterval(int);
+      }
+    }, d);
   }
 }, 1000);
 `)