diff --git a/README.md b/README.md index 08b264e1d..fc2674b53 100644 --- a/README.md +++ b/README.md @@ -35,6 +35,8 @@ ```bash $ npm run pack-authenticator ``` + + To clean the cargo dependencies of Authenticator's native modules add `-- --clean` to above command. 5. Build SAFE Browser and open it. diff --git a/app/shell-window.html b/app/shell-window.html index 22d496a12..cd76a0316 100644 --- a/app/shell-window.html +++ b/app/shell-window.html @@ -2,7 +2,7 @@ - Beaker + SAFE Browser diff --git a/authenticator b/authenticator index 95d0a0f3c..7841d952b 160000 --- a/authenticator +++ b/authenticator @@ -1 +1 @@ -Subproject commit 95d0a0f3c6604595b89fbef2dfbbfe7ff7a1ae01 +Subproject commit 7841d952bd4f4150b6b09c9f80a1ebd9e9a5093f diff --git a/scripts/main.js b/scripts/main.js index c4241ab9a..4a00807c3 100644 --- a/scripts/main.js +++ b/scripts/main.js @@ -31,7 +31,8 @@ const runSpawn = (title, cmdStr) => { const targetScript = process.argv[2]; const packAuthenticator = () => { - const cmd = `npm run pack-authenticator:${(osPlatform === 'win32') ? 'windows' : 'unix'}`; + const toClean = (process.argv.indexOf('--clean') !== -1); + const cmd = `npm run pack-authenticator:${(osPlatform === 'win32') ? 'windows' : 'unix'} ${(toClean ? 'clean' : '')}`; runSpawn('Pack Authenticator', cmd); }; diff --git a/scripts/pack_authenticator.ps1 b/scripts/pack_authenticator.ps1 index daf3a96d6..a2f708a51 100644 --- a/scripts/pack_authenticator.ps1 +++ b/scripts/pack_authenticator.ps1 @@ -1,13 +1,15 @@ -git submodule update --init --recursive --remote +$clean="" +if ( $args[0] ) { + $clean="--clean" +} +git submodule update --init --recursive $DEST_FOLD = "../app/node_modules/beaker-plugin-safe-authenticator" cd authenticator -git submodule update --init --recursive --remote - npm i -npm run build-libs features="mock-routing" +npm run build-libs -- --features="mock-routing" $clean npm run build $FILES_ARR = @("./dist", "./index.js", "./package.json") diff --git a/scripts/pack_authenticator.sh b/scripts/pack_authenticator.sh index c57653b4a..fa9ddb068 100644 --- a/scripts/pack_authenticator.sh +++ b/scripts/pack_authenticator.sh @@ -1,14 +1,15 @@ #!/bin/bash - -git submodule update --init --recursive --remote +clean="" +if [ $1 ]; then + clean="--clean" +fi +git submodule update --init --recursive DEST_FOLD="../app/node_modules/beaker-plugin-safe-authenticator" cd authenticator -git submodule update --init --recursive --remote - -npm i && npm run build-libs features="mock-routing" && npm run build +npm i && npm run build-libs -- --features="mock-routing" $clean && npm run build mkdir -p $DEST_FOLD