Skip to content

Commit baea34f

Browse files
oliyoliy
committed
Remove deprecated Cloudflare AMP Cache and A4A support.
1 parent 7627a16 commit baea34f

35 files changed

Lines changed: 4 additions & 1607 deletions

‎3p/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Review the [ads/README](../ads/README.md) for further details on ad integration.
5959
- JavaScript can not be involved with the initiation of font loading.
6060
- Font loading gets controlled (but not initiated) by [`<amp-font>`](https://github.com/ampproject/amphtml/issues/648).
6161
- AMP by default does not allow inclusion of external stylesheets, but it is happy to whitelist URL prefixes of font providers for font inclusion via link tags. These link tags and their fonts must be served via HTTPS.
62-
- If a font provider does referrer based "security" it needs to whitelist the AMP proxy origins before being included in the link tag whitelist. AMP proxy sends the appropriate referrer header such as `https://cdn.ampproject.org` and `https://amp.cloudflare.com`.
62+
- If a font provider does referrer based "security" it needs to whitelist the AMP proxy origins before being included in the link tag whitelist. AMP proxy sends the appropriate referrer header such as `https://cdn.ampproject.org`.
6363

6464
# Adding proper integration tests
6565

‎ads/_a4a-config.js‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
import {cloudflareIsA4AEnabled} from '../extensions/amp-ad-network-cloudflare-impl/0.1/cloudflare-a4a-config';
18-
import {gmosspIsA4AEnabled} from '../extensions/amp-ad-network-gmossp-impl/0.1/gmossp-a4a-config';
1917
import {map} from '../src/utils/object';
20-
import {myTargetIsA4AEnabled} from '../extensions/amp-ad-network-mytarget-impl/0.1/mytarget-a4a-config';
21-
import {tripleliftIsA4AEnabled} from '../extensions/amp-ad-network-triplelift-impl/0.1/triplelift-a4a-config';
2218

2319
/**
2420
* Registry for A4A (AMP Ads for AMPHTML pages) "is supported" predicates.
@@ -45,10 +41,6 @@ export function getA4ARegistry() {
4541
'adsense': () => true,
4642
'adzerk': () => true,
4743
'doubleclick': () => true,
48-
'triplelift': tripleliftIsA4AEnabled,
49-
'mytarget': myTargetIsA4AEnabled,
50-
'cloudflare': cloudflareIsA4AEnabled,
51-
'gmossp': gmosspIsA4AEnabled,
5244
'fake': () => true,
5345
// TODO: Add new ad network implementation "is enabled" functions here.
5446
// Note: if you add a function here that requires a new "import", above,
@@ -68,7 +60,4 @@ export function getA4ARegistry() {
6860
export const signingServerURLs = {
6961
'google': 'https://cdn.ampproject.org/amp-ad-verifying-keyset.json',
7062
'google-dev': 'https://cdn.ampproject.org/amp-ad-verifying-keyset-dev.json',
71-
'cloudflare': 'https://amp.cloudflare.com/amp-ad-verifying-keyset.json',
72-
'cloudflare-dev':
73-
'https://amp.cloudflare.com/amp-ad-verifying-keyset-dev.json',
7463
};

‎ads/dianomi.md‎

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎build-system/compile/bundles.config.js‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -292,30 +292,6 @@ exports.extensionBundles = [
292292
latestVersion: '0.1',
293293
type: TYPES.AD,
294294
},
295-
{
296-
name: 'amp-ad-network-triplelift-impl',
297-
version: '0.1',
298-
latestVersion: '0.1',
299-
type: TYPES.AD,
300-
},
301-
{
302-
name: 'amp-ad-network-cloudflare-impl',
303-
version: '0.1',
304-
latestVersion: '0.1',
305-
type: TYPES.AD,
306-
},
307-
{
308-
name: 'amp-ad-network-gmossp-impl',
309-
version: '0.1',
310-
latestVersion: '0.1',
311-
type: TYPES.AD,
312-
},
313-
{
314-
name: 'amp-ad-network-mytarget-impl',
315-
version: '0.1',
316-
latestVersion: '0.1',
317-
type: TYPES.AD,
318-
},
319295
{
320296
name: 'amp-ad-exit',
321297
version: '0.1',

‎build-system/global-configs/caches.json‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,6 @@
88
"updateCacheApiDomainSuffix": "cdn.ampproject.org",
99
"thirdPartyFrameDomainSuffix": "ampproject.net"
1010
},
11-
{
12-
"id": "cloudflare",
13-
"name": "Cloudflare AMP Cache",
14-
"docs": "https://amp.cloudflare.com/",
15-
"cacheDomain": "amp.cloudflare.com",
16-
"updateCacheApiDomainSuffix": "amp.cloudflare.com",
17-
"thirdPartyFrameDomainSuffix": "cloudflareamp.net"
18-
},
1911
{
2012
"id": "bing",
2113
"name": "Bing AMP Cache",

‎build-system/tasks/caches-json.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const gulp = require('gulp');
2020
const log = require('fancy-log');
2121
const through2 = require('through2');
2222

23-
const expectedCaches = ['cloudflare', 'google'];
23+
const expectedCaches = ['google'];
2424

2525
const cachesJsonPath = 'build-system/global-configs/caches.json';
2626

‎build-system/test-configs/dep-check-config.js‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -181,14 +181,6 @@ exports.rules = [
181181
'doubleclick-a4a-config.js',
182182
'ads/_a4a-config.js->' +
183183
'extensions/amp-ad-network-fake-impl/0.1/fake-a4a-config.js',
184-
'ads/_a4a-config.js->' +
185-
'extensions/amp-ad-network-triplelift-impl/0.1/triplelift-a4a-config.js',
186-
'ads/_a4a-config.js->' +
187-
'extensions/amp-ad-network-cloudflare-impl/0.1/cloudflare-a4a-config.js',
188-
'ads/_a4a-config.js->' +
189-
'extensions/amp-ad-network-gmossp-impl/0.1/gmossp-a4a-config.js',
190-
'ads/_a4a-config.js->' +
191-
'extensions/amp-ad-network-mytarget-impl/0.1/mytarget-a4a-config.js',
192184
],
193185
},
194186
// Rules for extensions and main src.
@@ -208,14 +200,10 @@ exports.rules = [
208200
whitelist: [
209201
// a4a ads depend on a4a.
210202
'extensions/amp-ad-network-fake-impl/0.1/amp-ad-network-fake-impl.js->extensions/amp-a4a/0.1/amp-a4a.js',
211-
'extensions/amp-ad-network-gmossp-impl/0.1/amp-ad-network-gmossp-impl.js->extensions/amp-a4a/0.1/amp-a4a.js',
212-
'extensions/amp-ad-network-triplelift-impl/0.1/amp-ad-network-triplelift-impl.js->extensions/amp-a4a/0.1/amp-a4a.js',
213-
'extensions/amp-ad-network-cloudflare-impl/0.1/amp-ad-network-cloudflare-impl.js->extensions/amp-a4a/0.1/amp-a4a.js',
214203
'extensions/amp-ad-network-adzerk-impl/0.1/amp-ad-network-adzerk-impl.js->extensions/amp-a4a/0.1/amp-a4a.js',
215204
'extensions/amp-ad-network-doubleclick-impl/0.1/sra-utils.js->extensions/amp-a4a/0.1/amp-a4a.js',
216205
'extensions/amp-ad-network-adsense-impl/0.1/amp-ad-network-adsense-impl.js->extensions/amp-a4a/0.1/amp-a4a.js',
217206
'extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js->extensions/amp-a4a/0.1/amp-a4a.js',
218-
'extensions/amp-ad-network-mytarget-impl/0.1/amp-ad-network-mytarget-impl.js->extensions/amp-a4a/0.1/amp-a4a.js',
219207

220208
// And a few mrore things depend on a4a.
221209
'extensions/amp-ad-custom/0.1/amp-ad-custom.js->extensions/amp-a4a/0.1/amp-ad-network-base.js',

‎examples/a4a.amp.html‎

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -53,44 +53,6 @@ <h2>Fake ad network</h2>
5353
<div fallback></div>
5454
</amp-ad>
5555

56-
<h2>TripleLift ad network</h2>
57-
<amp-ad width="297" height="410"
58-
type="triplelift"
59-
data-use-a4a="true"
60-
src="https://ib.3lift.com/ttj?inv_code=ampforadstest_main_feed">
61-
<div placeholder></div>
62-
<div fallback></div>
63-
</amp-ad>
64-
65-
<h2>myTarget ad network</h2>
66-
<amp-ad width="300" height="250"
67-
type="mytarget"
68-
data-use-a4a="true"
69-
data-ad-slot="197378">
70-
<div placeholder></div>
71-
<div fallback></div>
72-
</amp-ad>
73-
74-
<h2>Fake cloudflare as ad network ad</h2>
75-
<amp-ad width="300" height="150"
76-
type="cloudflare"
77-
data-cf-network="cloudflare"
78-
data-cf-a4a="true"
79-
src="/fake_a4a.json.html">
80-
<div placeholder></div>
81-
<div fallback></div>
82-
</amp-ad>
83-
84-
<h2>GMOSSP ad network</h2>
85-
<amp-ad width="300" height="90"
86-
type="gmossp"
87-
data-use-a4a="true"
88-
data-id="37831"
89-
src="https://sp.gmossp-sp.jp/ads/ssp.ad?space_id=37831&is_a4a=1">
90-
<div placeholder></div>
91-
<div fallback></div>
92-
</amp-ad>
93-
9456
<h2>Regular ad</h2>
9557
<amp-ad data-slot="/30497360/a4a/non_a4a_native"
9658
height="250"

‎extensions/amp-ad-network-cloudflare-impl/0.1/amp-ad-network-cloudflare-impl.js‎

Lines changed: 0 additions & 128 deletions
This file was deleted.

‎extensions/amp-ad-network-cloudflare-impl/0.1/cloudflare-a4a-config.js‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)