Merge branch 'master' into nanSlide

.circleci/config.yml

@@ -1,7 +1,7 @@
 version: 2.1
 
 orbs:
-  browser-tools: circleci/[email protected].1
+  browser-tools: circleci/[email protected].3
 
 push_and_pr_builds: &push_and_pr_builds
   filters:

.eslintrc.js

@@ -159,6 +159,7 @@ module.exports = {
     'local/no-style-property-setting': 2,
     'local/no-swallow-return-from-allow-console-error': 2,
     'local/no-unload-listener': 2,
+    'local/objstr-literal': 2,
     'local/preact': 2,
     'local/prefer-deferred-promise': 0,
     'local/prefer-destructuring': 2,

.github/workflows/sweep-experiments.yml

@@ -20,7 +20,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set Up Node
-        uses: actions/[email protected].4
+        uses: actions/[email protected].5
 
       - name: Set Up Environment
         run: sudo chown -R $(whoami) $(npm config get prefix)/{lib/node_modules,bin,share}

3p/ampcontext-integration.js

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 import {AbstractAmpContext} from './ampcontext';
-import {adConfig} from '../ads/_config';
 import {computeInMasterFrame} from './3p';
 import {dev, user, userAssert} from '../src/log';
 import {dict} from '../src/utils/object';
@@ -30,10 +29,8 @@ import {dict} from '../src/utils/object';
  */
 export function masterSelection(win, type) {
   type = type.toLowerCase();
-  const configType =
-    adConfig[type] && adConfig[type]['masterFrameAccessibleType'];
   // The master has a special name.
-  const masterName = 'frame_' + (configType || type) + '_master';
+  const masterName = 'frame_' + type + '_master';
   let master;
   try {
     // Try to get the master from the parent. If it does not

3p/integration.js

@@ -69,6 +69,7 @@ import {adop} from '../ads/vendors/adop';
 import {adpicker} from '../ads/vendors/adpicker';
 import {adplugg} from '../ads/vendors/adplugg';
 import {adpon} from '../ads/vendors/adpon';
+import {adpushup} from '../ads/vendors/adpushup';
 import {adreactor} from '../ads/vendors/adreactor';
 import {adsensor} from '../ads/vendors/adsensor';
 import {adservsolutions} from '../ads/vendors/adservsolutions';
@@ -334,6 +335,7 @@ register('adop', adop);
 register('adpicker', adpicker);
 register('adplugg', adplugg);
 register('adpon', adpon);
+register('adpushup', adpushup);
 register('adreactor', adreactor);
 register('adsensor', adsensor);
 register('adservsolutions', adservsolutions);
@@ -522,8 +524,8 @@ register('smartclip', smartclip);
 register('smi2', smi2);
 register('smilewanted', smilewanted);
 register('sogouad', sogouad);
-register('sortable', sortable);
 register('sona', sona);
+register('sortable', sortable);
 register('sovrn', sovrn);
 register('speakol', speakol);
 register('spotx', spotx);

3p/vendors/1wo.js

@@ -0,0 +1,28 @@
+/**
+ * Copyright 2021 The AMP HTML Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// src/polyfills.js must be the first import.
+import '../polyfills';
+
+import {draw3p, init} from '../integration-lib';
+import {register} from '../3p';
+
+import {_1wo} from '../../ads/vendors/1wo';
+
+init(window);
+register('1wo', _1wo);
+
+window.draw3p = draw3p;

3p/vendors/24smi.js

@@ -0,0 +1,28 @@
+/**
+ * Copyright 2021 The AMP HTML Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// src/polyfills.js must be the first import.
+import '../polyfills';
+
+import {draw3p, init} from '../integration-lib';
+import {register} from '../3p';
+
+import {_24smi} from '../../ads/vendors/24smi';
+
+init(window);
+register('24smi', _24smi);
+
+window.draw3p = draw3p;

3p/vendors/3d-gltf.js

@@ -0,0 +1,28 @@
+/**
+ * Copyright 2021 The AMP HTML Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// src/polyfills.js must be the first import.
+import '../polyfills';
+
+import {draw3p, init} from '../integration-lib';
+import {register} from '../3p';
+
+import {gltfViewer} from '../3d-gltf/index';
+
+init(window);
+register('3d-gltf', gltfViewer);
+
+window.draw3p = draw3p;

3p/vendors/_ping_.js

@@ -0,0 +1,28 @@
+/**
+ * Copyright 2021 The AMP HTML Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// src/polyfills.js must be the first import.
+import '../polyfills';
+
+import {draw3p, init} from '../integration-lib';
+import {register} from '../3p';
+
+import {_ping_} from '../../ads/vendors/_ping_';
+
+init(window);
+register('_ping_', _ping_);
+
+window.draw3p = draw3p;

3p/vendors/a8.js

@@ -0,0 +1,28 @@
+/**
+ * Copyright 2021 The AMP HTML Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// src/polyfills.js must be the first import.
+import '../polyfills';
+
+import {draw3p, init} from '../integration-lib';
+import {register} from '../3p';
+
+import {a8} from '../../ads/vendors/a8';
+
+init(window);
+register('a8', a8);
+
+window.draw3p = draw3p;

3p/vendors/a9.js

@@ -0,0 +1,28 @@
+/**
+ * Copyright 2021 The AMP HTML Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// src/polyfills.js must be the first import.
+import '../polyfills';
+
+import {draw3p, init} from '../integration-lib';
+import {register} from '../3p';
+
+import {a9} from '../../ads/vendors/a9';
+
+init(window);
+register('a9', a9);
+
+window.draw3p = draw3p;

3p/vendors/accesstrade.js

@@ -0,0 +1,28 @@
+/**
+ * Copyright 2021 The AMP HTML Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// src/polyfills.js must be the first import.
+import '../polyfills';
+
+import {draw3p, init} from '../integration-lib';
+import {register} from '../3p';
+
+import {accesstrade} from '../../ads/vendors/accesstrade';
+
+init(window);
+register('accesstrade', accesstrade);
+
+window.draw3p = draw3p;

3p/vendors/adagio.js

@@ -0,0 +1,28 @@
+/**
+ * Copyright 2021 The AMP HTML Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// src/polyfills.js must be the first import.
+import '../polyfills';
+
+import {draw3p, init} from '../integration-lib';
+import {register} from '../3p';
+
+import {adagio} from '../../ads/vendors/adagio';
+
+init(window);
+register('adagio', adagio);
+
+window.draw3p = draw3p;

3p/vendors/adblade.js

@@ -0,0 +1,28 @@
+/**
+ * Copyright 2021 The AMP HTML Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// src/polyfills.js must be the first import.
+import '../polyfills';
+
+import {draw3p, init} from '../integration-lib';
+import {register} from '../3p';
+
+import {adblade} from '../../ads/vendors/adblade';
+
+init(window);
+register('adblade', adblade);
+
+window.draw3p = draw3p;

3p/vendors/adbutler.js

@@ -0,0 +1,28 @@
+/**
+ * Copyright 2021 The AMP HTML Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// src/polyfills.js must be the first import.
+import '../polyfills';
+
+import {draw3p, init} from '../integration-lib';
+import {register} from '../3p';
+
+import {adbutler} from '../../ads/vendors/adbutler';
+
+init(window);
+register('adbutler', adbutler);
+
+window.draw3p = draw3p;

3p/vendors/adform.js

@@ -0,0 +1,28 @@
+/**
+ * Copyright 2021 The AMP HTML Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// src/polyfills.js must be the first import.
+import '../polyfills';
+
+import {draw3p, init} from '../integration-lib';
+import {register} from '../3p';
+
+import {adform} from '../../ads/vendors/adform';
+
+init(window);
+register('adform', adform);
+
+window.draw3p = draw3p;