From e2af636ed844bc0ec56a9775d9b5a13d4e1953e5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 12 Sep 2021 01:13:39 +0000
Subject: [PATCH 1/2] Build(deps-dev): Bump eslint-plugin-unicorn from 35.0.0
 to 36.0.0

Bumps [eslint-plugin-unicorn](https://github.com/sindresorhus/eslint-plugin-unicorn) from 35.0.0 to 36.0.0.
- [Release notes](https://github.com/sindresorhus/eslint-plugin-unicorn/releases)
- [Commits](https://github.com/sindresorhus/eslint-plugin-unicorn/compare/v35.0.0...v36.0.0)

---
updated-dependencies:
- dependency-name: eslint-plugin-unicorn
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 3eff87a7f867..8c5b81215df1 100644
--- a/package.json
+++ b/package.json
@@ -116,7 +116,7 @@
     "eslint-plugin-prettier-internal-rules": "2.0.1",
     "eslint-plugin-react": "7.25.1",
     "eslint-plugin-regexp": "1.1.0",
-    "eslint-plugin-unicorn": "35.0.0",
+    "eslint-plugin-unicorn": "36.0.0",
     "esm-utils": "2.0.0",
     "execa": "5.1.1",
     "jest": "27.1.0",
diff --git a/yarn.lock b/yarn.lock
index 640958707481..f5601f3f9c18 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3015,10 +3015,10 @@ eslint-plugin-regexp@1.1.0:
     regexpp "^3.2.0"
     scslre "^0.1.6"
 
-eslint-plugin-unicorn@35.0.0:
-  version "35.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-unicorn/-/eslint-plugin-unicorn-35.0.0.tgz#40797793d4f645bafaaa7a1396b8f4ca7b2a7dbd"
-  integrity sha512-FHsaO68tDPQILfs/mGF8eSISJp8RswR4FpUuBDnueK2wyEHC6zmsc9WxjYyldXoIsBuVmru6jQyFCbCWPoW/KQ==
+eslint-plugin-unicorn@36.0.0:
+  version "36.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-unicorn/-/eslint-plugin-unicorn-36.0.0.tgz#db50e1426839e401d33c5a279f49d4a5bbb640d8"
+  integrity sha512-xxN2vSctGWnDW6aLElm/LKIwcrmk6mdiEcW55Uv5krcrVcIFSWMmEgc/hwpemYfZacKZ5npFERGNz4aThsp1AA==
   dependencies:
     "@babel/helper-validator-identifier" "^7.14.9"
     ci-info "^3.2.0"

From b9dec7b5a786e4d890c28965e1845f7d32014bbd Mon Sep 17 00:00:00 2001
From: Sosuke Suzuki <aosukeke@gmail.com>
Date: Mon, 13 Sep 2021 00:19:27 +0900
Subject: [PATCH 2/2] Fix for new prefer-spread (#11513)

---
 src/language-js/print/literal.js | 2 +-
 src/main/core.js                 | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/language-js/print/literal.js b/src/language-js/print/literal.js
index 15cb41afaec8..a61a65eb3ddf 100644
--- a/src/language-js/print/literal.js
+++ b/src/language-js/print/literal.js
@@ -53,7 +53,7 @@ function printBigInt(raw) {
 }
 
 function printRegex({ pattern, flags }) {
-  flags = flags.split("").sort().join("");
+  flags = [...flags].sort().join("");
   return `/${pattern}/${flags}`;
 }
 
diff --git a/src/main/core.js b/src/main/core.js
index 48035d355ed9..63c40594a9b9 100644
--- a/src/main/core.js
+++ b/src/main/core.js
@@ -109,14 +109,14 @@ function coreFormat(originalText, opts, addAlignmentSize = 0) {
     // diff old and new cursor node texts, with a special cursor
     // symbol inserted to find out where it moves to
 
-    const oldCursorNodeCharArray = oldCursorNodeText.split("");
+    const oldCursorNodeCharArray = [...oldCursorNodeText];
     oldCursorNodeCharArray.splice(
       cursorOffsetRelativeToOldCursorNode,
       0,
       CURSOR
     );
 
-    const newCursorNodeCharArray = newCursorNodeText.split("");
+    const newCursorNodeCharArray = [...newCursorNodeText];
 
     const cursorNodeDiff = diff.diffArrays(
       oldCursorNodeCharArray,