Merge pull request #8650 from electron/will-attach-webview-docs

[ci skip] Improve docs for `will-attach-webview` event

diff --git a/script/create-dist.py b/script/create-dist.py
index f777d7a..4aa67ea 100755 (executable)
--- a/script/create-dist.py
+++ b/script/create-dist.py
@@ -132,9 +132,13 @@ def copy_license():
   shutil.copy2(os.path.join(SOURCE_ROOT, 'LICENSE'), DIST_DIR)
 
 def create_api_json_schema():
+  node_bin_dir = os.path.join(SOURCE_ROOT, 'node_modules', '.bin')
+  env = os.environ.copy()
+  env['PATH'] = os.path.pathsep.join([node_bin_dir, env['PATH']])
   outfile = os.path.relpath(os.path.join(DIST_DIR, 'electron-api.json'))
   execute(['electron-docs-linter', 'docs', '--outfile={0}'.format(outfile),
-           '--version={}'.format(ELECTRON_VERSION.replace('v', ''))])
+           '--version={}'.format(ELECTRON_VERSION.replace('v', ''))],
+          env=env)
 
 def strip_binaries():
   for binary in TARGET_BINARIES[PLATFORM]:

diff --git a/script/lib/config.py b/script/lib/config.py
index e6d1493..96c6591 100644 (file)
--- a/script/lib/config.py
+++ b/script/lib/config.py
@@ -9,7 +9,7 @@ import sys
 BASE_URL = os.getenv('LIBCHROMIUMCONTENT_MIRROR') or \
     'https://s3.amazonaws.com/github-janky-artifacts/libchromiumcontent'
 LIBCHROMIUMCONTENT_COMMIT = os.getenv('LIBCHROMIUMCONTENT_COMMIT') or \
-    'e0da1e9caa7c8f3da3519963a9ea32abba43c7c8'
+    'ea20b8dfe0a7fad61bb4917404950ddcd2224588'
 
 PLATFORM = {
   'cygwin': 'win32',