Replace PostScribe in the PUC (#246)

OlenaPostindustria · web-flow · commit b97d8d636350 · 2024-12-03T11:10:40.000-05:00
* Remove deprecated postscribe

* Fix mobile-app rendering when admarkup contains lowercase DOCTYPE tag
diff --git a/package.json b/package.json
@@ -76,7 +76,6 @@
         "webpack-common-shake": "^1.0.0"
     },
     "dependencies": {
-        "babel-plugin-transform-object-assign": "^6.22.0",
-        "postscribe": "^2.0.8"
+        "babel-plugin-transform-object-assign": "^6.22.0"
     }
 }
diff --git a/src/adHtmlRender.js b/src/adHtmlRender.js
@@ -0,0 +1,11 @@
+export function writeAdHtml(markup, insertHTML = document.body.insertAdjacentHTML.bind(document.body)) {
+    // remove <?xml> and <!doctype> tags
+    // https://github.com/prebid/prebid-universal-creative/issues/134
+    markup = markup.replace(/\<(\?xml|(\!DOCTYPE[^\>\[]+(\[[^\]]+)?))+[^>]+\>/gi, '');
+
+    try {
+        insertHTML('beforeend', markup);
+    } catch (error) {
+        console.error(error);
+    }
+}
diff --git a/src/mobileAndAmpRender.js b/src/mobileAndAmpRender.js
@@ -1,7 +1,7 @@
 import { getCreativeCommentMarkup, triggerPixel, createTrackPixelHtml, loadScript, getCreativeComment, writeAdUrl, transformAuctionTargetingData, sendRequest, getUUID } from './utils';
 import { isSafeFrame, isMobileApp } from './environment';
 import { insertElement } from './domHelper';
-import { writeAdHtml } from './postscribeRender';
+import { writeAdHtml } from './adHtmlRender';
 
 const DEFAULT_CACHE_HOST = 'prebid.adnxs.com';
 const DEFAULT_CACHE_PATH = '/pbc/v1/cache';
@@ -151,7 +151,6 @@ function responseCallback(isMobileApp, hbPb) {
       if (isMobileApp) {
         let adhtml = loadScript(window, bidObject.nurl);
         ad += constructMarkup(adhtml.outerHTML, width, height);
-
         writeAdHtml(ad);
       } else {
         let nurl = bidObject.nurl;
diff --git a/src/postscribeRender.js b/src/postscribeRender.js
diff --git a/test/spec/mobileAndAmpRender_spec.js b/test/spec/mobileAndAmpRender_spec.js
@@ -1,10 +1,10 @@
 import { renderAmpOrMobileAd } from 'src/mobileAndAmpRender';
-import * as postscribeRender from 'src/postscribeRender'
+import * as postscribeRender from 'src/adHtmlRender'
 import * as utils from 'src/utils';
 import { expect } from 'chai';
 import { mocks } from 'test/helpers/mocks';
 import { merge } from 'lodash';
-import {writeAdHtml} from 'src/postscribeRender';
+import {writeAdHtml} from 'src/adHtmlRender';
 
 
 function renderingMocks() {
@@ -312,5 +312,11 @@ describe('writeAdHtml', () => {
     const ps = sinon.stub();
     writeAdHtml('<!DOCTYPE html><div>mock-ad</div>', ps);
     sinon.assert.calledWith(ps, sinon.match.any, '<div>mock-ad</div>')
-  })
+  });
+
+  it('removes lowercase doctype from markup', () => {
+    const ps = sinon.stub();
+    writeAdHtml('<!doctype html><div>mock-ad</div>', ps);
+    sinon.assert.calledWith(ps, sinon.match.any, '<div>mock-ad</div>')
+  });
 })

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,6 @@`
`76`	`76`	`"webpack-common-shake": "^1.0.0"`
`77`	`77`	`},`
`78`	`78`	`"dependencies": {`
`79`		`- "babel-plugin-transform-object-assign": "^6.22.0",`
`80`		`- "postscribe": "^2.0.8"`
	`79`	`+ "babel-plugin-transform-object-assign": "^6.22.0"`
`81`	`80`	`}`
`82`	`81`	`}`