Fixup for @ipld/dag-cbor

Now using the same version as backend which also fixes our common JS issues for now.
TryQuiet · Oct 11, 2023 · d4a8082 · d4a8082
1 parent 11b9c1e
commit d4a8082
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 79 deletions.
diff --git a/packages/desktop/.storybook/main.js b/packages/desktop/.storybook/main.js
@@ -37,7 +37,6 @@ module.exports = {
       'electron-store-webpack-wrapper': path.resolve(__dirname, 'electronStoreMock.js'),
       net: path.resolve(__dirname, 'netMock.js')
     };
-    config.resolve.conditionNames = ["import", "node"]
     config.module.rules.push({
       test: /\.scss$/,
       use: ['style-loader', 'css-loader', 'sass-loader'],

diff --git a/packages/desktop/jest/resolver.js b/packages/desktop/jest/resolver.js
diff --git a/packages/desktop/package.json b/packages/desktop/package.json
@@ -280,10 +280,9 @@
     "setupFiles": [
       "<rootDir>/src/shared/setupTests.ts"
     ],
-    "resolver": "<rootDir>/jest/resolver.js",
     "transform": {
       "^.+\\.tsx?$": "ts-jest",
-      "node_modules/(@react-dnd|react-dnd|react-dnd-html5-backend|dnd-core|@ipld)/.+\\.(j|t)sx?$": "ts-jest"
+      "node_modules/(@react-dnd|react-dnd|react-dnd-html5-backend|dnd-core)/.+\\.(j|t)sx?$": "ts-jest"
     },
     "transformIgnorePatterns": [
       "<rootDir>/node_modules/(?!@react-dnd.*/|react-dnd./*|react-dnd-html5-backend/.*|dnd-core./*)"

diff --git a/packages/desktop/webpack/webpack.config.renderer.dev.js b/packages/desktop/webpack/webpack.config.renderer.dev.js
@@ -17,8 +17,7 @@ module.exports = {
     extensions: ['.ts', '.tsx', '.js', '.jsx'],
     plugins: [
       new TsconfigPathsPlugin({ configFile: 'tsconfig.build.json' })
-    ],
-    conditionNames: ["import", "node"]
+    ]
   },
   module: {
     rules: [

diff --git a/packages/desktop/webpack/webpack.config.renderer.prod.js b/packages/desktop/webpack/webpack.config.renderer.prod.js
@@ -14,7 +14,6 @@ module.exports = {
   },
   resolve: {
     extensions: ['.ts', '.tsx', '.js', '.jsx']
-    conditionNames: ["import", "node"]
   },
   module: {
     rules: [

diff --git a/packages/state-manager/jest/resolver.js b/packages/state-manager/jest/resolver.js
diff --git a/packages/state-manager/package-lock.json b/packages/state-manager/package-lock.json
diff --git a/packages/state-manager/package.json b/packages/state-manager/package.json
@@ -23,7 +23,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@ipld/dag-cbor": "^9.0.5",
+    "@ipld/dag-cbor": "^6.0.15",
     "@quiet/common": "^2.0.1-alpha.3",
     "@quiet/logger": "^2.0.1-alpha.3",
     "@quiet/types": "^2.0.1-alpha.3",
@@ -77,10 +77,6 @@
     "rootDir": "src",
     "setupFiles": [
       "./setupTests.ts"
-    ],
-    "resolver": "<rootDir>/../jest/resolver.js",
-    "transformIgnorePatterns": [
-      "node_modules/(?!@ipld|cborg)"
     ]
   }
 }