Skip to content

Commit 1ed44ea

Browse files
committed
[DDW-596] Sort Darwin installer deps + add a comment to webpack config
1 parent 9cef1a5 commit 1ed44ea

File tree

2 files changed

+32
-32
lines changed

2 files changed

+32
-32
lines changed

installers/common/MacInstaller.hs

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -221,94 +221,94 @@ buildElectronApp darwinConfig@DarwinConfig{dcAppName, dcAppNameApp} installerCon
221221
[ "@babel"
222222
, "@protobufjs"
223223
, "@trezor"
224+
, "babel-runtime"
224225
, "base-x"
225226
, "base64-js"
226227
, "bchaddrjs"
227228
, "bech32"
228229
, "big-integer"
229230
, "bignumber.js"
231+
, "bindings"
230232
, "bip66"
231233
, "bitcoin-ops"
232-
, "blake2b"
233-
, "blake2"
234234
, "blake-hash"
235+
, "blake2"
236+
, "blake2b"
235237
, "blake2b-wasm"
236238
, "bn.js"
237239
, "brorand"
240+
, "brotli"
238241
, "bs58"
239242
, "bs58check"
243+
, "buffer"
240244
, "bytebuffer"
241245
, "call-bind"
242246
, "cashaddrjs"
243247
, "cbor-web"
248+
, "clone"
244249
, "create-hash"
245250
, "create-hmac"
246251
, "cross-fetch"
252+
, "deep-equal"
247253
, "define-properties"
254+
, "dfa"
248255
, "elliptic"
249256
, "es-abstract"
257+
, "eventemitter2"
258+
, "file-uri-to-path"
259+
, "fontkit"
250260
, "function-bind"
261+
, "functions-have-names"
251262
, "get-intrinsic"
252263
, "has"
264+
, "has-property-descriptors"
253265
, "has-symbols"
266+
, "has-tostringtag"
254267
, "hash.js"
255268
, "hmac-drbg"
256269
, "ieee754"
257270
, "inherits"
258271
, "int64-buffer"
272+
, "is-arguments"
273+
, "is-date-object"
274+
, "is-regex"
259275
, "js-chain-libs-node"
260276
, "json-stable-stringify"
261277
, "keccak"
278+
, "linebreak"
262279
, "long"
263-
, "ms"
264280
, "minimalistic-assert"
265281
, "minimalistic-crypto-utils"
282+
, "ms"
266283
, "nanoassert"
267284
, "node-fetch"
285+
, "node-hid"
286+
, "object-is"
268287
, "object-keys"
269288
, "object.values"
270289
, "parse-uri"
290+
, "pdfkit"
291+
, "png-js"
271292
, "protobufjs"
272293
, "pushdata-bitcoin"
273294
, "randombytes"
274295
, "regenerator-runtime"
296+
, "regexp.prototype.flags"
297+
, "restructure"
275298
, "runtypes"
276299
, "safe-buffer"
277300
, "semver-compare"
301+
, "tiny-inflate"
302+
, "tiny-secp256k1"
278303
, "tiny-worker"
279304
, "trezor-connect"
280-
, "tiny-secp256k1"
281305
, "typeforce"
306+
, "unicode-properties"
307+
, "unicode-trie"
308+
, "usb-detection"
282309
, "util-deprecate"
283310
, "varuint-bitcoin"
284311
, "wif"
285-
, "usb-detection"
286-
, "babel-runtime"
287-
, "bindings"
288-
, "brotli"
289-
, "buffer"
290-
, "clone"
291-
, "deep-equal"
292-
, "dfa"
293-
, "eventemitter2"
294-
, "file-uri-to-path"
295-
, "fontkit"
296-
, "functions-have-names"
297-
, "has-property-descriptors"
298-
, "has-tostringtag"
299-
, "is-arguments"
300-
, "is-date-object"
301-
, "is-regex"
302-
, "linebreak"
303-
, "node-hid"
304-
, "object-is"
305-
, "pdfkit"
306-
, "png-js"
307-
, "regexp.prototype.flags"
308-
, "restructure"
309-
, "tiny-inflate"
310-
, "unicode-properties"
311-
, "unicode-trie"
312312
]
313313
mapM_ (\lib -> do
314314
cptree ("../node_modules" </> lib) ((fromText pathtoapp) </> "Contents/Resources/app/node_modules" </> lib)

source/renderer/webpack.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ module.exports = {
103103
symlinks: true, // for native libraries
104104
extensions: ['.ts', '.tsx', '.js', '.json'],
105105
alias: {
106-
react: require.resolve('react'),
106+
react: require.resolve('react'), // else, it’s added a few times to index.js 🙄
107107
},
108108
fallback: {
109109
process: require.resolve('process/browser'),

0 commit comments

Comments
 (0)