Resolve merge conflicts

microsoft · May 20, 2024 · df947ad · df947ad
1 parent a47f515
commit df947ad
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -32,7 +32,9 @@
       "**/react-dom",
       "**/react-syntax-highlighter",
       "**/typescript",
-      "**/webpack"
+      "**/webpack",
+      "**/@storybook/builder-webpack5",
+      "**/@storybook/builder-webpack5/**"
     ]
   },
   "engines": {

diff --git a/packages/web-components/fast-element/package.json b/packages/web-components/fast-element/package.json
@@ -153,8 +153,6 @@
     "ts-node": "^8.9.1",
     "tsconfig-paths": "^3.9.0",
     "tslib": "^2.4.0",
-    "typescript": "~4.7.0",
-    "webpack": "^5.72.0",
-    "webpack-cli": "^4.9.2"
+    "typescript": "~4.7.0"
   }
 }