Merge branch 'master' into merge-into-release

google · Sep 30, 2021 · 793f3af · 793f3af
2 parents 4f455a5 + 21e3e22
commit 793f3af
Show file tree

Hide file tree

Showing 83 changed files with 100,162 additions and 66,965 deletions.
diff --git a/codelabs/custom_generator/custom_generator.md b/codelabs/custom_generator/custom_generator.md
@@ -39,7 +39,7 @@ You will make all of your changes in the advanced playground, which you can find
 To start, create a file named `custom_generator.js` in the same folder as the playground.  Include it with a script tag.
 
 ```
-<script src="custom_generator.js"></script>
+<script src="./custom_generator.js"></script>
 ```
 
 Note: you must include your custom code *after* including the Blockly library.

diff --git a/examples/blockly-angular/package-lock.json b/examples/blockly-angular/package-lock.json
diff --git a/examples/blockly-react/package-lock.json b/examples/blockly-react/package-lock.json
diff --git a/examples/blockly-rtc/package-lock.json b/examples/blockly-rtc/package-lock.json
diff --git a/gh-pages/index.md b/gh-pages/index.md
@@ -29,6 +29,7 @@ layout: index
 * [Fixed Edges](plugins/fixed-edges/test/index.html)
 * [Zoom to Fit](plugins/zoom-to-fit/test/index.html)
 * [Keyboard Navigation](plugins/keyboard-navigation/test/index.html)
+* [Scroll Options](plugins/scroll-options/test/index.html)
 
 ## Themes
 * [Theme Dark](plugins/theme-dark/test/index.html)

diff --git a/lerna.json b/lerna.json
@@ -11,5 +11,6 @@
     "publish": {
       "registry": "https://wombat-dressing-room.appspot.com"
     }
-  }
+  },
+  "ignoreChanges": ["plugins/**/package-lock.json"]
 }