[DDW-596] Fix Linux and Darwin builds

michalrus · michalrus · commit 9cef1a5e9bec · 2022-05-27T18:35:41.000+02:00
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -1,21 +1,21 @@
 env:
   ARTIFACT_BUCKET: s3://ci-output-sink
 steps:
-  # - label: 'daedalus-x86_64-darwin'
-  #   command: 'scripts/build-installer-unix.sh --build-id $BUILDKITE_BUILD_NUMBER'
-  #   env:
-  #     NIX_SSL_CERT_FILE: /nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt
-  #   agents:
-  #     queue: daedalus
-  #     system: x86_64-darwin
+  - label: 'daedalus-x86_64-darwin'
+    command: 'scripts/build-installer-unix.sh --build-id $BUILDKITE_BUILD_NUMBER'
+    env:
+      NIX_SSL_CERT_FILE: /nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt
+    agents:
+      queue: daedalus
+      system: x86_64-darwin
   - label: 'daedalus-x86_64-linux-nix'
     command: 'scripts/build-installer-nix.sh $BUILDKITE_BUILD_NUMBER'
     agents:
       system: x86_64-linux
-  # - label: 'daedalus-x86_64-windows-nix'
-  #   command: 'scripts/build-cross-windows.sh $BUILDKITE_BUILD_NUMBER'
-  #   agents:
-  #     system: x86_64-linux
+  - label: 'daedalus-x86_64-windows-nix'
+    command: 'scripts/build-cross-windows.sh $BUILDKITE_BUILD_NUMBER'
+    agents:
+      system: x86_64-linux
 
   # TODO: Re-enable once script is fixed
   # - label: 'release.nix'
diff --git a/.gitignore b/.gitignore
@@ -47,6 +47,9 @@ installers/config.yaml
 installers/icons/electron.icns
 installers/installer-config.json
 installers/topology.yaml
+installers/csl-daedalus/
+installers/delegation.cert
+installers/signing.key
 
 # temporary certs for daedalus dev
 tls/client
diff --git a/installers/common/MacInstaller.hs b/installers/common/MacInstaller.hs
@@ -282,6 +282,33 @@ buildElectronApp darwinConfig@DarwinConfig{dcAppName, dcAppNameApp} installerCon
       , "util-deprecate"
       , "varuint-bitcoin"
       , "wif"
+      , "usb-detection"
+      , "babel-runtime"
+      , "bindings"
+      , "brotli"
+      , "buffer"
+      , "clone"
+      , "deep-equal"
+      , "dfa"
+      , "eventemitter2"
+      , "file-uri-to-path"
+      , "fontkit"
+      , "functions-have-names"
+      , "has-property-descriptors"
+      , "has-tostringtag"
+      , "is-arguments"
+      , "is-date-object"
+      , "is-regex"
+      , "linebreak"
+      , "node-hid"
+      , "object-is"
+      , "pdfkit"
+      , "png-js"
+      , "regexp.prototype.flags"
+      , "restructure"
+      , "tiny-inflate"
+      , "unicode-properties"
+      , "unicode-trie"
       ]
   mapM_ (\lib -> do
       cptree ("../node_modules" </> lib) ((fromText pathtoapp) </> "Contents/Resources/app/node_modules" </> lib)
diff --git a/package.json b/package.json
@@ -213,6 +213,7 @@
     "cardano-js": "0.4.8",
     "cardano-launcher": "0.20220119.0",
     "cbor": "5.0.2",
+    "cbor-web": "7.0.6",
     "check-disk-space": "3.2.0",
     "chroma-js": "2.1.0",
     "classnames": "2.2.6",
@@ -261,7 +262,7 @@
     "react-custom-scrollbars": "4.2.1",
     "react-datetime": "3.0.4",
     "react-dom": "16.14.0",
-    "react-intl": "2.7.2",
+    "react-intl": "2.9.0",
     "react-lottie": "1.2.3",
     "react-markdown": "5.0.3",
     "react-polymorph": "1.0.4",
@@ -301,7 +302,6 @@
     }
   },
   "resolutions": {
-    "@types/react": "16.9.56",
     "**/**/handlebars": "4.7.7",
     "**/**/elliptic": "6.5.4",
     "**/**/bl": "4.1.0",
diff --git a/source/main/webpack.config.js b/source/main/webpack.config.js
@@ -58,6 +58,7 @@ module.exports = {
     minimize: false,
   },
   resolve: {
+    symlinks: true, // for native libraries
     extensions: ['.ts', '.tsx', '.js', '.json'],
   },
   module: {
diff --git a/source/renderer/webpack.config.js b/source/renderer/webpack.config.js
@@ -100,7 +100,11 @@ module.exports = {
     ],
   },
   resolve: {
+    symlinks: true, // for native libraries
     extensions: ['.ts', '.tsx', '.js', '.json'],
+    alias: {
+      react: require.resolve('react'),
+    },
     fallback: {
       process: require.resolve('process/browser'),
       path: require.resolve('path-browserify'),
diff --git a/yarn.lock b/yarn.lock
@@ -2986,11 +2986,7 @@
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
 
-"@types/minimatch@*":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
-
-"@types/minimatch@^3.0.3":
+"@types/minimatch@*", "@types/minimatch@^3.0.3":
   version "3.0.5"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
 
@@ -5324,6 +5320,10 @@ cashaddrjs@0.4.4:
   dependencies:
     big-integer "1.6.36"
 
+cbor-web@7.0.6:
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/cbor-web/-/cbor-web-7.0.6.tgz#6e23a0c58db4c38e485e395de511b9e2f628961c"
+
 cbor-web@^7.0.6:
   version "7.0.6"
   resolved "https://registry.yarnpkg.com/cbor-web/-/cbor-web-7.0.6.tgz#6e23a0c58db4c38e485e395de511b9e2f628961c"
@@ -9224,10 +9224,6 @@ hmac-drbg@^1.0.1:
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.1"
 
-hoist-non-react-statics@^2.5.5:
-  version "2.5.5"
-  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47"
-
 hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
@@ -11694,25 +11690,7 @@ minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
 
-minimatch@3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimatch@^3.0.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimatch@^3.0.4:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimatch@^3.1.2:
+minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   dependencies:
@@ -13768,11 +13746,11 @@ react-intl-translations-manager@5.0.3:
     json-stable-stringify "^1.0.1"
     mkdirp "^0.5.1"
 
-react-intl@2.7.2:
-  version "2.7.2"
-  resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-2.7.2.tgz#efe97e3fc0e99b4e88a6e6150854d3d1852a4381"
+react-intl@2.9.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-2.9.0.tgz#c97c5d17d4718f1575fdbd5a769f96018a3b1843"
   dependencies:
-    hoist-non-react-statics "^2.5.5"
+    hoist-non-react-statics "^3.3.0"
     intl-format-cache "^2.0.5"
     intl-messageformat "^2.1.0"
     intl-relativeformat "^2.1.0"
diff --git a/yarn2nix.nix b/yarn2nix.nix
@@ -124,7 +124,7 @@ yarn2nix.mkYarnPackage {
     rm -rf $out/resources/app/{installers,launcher-config.yaml,gulpfile.js,home}
 
     mkdir -pv $out/resources/app/node_modules
-    cp -rv $node_modules/{\@babel,\@protobufjs,regenerator-runtime,node-fetch,\@trezor,runtypes,parse-uri,randombytes,safe-buffer,bip66,pushdata-bitcoin,bitcoin-ops,typeforce,varuint-bitcoin,create-hash,blake2b,nanoassert,blake2b-wasm,bs58check,bs58,base-x,create-hmac,wif,ms,keccak,semver-compare,long,define-properties,object-keys,has,function-bind,es-abstract,has-symbols,json-stable-stringify,tiny-worker,cashaddrjs,big-integer,inherits,bchaddrjs,cross-fetch,trezor-connect,js-chain-libs-node,bignumber.js,call-bind,get-intrinsic,base64-js,ieee754,cbor-web,util-deprecate,bech32,blake-hash,blake2,tiny-secp256k1,bn.js,elliptic,minimalistic-assert,minimalistic-crypto-utils,brorand,hash.js,hmac-drbg,int64-buffer,object.values,bytebuffer,protobufjs,usb-detection} $out/resources/app/node_modules
+    cp -rv $node_modules/{\@babel,\@protobufjs,regenerator-runtime,node-fetch,\@trezor,runtypes,parse-uri,randombytes,safe-buffer,bip66,pushdata-bitcoin,bitcoin-ops,typeforce,varuint-bitcoin,create-hash,blake2b,nanoassert,blake2b-wasm,bs58check,bs58,base-x,create-hmac,wif,ms,keccak,semver-compare,long,define-properties,object-keys,has,function-bind,es-abstract,has-symbols,json-stable-stringify,tiny-worker,cashaddrjs,big-integer,inherits,bchaddrjs,cross-fetch,trezor-connect,js-chain-libs-node,bignumber.js,call-bind,get-intrinsic,base64-js,ieee754,cbor-web,util-deprecate,bech32,blake-hash,blake2,tiny-secp256k1,bn.js,elliptic,minimalistic-assert,minimalistic-crypto-utils,brorand,hash.js,hmac-drbg,int64-buffer,object.values,bytebuffer,protobufjs,usb-detection,babel-runtime,bindings,brotli,buffer,clone,deep-equal,dfa,eventemitter2,file-uri-to-path,fontkit,functions-have-names,has-property-descriptors,has-tostringtag,is-arguments,is-date-object,is-regex,linebreak,node-hid,object-is,pdfkit,png-js,regexp.prototype.flags,restructure,tiny-inflate,unicode-properties,unicode-trie} $out/resources/app/node_modules
 
     cd $out/resources/app/
     unzip ${./nix/windows-usb-libs.zip}
