Enforce Dangling Commas

.eslintrc

@@ -16,6 +16,7 @@
     "array-bracket-spacing": [2, "never"],
     "arrow-parens": [2, "as-needed"],
     "arrow-spacing": 2,
+    "comma-dangle": [2, "always-multiline"],
     "computed-property-spacing": [2, "never"],
     "curly": 2,
     "dot-location": [2, "property"],

3p/integration.js

@@ -52,7 +52,7 @@ import {openadstream} from '../ads/openadstream';
  * @const {!Object<string: boolean>}
  */
 const AMP_EMBED_ALLOWED = {
-  taboola: true
+  taboola: true,
 };
 
 register('a9', a9);
@@ -207,7 +207,7 @@ function triggerDimensions(width, height) {
 function triggerResizeRequest(width, height) {
   nonSensitiveDataPostMessage('embed-size', {
     width: width,
-    height: height
+    height: height,
   });
 }
 
@@ -283,7 +283,7 @@ function reportRenderedEntityIdentifier(entityId) {
   assert(typeof entityId == 'string',
       'entityId should be a string %s', entityId);
   nonSensitiveDataPostMessage('entity-id', {
-    id: entityId
+    id: entityId,
   });
 }
 

ads/_config.js

@@ -66,7 +66,7 @@ export const adPreconnect = {
     'https://trends.revcontent.com',
     'https://cdn.revcontent.com',
     'https://img.revcontent.com',
-  ]
+  ],
 };
 
 /**

ads/adform.js

@@ -19,7 +19,7 @@ import {writeScript, validateSrcPrefix, validateExactlyOne} from '../src/3p';
 // Valid adform ad source hosts
 const hosts = {
   track: 'https://track.adform.net/',
-  adx: 'https://adx.adform.net/'
+  adx: 'https://adx.adform.net/',
 };
 
 /**

ads/doubleclick.js

@@ -44,7 +44,7 @@ export function doubleclick(global, data) {
 function doubleClickWithGpt(global, data) {
   const dimensions = [[
     parseInt(data.overrideWidth || data.width, 10),
-    parseInt(data.overrideHeight || data.height, 10)
+    parseInt(data.overrideHeight || data.height, 10),
   ]];
 
   if (global.context.clientId) {

ads/mediaimpact.js

@@ -33,7 +33,7 @@ export function mediaimpact(global, data) {
   }, false);
   asmiSetup = {
     view: 'm',
-    async: true
+    async: true,
   };
   loadScript(global, 'https://ec-ns.sascdn.com/diff/251/divscripte/amp.js?dom=' + window.context.location.host, () => {
     if (!document.getElementById('sas_' + data.slot.replace('sas_',''))) {

ads/plista.js

@@ -23,7 +23,7 @@ import {loadScript, checkData} from '../src/3p';
 export function plista(global, data) {
   checkData(data, [
     'publickey', 'widgetname', 'urlprefix',
-    'item', 'geo', 'categories', 'countrycode'
+    'item', 'geo', 'categories', 'countrycode',
   ]);
   const div = global.document.createElement('div');
   div.setAttribute('data-display', 'plista_widget_' + data.widgetname);
@@ -33,14 +33,14 @@ export function plista(global, data) {
     publickey: data.publickey,
     widgets: [{
       name: data.widgetname,
-      pre: data.urlprefix
+      pre: data.urlprefix,
     }],
     item: data.item,
     geo: data.geo,
     categories: data.categories,
     noCache: true,
     useDocumentReady: false,
-    dataMode: 'data-display'
+    dataMode: 'data-display',
   };
 
   // load the plista modules asynchronously

ads/smartadserver.js

@@ -37,7 +37,7 @@ export function smartadserver(global, data) {
         'pageId': data.page,
         'formatId': data.format,
         'target': data.target,
-        'tagId': data.tag
+        'tagId': data.tag,
       });
     });
   });

ads/taboola.js

@@ -35,7 +35,7 @@ export function taboola(global, data) {
   // setup default values for referrer and url
   const params = {
     referrer: data.referrer || global.context.referrer,
-    url: data.url || global.context.canonicalUrl
+    url: data.url || global.context.canonicalUrl,
   };
 
   // copy none blacklisted attribute to the 'params' map
@@ -52,7 +52,7 @@ export function taboola(global, data) {
     placement: data.placement,
     mode: data.mode,
     framework: 'amp',
-    container: 'c'
+    container: 'c',
   },
     params,
     {flush: true}]
@@ -65,7 +65,7 @@ export function taboola(global, data) {
         global._taboola.push({
           visible: true,
           rects: c,
-          placement: data.placement
+          placement: data.placement,
         });
       }
     });

builtins/amp-ad.js

@@ -32,7 +32,7 @@ import {userNotificationManagerFor} from '../src/user-notification';
 
 /** @private @const These tags are allowed to have fixed positioning */
 const POSITION_FIXED_TAG_WHITELIST = {
-  'AMP-LIGHTBOX': true
+  'AMP-LIGHTBOX': true,
 };
 
 /**

extensions/amp-access/0.1/amp-access.js

@@ -308,7 +308,7 @@ export class AccessService {
   broadcastReauthorize_() {
     this.viewer_.broadcast({
       'type': 'amp-access-reauthorize',
-      'origin': this.pubOrigin_
+      'origin': this.pubOrigin_,
     });
   }
 
@@ -338,7 +338,7 @@ export class AccessService {
     return this.getReaderId_().then(readerId => {
       const vars = {
         'READER_ID': readerId,
-        'ACCESS_READER_ID': readerId  // A synonym.
+        'ACCESS_READER_ID': readerId,  // A synonym.
       };
       if (useAuthData) {
         vars['AUTHDATA'] = field => {
@@ -373,7 +373,7 @@ export class AccessService {
           AUTHORIZATION_TIMEOUT,
           this.xhr_.fetchJson(url, {
             credentials: 'include',
-            requireAmpResponseSourceOrigin: true
+            requireAmpResponseSourceOrigin: true,
           }));
     }).catch(error => {
       this.analyticsEvent_('access-authorization-failed');
@@ -662,9 +662,9 @@ export class AccessService {
         credentials: 'include',
         requireAmpResponseSourceOrigin: true,
         headers: {
-          'Content-Type': 'application/x-www-form-urlencoded'
+          'Content-Type': 'application/x-www-form-urlencoded',
         },
-        body: ''
+        body: '',
       });
     }).then(() => {
       log.fine(TAG, 'Pingback complete');

extensions/amp-access/0.1/amp-login-done-dialog.js

@@ -163,7 +163,7 @@ export class LoginDoneDialog {
       opener./*OK*/postMessage({
         sentinel: 'amp',
         type: 'result',
-        result: response
+        result: response,
       }, target);
 
       this.win.setTimeout(() => {

extensions/amp-access/0.1/login-dialog.js

@@ -191,7 +191,7 @@ class LoginDialog {
         if (this.dialog_) {
           this.dialog_./*OK*/postMessage({
             sentinel: 'amp',
-            type: 'result-ack'
+            type: 'result-ack',
           }, returnOrigin);
         }
         this.loginDone_(e.data.result);

extensions/amp-access/0.1/test/test-access-expr.js

@@ -200,7 +200,7 @@ describe('evaluateAccessExpr', () => {
         str: 'A',
         num: 11,
         bool: true,
-      }
+      },
     };
 
     expect(evaluateAccessExpr('obj.bool = true', resp)).to.be.true;
@@ -226,8 +226,8 @@ describe('evaluateAccessExpr', () => {
       obj: {
         str: 'A',
         child: {
-          str: 'B'
-        }
+          str: 'B',
+        },
       },
     };