From 821fe6bb8dee6d15bd031bcc3f09a476f01be1b7 Mon Sep 17 00:00:00 2001
From: Ian Sutherland <ian@iansutherland.ca>
Date: Wed, 27 Nov 2019 15:40:32 -0700
Subject: [PATCH] Update CHANGELOG

---
 CHANGELOG.md | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 11c865f6..172c0a14 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## 3.3.0 (2019-xx-xx)
 
-DRAFT
+v3.3.0 is a minor release that adds new features, including custom templates and support for the new optional chaining and nullish coalescing operators.
 
 ### Custom Templates
 
@@ -41,6 +41,40 @@ We've added support for [numeric separators](https://github.com/tc39/proposal-nu
 101_475_938.38; // And this is hundreds of millions
 ```
 
+### no-unexpected-multiline
+
+We've removed this rule as it is not compatible with Prettier. If you rely on this rule you can re-enable it by [extending our ESLint config](https://create-react-app.dev/docs/setting-up-your-editor/#experimental-extending-the-eslint-config) and adding the following:
+
+```json
+{
+  "extends": "react-app",
+  "overrides": [
+    {
+      "files": ["**/*.{js,ts?(x)}"],
+      "rules": {
+        "no-unexpected-multiline": "warn"
+      }
+    }
+  ]
+}
+```
+
+<!-- INSERT LERNA CHANGELOG -->
+
+### Migrating from 3.2.0 to 3.3.0
+
+Inside any created project that has not been ejected, run:
+
+```sh
+npm install --save --save-exact react-scripts@3.3.0
+```
+
+or
+
+```sh
+yarn add --exact react-scripts@3.3.0
+```
+
 ## 3.2.0 (2019-10-03)
 
 v3.2.0 is a minor release that adds support for production profiling and ignoring TypeScript type errors to make migrating JavaScript projects to TypeScript easier. It also includes other minor bug fixes and documentation updates.