chore: merge master into develop

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,7 +1,7 @@
 ---
 name: Bug Report
 about: Create a report to help us improve
-labels: 'type: bug, triage'
+labels: 'type: bug, issue: triage'
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/documentation.md

@@ -1,7 +1,7 @@
 ---
 name: Documentation
 about: Report an issue with our documentation
-labels: 'type: documentation, triage'
+labels: 'type: documentation, issue: triage'
 assignees: ''
 
 ---
@@ -21,10 +21,10 @@ assignees: ''
 
 **What**
 
-<!-- What kind of content is it? 
-  -  Check a box with an 'x' between the brackets: [x] 
+<!-- What kind of content is it?
+  -  Check a box with an 'x' between the brackets: [x]
   -->
-  
+
 - [ ] Text
 - [ ] Image or Gif
 - [ ] Other
@@ -39,6 +39,6 @@ assignees: ''
 
 **Additional context**
 
-<!-- Add any other context about the problem here. 
+<!-- Add any other context about the problem here.
   -  If this is related to a specific pull request, link to it.
   -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,7 +1,7 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
-labels: 'type: feature request, triage'
+labels: 'type: feature request, issue: triage'
 assignees: ''
 
 ---

.github/PULL_REQUEST_TEMPLATE.md

@@ -10,6 +10,7 @@
 - [ ] I branched from develop
 - [ ] My pull request is against develop
 - [ ] My code follows the [style guide](https://developers.google.com/blockly/guides/modify/web/style-guide)
+- [ ] I ran `npm run format` and `npm run lint`
 
 ## The details
 ### Resolves

README.md

@@ -41,11 +41,11 @@ Want to make Blockly better? We welcome contributions to Blockly in the form of
 
 ## Releases
 
-The next major release will be **September 30th, 2021**.
+The next major release will be during the last week of **March 2022**.
 
 We release by pushing the latest code to the master branch, followed by updating the npm package, our [docs](https://developers.google.com/blockly), and [demo pages](https://google.github.io/blockly-samples/). We typically release a new version of Blockly once a quarter (every 3 months). If there are breaking bugs, such as a crash when performing a standard action or a rendering issue that makes Blockly unusable, we will cherry-pick fixes to master between releases to fix them. The [releases page](https://github.com/google/blockly/releases) has a list of all releases.
 
-Releases are tagged by the release date (YYYYMMDD) with a leading '4.' and a trailing '.0' in case we ever need a major or patch version (such as [2.20190722.1](https://github.com/google/blockly/tree/2.20190722.1)). Releases that have breaking changes or are otherwise not backwards compatible will have a new major version. Patch versions are reserved for bug-fix patches between scheduled releases.
+Releases are tagged by the release date (YYYYMMDD) with a leading major version number and a trailing '.0' in case we ever need a major or patch version (such as [2.20190722.1](https://github.com/google/blockly/tree/2.20190722.1)). Releases that have breaking changes or are otherwise not backwards compatible will have a new major version. Patch versions are reserved for bug-fix patches between scheduled releases.
 
 We now have a [beta release on npm](https://www.npmjs.com/package/blockly?activeTab=versions). If you'd like to test the upcoming release, or try out a not-yet-released new API, you can use the beta channel with:
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "blockly",
-  "version": "7.20211209.0",
+  "version": "7.20211209.4",
   "description": "Blockly is a library for building visual programming editors.",
   "keywords": [
     "blockly"

typings/index.d.ts

@@ -12,11 +12,11 @@
 /// <reference path="core.d.ts" />
 /// <reference path="blocks.d.ts" />
 /// <reference path="javascript.d.ts" />
-/// <reference path="msg/en.d.ts" />
+/// <reference path="msg/msg.d.ts" />
 
 import * as Blockly from './core';
 import './blocks';
 import './javascript';
-import './msg/en';
+import './msg/msg';
 
 export = Blockly;