From 2d725ef79bb7ff510610be9106c5fa9837e42b52 Mon Sep 17 00:00:00 2001
From: Maribeth Bottorff <maribethb@google.com>
Date: Wed, 5 Oct 2022 14:44:41 -0700
Subject: [PATCH] chore: Update lerna-version to use the correct form of
 conventional commits

---
 lerna.json        |  3 +++
 package-lock.json | 26 ++++++++++++++++++++++++++
 package.json      |  1 +
 3 files changed, 30 insertions(+)

diff --git a/lerna.json b/lerna.json
index 47158f550d..5440d7a535 100644
--- a/lerna.json
+++ b/lerna.json
@@ -9,5 +9,8 @@
       "registry": "https://wombat-dressing-room.appspot.com"
     }
   },
+  "changelogPreset": {
+    "name": "conventionalcommits"
+  },
   "ignoreChanges": ["plugins/**/package-lock.json"]
 }
diff --git a/package-lock.json b/package-lock.json
index 0bf2a09d2b..65581d29a5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,6 +11,7 @@
       "license": "Apache-2.0",
       "devDependencies": {
         "@blockly/eslint-config": "^2.1.7",
+        "conventional-changelog-conventionalcommits": "^5.0.0",
         "eslint": "^7.15.0",
         "gh-pages": "^3.1.0",
         "gulp": "^4.0.2",
@@ -4943,6 +4944,20 @@
         "node": ">=10"
       }
     },
+    "node_modules/conventional-changelog-conventionalcommits": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-5.0.0.tgz",
+      "integrity": "sha512-lCDbA+ZqVFQGUj7h9QBKoIpLhl8iihkO0nCTyRNzuXtcd7ubODpYB04IFy31JloiJgG0Uovu8ot8oxRzn7Nwtw==",
+      "dev": true,
+      "dependencies": {
+        "compare-func": "^2.0.0",
+        "lodash": "^4.17.15",
+        "q": "^1.5.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/conventional-changelog-core": {
       "version": "4.2.4",
       "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-4.2.4.tgz",
@@ -18910,6 +18925,17 @@
         "q": "^1.5.1"
       }
     },
+    "conventional-changelog-conventionalcommits": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-5.0.0.tgz",
+      "integrity": "sha512-lCDbA+ZqVFQGUj7h9QBKoIpLhl8iihkO0nCTyRNzuXtcd7ubODpYB04IFy31JloiJgG0Uovu8ot8oxRzn7Nwtw==",
+      "dev": true,
+      "requires": {
+        "compare-func": "^2.0.0",
+        "lodash": "^4.17.15",
+        "q": "^1.5.1"
+      }
+    },
     "conventional-changelog-core": {
       "version": "4.2.4",
       "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-4.2.4.tgz",
diff --git a/package.json b/package.json
index fcdac665b8..f504c572d6 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,7 @@
   },
   "devDependencies": {
     "@blockly/eslint-config": "^2.1.7",
+    "conventional-changelog-conventionalcommits": "^5.0.0",
     "eslint": "^7.15.0",
     "gh-pages": "^3.1.0",
     "gulp": "^4.0.2",