From 3717ffab557e81287631ab804b933605fd56f4d8 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 13 Apr 2020 10:03:00 +0200 Subject: [PATCH] Change semver version in package.json to version range (#54) - Change semver version in package.json to version range - Fixes #49 - Reverts changes from #36 - Add timeout to workflow --- .github/workflows/build.yml | 1 + package-lock.json | 19 ++++++++----------- package.json | 8 ++++---- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3422d53..300622a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,6 +20,7 @@ jobs: matrix: node-version: ['10', '12', '13'] os: [ubuntu-latest, windows-latest, macOS-latest] + timeout-minutes: 15 steps: - uses: actions/checkout@v2 diff --git a/package-lock.json b/package-lock.json index 9fa2307..34abadb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1014,8 +1014,7 @@ "@types/node": { "version": "12.12.35", "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.35.tgz", - "integrity": "sha512-ASYsaKecA7TUsDrqIGPNk3JeEox0z/0XR/WsJJ8BIX/9+SkMSImQXKWfU/yBrSyc7ZSE/NPqLu36Nur0miCFfQ==", - "dev": true + "integrity": "sha512-ASYsaKecA7TUsDrqIGPNk3JeEox0z/0XR/WsJJ8BIX/9+SkMSImQXKWfU/yBrSyc7ZSE/NPqLu36Nur0miCFfQ==" }, "@types/prettier": { "version": "1.19.1", @@ -1046,7 +1045,6 @@ "version": "7.1.0", "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.1.0.tgz", "integrity": "sha512-pOKLaubrAEMUItGNpgwl0HMFPrSAFic8oSVIvfu1UwcgGNmNyK9gyhBHKmBnUTwwVvpZfkzUC0GaMgnL6P86uA==", - "dev": true, "requires": { "@types/node": "*" } @@ -6165,9 +6163,9 @@ } }, "semver": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.2.1.tgz", - "integrity": "sha512-aHhm1pD02jXXkyIpq25qBZjr3CQgg8KST8uX0OWXch3xE6jw+1bfbWnCjzMwojsTquroUmKFHNzU6x26mEiRxw==" + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.2.2.tgz", + "integrity": "sha512-Zo84u6o2PebMSK3zjJ6Zp5wi8VnQZnEaCP13Ul/lt1ANsLACxnJxq4EEm1PY94/por1Hm9+7xpIswdS5AkieMA==" }, "set-blocking": { "version": "2.0.0", @@ -6891,9 +6889,9 @@ } }, "ts-jest": { - "version": "25.3.1", - "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-25.3.1.tgz", - "integrity": "sha512-O53FtKguoMUByalAJW+NWEv7c4tus5ckmhfa7/V0jBb2z8v5rDSLFC1Ate7wLknYPC1euuhY6eJjQq4FtOZrkg==", + "version": "25.3.0", + "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-25.3.0.tgz", + "integrity": "sha512-qH/uhaC+AFDU9JfAueSr0epIFJkGMvUPog4FxSEVAtPOur1Oni5WBJMiQIkfHvc7PviVRsnlVLLY2I6221CQew==", "dev": true, "requires": { "bs-logger": "0.x", @@ -6902,11 +6900,10 @@ "json5": "2.x", "lodash.memoize": "4.x", "make-error": "1.x", - "micromatch": "4.x", "mkdirp": "1.x", "resolve": "1.x", "semver": "6.x", - "yargs-parser": "18.x" + "yargs-parser": "^18.1.1" }, "dependencies": { "semver": { diff --git a/package.json b/package.json index 8cbdc6f..a3140cb 100644 --- a/package.json +++ b/package.json @@ -21,9 +21,10 @@ "release-script": "./dist/release-script-cli.js" }, "dependencies": { + "@types/semver": "^7.0.0", "command-line-args": "5.1.1", "command-line-usage": "6.1.0", - "semver": "7.2.1", + "semver": "^7.0.0", "simple-git": "1.132.0" }, "engines": { @@ -40,7 +41,6 @@ "@types/jest": "25.2.1", "@types/mkdirp": "1.0.0", "@types/rimraf": "3.0.0", - "@types/semver": "7.1.0", "@typescript-eslint/parser": "2.27.0", "@typescript-eslint/eslint-plugin": "2.27.0", "eslint": "6.8.0", @@ -52,7 +52,7 @@ "rimraf": "3.0.2", "rollup": "1.32.1", "shx": "0.3.2", - "ts-jest": "25.3.1", + "ts-jest": "25.3.0", "tslib": "1.11.1", "typescript": "3.8.3" }, @@ -61,7 +61,7 @@ "prebuild": "rimraf dist", "build": "rollup -c && shx cp src/types.d.ts dist/release-script.d.ts", "watch": "rollup -c --watch", - "test": "jest --clearCache && jest --coverage --maxWorkers=2" + "test": "jest --coverage --maxWorkers=2" }, "files": [ "dist/"