fix(build): successful yarn link to local @hawtio/react

hawtio · Apr 26, 2024 · 06c1868 · 06c1868
1 parent 23a792f
commit 06c1868
Show file tree

Hide file tree

Showing 6 changed files with 125 additions and 606 deletions.
diff --git a/package.json b/package.json
@@ -71,5 +71,22 @@
   },
   "dependencies": {
     "jasmine": "^5.1.0"
+  },
+  "resolutions": {
+    "victory-area": "36.8.6",
+    "victory-bar": "36.8.6",
+    "victory-brush-container": "36.8.6",
+    "victory-core": "36.8.6",
+    "victory-cursor-container": "36.8.6",
+    "victory-create-container": "36.8.6",
+    "victory-legend": "36.8.6",
+    "victory-line": "36.8.6",
+    "victory-pie": "36.8.6",
+    "victory-scatter": "36.8.6",
+    "victory-selection-container": "36.8.6",
+    "victory-shared-events": "36.8.6",
+    "victory-tooltip": "36.8.6",
+    "victory-voronoi-container": "36.8.6",
+    "victory-zoom-container": "36.8.6"
   }
 }
diff --git a/packages/kubernetes-api/jest.config.ts b/packages/kubernetes-api/jest.config.ts
@@ -15,7 +15,7 @@ export default {
     '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga|md)$':
       '<rootDir>/src/__mocks__/fileMock.js',
     '\\.(css|less)$': '<rootDir>/src/__mocks__/styleMock.js',
-    'react-markdown': '<rootDir>/../../node_modules/@hawtio/react/node_modules/react-markdown/react-markdown.min.js',
+    'react-markdown': '<rootDir>/../../node_modules/react-markdown/react-markdown.min.js',
     '@patternfly/react-code-editor': path.resolve(__dirname, './src/__mocks__/codeEditorMock.js'),
     oauth4webapi: path.resolve(__dirname, './src/__mocks__/oauth4webapi.js'),
   },

diff --git a/packages/oauth/package.json b/packages/oauth/package.json
@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "@hawtio/react": "^1.2.3",
-    "@thumbmarkjs/thumbmarkjs": "^0.14.6",
+    "@thumbmarkjs/thumbmarkjs": "^0.14.7",
     "babel-jest": "^29.6.1",
     "fetch-intercept": "^2.4.0",
     "jest-extended": "^4.0.0",

diff --git a/packages/oauth/src/utils/crypto.ts b/packages/oauth/src/utils/crypto.ts
@@ -2,7 +2,7 @@ import { getFingerprint } from '@thumbmarkjs/thumbmarkjs'
 
 export async function generateKey(salt: ArrayBufferView): Promise<CryptoKey> {
   const fingerprint = await getFingerprint()
-  const data = new TextEncoder().encode(fingerprint)
+  const data = new TextEncoder().encode(fingerprint as string)
   const key = await window.crypto.subtle.importKey('raw', data, { name: 'PBKDF2' }, false, ['deriveKey'])
   const algorithm = {
     name: 'PBKDF2',

diff --git a/packages/online-shell/package.json b/packages/online-shell/package.json
@@ -50,7 +50,7 @@
     "openshift-logos-icon": "^1.7.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-markdown": "^9.0.1",
+    "react-markdown": "^8.0.7",
     "typescript": "^5.4.5",
     "web-vitals": "^3.5.2"
   },