Updates after rebase

gulpfile.js

@@ -25,7 +25,6 @@ const buffer = require('vinyl-buffer');
 const colors = require('ansi-colors');
 const fs = require('fs-extra');
 const gulp = $$.help(require('gulp'));
-const {TOKEN: internalRuntimeToken, VERSION: internalRuntimeVersion} = require('./build-system/internal-version') ;
 const lazypipe = require('lazypipe');
 const log = require('fancy-log');
 const minimatch = require('minimatch');
@@ -40,6 +39,7 @@ const {cleanupBuildDir, closureCompile} = require('./build-system/tasks/compile'
 const {createCtrlcHandler, exitCtrlcHandler} = require('./build-system/ctrlcHandler');
 const {jsifyCssAsync} = require('./build-system/tasks/jsify-css');
 const {serve} = require('./build-system/tasks/serve.js');
+const {TOKEN: internalRuntimeToken, VERSION: internalRuntimeVersion} = require('./build-system/internal-version') ;
 const {transpileTs} = require('./build-system/typescript');
 
 const argv = minimist(

src/service/action-impl.js

@@ -476,7 +476,7 @@ export class ActionService {
       const args = dereferenceExprsInArgs(actionInfo.args, event);
       const invokeAction = () => {
         // Document root is the target node for global targets e.g. "AMP".
-        const target = actionInfo.target;
+        const {target} = actionInfo;
         // If it isn't a global target, it should be an element id.
         // Find the corresponding element.
         const node = (this.globalTargets_[target])

src/service/standard-actions-impl.js

@@ -171,7 +171,7 @@ export class StandardActions {
     if (!invocation.satisfiesTrust(ActionTrust.HIGH)) {
       return null;
     }
-    const node = invocation.node;
+    const {node} = invocation;
     const win = (node.ownerDocument || node).defaultView;
     const url = invocation.args['url'];
     const requestedBy = `AMP.${invocation.method}`;
@@ -200,7 +200,7 @@ export class StandardActions {
     if (!invocation.satisfiesTrust(ActionTrust.HIGH)) {
       return null;
     }
-    const node = invocation.node;
+    const {node} = invocation;
     const win = (node.ownerDocument || node).defaultView;
     win.print();
     return null;

src/service/video/docking.js

@@ -1385,8 +1385,8 @@ export class VideoDocking {
   // destructuring.
   getViewportSize_() {
     const viewportSize = this.viewport_.getSize();
-    const vw = viewportSize.width;
-    const vh = viewportSize.height;
+    const {width: vw, height: vh} = viewportSize ;
+
     return {vw, vh};
   }