From d6dcd83271be583bb8e48cdce947fbf227136033 Mon Sep 17 00:00:00 2001 From: Jan Hovancik Date: Mon, 21 Dec 2020 11:37:26 +0100 Subject: [PATCH] Release 1.4 --- .drone.yml | 84 ++++++++++++++ .github/workflows/build.yml | 21 ++++ .github/workflows/snap-build.yml | 21 ++++ .github/workflows/tests.yml | 1 + .travis.yml | 24 ---- CHANGELOG.md | 14 +-- app/package-lock.json | 16 +-- app/package.json | 6 +- appveyor.yml | 13 +-- package-lock.json | 184 ++++++++++++++++--------------- package.json | 10 +- 11 files changed, 249 insertions(+), 145 deletions(-) create mode 100644 .drone.yml create mode 100644 .github/workflows/build.yml create mode 100644 .github/workflows/snap-build.yml delete mode 100644 .travis.yml diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 000000000..2cc0aa0a8 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,84 @@ +--- +kind: pipeline +type: docker +name: amd64 Linux Build + +platform: + os: linux + arch: amd64 + +steps: +- name: Build + image: amd64/node:12.18.3-buster + commands: + - apt update && apt-get install --no-install-recommends -y gcc-multilib g++-multilib bsdtar rpm libopenjp2-tools + - npm install + - npm install npm -g + - node_modules/.bin/electron-builder build --x64 --ia32 + environment: + GH_TOKEN: + from_secret: GH_TOKEN + +trigger: + branch: + - release + event: + - push + +--- +kind: pipeline +type: docker +name: arm64v8 Linux Build + +platform: + os: linux + arch: arm64 + +steps: +- name: Build + image: arm64v8/node:12.18.3-buster + commands: + - apt update && apt-get install --no-install-recommends -y ruby-full bsdtar rpm libopenjp2-tools + - gem install fpm -v 1.10.1 + - export USE_SYSTEM_FPM="true" + - npm install + - npm install npm -g + - node_modules/.bin/electron-builder build --arm64 + environment: + GH_TOKEN: + from_secret: GH_TOKEN + +trigger: + branch: + - release + event: + - push + +--- +kind: pipeline +type: docker +name: arm32v7 Linux Build + +platform: + os: linux + arch: arm + +steps: +- name: Build + image: arm32v7/node:12.18.3-buster + commands: + - apt update && apt-get install --no-install-recommends -y ruby-full bsdtar rpm libopenjp2-tools + - gem install fpm -v 1.10.1 + - export USE_SYSTEM_FPM="true" + - npm install + - npm install npm -g + - node_modules/.bin/electron-builder build --armv7l + environment: + GH_TOKEN: + from_secret: GH_TOKEN + +trigger: + branch: + - release + event: + - push diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 000000000..dd2a72a47 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,21 @@ +name: macOS build + +on: + push: + branches: + - release + +jobs: + build: + runs-on: macos-latest + + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-node@v1 + with: + node-version: '12.18.3' + - run: npm install + - run: npm install npm -g + - run: node_modules/.bin/electron-builder build + env: + GH_TOKEN: ${{ secrets.github_token }} diff --git a/.github/workflows/snap-build.yml b/.github/workflows/snap-build.yml new file mode 100644 index 000000000..336e0697d --- /dev/null +++ b/.github/workflows/snap-build.yml @@ -0,0 +1,21 @@ +name: Linux Snap build + +on: + push: + branches: + - release + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-node@v1 + with: + node-version: '12.18.3' + - run: npm install -g npm + - run: npm install + - run: node_modules/.bin/electron-builder --linux snap -c.snap.publish=github + env: + GH_TOKEN: ${{ secrets.github_token }} diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e5c785835..1c3791470 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -23,6 +23,7 @@ jobs: with: node-version: '12.18.3' - run: npm install + - run: npm install npm -g - run: npx nyc --reporter=lcov npm test env: CI: true diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 6b48d213e..000000000 --- a/.travis.yml +++ /dev/null @@ -1,24 +0,0 @@ -language: node_js - -os: - - linux - - osx - -node_js: "12.18.3" - -services: - - xvfb - -before_install: -- export TZ=Europe/Amsterdam - -script: - - if [[ "$TRAVIS_OS_NAME" == "linux" && "$TRAVIS_BRANCH" == "release" ]]; then sudo apt update && sudo apt-get install --no-install-recommends -y gcc-multilib g++-multilib bsdtar rpm libopenjp2-tools; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" && "$TRAVIS_BRANCH" == "release" ]]; then brew install rpm; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" && "$TRAVIS_BRANCH" == "release" ]]; then electron-builder --linux snap -c.snap.publish=github; fi - - npx nyc --reporter=lcov npm test && npx codecov - - if [[ "$TRAVIS_BRANCH" == "release" ]]; then npm run dist; fi - -notifications: - email: - on_success: never diff --git a/CHANGELOG.md b/CHANGELOG.md index fd721e166..983b99f8e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,23 +6,22 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] +## [1.4.0] - 2020-12-25 ### Added -- Better handling of app errors: error will ask user to report issue +- Better handling of app errors: error will ask user to report issue - Esperanto translations - Norwegian translations - Snow white theme +- experimental Linux builds for arm ### Changed -- Updated Bulgarian translations -- Updated Swedish translations -- Updated Chinese translations -- Updated Slovak translations -- Updated Czech translations +- Updated many translations ### Fixed - notification of new version being showed even disabled - browser tab non-responsive after resuming - don't show notification title for macOS Big Sur +- DND mode in macOS Big Sur ## [1.3.0] - 2020-11-08 ### Added @@ -529,7 +528,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/). - resume/pause functionality for reminder - scripts for creating installers for OS X, Windows, Linux -[Unreleased]: https://github.com/hovancik/stretchly/compare/v1.3.0...HEAD +[Unreleased]: https://github.com/hovancik/stretchly/compare/v1.4.0...HEAD +[1.4.0]: https://github.com/hovancik/stretchly/compare/v1.3.0...v1.4.0 [1.3.0]: https://github.com/hovancik/stretchly/compare/v1.2.0...v1.3.0 [1.2.0]: https://github.com/hovancik/stretchly/compare/v1.1.0...v1.2.0 [1.1.0]: https://github.com/hovancik/stretchly/compare/v1.0.0...v1.1.0 diff --git a/app/package-lock.json b/app/package-lock.json index 5f0700cbd..297cd8fdb 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -1,6 +1,6 @@ { "name": "Stretchly", - "version": "1.3.0", + "version": "1.4.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -39,9 +39,9 @@ } }, "electron-log": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-4.3.0.tgz", - "integrity": "sha512-iuJjH/ZEJkDyCbuAMvvFxAjCMDLMXIQ5NqvppETGrbtf4b/007r5P36BSvexdy0UzwDNzDtIuEXLR34vRXWZrg==" + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-4.3.1.tgz", + "integrity": "sha512-S/0CMjYjgyWUsZ3d27VvErPaI5W4oILp4jfeCuN4DhDqrJW6jKRUD2PxFfTdeZEIjM7+fttGg7A61rPcAcZC1w==" }, "esprima": { "version": "4.0.1", @@ -109,11 +109,11 @@ } }, "meeussunmoon": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/meeussunmoon/-/meeussunmoon-3.0.2.tgz", - "integrity": "sha512-6uQcR1d6fg436iNU8ofWTeQqY8dpY7jEzGIiZ6w0wrvXFTJOigHnyzjD4oxBYKn6+N+UZ64qK6cw7noJFH5Sog==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/meeussunmoon/-/meeussunmoon-3.0.3.tgz", + "integrity": "sha512-JM5BWaSu8zZQoFRoYEZn5F3hVw20Zh+TARGr/mRe/4jBYtYu74xbitxz5GvZhe/aM+qot8AfjO3WRFmlKIbJnA==", "requires": { - "luxon": "^1.24.1" + "luxon": "^1.25.0" } }, "minimist": { diff --git a/app/package.json b/app/package.json index 29a9d3a10..6e1c747e4 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "Stretchly", - "version": "1.3.0", + "version": "1.4.0", "description": "The break time reminder app", "main": "main.js", "repository": { @@ -21,11 +21,11 @@ "homepage": "https://hovancik.net/stretchly", "dependencies": { "@meetfranz/electron-notification-state": "^1.0.0", - "electron-log": "^4.3.0", + "electron-log": "^4.3.1", "i18next": "^19.8.4", "i18next-node-fs-backend": "^2.1.3", "luxon": "^1.25.0", - "meeussunmoon": "^3.0.2", + "meeussunmoon": "^3.0.3", "semver": "^7.3.4", "windows-focus-assist": "^1.2.1" }, diff --git a/appveyor.yml b/appveyor.yml index 1561fa38f..75c0c476e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,6 @@ os: Visual Studio 2019 platform: - - x86 - x64 skip_tags: true @@ -9,8 +8,9 @@ skip_tags: true environment: nodejs_version: "12.18.3" -init: -- tzutil /s "W. Europe Standard Time" +branches: + only: + - release cache: - node_modules -> package.json @@ -20,10 +20,5 @@ install: - npm install npm -g - npm install -test_script: - - node --version - - npm --version - - npx nyc --reporter=lcov npm test && npx codecov - build_script: - - IF %APPVEYOR_REPO_BRANCH%==release (npm run dist) + - node_modules/.bin/electron-builder build --x64 --ia32 diff --git a/package-lock.json b/package-lock.json index 7591d3a46..8844fbb54 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "Stretchly", - "version": "1.3.0", + "version": "1.4.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -11,34 +11,34 @@ "dev": true }, "@babel/code-frame": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz", - "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==", + "version": "7.12.11", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz", + "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==", "dev": true, "requires": { "@babel/highlight": "^7.10.4" } }, "@babel/generator": { - "version": "7.12.10", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.10.tgz", - "integrity": "sha512-6mCdfhWgmqLdtTkhXjnIz0LcdVCd26wS2JXRtj2XY0u5klDsXBREA/pG5NVOuVnF2LUrBGNFtQkIqqTbblg0ww==", + "version": "7.12.11", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz", + "integrity": "sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA==", "dev": true, "requires": { - "@babel/types": "^7.12.10", + "@babel/types": "^7.12.11", "jsesc": "^2.5.1", "source-map": "^0.5.0" } }, "@babel/helper-function-name": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz", - "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==", + "version": "7.12.11", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz", + "integrity": "sha512-AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA==", "dev": true, "requires": { - "@babel/helper-get-function-arity": "^7.10.4", - "@babel/template": "^7.10.4", - "@babel/types": "^7.10.4" + "@babel/helper-get-function-arity": "^7.12.10", + "@babel/template": "^7.12.7", + "@babel/types": "^7.12.11" } }, "@babel/helper-get-function-arity": { @@ -51,18 +51,18 @@ } }, "@babel/helper-split-export-declaration": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz", - "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==", + "version": "7.12.11", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz", + "integrity": "sha512-LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g==", "dev": true, "requires": { - "@babel/types": "^7.11.0" + "@babel/types": "^7.12.11" } }, "@babel/helper-validator-identifier": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", - "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", + "version": "7.12.11", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz", + "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==", "dev": true }, "@babel/highlight": { @@ -77,9 +77,9 @@ } }, "@babel/parser": { - "version": "7.12.10", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.10.tgz", - "integrity": "sha512-PJdRPwyoOqFAWfLytxrWwGrAxghCgh/yTNCYciOz8QgjflA7aZhECPZAa2VUedKg2+QMWkI0L9lynh2SNmNEgA==", + "version": "7.12.11", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.11.tgz", + "integrity": "sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg==", "dev": true }, "@babel/runtime": { @@ -119,12 +119,12 @@ } }, "@babel/types": { - "version": "7.12.10", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.10.tgz", - "integrity": "sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw==", + "version": "7.12.11", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.11.tgz", + "integrity": "sha512-ukA9SQtKThINm++CX1CwmliMrE54J6nIYB5XTwL5f/CLFW9owfls+YSU8tVW15RQ2w+a3fSbPjC6HdQNtWZkiA==", "dev": true, "requires": { - "@babel/helper-validator-identifier": "^7.10.4", + "@babel/helper-validator-identifier": "^7.12.11", "lodash": "^4.17.19", "to-fast-properties": "^2.0.0" } @@ -449,9 +449,9 @@ "dev": true }, "@types/yargs": { - "version": "15.0.11", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.11.tgz", - "integrity": "sha512-jfcNBxHFYJ4nPIacsi3woz1+kvUO6s1CyeEhtnDHBjHUMNj5UlW2GynmnSgiJJEdNg9yW5C8lfoNRZrHGv5EqA==", + "version": "15.0.12", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.12.tgz", + "integrity": "sha512-f+fD/fQAo3BCbCDlrUpznF1A5Zp9rB0noS5vnoormHSIPFKL0Z2DcUJ3Gxp5ytH4uLRNxy7AwYUC9exZzqGMAw==", "dev": true, "requires": { "@types/yargs-parser": "*" @@ -480,9 +480,9 @@ "dev": true }, "@wdio/config": { - "version": "6.10.10", - "resolved": "https://registry.npmjs.org/@wdio/config/-/config-6.10.10.tgz", - "integrity": "sha512-sSIC25+iq1Ad+rUr16ghPebXyUij188ItQFCw4JvDOh8j8SV5oxZVaJm8W0Cv1PtmuaQ/tSYjLNVi0UQ3Z025A==", + "version": "6.10.11", + "resolved": "https://registry.npmjs.org/@wdio/config/-/config-6.10.11.tgz", + "integrity": "sha512-yyv1UhJtASykXO6/q6JHmmySMa4NUQirOUVQZSG+viHdTIt/noMXmqD3BKFvev10ZG/k0DnxhXTnU+2aT/7BTA==", "dev": true, "requires": { "@wdio/logger": "6.10.10", @@ -575,18 +575,18 @@ "dev": true }, "@wdio/repl": { - "version": "6.10.10", - "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-6.10.10.tgz", - "integrity": "sha512-9NMPI8oINqsqUzquFw5PXsR4wAkwqZfFyJexeEx/X8zxtsBRDiIUQJYNiSKVzcMC3MyeyHuDw6QLXSJS3Er9/g==", + "version": "6.10.11", + "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-6.10.11.tgz", + "integrity": "sha512-Ig3WLUi7anpEd8bvRnunZ9PHbVXtkvUQH2wPbEuDcJ3kPwPkKWQl9IK7AyDrIl81RX2S++iBBa4r27IREXWNOQ==", "dev": true, "requires": { - "@wdio/utils": "6.10.10" + "@wdio/utils": "6.10.11" } }, "@wdio/utils": { - "version": "6.10.10", - "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-6.10.10.tgz", - "integrity": "sha512-NBClvoJOYBF/d6g6Y4364sNTQYv4+CeAt29uYkyTQk+ux+ouH7AQ4bxzpbXz5q6V8SRIeiwdqUMr7PrRPP/Z1w==", + "version": "6.10.11", + "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-6.10.11.tgz", + "integrity": "sha512-x4yc08UWPvP1j7sPKt4Wwyd+z85pVaSYZ+6iyodbXpflCo9uxnQgSmLdDnGDxksREeBVkndsBqhdJHsuI8eWsw==", "dev": true, "requires": { "@wdio/logger": "6.10.10" @@ -1754,18 +1754,18 @@ "dev": true }, "devtools": { - "version": "6.10.10", - "resolved": "https://registry.npmjs.org/devtools/-/devtools-6.10.10.tgz", - "integrity": "sha512-IMPH8SQDSzQaPiTcTYqwG6tSp15/miC0Z8Om9Wu1N3nKHcH3iMxoPCCEG1un10L2CzygjSPD4mdZtcXVM+LWlw==", + "version": "6.10.11", + "resolved": "https://registry.npmjs.org/devtools/-/devtools-6.10.11.tgz", + "integrity": "sha512-PjsxgEb4RPp3bJwq1zqcM3JNaXo9QhGiVnOsNkGzftCFr4OOKrvtdOCCST+xpQvE+5F/jNc2qWKI1WXGCBNRew==", "dev": true, "requires": { "@types/puppeteer-core": "^2.0.0", "@types/ua-parser-js": "^0.7.33", "@types/uuid": "^8.3.0", - "@wdio/config": "6.10.10", + "@wdio/config": "6.10.11", "@wdio/logger": "6.10.10", "@wdio/protocols": "6.10.6", - "@wdio/utils": "6.10.10", + "@wdio/utils": "6.10.11", "chrome-launcher": "^0.13.1", "edge-paths": "^2.1.0", "puppeteer-core": "^5.1.0", @@ -1912,14 +1912,14 @@ "integrity": "sha512-kpH/7dujXMOQ3v/Tjbk+1lWTab8W7Xg4nH4kA/S0PJ6fumrhhRwm7TLniP7olZBJSUpeuz0upGCW/ts6hA+uDg==", "dev": true, "requires": { - "electron": "^11.1.0", + "electron": "^11.1.1", "watch": "^1.0.2" } }, "electron": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/electron/-/electron-11.1.0.tgz", - "integrity": "sha512-RFAhR/852VMaRd9NSe7jprwSoG9dLc6u1GwnqRWg+/3cy/8Zrwt1Betw1lXiZH7hGuB9K2cqju83Xv5Pq5ZSGA==", + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/electron/-/electron-11.1.1.tgz", + "integrity": "sha512-tlbex3xosJgfileN6BAQRotevPRXB/wQIq48QeQ08tUJJrXwE72c8smsM/hbHx5eDgnbfJ2G3a60PmRjHU2NhA==", "dev": true, "requires": { "@electron/get": "^1.0.1", @@ -2070,9 +2070,9 @@ } }, "electron-log": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-4.3.0.tgz", - "integrity": "sha512-iuJjH/ZEJkDyCbuAMvvFxAjCMDLMXIQ5NqvppETGrbtf4b/007r5P36BSvexdy0UzwDNzDtIuEXLR34vRXWZrg==" + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-4.3.1.tgz", + "integrity": "sha512-S/0CMjYjgyWUsZ3d27VvErPaI5W4oILp4jfeCuN4DhDqrJW6jKRUD2PxFfTdeZEIjM7+fttGg7A61rPcAcZC1w==" }, "electron-publish": { "version": "22.9.1", @@ -2990,9 +2990,9 @@ "dev": true }, "get-intrinsic": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.1.tgz", - "integrity": "sha512-ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.2.tgz", + "integrity": "sha512-aeX0vrFm21ILl3+JpFFRNe9aUvp6VFZb2/CTbgLb8j75kOhvoNYjt9d8KA/tJG4gSo8nzEDedRl0h7vDmBYRVg==", "dev": true, "requires": { "function-bind": "^1.1.1", @@ -3070,12 +3070,20 @@ } }, "global-dirs": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-2.0.1.tgz", - "integrity": "sha512-5HqUqdhkEovj2Of/ms3IeS/EekcO54ytHRLV4PEY2rhRwrHXLQjeVEES0Lhka0xwNDtGYn58wyC4s5+MHsOO6A==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-2.1.0.tgz", + "integrity": "sha512-MG6kdOUh/xBnyo9cJFeIKkLEc1AyFq42QTU4XiX51i2NEdxLxLWXIjEjmqKeSuKR7pAZjTqUVoT2b2huxVLgYQ==", "dev": true, "requires": { - "ini": "^1.3.5" + "ini": "1.3.7" + }, + "dependencies": { + "ini": { + "version": "1.3.7", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.7.tgz", + "integrity": "sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ==", + "dev": true + } } }, "global-tunnel-ng": { @@ -3358,9 +3366,9 @@ "dev": true }, "import-fresh": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.2.tgz", - "integrity": "sha512-cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", + "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", "dev": true, "requires": { "parent-module": "^1.0.0", @@ -3732,13 +3740,13 @@ } }, "jsx-ast-utils": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.1.0.tgz", - "integrity": "sha512-d4/UOjg+mxAWxCiF0c5UTSwyqbchkbqCvK87aBovhnh8GtysTjWmgC63tY0cJx/HzGgm9qnA147jVBdpOiQ2RA==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.2.0.tgz", + "integrity": "sha512-EIsmt3O3ljsU6sot/J4E1zDRxfBNrhjyf/OKjlydwgEimQuznlM4Wv7U+ueONJMyEn1WRE0K8dhi3dVAXYT24Q==", "dev": true, "requires": { - "array-includes": "^3.1.1", - "object.assign": "^4.1.1" + "array-includes": "^3.1.2", + "object.assign": "^4.1.2" } }, "just-extend": { @@ -4078,11 +4086,11 @@ } }, "meeussunmoon": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/meeussunmoon/-/meeussunmoon-3.0.2.tgz", - "integrity": "sha512-6uQcR1d6fg436iNU8ofWTeQqY8dpY7jEzGIiZ6w0wrvXFTJOigHnyzjD4oxBYKn6+N+UZ64qK6cw7noJFH5Sog==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/meeussunmoon/-/meeussunmoon-3.0.3.tgz", + "integrity": "sha512-JM5BWaSu8zZQoFRoYEZn5F3hVw20Zh+TARGr/mRe/4jBYtYu74xbitxz5GvZhe/aM+qot8AfjO3WRFmlKIbJnA==", "requires": { - "luxon": "^1.24.1" + "luxon": "^1.25.0" } }, "merge": { @@ -4092,9 +4100,9 @@ "dev": true }, "mime": { - "version": "2.4.6", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz", - "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==", + "version": "2.4.7", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.7.tgz", + "integrity": "sha512-dhNd1uA2u397uQk3Nv5LM4lm93WYDUXFn3Fu291FJerns4jyTudqhIWe4W04YLy7Uk1tm1Ore04NpjRvQp/NPA==", "dev": true }, "mime-db": { @@ -6124,16 +6132,16 @@ } }, "webdriver": { - "version": "6.10.10", - "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-6.10.10.tgz", - "integrity": "sha512-xypImr7Vf5MVnTglu08fWcquuVhpozTFTa0oviAFcagJvRXt09d3bMfmOc1LfEYaLszX4pXs+ncln2fjBQyXdA==", + "version": "6.10.11", + "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-6.10.11.tgz", + "integrity": "sha512-3LW1ST2ktdiW8ANO8ie09ct1zEAfk+Vn6ELJJXwwh858YL4ckG5Eu07w1HlCe+K1NwcrkHVsk7gw8Hq/qs/WyA==", "dev": true, "requires": { "@types/lodash.merge": "^4.6.6", - "@wdio/config": "6.10.10", + "@wdio/config": "6.10.11", "@wdio/logger": "6.10.10", "@wdio/protocols": "6.10.6", - "@wdio/utils": "6.10.10", + "@wdio/utils": "6.10.11", "got": "^11.0.2", "lodash.merge": "^4.6.1" }, @@ -6256,9 +6264,9 @@ } }, "webdriverio": { - "version": "6.10.10", - "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-6.10.10.tgz", - "integrity": "sha512-9/nWf+S0EUlT7eoEtBbgJfwfMGAIbzen+R5lk7p8INDjaQ+zPEOv2v5AX8j0Ol3BARGeLSU99PSxednzPUp3Dw==", + "version": "6.10.11", + "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-6.10.11.tgz", + "integrity": "sha512-1EGQuX7oN2KJ1zyWmQGELP9deP1++moRLR/l8sEbZKMvv3qZ+lyT1g2t3Eu+AE7kan2wpBc94oWXmSF0KjEENQ==", "dev": true, "requires": { "@types/archiver": "^5.1.0", @@ -6269,15 +6277,15 @@ "@types/lodash.isplainobject": "^4.0.6", "@types/lodash.zip": "^4.2.6", "@types/puppeteer-core": "^2.0.0", - "@wdio/config": "6.10.10", + "@wdio/config": "6.10.11", "@wdio/logger": "6.10.10", - "@wdio/repl": "6.10.10", - "@wdio/utils": "6.10.10", + "@wdio/repl": "6.10.11", + "@wdio/utils": "6.10.11", "archiver": "^5.0.0", "atob": "^2.1.2", "css-shorthand-properties": "^1.1.1", "css-value": "^0.0.1", - "devtools": "6.10.10", + "devtools": "6.10.11", "fs-extra": "^9.0.1", "get-port": "^5.1.1", "grapheme-splitter": "^1.0.2", @@ -6290,7 +6298,7 @@ "resq": "^1.9.1", "rgb2hex": "0.2.3", "serialize-error": "^7.0.0", - "webdriver": "6.10.10" + "webdriver": "6.10.11" }, "dependencies": { "fs-extra": { diff --git a/package.json b/package.json index a6d3ec7e3..f165b52b4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Stretchly", - "version": "1.3.0", + "version": "1.4.0", "description": "The break time reminder app", "main": "app/main.js", "engines": { @@ -11,8 +11,6 @@ "dev": "cross-env NODE_ENV=development electron ./app --enable-logging --remote-debugging-port=9222", "electromon": "electromon ./app", "postinstall": "electron-builder install-app-deps", - "pack-all": "electron-builder build --dir -mwl --x64 --ia32", - "dist-all": "electron-builder build -mwl --x64 --ia32", "pack": "electron-builder build --dir", "dist": "electron-builder build --x64 --ia32", "test": "mocha test", @@ -42,7 +40,7 @@ "chai-as-promised": "^7.1.1", "cross-env": "^7.0.3", "electromon": "^1.0.10", - "electron": "^11.1.0", + "electron": "^11.1.1", "electron-builder": "^22.9.1", "husky": "^4.3.6", "mocha": "^8.2.1", @@ -135,11 +133,11 @@ }, "dependencies": { "@meetfranz/electron-notification-state": "^1.0.0", - "electron-log": "^4.3.0", + "electron-log": "^4.3.1", "i18next": "^19.8.4", "i18next-node-fs-backend": "^2.1.3", "luxon": "^1.25.0", - "meeussunmoon": "^3.0.2", + "meeussunmoon": "^3.0.3", "semver": "^7.3.4", "windows-focus-assist": "^1.2.1" }