KILTprotocol · arty-name · May 23, 2023 · May 17, 2023 · rflechtner · May 22, 2023
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -50,6 +50,6 @@
     "@polkadot/types": "^10.0.0",
     "@polkadot/util": "^11.0.0",
     "@polkadot/util-crypto": "^11.0.0",
-    "cbor": "^8.1.0"
+    "cbor-web": "^8.0.0"
   }
 }
diff --git a/packages/core/src/cbor-web.d.ts b/packages/core/src/cbor-web.d.ts
@@ -0,0 +1 @@
+declare module 'cbor-web'
diff --git a/packages/core/src/publicCredential/PublicCredential.chain.ts b/packages/core/src/publicCredential/PublicCredential.chain.ts
@@ -22,7 +22,7 @@ import type {
   PublicCredentialsCredentialsCredentialEntry,
 } from '@kiltprotocol/augment-api'
 
-import { encode as cborEncode, decode as cborDecode } from 'cbor'
+import { encode as cborEncode, decode as cborDecode } from 'cbor-web'
 
 import { HexString } from '@polkadot/util/types'
 import { ConfigService } from '@kiltprotocol/config'

diff --git a/packages/did/package.json b/packages/did/package.json
@@ -46,6 +46,6 @@
     "@polkadot/types-codec": "^10.0.0",
     "@polkadot/util": "^11.0.0",
     "@polkadot/util-crypto": "^11.0.0",
-    "cbor": "^8.1.0"
+    "cbor-web": "^8.0.0"
   }
 }
diff --git a/packages/did/src/DidDetails/LightDidDetails.ts b/packages/did/src/DidDetails/LightDidDetails.ts
@@ -5,7 +5,7 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
-import { decode as cborDecode, encode as cborEncode } from 'cbor'
+import { decode as cborDecode, encode as cborEncode } from 'cbor-web'
 import {
   base58Decode,
   base58Encode,

diff --git a/packages/did/src/cbor-web.d.ts b/packages/did/src/cbor-web.d.ts
@@ -0,0 +1 @@
+declare module 'cbor-web'
diff --git a/packages/sdk-js/package.json b/packages/sdk-js/package.json
@@ -32,15 +32,9 @@
   "bugs": "https://github.com/KILTprotocol/sdk-js/issues",
   "homepage": "https://github.com/KILTprotocol/sdk-js#readme",
   "devDependencies": {
-    "buffer": "^6.0.3",
-    "crypto-browserify": "^3.12.0",
-    "process": "^0.11.10",
     "rimraf": "^3.0.2",
-    "stream-browserify": "^3.0.0",
     "terser-webpack-plugin": "^5.1.1",
     "typescript": "^4.8.3",
-    "url": "^0.11.0",
-    "util": "^0.12.4",
     "webpack": "^5.70.0",
     "webpack-cli": "^4.9.2"
   },

diff --git a/packages/sdk-js/webpack.config.js b/packages/sdk-js/webpack.config.js
@@ -8,7 +8,6 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 const path = require('path')
 const TerserPlugin = require('terser-webpack-plugin')
-const webpack = require('webpack')
 
 module.exports = {
   mode: 'production',
@@ -27,14 +26,6 @@ module.exports = {
   resolve: {
     extensions: ['.ts', '.js', '.d.ts', '.mjs', '.json'],
     symlinks: false,
-    // Explicit fallbacks to include these in bundle
-    fallback: {
-      buffer: require.resolve('buffer'),
-      crypto: require.resolve('crypto-browserify'),
-      stream: require.resolve('stream-browserify'),
-      url: require.resolve('url'),
-      util: require.resolve('util'),
-    },
   },
   stats: {
     errorDetails: true,
@@ -44,10 +35,4 @@ module.exports = {
     // only minimize the *.min* bundle output
     minimizer: [new TerserPlugin({ include: /\.min\.umd\.js$/ })],
   },
-  plugins: [
-    new webpack.ProvidePlugin({
-      process: 'process/browser',
-      Buffer: ['buffer', 'Buffer'],
-    }),
-  ],
 }
diff --git a/tests/cbor-web.d.ts b/tests/cbor-web.d.ts
@@ -0,0 +1 @@
+declare module 'cbor-web'
diff --git a/tests/tsconfig.json b/tests/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "extends": "../tsconfig.json",
-  "include": ["bundle-test.ts", "types.d.ts"],
+  "include": ["bundle-test.ts", "types.d.ts", "cbor-web.d.ts"],
   "compilerOptions": {
     "module": "None",
     "resolveJsonModule": false,
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		declare module 'cbor-web'
Copy link Contributor rflechtner May 22, 2023 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. I'm debating - is an empty declaration file better than a `@ts-expect-error` in front of the import? The result is the same - it's treated as any Copy link Collaborator Author arty-name May 22, 2023 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. Well, I guess there is also an option to keep cbor as a dependency and make this module definition re-export the actual cbor types. This should be doable, though I doubt I will pull it off quickly. Copy link Contributor rflechtner May 23, 2023 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. I don't think that's the solution, this way we'll still keep the dependency on cbor - extracting type definitions from another package and adding it to your build is not really what tsc is made for I think Copy link Contributor rflechtner May 23, 2023 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. also it wouldn't really help us much with anything, we're just importing two functions and do not plan to re-export them, there's not that much we can do wrong Copy link Collaborator Author arty-name May 23, 2023 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. Here’s a thing by the way Copy link Collaborator Author arty-name May 23, 2023 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. And its discussion