summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAndrej Mihajlov <and.mikhaylov@gmail.com>2018-05-29 12:16:23 +0200
committerAndrej Mihajlov <and.mikhaylov@gmail.com>2018-05-29 12:16:23 +0200
commit49b804709235c29d549576cc78ea26446e344ea7 (patch)
tree45610c5b67558741c399c18555a8f0ddfb5ce31d
parent14262e3bab7f14c77ad4cc376ebdf55f5a35f620 (diff)
parent8fc3988ea22a1582ea543203695df0733ffa1e84 (diff)
downloadmullvadvpn-49b804709235c29d549576cc78ea26446e344ea7.tar.xz
mullvadvpn-49b804709235c29d549576cc78ea26446e344ea7.zip
Merge branch 'cleanup-electron-sudo'
-rw-r--r--flow-typed/npm/electron-sudo_vx.x.x.js74
-rw-r--r--flow-typed/npm/sudo-prompt_vx.x.x.js45
-rw-r--r--package.json2
-rwxr-xr-xpre-mac-sign.sh5
4 files changed, 1 insertions, 125 deletions
diff --git a/flow-typed/npm/electron-sudo_vx.x.x.js b/flow-typed/npm/electron-sudo_vx.x.x.js
deleted file mode 100644
index e733638998..0000000000
--- a/flow-typed/npm/electron-sudo_vx.x.x.js
+++ /dev/null
@@ -1,74 +0,0 @@
-// flow-typed signature: b92711eaa00b7c030c9547ddda0f2509
-// flow-typed version: <<STUB>>/electron-sudo_vhttps://github.com/eriklarko/electron-sudo.git/flow_v0.65.0
-
-/**
- * This is an autogenerated libdef stub for:
- *
- * 'electron-sudo'
- *
- * Fill this stub out by replacing all the `any` types.
- *
- * Once filled out, we encourage you to share your work with the
- * community by sending a pull request to:
- * https://github.com/flowtype/flow-typed
- */
-
-declare module 'electron-sudo' {
- declare module.exports: any;
-}
-
-/**
- * We include stubs for each file inside this npm package in case you need to
- * require those files directly. Feel free to delete any files that aren't
- * needed.
- */
-declare module 'electron-sudo/dist/index' {
- declare module.exports: any;
-}
-
-declare module 'electron-sudo/src/index' {
- declare module.exports: any;
-}
-
-declare module 'electron-sudo/src/lib/sudoer' {
- declare module.exports: any;
-}
-
-declare module 'electron-sudo/src/lib/utils' {
- declare module.exports: any;
-}
-
-declare module 'electron-sudo/tests/index' {
- declare module.exports: any;
-}
-
-declare module 'electron-sudo/webpack/chmod' {
- declare module.exports: any;
-}
-
-declare module 'electron-sudo/webpack/config.babel' {
- declare module.exports: any;
-}
-
-// Filename aliases
-declare module 'electron-sudo/dist/index.js' {
- declare module.exports: $Exports<'electron-sudo/dist/index'>;
-}
-declare module 'electron-sudo/src/index.js' {
- declare module.exports: $Exports<'electron-sudo/src/index'>;
-}
-declare module 'electron-sudo/src/lib/sudoer.js' {
- declare module.exports: $Exports<'electron-sudo/src/lib/sudoer'>;
-}
-declare module 'electron-sudo/src/lib/utils.js' {
- declare module.exports: $Exports<'electron-sudo/src/lib/utils'>;
-}
-declare module 'electron-sudo/tests/index.js' {
- declare module.exports: $Exports<'electron-sudo/tests/index'>;
-}
-declare module 'electron-sudo/webpack/chmod.js' {
- declare module.exports: $Exports<'electron-sudo/webpack/chmod'>;
-}
-declare module 'electron-sudo/webpack/config.babel.js' {
- declare module.exports: $Exports<'electron-sudo/webpack/config.babel'>;
-}
diff --git a/flow-typed/npm/sudo-prompt_vx.x.x.js b/flow-typed/npm/sudo-prompt_vx.x.x.js
deleted file mode 100644
index 3c762d1dca..0000000000
--- a/flow-typed/npm/sudo-prompt_vx.x.x.js
+++ /dev/null
@@ -1,45 +0,0 @@
-// flow-typed signature: ff03b3d5b4912b377eef1ed260d6968f
-// flow-typed version: <<STUB>>/sudo-prompt_v7.0.0/flow_v0.48.0
-
-/**
- * This is an autogenerated libdef stub for:
- *
- * 'sudo-prompt'
- *
- * Fill this stub out by replacing all the `any` types.
- *
- * Once filled out, we encourage you to share your work with the
- * community by sending a pull request to:
- * https://github.com/flowtype/flow-typed
- */
-
-declare module 'sudo-prompt' {
- declare module.exports: any;
-}
-
-/**
- * We include stubs for each file inside this npm package in case you need to
- * require those files directly. Feel free to delete any files that aren't
- * needed.
- */
-declare module 'sudo-prompt/test-concurrent' {
- declare module.exports: any;
-}
-
-declare module 'sudo-prompt/test' {
- declare module.exports: any;
-}
-
-// Filename aliases
-declare module 'sudo-prompt/index' {
- declare module.exports: $Exports<'sudo-prompt'>;
-}
-declare module 'sudo-prompt/index.js' {
- declare module.exports: $Exports<'sudo-prompt'>;
-}
-declare module 'sudo-prompt/test-concurrent.js' {
- declare module.exports: $Exports<'sudo-prompt/test-concurrent'>;
-}
-declare module 'sudo-prompt/test.js' {
- declare module.exports: $Exports<'sudo-prompt/test'>;
-}
diff --git a/package.json b/package.json
index a4f8edce34..aedfec6446 100644
--- a/package.json
+++ b/package.json
@@ -74,7 +74,7 @@
"lint": "eslint --no-ignore scripts app test *.js",
"flow": "flow",
"pack": "run-s pack:mac pack:win pack:linux",
- "pack:mac": "./pre-mac-sign.sh && cross-env BABEL_ENV=electron run-s private:clean private:compile private:build:mac && rm -r ./dist/mac",
+ "pack:mac": "cross-env BABEL_ENV=electron run-s private:clean private:compile private:build:mac && rm -r ./dist/mac",
"pack:win": "cross-env BABEL_ENV=electron run-s private:clean private:compile private:build:win",
"pack:linux": "cross-env BABEL_ENV=electron run-s private:clean private:compile private:build:linux",
"private:build:mac": "npm run private:build -- --mac",
diff --git a/pre-mac-sign.sh b/pre-mac-sign.sh
deleted file mode 100755
index a30a58f77e..0000000000
--- a/pre-mac-sign.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /bin/bash
-
-set -eux
-
-rm -f node_modules/electron-sudo/{src,dist}/bin/applet.app/LICENSE