fix storybook (#15387)

lavamoat/build-system/policy.json

@@ -1313,10 +1313,15 @@
     "brfs>static-module>acorn-node": {
       "packages": {
         "@storybook/addon-essentials>@storybook/addon-docs>acorn-walk": true,
-        "jsdom>acorn": true,
+        "brfs>static-module>acorn-node>acorn": true,
         "watchify>xtend": true
       }
     },
+    "brfs>static-module>acorn-node>acorn": {
+      "globals": {
+        "define": true
+      }
+    },
     "brfs>static-module>magic-string": {
       "globals": {
         "Buffer": true,
@@ -2721,13 +2726,24 @@
     "eslint>espree": {
       "packages": {
         "eslint>eslint-visitor-keys": true,
-        "eslint>espree>acorn-jsx": true,
-        "jsdom>acorn": true
+        "eslint>espree>acorn": true,
+        "eslint>espree>acorn-jsx": true
+      }
+    },
+    "eslint>espree>acorn": {
+      "globals": {
+        "console": true,
+        "define": true
       }
     },
     "eslint>espree>acorn-jsx": {
       "packages": {
-        "jsdom>acorn": true
+        "eslint>espree>acorn-jsx>acorn": true
+      }
+    },
+    "eslint>espree>acorn-jsx>acorn": {
+      "globals": {
+        "define": true
       }
     },
     "eslint>esquery": {
@@ -3656,8 +3672,8 @@
         "gulp-sourcemaps>source-map": true,
         "gulp-sourcemaps>strip-bom-string": true,
         "gulp-sourcemaps>through2": true,
-        "jsdom>acorn": true,
-        "nyc>convert-source-map": true
+        "nyc>convert-source-map": true,
+        "webpack>acorn": true
       }
     },
     "gulp-sourcemaps>@gulp-sourcemaps/identity-map": {
@@ -3665,8 +3681,8 @@
         "css-loader>normalize-path": true,
         "gulp-sourcemaps>@gulp-sourcemaps/identity-map>source-map": true,
         "gulp-sourcemaps>@gulp-sourcemaps/identity-map>through2": true,
-        "jsdom>acorn": true,
-        "stylelint>postcss": true
+        "stylelint>postcss": true,
+        "webpack>acorn": true
       }
     },
     "gulp-sourcemaps>@gulp-sourcemaps/identity-map>through2": {
@@ -5260,11 +5276,6 @@
         "pump>once": true
       }
     },
-    "jsdom>acorn": {
-      "globals": {
-        "define": true
-      }
-    },
     "jsdom>escodegen": {
       "globals": {
         "sourceMap.SourceNode": true
@@ -6794,8 +6805,8 @@
         "process.stdin.setEncoding": true
       },
       "packages": {
-        "jsdom>acorn": true,
-        "source-map": true
+        "source-map": true,
+        "webpack>acorn": true
       }
     },
     "terser>source-map-support": {
@@ -7047,6 +7058,11 @@
         "eth-rpc-errors>fast-safe-stringify": true
       }
     },
+    "webpack>acorn": {
+      "globals": {
+        "define": true
+      }
+    },
     "webpack>micromatch>braces>snapdragon-node": {
       "packages": {
         "gulp>gulp-cli>isobject": true,

package.json

@@ -76,7 +76,6 @@
     "lavamoat:auto": "yarn lavamoat:build:auto && yarn lavamoat:background:auto"
   },
   "resolutions": {
-    "acorn": "^7.4.1",
     "**/regenerator-runtime": "^0.13.7",
     "**/caniuse-lite": "1.0.30001265",
     "**/cross-fetch": "^3.1.5",

patches/acorn-node++acorn+7.4.1.patch

@@ -1,13 +1,13 @@
-diff --git a/node_modules/acorn/dist/acorn.js b/node_modules/acorn/dist/acorn.js
-index 0523f0e..9d3d5c2 100644
---- a/node_modules/acorn/dist/acorn.js
-+++ b/node_modules/acorn/dist/acorn.js
+diff --git a/node_modules/acorn-node/node_modules/acorn/dist/acorn.js b/node_modules/acorn-node/node_modules/acorn/dist/acorn.js
+index 0523f0e..2bb9b56 100644
+--- a/node_modules/acorn-node/node_modules/acorn/dist/acorn.js
++++ b/node_modules/acorn-node/node_modules/acorn/dist/acorn.js
 @@ -1835,7 +1835,7 @@
        if (checkClashes) {
          if (has(checkClashes, expr.name))
            { this.raiseRecoverable(expr.start, "Argument name clash"); }
 -        checkClashes[expr.name] = true;
-+        Object.defineProperty(checkClashes, expr.name, { value: true, writable: true, enumerable: true, configurable: true })
++        Object.defineProperty(checkClashes, expr.name, { value: true, writable: true, enumerable: true, configurable: true });
        }
        if (bindingType !== BIND_NONE && bindingType !== BIND_OUTSIDE) { this.declareName(expr.name, bindingType, expr.start); }
-       break
+       break

yarn.lock

@@ -5447,11 +5447,26 @@ acorn-walk@^8.2.0:
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
   integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
 
-acorn@^5.1.2, acorn@^6.0.1, acorn@^6.4.1, acorn@^7.0.0, acorn@^7.1.1, acorn@^7.4.1, acorn@^8.2.4, acorn@^8.7.0, acorn@^8.7.1:
+acorn@^5.1.2:
+  version "5.7.4"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e"
+  integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==
+
+acorn@^6.0.1, acorn@^6.4.1:
+  version "6.4.2"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6"
+  integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==
+
+acorn@^7.0.0, acorn@^7.1.1, acorn@^7.4.1:
   version "7.4.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
+acorn@^8.2.4, acorn@^8.7.0, acorn@^8.7.1:
+  version "8.8.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8"
+  integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==
+
 addons-linter@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/addons-linter/-/addons-linter-5.2.0.tgz#a1a36cdb72f5df359e246c25e1261d2183b4f6a7"