From aeda400b25a1709570de36dfc83f7599bbff9d60 Mon Sep 17 00:00:00 2001
From: Michael Shilman <michael@lab80.co>
Date: Wed, 17 Nov 2021 09:17:23 +0800
Subject: [PATCH 1/2] Fix addon-docs acorn dependency for pnpm compat

---
 addons/docs/package.json |  2 +-
 yarn.lock                | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/addons/docs/package.json b/addons/docs/package.json
index 6e824ba67dd8..6a53d7356e64 100644
--- a/addons/docs/package.json
+++ b/addons/docs/package.json
@@ -78,7 +78,7 @@
     "@storybook/source-loader": "6.4.0-rc.3",
     "@storybook/store": "6.4.0-rc.3",
     "@storybook/theming": "6.4.0-rc.3",
-    "acorn": "^7.4.1",
+    "acorn": "^8.5.0",
     "acorn-jsx": "^5.3.1",
     "acorn-walk": "^7.2.0",
     "core-js": "^3.8.2",
diff --git a/yarn.lock b/yarn.lock
index c9aee0767256..98abe6921ecf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7072,7 +7072,7 @@ __metadata:
     "@types/prop-types": ^15.7.3
     "@types/tmp": ^0.2.0
     "@types/util-deprecate": ^1.0.0
-    acorn: ^7.4.1
+    acorn: ^8.5.0
     acorn-jsx: ^5.3.1
     acorn-walk: ^7.2.0
     babel-loader: ^8.0.0
@@ -12989,7 +12989,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn@npm:^7.0.0, acorn@npm:^7.1.0, acorn@npm:^7.1.1, acorn@npm:^7.3.1, acorn@npm:^7.4.0, acorn@npm:^7.4.1":
+"acorn@npm:^7.0.0, acorn@npm:^7.1.0, acorn@npm:^7.1.1, acorn@npm:^7.3.1, acorn@npm:^7.4.0":
   version: 7.4.1
   resolution: "acorn@npm:7.4.1"
   bin:
@@ -13007,6 +13007,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"acorn@npm:^8.5.0":
+  version: 8.5.0
+  resolution: "acorn@npm:8.5.0"
+  bin:
+    acorn: bin/acorn
+  checksum: a0cd0009d215df0c5a6c69ea40a5e784114f1b89d5649d663264ccbb855d4c6b6da6936fed607078b7d681bd8d8f2e730dad25931edbdef709bc4b520c0caa80
+  languageName: node
+  linkType: hard
+
 "address@npm:1.1.2, address@npm:^1.0.1, address@npm:^1.1.2":
   version: 1.1.2
   resolution: "address@npm:1.1.2"

From e15d541d6a5adf812638b76c11109df85f3368fc Mon Sep 17 00:00:00 2001
From: Michael Shilman <michael@lab80.co>
Date: Wed, 17 Nov 2021 09:56:45 +0800
Subject: [PATCH 2/2] Upgrade acorn to 8

---
 addons/docs/src/frameworks/react/lib/inspection/acornParser.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/docs/src/frameworks/react/lib/inspection/acornParser.ts b/addons/docs/src/frameworks/react/lib/inspection/acornParser.ts
index 28a5a7ad2267..f5bfad7c229a 100644
--- a/addons/docs/src/frameworks/react/lib/inspection/acornParser.ts
+++ b/addons/docs/src/frameworks/react/lib/inspection/acornParser.ts
@@ -207,7 +207,7 @@ function parseExpression(expression: any): ParsingResult<InspectionInferedType>
 }
 
 export function parse(value: string): ParsingResult<InspectionInferedType> {
-  const ast = (acornParser.parse(`(${value})`) as unknown) as estree.Program;
+  const ast = (acornParser.parse(`(${value})`, { ecmaVersion: 6 }) as unknown) as estree.Program;
 
   let parsingResult: ParsingResult<InspectionUnknown> = {
     inferredType: { type: InspectionType.UNKNOWN },