From 4f886b1dfc903e6adc4cfa0628a1265b4861366b Mon Sep 17 00:00:00 2001 From: Sambo Chea Date: Thu, 13 Feb 2020 16:26:28 +0700 Subject: [PATCH] updated config builder --- .github/workflows/electron.yml | 7 +- config/electron-builder-dev.json | 17 +++++ config/electron-builder-sandbox.json | 17 +++++ package.json | 20 +----- yarn.lock | 103 +-------------------------- 5 files changed, 42 insertions(+), 122 deletions(-) create mode 100644 config/electron-builder-dev.json create mode 100644 config/electron-builder-sandbox.json diff --git a/.github/workflows/electron.yml b/.github/workflows/electron.yml index 3c421b9..23cde31 100644 --- a/.github/workflows/electron.yml +++ b/.github/workflows/electron.yml @@ -11,7 +11,7 @@ jobs: os: [macos-latest, ubuntu-latest, windows-latest] steps: - - name: Check out Git repository + - name: Check out Git repository on Clinic Sandbox uses: actions/checkout@v1 - name: Install Node.js, NPM and Yarn @@ -19,13 +19,10 @@ jobs: with: node-version: 10 - - name: Build/release Electron app + - name: Build/release Clinic Desktop App uses: samuelmeuli/action-electron-builder@v1 with: - # GitHub token, automatically provided to the action - # (No need to define this secret in the repo settings) github_token: ${{ secrets.github_token }} # If the commit is tagged with a version (e.g. "v1.0.0"), - # release the app after building release: ${{ startsWith(github.ref, 'refs/tags/v') }} diff --git a/config/electron-builder-dev.json b/config/electron-builder-dev.json new file mode 100644 index 0000000..2d68f4e --- /dev/null +++ b/config/electron-builder-dev.json @@ -0,0 +1,17 @@ +{ + "productName": "Clinic-Dev", + "appId": "com.cubetiqs.clinic", + "mac": { + "category": "com.cubetiqs.pro.clinic" + }, + "linux": { + "category": "com.cubetiqs.pro.clinic", + "target": ["AppImage", "deb"] + }, + "win": { + "target": "nsis" + }, + "directories": { + "output": "./dist/dev" + } +} diff --git a/config/electron-builder-sandbox.json b/config/electron-builder-sandbox.json new file mode 100644 index 0000000..a4917e0 --- /dev/null +++ b/config/electron-builder-sandbox.json @@ -0,0 +1,17 @@ +{ + "productName": "Clinic-Sandbox", + "appId": "com.cubetiqs.clinic", + "mac": { + "category": "com.cubetiqs.pro.clinic" + }, + "linux": { + "category": "com.cubetiqs.pro.clinic", + "target": ["AppImage", "deb"] + }, + "win": { + "target": "nsis" + }, + "directories": { + "output": "./dist/sandbox" + } +} diff --git a/package.json b/package.json index eb0d19d..34b560d 100644 --- a/package.json +++ b/package.json @@ -3,22 +3,6 @@ "version": "1.0.0", "description": "Clinic Application", "main": "main.js", - "build": { - "appId": "com.cubetiqs.clinic", - "mac": { - "category": "com.cubetiqs.pro.clinic" - }, - "linux": { - "category": "com.cubetiqs.pro.clinic", - "target": [ - "AppImage", - "deb" - ] - }, - "win": { - "target": "nsis" - } - }, "devDependencies": { "electron": "^8.0.0", "electron-builder": "^22.3.2" @@ -27,7 +11,9 @@ "postinstall": "electron-builder install-app-deps", "start": "yarn && electron ./main", "pack": "electron-builder --dir", - "dist": "electron-builder", + "dist": "electron-builder --config ./config/electron-builder-dev.json", + "sandbox": "electron-builder --config ./config/electron-builder-sandbox.json", + "builder-help": "electron-builder --help", "test": "echo \"Error: no test specified\" && exit 1" }, "repository": { diff --git a/yarn.lock b/yarn.lock index 0dff650..5e25b43 100644 --- a/yarn.lock +++ b/yarn.lock @@ -74,7 +74,7 @@ ajv-keywords@^3.1.0: resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da" integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ== -ajv@^6.1.0, ajv@^6.10.2: +ajv@^6.1.0: version "6.11.0" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.11.0.tgz#c3607cbc8ae392d8a5a536f25b21f8e5f3f87fe9" integrity sha512-nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA== @@ -362,22 +362,6 @@ concat-stream@1.6.2: readable-stream "^2.2.2" typedarray "^0.0.6" -conf@^6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/conf/-/conf-6.2.0.tgz#274d37a0a2e50757ffb89336e954d08718eb359a" - integrity sha512-fvl40R6YemHrFsNiyP7TD0tzOe3pQD2dfT2s20WvCaq57A1oV+RImbhn2Y4sQGDz1lB0wNSb7dPcPIvQB69YNA== - dependencies: - ajv "^6.10.2" - debounce-fn "^3.0.1" - dot-prop "^5.0.0" - env-paths "^2.2.0" - json-schema-typed "^7.0.1" - make-dir "^3.0.0" - onetime "^5.1.0" - pkg-up "^3.0.1" - semver "^6.2.0" - write-file-atomic "^3.0.0" - config-chain@^1.1.11: version "1.1.12" resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa" @@ -413,13 +397,6 @@ crypto-random-string@^2.0.0: resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== -debounce-fn@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/debounce-fn/-/debounce-fn-3.0.1.tgz#034afe8b904d985d1ec1aa589cd15f388741d680" - integrity sha512-aBoJh5AhpqlRoHZjHmOzZlRx+wz2xVwGL9rjs+Kj0EWUrL4/h4K7OD176thl2Tdoqui/AaA4xhHrNArGLAaI3Q== - dependencies: - mimic-fn "^2.1.0" - debug@2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" @@ -481,7 +458,7 @@ dmg-builder@22.3.2: js-yaml "^3.13.1" sanitize-filename "^1.6.3" -dot-prop@^5.0.0, dot-prop@^5.1.0: +dot-prop@^5.1.0: version "5.2.0" resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.2.0.tgz#c34ecc29556dc45f1f4c22697b6f4904e0cc4fcb" integrity sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A== @@ -508,11 +485,6 @@ ejs@^3.0.1: resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.0.1.tgz#30c8f6ee9948502cc32e85c37a3f8b39b5a614a5" integrity sha512-cuIMtJwxvzumSAkqaaoGY/L6Fc/t6YvoP9/VIaK0V/CyqKLEQ8sqODmYfy/cjXEdZ9+OOL8TecbJu+1RsofGDw== -electron-browser-storage@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/electron-browser-storage/-/electron-browser-storage-1.0.6.tgz#1507be52a38c726f9d3f138c79260bbee58f4f87" - integrity sha512-ap986HDJNPAangFsG0w0KWMal2GSOXEShMXho5Ory9XG+u2CIfP76nI1yruSemTCvDr+Rg4zpC8Ec9S349eUgw== - electron-builder@^22.3.2: version "22.3.2" resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.3.2.tgz#902d150fc0670cb90213262e5e0aa3c4f299ffa4" @@ -532,11 +504,6 @@ electron-builder@^22.3.2: update-notifier "^4.0.0" yargs "^15.1.0" -electron-localstorage@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/electron-localstorage/-/electron-localstorage-1.0.5.tgz#910df498b3b125519a00accc99cd770275978822" - integrity sha512-wmEcjZdyFI1YFlCtU8g8JP0FJ02WuIrUyNwxu0Mn7Be5YiFowuejeudgWMTaa2zd2qJlQCLmA3bj8pydIoti7Q== - electron-publish@22.3.2: version "22.3.2" resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.3.2.tgz#d2e60caf7a9643fe57e501c20acaf32c737b1c50" @@ -564,14 +531,6 @@ electron-publish@22.3.3: lazy-val "^1.0.4" mime "^2.4.4" -electron-store@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/electron-store/-/electron-store-5.1.0.tgz#0b3cb66b15d0002678fc5c13e8b0c38a8678d670" - integrity sha512-uhAF/4+zDb+y0hWqlBirEPEAR4ciCZDp4fRWGFNV62bG+ArdQPpXk7jS0MEVj3CfcG5V7hx7Dpq5oD+1j6GD8Q== - dependencies: - conf "^6.2.0" - type-fest "^0.7.1" - electron@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/electron/-/electron-8.0.0.tgz#b5f105cda6985ca2f2496de15e44b2bbb0c8e4f4" @@ -650,13 +609,6 @@ fd-slicer@~1.0.1: dependencies: pend "~1.2.0" -find-up@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" - integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg== - dependencies: - locate-path "^3.0.0" - find-up@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" @@ -884,11 +836,6 @@ json-schema-traverse@^0.4.1: resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== -json-schema-typed@^7.0.1: - version "7.0.3" - resolved "https://registry.yarnpkg.com/json-schema-typed/-/json-schema-typed-7.0.3.tgz#23ff481b8b4eebcd2ca123b4fa0409e66469a2d9" - integrity sha512-7DE8mpG+/fVw+dTpjbxnx47TaMnDfOI1jwft9g1VybltZCduyRQPJPvc+zzKY9WPHxhPWczyFuYa6I8Mw4iU5A== - json-stringify-safe@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" @@ -927,14 +874,6 @@ lazy-val@^1.0.4: resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.4.tgz#882636a7245c2cfe6e0a4e3ba6c5d68a137e5c65" integrity sha512-u93kb2fPbIrfzBuLjZE+w+fJbUUMhNDXxNmMfaqNgpfQf1CO5ZSe2LfsnBqVAk7i/2NF48OSoRj+Xe2VT+lE8Q== -locate-path@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" - integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A== - dependencies: - p-locate "^3.0.0" - path-exists "^3.0.0" - locate-path@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" @@ -983,11 +922,6 @@ mime@^2.4.4: resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5" integrity sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA== -mimic-fn@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" - integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== - mimic-response@^1.0.0, mimic-response@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" @@ -1062,32 +996,18 @@ once@^1.3.1, once@^1.4.0: dependencies: wrappy "1" -onetime@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz#fff0f3c91617fe62bb50189636e99ac8a6df7be5" - integrity sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q== - dependencies: - mimic-fn "^2.1.0" - p-cancelable@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw== -p-limit@^2.0.0, p-limit@^2.2.0: +p-limit@^2.2.0: version "2.2.2" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz#61279b67721f5287aa1c13a9a7fbbc48c9291b1e" integrity sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ== dependencies: p-try "^2.0.0" -p-locate@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" - integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ== - dependencies: - p-limit "^2.0.0" - p-locate@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" @@ -1110,11 +1030,6 @@ package-json@^6.3.0: registry-url "^5.0.0" semver "^6.2.0" -path-exists@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" - integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= - path-exists@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" @@ -1135,13 +1050,6 @@ pify@^3.0.0: resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY= -pkg-up@^3.0.1: - version "3.1.0" - resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5" - integrity sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA== - dependencies: - find-up "^3.0.0" - prepend-http@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" @@ -1463,11 +1371,6 @@ tunnel@^0.0.6: resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c" integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg== -type-fest@^0.7.1: - version "0.7.1" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.7.1.tgz#8dda65feaf03ed78f0a3f9678f1869147f7c5c48" - integrity sha512-Ne2YiiGN8bmrmJJEuTWTLJR32nh/JdL1+PSicowtNb0WFpn59GK8/lfD61bVtzguz7b3PBt74nxpv/Pw5po5Rg== - type-fest@^0.8.0, type-fest@^0.8.1: version "0.8.1" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"