ampproject · cramforce · May 9, 2016 · May 9, 2016
diff --git a/src/3p.js → 3p/3p.js b/src/3p.js → 3p/3p.js
@@ -22,9 +22,9 @@
 // Note: loaded by 3p system. Cannot rely on babel polyfills.
 
 
-import {dev, user} from './log';
-import {isArray} from './types';
-import {rethrowAsync} from './log';
+import {dev, user} from '../src/log';
+import {isArray} from '../src/types';
+import {rethrowAsync} from '../src/log';
 
 
 /** @typedef {function(!Window, !Object)}  */

diff --git a/3p/facebook.js b/3p/facebook.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {loadScript} from '../src/3p';
+import {loadScript} from './3p';
 import {user} from '../src/log';
 
 

diff --git a/3p/integration.js b/3p/integration.js
@@ -47,7 +47,7 @@ import {mediaimpact} from '../ads/mediaimpact';
 import {nonSensitiveDataPostMessage, listenParent} from './messaging';
 import {twitter} from './twitter';
 import {yieldmo} from '../ads/yieldmo';
-import {computeInMasterFrame, nextTick, register, run} from '../src/3p';
+import {computeInMasterFrame, nextTick, register, run} from './3p';
 import {parseUrl, getSourceUrl} from '../src/url';
 import {appnexus} from '../ads/appnexus';
 import {taboola} from '../ads/taboola';

diff --git a/3p/twitter.js b/3p/twitter.js
@@ -16,7 +16,7 @@
 
 // TODO(malteubl) Move somewhere else since this is not an ad.
 
-import {computeInMasterFrame, loadScript} from '../src/3p';
+import {computeInMasterFrame, loadScript} from './3p';
 
 /**
  * Produces the Twitter API object for the passed in callback. If the current

diff --git a/ads/a9.js b/ads/a9.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {writeScript, checkData} from '../src/3p';
+import {writeScript, checkData} from '../3p/3p';
 
 /**
  * @param {!Window} global

diff --git a/ads/adblade.js b/ads/adblade.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {writeScript, checkData, validateDataExists} from '../src/3p';
+import {writeScript, checkData, validateDataExists} from '../3p/3p';
 
 const adbladeFields = ['width', 'height', 'cid'];
 const adbladeHostname = 'web.adblade.com';

diff --git a/ads/adform.js b/ads/adform.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {writeScript, validateSrcPrefix, validateExactlyOne} from '../src/3p';
+import {writeScript, validateSrcPrefix, validateExactlyOne} from '../3p/3p';
 
 // Valid adform ad source hosts
 const hosts = {

diff --git a/ads/adition.js b/ads/adition.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {writeScript, validateDataExists} from '../src/3p';
+import {writeScript, validateDataExists} from '../3p/3p';
 
 /**
  * @param {!Window} global

diff --git a/ads/adman.js b/ads/adman.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {checkData, validateDataExists} from '../src/3p';
+import {checkData, validateDataExists} from '../3p/3p';
 
 /**
  * @param {!Window} global

diff --git a/ads/adreactor.js b/ads/adreactor.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {writeScript, checkData} from '../src/3p';
+import {writeScript, checkData} from '../3p/3p';
 
 /**
  * @param {!Window} global

diff --git a/ads/adstir.js b/ads/adstir.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {loadScript, checkData} from '../src/3p';
+import {loadScript, checkData} from '../3p/3p';
 
 /**
  * @param {!Window} global

diff --git a/ads/adtech.js b/ads/adtech.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {writeScript, validateSrcPrefix, validateSrcContains} from '../src/3p';
+import {writeScript, validateSrcPrefix, validateSrcContains} from '../3p/3p';
 
 /**
  * @param {!Window} global

diff --git a/ads/aduptech.js b/ads/aduptech.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {loadScript, checkData, validateDataExists} from '../src/3p';
+import {loadScript, checkData, validateDataExists} from '../3p/3p';
 
 /**
  * @param {!Window} global

diff --git a/ads/appnexus.js b/ads/appnexus.js
@@ -17,7 +17,7 @@
 import {
   loadScript, writeScript, validateDataExists,
 }
-from '../src/3p';
+from '../3p/3p';
 
 const APPNEXUS_AST_URL = 'https://acdn.adnxs.com/ast/ast.js';
 

diff --git a/ads/colombia.js b/ads/colombia.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {loadScript, validateDataExists} from '../src/3p';
+import {loadScript, validateDataExists} from '../3p/3p';
 
 /**
  * @param {!Window} global

diff --git a/ads/criteo.js b/ads/criteo.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {loadScript} from '../src/3p';
+import {loadScript} from '../3p/3p';
 
 /**
  * @param {!Window} global

diff --git a/ads/dotandads.js b/ads/dotandads.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {writeScript} from '../src/3p';
+import {writeScript} from '../3p/3p';
 
 /**
  * @param {!Window} global

diff --git a/ads/eplanning.js b/ads/eplanning.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {loadScript, validateDataExists} from '../src/3p';
+import {loadScript, validateDataExists} from '../3p/3p';
 
 /**
  * @param {!Window} global

diff --git a/ads/flite.js b/ads/flite.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
- import {loadScript, checkData} from '../src/3p';
+ import {loadScript, checkData} from '../3p/3p';
 
 /**
  * @param {!Window} global

diff --git a/ads/gmossp.js b/ads/gmossp.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {writeScript, checkData, validateDataExists} from '../src/3p';
+import {writeScript, checkData, validateDataExists} from '../3p/3p';
 
 const gmosspFields = ['width', 'height', 'id'];
 

diff --git a/ads/google/adsense.js b/ads/google/adsense.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {checkData} from '../../src/3p';
+import {checkData} from '../../3p/3p';
 
 /**
  * @param {!Window} global

diff --git a/ads/google/doubleclick.js b/ads/google/doubleclick.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {loadScript, checkData} from '../../src/3p';
+import {loadScript, checkData} from '../../3p/3p';
 import {getCorrelator} from './utils';
 
 /**

diff --git a/ads/imobile.js b/ads/imobile.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {writeScript} from '../src/3p';
+import {writeScript} from '../3p/3p';
 /**
  * @param {!Window} global
  * @param {!Object} data

diff --git a/ads/improvedigital.js b/ads/improvedigital.js
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {writeScript, checkData, validateDataExists} from '../src/3p';
+import {writeScript, checkData, validateDataExists} from '../3p/3p';
 
 const adImproveField = ['width', 'height', 'placement', 'optin', 'keyvalue'];
 const adImproveMandatoryField = ['placement'];

diff --git a/ads/mantis.js b/ads/mantis.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {loadScript, checkData, validateDataExists} from '../src/3p';
+import {loadScript, checkData, validateDataExists} from '../3p/3p';
 
 /**
  * @param {!Window} global

diff --git a/ads/mediaimpact.js b/ads/mediaimpact.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {loadScript} from '../src/3p';
+import {loadScript} from '../3p/3p';
 
 /**
  * @param {!Window} global

diff --git a/ads/openadstream.js b/ads/openadstream.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {checkData, validateDataExists, writeScript} from '../src/3p';
+import {checkData, validateDataExists, writeScript} from '../3p/3p';
 
 
 /**

diff --git a/ads/openx.js b/ads/openx.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {loadScript, writeScript, checkData} from '../src/3p';
+import {loadScript, writeScript, checkData} from '../3p/3p';
 import {doubleclick} from '../ads/google/doubleclick';
 
 /**

diff --git a/ads/plista.js b/ads/plista.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {loadScript, checkData} from '../src/3p';
+import {loadScript, checkData} from '../3p/3p';
 
 /**
  * @param {!Window} global

diff --git a/ads/pubmatic.js b/ads/pubmatic.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {loadScript} from '../src/3p';
+import {loadScript} from '../3p/3p';
 
 /**
  * @param {!Window} global

diff --git a/ads/revcontent.js b/ads/revcontent.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {writeScript, checkData} from '../src/3p';
+import {writeScript, checkData} from '../3p/3p';
 
 /**
  * @param {!Window} global

diff --git a/ads/rubicon.js b/ads/rubicon.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {writeScript, loadScript, checkData} from '../src/3p';
+import {writeScript, loadScript, checkData} from '../3p/3p';
 import {getSourceUrl} from '../src/url';
 import {doubleclick} from '../ads/google/doubleclick';
 

diff --git a/ads/sharethrough.js b/ads/sharethrough.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {writeScript, checkData, validateDataExists} from '../src/3p';
+import {writeScript, checkData, validateDataExists} from '../3p/3p';
 
 /**
  * @param {!Window} global

diff --git a/ads/smartadserver.js b/ads/smartadserver.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {loadScript} from '../src/3p';
+import {loadScript} from '../3p/3p';
 
 /**
  * @param {!Window} global

diff --git a/ads/sortable.js b/ads/sortable.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {loadScript, validateDataExists} from '../src/3p';
+import {loadScript, validateDataExists} from '../3p/3p';
 
 /**
  * @param {!Window} global

diff --git a/ads/sovrn.js b/ads/sovrn.js
@@ -19,7 +19,7 @@
  * New customers please see www.sovrn.com to sign up and get started!
  *********
  */
-import {writeScript} from '../src/3p';
+import {writeScript} from '../3p/3p';
 /**
  * @param {!Window} global
  * @param {!Object} data

diff --git a/ads/taboola.js b/ads/taboola.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {loadScript, validateDataExists, validateExactlyOne} from '../src/3p';
+import {loadScript, validateDataExists, validateExactlyOne} from '../3p/3p';
 
 /**
  * @param {!Window} global

diff --git a/ads/teads.js b/ads/teads.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {loadScript, checkData, validateDataExists} from '../src/3p';
+import {loadScript, checkData, validateDataExists} from '../3p/3p';
 
 /**
  * @param {!Window} global

diff --git a/ads/triplelift.js b/ads/triplelift.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {loadScript, validateSrcPrefix} from '../src/3p';
+import {loadScript, validateSrcPrefix} from '../3p/3p';
 
 /**
  * @param {!Window} global

diff --git a/ads/webediads.js b/ads/webediads.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {loadScript, checkData, validateDataExists} from '../src/3p';
+import {loadScript, checkData, validateDataExists} from '../3p/3p';
 
 /** Created by Webedia on 07/03/16 */
 export function webediads(global, data) {

diff --git a/ads/weborama.js b/ads/weborama.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {writeScript, checkData, validateDataExists} from '../src/3p';
+import {writeScript, checkData, validateDataExists} from '../3p/3p';
 
 /**
  * @param {!Window} global

diff --git a/ads/yieldbot.js b/ads/yieldbot.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {validateDataExists, checkData, loadScript} from '../src/3p';
+import {validateDataExists, checkData, loadScript} from '../3p/3p';
 import {doubleclick} from '../ads/google/doubleclick';
 import {rethrowAsync} from '../src/log';
 

diff --git a/ads/yieldmo.js b/ads/yieldmo.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {loadScript} from '../src/3p';
+import {loadScript} from '../3p/3p';
 
 /**
  * @param {!Window} global