fix: add drag drop deps and remove unused code editor deps (#3866)

* fix: add drag drop deps and remove unused code editor deps * bump react-docs to fix error * bump the prerelease versions
patternfly · Jan 30, 2024 · 6b2a15f · 6b2a15f
1 parent 0aedc8f
commit 6b2a15f
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 66 deletions.
diff --git a/package.json b/package.json
@@ -35,9 +35,9 @@
   },
   "devDependencies": {
     "@patternfly/patternfly": "5.2.0-prerelease.7",
-    "@patternfly/react-code-editor": "5.2.0-prerelease.48",
-    "@patternfly/react-core": "5.2.0-prerelease.47",
-    "@patternfly/react-table": "5.2.0-prerelease.47",
+    "@patternfly/react-code-editor": "5.2.0-prerelease.50",
+    "@patternfly/react-core": "5.2.0-prerelease.49",
+    "@patternfly/react-table": "5.2.0-prerelease.49",
     "@octokit/rest": "^19.0.7",
     "glob": "^8.1.0",
     "lerna": "^6.4.1",

diff --git a/packages/documentation-framework/package.json b/packages/documentation-framework/package.json
@@ -43,8 +43,6 @@
     "mdast-util-to-hast": "9.1.1",
     "mdurl": "1.0.1",
     "mini-css-extract-plugin": "2.7.5",
-    "monaco-editor": "0.34.1",
-    "monaco-editor-webpack-plugin": "7.0.1",
     "null-loader": "4.0.1",
     "parse-entities": "2.0.0",
     "path-browserify": "1.0.1",
@@ -54,7 +52,6 @@
     "puppeteer": "19.11.1",
     "puppeteer-cluster": "0.23.0",
     "react-docgen": "5.3.1",
-    "react-monaco-editor": "^0.51.0",
     "react-ssr-prepass": "1.5.0",
     "remark-footnotes": "1.0.0",
     "remark-frontmatter": "2.0.0",
@@ -81,9 +78,9 @@
   },
   "peerDependencies": {
     "@patternfly/patternfly": "5.2.0-prerelease.7",
-    "@patternfly/react-code-editor": "5.2.0-prerelease.48",
-    "@patternfly/react-core": "5.2.0-prerelease.47",
-    "@patternfly/react-table": "5.2.0-prerelease.47",
+    "@patternfly/react-code-editor": "5.2.0-prerelease.50",
+    "@patternfly/react-core": "5.2.0-prerelease.49",
+    "@patternfly/react-table": "5.2.0-prerelease.49",
     "react": "^17.0.0 || ^18.0.0",
     "react-dom": "^17.0.0 || ^18.0.0"
   }

diff --git a/packages/documentation-framework/scripts/webpack/webpack.base.config.js b/packages/documentation-framework/scripts/webpack/webpack.base.config.js
@@ -2,7 +2,6 @@ const path = require('path');
 const webpack = require('webpack');
 const { CleanWebpackPlugin } = require('clean-webpack-plugin');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
-const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
 
 module.exports = (_env, argv) => {
   const {
@@ -155,9 +154,6 @@ module.exports = (_env, argv) => {
         patterns: [
           { from: path.join(__dirname, '../../assets'), to: 'assets' }
         ]
-      }),
-      new MonacoWebpackPlugin({
-        globalAPI: true,
       })
     ],
     stats: 'minimal'

diff --git a/packages/documentation-site/package.json b/packages/documentation-site/package.json
@@ -21,9 +21,9 @@
     "@patternfly/quickstarts": "^5.1.0",
     "@patternfly/react-catalog-view-extension": "5.0.0",
     "@patternfly/react-console": "5.0.0",
-    "@patternfly/react-docs": "6.2.0-prerelease.49",
+    "@patternfly/react-docs": "6.2.0-prerelease.52",
     "@patternfly/react-log-viewer": "5.1.0-prerelease.1",
-    "@patternfly/react-topology": "5.2.0-prerelease.3",
+    "@patternfly/react-topology": "5.2.0-prerelease.4",
     "@patternfly/react-user-feedback": "5.0.0",
     "@patternfly/react-component-groups": "5.1.0-prerelease.2",
     "@patternfly/react-virtualized-extension": "5.0.0",

diff --git a/packages/documentation-site/patternfly-docs/patternfly-docs.source.js b/packages/documentation-site/patternfly-docs/patternfly-docs.source.js
@@ -49,6 +49,9 @@ module.exports = (sourceMD, sourceProps, sourceFunctionDocs) => {
     const reactChartsPath = require
       .resolve('@patternfly/react-charts/package.json')
       .replace('package.json', 'src');
+    const reactDragDropPath = require
+      .resolve('@patternfly/react-drag-drop/package.json')
+      .replace('package.json', 'src');
 
     const reactTopologyPath = require
     .resolve('@patternfly/react-topology/package.json')
@@ -58,6 +61,7 @@ module.exports = (sourceMD, sourceProps, sourceFunctionDocs) => {
     sourceProps(path.join(reactTablePath, '/**/*.tsx'), reactPropsIgnore);
     sourceProps(path.join(reactCodeEditorPath, '/**/*.tsx'),reactPropsIgnore);
     sourceProps(path.join(reactChartsPath, '/**/*.tsx'),reactPropsIgnore);
+    sourceProps(path.join(reactDragDropPath, '/**/*.tsx'),reactPropsIgnore);
     sourceProps(path.join(reactTopologyPath, '/**/*.tsx'), reactPropsIgnore);
 
     // React MD
@@ -78,6 +82,9 @@ module.exports = (sourceMD, sourceProps, sourceFunctionDocs) => {
     // React-code-editor MD
     sourceMD(path.join(reactCodeEditorPath, '/**/examples/*.md'), 'react');
 
+    // Drag drop MD
+    sourceMD(path.join(reactDragDropPath, '/**/examples/*.md'), 'react-next');
+
     // React-topology MD
     sourceMD(path.join(reactTopologyPath, '/**/*.md'), 'extensions');
 

diff --git a/scripts/latest-versions.sh b/scripts/latest-versions.sh
@@ -7,6 +7,7 @@ packages=(
   @patternfly/react-component-groups
   @patternfly/react-console
   @patternfly/react-core
+  @patternfly/react-drag-drop
   @patternfly/react-icons
   @patternfly/react-log-viewer
   @patternfly/react-styles

diff --git a/yarn.lock b/yarn.lock
@@ -2304,13 +2304,13 @@
     victory-voronoi-container "^36.8.1"
     victory-zoom-container "^36.8.1"
 
-"@patternfly/[email protected].48", "@patternfly/react-code-editor@^5.2.0-prerelease.48":
-  version "5.2.0-prerelease.48"
-  resolved "https://registry.yarnpkg.com/@patternfly/react-code-editor/-/react-code-editor-5.2.0-prerelease.48.tgz#58600c7f1a7c320d40e66351cf7292a2848832a0"
-  integrity sha512-UD/qdJNzpYuUApzri6R3sTWI2u73F27AEVvL5pI4v/9HmjfeX6MjdHu82n97E8m5Y07/AOVunt2ZYfqxhDbTQw==
+"@patternfly/[email protected].50", "@patternfly/react-code-editor@^5.2.0-prerelease.50":
+  version "5.2.0-prerelease.50"
+  resolved "https://registry.yarnpkg.com/@patternfly/react-code-editor/-/react-code-editor-5.2.0-prerelease.50.tgz#a033f41c0e70757885607b92412f0bad2972f6b7"
+  integrity sha512-kfgnmhKgSBopJP//R3kg9IIiVHtZJcP88G0sdNkEg9qKRI0eOCzcFCfyrNdwjfHTvCX5smF2FDDQaDPU9yO8pw==
   dependencies:
     "@monaco-editor/react" "^4.6.0"
-    "@patternfly/react-core" "^5.2.0-prerelease.47"
+    "@patternfly/react-core" "^5.2.0-prerelease.49"
     "@patternfly/react-icons" "^5.2.0-prerelease.10"
     "@patternfly/react-styles" "^5.2.0-prerelease.6"
     react-dropzone "14.2.3"
@@ -2340,10 +2340,10 @@
     xterm "^4.8.1"
     xterm-addon-fit "^0.2.1"
 
-"@patternfly/[email protected].47", "@patternfly/react-core@^5.2.0-prerelease.47":
-  version "5.2.0-prerelease.47"
-  resolved "https://registry.yarnpkg.com/@patternfly/react-core/-/react-core-5.2.0-prerelease.47.tgz#bed2576f090b7b3deea694f9a114d8e8eac9a6fd"
-  integrity sha512-1U0ySX+YpUN2JwtbS2tRx3LOgrrmnjcgxvnPNeqdUv3VHeLw8cgXCsd/EkYigu5eiSTiEn4FXEdKOpteT4+5Gw==
+"@patternfly/[email protected].49", "@patternfly/react-core@^5.2.0-prerelease.49":
+  version "5.2.0-prerelease.49"
+  resolved "https://registry.yarnpkg.com/@patternfly/react-core/-/react-core-5.2.0-prerelease.49.tgz#e2b082fabbb09bde51ee6b75de52b8e324209120"
+  integrity sha512-3IOKbJjFsltG2PRY0A+gMtZ4TVjwNerOpdYG9y4pCmP9ShAuYyIgpNAcO5CkRZyube5dc/Oz6kYtQOzEp1SclQ==
   dependencies:
     "@patternfly/react-icons" "^5.2.0-prerelease.10"
     "@patternfly/react-styles" "^5.2.0-prerelease.6"
@@ -2376,30 +2376,30 @@
     react-dropzone "^14.2.3"
     tslib "^2.5.0"
 
-"@patternfly/[email protected].49":
-  version "6.2.0-prerelease.49"
-  resolved "https://registry.yarnpkg.com/@patternfly/react-docs/-/react-docs-6.2.0-prerelease.49.tgz#a1a31e2108036af52ce9088b48f0e1c4efaeabef"
-  integrity sha512-Vq5sMjtS1QtWpS4/TuKXEvDq34TZ8CWDO3GXiMXbX0UGYg9rMzKSrreC+xdGkjIWb8WzN/w6UGKYm+8v8JDTxA==
+"@patternfly/[email protected].52":
+  version "6.2.0-prerelease.52"
+  resolved "https://registry.yarnpkg.com/@patternfly/react-docs/-/react-docs-6.2.0-prerelease.52.tgz#c7e8f20dbd6dc7353b9a2479cf833bf84b380c18"
+  integrity sha512-J0ILxjmrSbUNVnl4iBY3D1TekD3VXKjNJOBN80RAu4VQoLuJR6u6XxuCwsGTWIyHSGy//p1KcKPxpGHoIEFk7Q==
   dependencies:
     "@patternfly/patternfly" "5.2.0-prerelease.7"
     "@patternfly/react-charts" "^7.2.0-prerelease.10"
-    "@patternfly/react-code-editor" "^5.2.0-prerelease.48"
-    "@patternfly/react-core" "^5.2.0-prerelease.47"
-    "@patternfly/react-drag-drop" "^5.2.0-prerelease.5"
+    "@patternfly/react-code-editor" "^5.2.0-prerelease.50"
+    "@patternfly/react-core" "^5.2.0-prerelease.49"
+    "@patternfly/react-drag-drop" "^5.2.0-prerelease.8"
     "@patternfly/react-icons" "^5.2.0-prerelease.10"
     "@patternfly/react-styles" "^5.2.0-prerelease.6"
-    "@patternfly/react-table" "^5.2.0-prerelease.47"
+    "@patternfly/react-table" "^5.2.0-prerelease.49"
     "@patternfly/react-tokens" "^5.2.0-prerelease.7"
 
-"@patternfly/react-drag-drop@^5.2.0-prerelease.5":
-  version "5.2.0-prerelease.5"
-  resolved "https://registry.yarnpkg.com/@patternfly/react-drag-drop/-/react-drag-drop-5.2.0-prerelease.5.tgz#beafd9c19359d089542820cc7a67b5882d2f9a83"
-  integrity sha512-RM5yVtdS4m87UjWY9/9E09969QlgI0KVMoMmrFAhZDoBrAGUVA78Tf9xXBFwP7zb97+R77zDrd7DFdBcRB/tOg==
+"@patternfly/react-drag-drop@^5.2.0-prerelease.8":
+  version "5.2.0-prerelease.8"
+  resolved "https://registry.yarnpkg.com/@patternfly/react-drag-drop/-/react-drag-drop-5.2.0-prerelease.8.tgz#371968f7f35c8ed26b1ff3616f8e9fa260f72fc6"
+  integrity sha512-0XUCZlnu9OlSuLnQcqFtrqXT+Ykem08KOwrgtCSXZGMDFpL+DSlNUuavlJon+oFsaT0ItEsFRULdHj/38+KvuQ==
   dependencies:
     "@dnd-kit/core" "^6.0.8"
     "@dnd-kit/modifiers" "^6.0.1"
     "@dnd-kit/sortable" "^7.0.2"
-    "@patternfly/react-core" "^5.2.0-prerelease.47"
+    "@patternfly/react-core" "^5.2.0-prerelease.49"
     "@patternfly/react-icons" "^5.2.0-prerelease.10"
     "@patternfly/react-styles" "^5.2.0-prerelease.6"
     memoize-one "^5.1.0"
@@ -2445,12 +2445,12 @@
   resolved "https://registry.yarnpkg.com/@patternfly/react-styles/-/react-styles-5.2.0-prerelease.6.tgz#7014796bc4113f9733cd4c37256592cb99af2bc8"
   integrity sha512-Q8ei2WFoXxVoGGAJUP+nkQ+V0EKvUopcM4kvRgz1akZKrmfPOCwExtErgig75XDp9jEJU8pifLjK7o7t6YnaGA==
 
-"@patternfly/[email protected].47", "@patternfly/react-table@^5.2.0-prerelease.47":
-  version "5.2.0-prerelease.47"
-  resolved "https://registry.yarnpkg.com/@patternfly/react-table/-/react-table-5.2.0-prerelease.47.tgz#2bc08763f4cc761a42a3b796e8c185caf6c9c138"
-  integrity sha512-aZvoJpeZ2cD9nzzzvhNbQTubUyixXk42jqNtqj4mdOxZJ8zxt+mi2GjjuWKYgIxNguh7mdl3hoRnPHJ3lYpfPw==
+"@patternfly/[email protected].49", "@patternfly/react-table@^5.2.0-prerelease.49":
+  version "5.2.0-prerelease.49"
+  resolved "https://registry.yarnpkg.com/@patternfly/react-table/-/react-table-5.2.0-prerelease.49.tgz#4688dbf3715cf04638e5aadc9f30fee2d64f6e23"
+  integrity sha512-JEWilYQGwIgCW+ZMw2JsRCFEvKGawooBuiPI6ap0NsF7LUs/FX+cNsuk+n3ny4azTgtAug28Kwov4CDTVcO5mg==
   dependencies:
-    "@patternfly/react-core" "^5.2.0-prerelease.47"
+    "@patternfly/react-core" "^5.2.0-prerelease.49"
     "@patternfly/react-icons" "^5.2.0-prerelease.10"
     "@patternfly/react-styles" "^5.2.0-prerelease.6"
     "@patternfly/react-tokens" "^5.2.0-prerelease.7"
@@ -2484,10 +2484,10 @@
   resolved "https://registry.yarnpkg.com/@patternfly/react-tokens/-/react-tokens-5.2.0-prerelease.7.tgz#e443b97c3ec96ace00e0aa37e1b06786824a9668"
   integrity sha512-pMTth24Z1Wltcy64QAQjSL3pJMkze6R1XqwdaJD9frM+F//zvcdAHCBFBcFGLPNQnqgoYRvocptP0utmkB90KQ==
 
-"@patternfly/[email protected].3":
-  version "5.2.0-prerelease.3"
-  resolved "https://registry.yarnpkg.com/@patternfly/react-topology/-/react-topology-5.2.0-prerelease.3.tgz#a2e26de2bb3bb379bc8986721f7325d661081971"
-  integrity sha512-BqEtWRopHstd1zfLUtDSIHe0tj6syIUmYTY+U3HYPPhyUoyDe7RgFyttDt2J6UVoYfFppk1wl1ZMMyNQQwwQYA==
+"@patternfly/[email protected].4":
+  version "5.2.0-prerelease.4"
+  resolved "https://registry.yarnpkg.com/@patternfly/react-topology/-/react-topology-5.2.0-prerelease.4.tgz#bfb38addfd45635e0913c20b0a5cd0afb97d32d6"
+  integrity sha512-inYgjvoorrFwwI6XayCJNZL0gXZVwWzUZzOXZaVpzNxClse6MErj9tXmIKxclejE/62m4CScaY+/TbV01HFucQ==
   dependencies:
     "@patternfly/react-core" "^5.1.1"
     "@patternfly/react-icons" "^5.1.1"
@@ -7811,7 +7811,7 @@ loader-runner@^4.2.0:
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1"
   integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==
 
-loader-utils@^2.0.0, loader-utils@^2.0.2:
+loader-utils@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.4.tgz#8b5cb38b5c34a9a018ee1fc0e6a066d1dfcc528c"
   integrity sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==
@@ -8445,18 +8445,6 @@ modify-values@^1.0.0:
   resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"
   integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==
 
-[email protected]:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/monaco-editor-webpack-plugin/-/monaco-editor-webpack-plugin-7.0.1.tgz#ba19c60aba990184e36ad8722b1ed6a564527c7c"
-  integrity sha512-M8qIqizltrPlIbrb73cZdTWfU9sIsUVFvAZkL3KGjAHmVWEJ0hZKa/uad14JuOckc0GwnCaoGHvMoYtJjVyCzw==
-  dependencies:
-    loader-utils "^2.0.2"
-
-[email protected]:
-  version "0.34.1"
-  resolved "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.34.1.tgz#1b75c4ad6bc4c1f9da656d740d98e0b850a22f87"
-  integrity sha512-FKc80TyiMaruhJKKPz5SpJPIjL+dflGvz4CpuThaPMc94AyN7SeC9HQ8hrvaxX7EyHdJcUY5i4D0gNyJj1vSZQ==
-
 [email protected]:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/moniker/-/moniker-0.1.2.tgz#872dfba575dcea8fa04a5135b13d5f24beccc97e"
@@ -9916,13 +9904,6 @@ react-measure@^2.3.0:
     prop-types "^15.6.2"
     resize-observer-polyfill "^1.5.0"
 
-react-monaco-editor@^0.51.0:
-  version "0.51.0"
-  resolved "https://registry.yarnpkg.com/react-monaco-editor/-/react-monaco-editor-0.51.0.tgz#68d6afc912f7fcb7782e57b39889a5fd75fc0ceb"
-  integrity sha512-6jx1V8p6gHVKJHFaTvicOtmlhFjOJhekobeNd92ZAo7F5UvAin1cF7bxWLCKgtxClYZ7CB3Ar284Kpbhj22FpQ==
-  dependencies:
-    prop-types "^15.8.1"
-
 react-router-dom@^6.3.0:
   version "6.15.0"
   resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.15.0.tgz#6da7db61e56797266fbbef0d5e324d6ac443ee40"