From 88724a07655ddd4ce374d92d5719a61cc0e9ca2f Mon Sep 17 00:00:00 2001 From: Florian CHAZAL Date: Wed, 5 Jan 2022 11:43:59 +0100 Subject: [PATCH 1/2] chore: don't bump version for merge to main --- .github/workflows/on-merge-to-main.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/.github/workflows/on-merge-to-main.yml b/.github/workflows/on-merge-to-main.yml index 6f84542056..b18306cb54 100644 --- a/.github/workflows/on-merge-to-main.yml +++ b/.github/workflows/on-merge-to-main.yml @@ -32,21 +32,6 @@ jobs: run: npm run lerna-lint - name: Run tests run: npm run lerna-test - - name: "Version and publish" - env: - GH_TOKEN: ${{ secrets.GH_PUBLISH_TOKEN }} - run: | - git config --global user.name 'github-actions[bot]' - git config --global user.email 'github-actions[bot]@users.noreply.github.com' - git remote set-url origin https://x-access-token:${GH_TOKEN}@github.com/$GITHUB_REPOSITORY - - # For merge to main we - ## don't create github release, - ## don't update changelog (--no-changelog) - ## bump version as a pre-release (--conventional-prerelease) - ## add a custom preid (--preid dev): 0.2.0-dev.1 -> 0.2.0-dev.2 - npx lerna version --conventional-commits --conventional-prerelease --preid dev --force-publish=* --yes --no-changelog - git push --delete origin $(git describe --abbrev=0) - name: update release draft uses: release-drafter/release-drafter@v5.15.0 env: From e76be87d193b8f6b8d9378b09e8afcce38ebd281 Mon Sep 17 00:00:00 2001 From: Florian CHAZAL Date: Wed, 5 Jan 2022 11:50:07 +0100 Subject: [PATCH 2/2] fix deps of commons --- packages/logger/npm-shrinkwrap.json | 6 ++-- packages/logger/package.json | 2 +- packages/metrics/package-lock.json | 18 +++++------ packages/metrics/package.json | 2 +- packages/tracing/package-lock.json | 46 ++++++++++++++++++++++++++--- packages/tracing/package.json | 2 +- 6 files changed, 57 insertions(+), 19 deletions(-) diff --git a/packages/logger/npm-shrinkwrap.json b/packages/logger/npm-shrinkwrap.json index 2fa04921a3..efc005861d 100644 --- a/packages/logger/npm-shrinkwrap.json +++ b/packages/logger/npm-shrinkwrap.json @@ -1,15 +1,15 @@ { "name": "@aws-lambda-powertools/logger", - "version": "0.2.0-beta.18", + "version": "0.2.0-dev.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@aws-lambda-powertools/logger", - "version": "0.2.0-beta.18", + "version": "0.2.0-dev.2", "license": "MIT", "dependencies": { - "@aws-lambda-powertools/commons": "^0.2.0-beta.18", + "@aws-lambda-powertools/commons": "0.2.0-beta.19", "@middy/core": "^2.5.3", "@types/aws-lambda": "^8.10.72", "lodash": "^4.17.21", diff --git a/packages/logger/package.json b/packages/logger/package.json index ec755b2f5b..d4dfb54b55 100644 --- a/packages/logger/package.json +++ b/packages/logger/package.json @@ -63,7 +63,7 @@ "url": "https://github.com/awslabs/aws-lambda-powertools-typescript/issues" }, "dependencies": { - "@aws-lambda-powertools/commons": "^0.2.0-dev.2", + "@aws-lambda-powertools/commons": "0.2.0-beta.19", "@middy/core": "^2.5.3", "@types/aws-lambda": "^8.10.72", "lodash": "^4.17.21", diff --git a/packages/metrics/package-lock.json b/packages/metrics/package-lock.json index 1ab1323900..c96a3480d1 100644 --- a/packages/metrics/package-lock.json +++ b/packages/metrics/package-lock.json @@ -6,10 +6,10 @@ "packages": { "": { "name": "@aws-lambda-powertools/metrics", - "version": "0.2.0-dev.1", + "version": "0.2.0-dev.2", "license": "MIT-0", "dependencies": { - "@aws-lambda-powertools/commons": "^0.2.0-beta.18", + "@aws-lambda-powertools/commons": "0.2.0-beta.19", "@types/aws-lambda": "^8.10.72" }, "devDependencies": { @@ -24,7 +24,7 @@ "@typescript-eslint/parser": "^5.4.0", "aws-cdk": "^1.137.0", "aws-sdk": "^2.1048.0", - "esbuild": "^0.14.5", + "esbuild": "0.14.5", "eslint": "^8.3.0", "eslint-import-resolver-node": "^0.3.6", "eslint-import-resolver-typescript": "^2.5.0", @@ -786,9 +786,9 @@ } }, "node_modules/@aws-lambda-powertools/commons": { - "version": "0.2.0-beta.18", - "resolved": "https://registry.npmjs.org/@aws-lambda-powertools/commons/-/commons-0.2.0-beta.18.tgz", - "integrity": "sha512-EXfTMYadBYPo3+uOn57f2Geh3dkcxy2sIRPU8ClfbW5pP2TxKBdA81wTniWrQXcqWIvr4ndz3uA7NOEp4KZPVg==", + "version": "0.2.0-beta.19", + "resolved": "https://registry.npmjs.org/@aws-lambda-powertools/commons/-/commons-0.2.0-beta.19.tgz", + "integrity": "sha512-T1Sjk2VsEWvsUGLQ2iB6TN6EkX/LMge7m8u9ABZmz6gCnhiOvmXU7PoOh4AHk7YLPoBgdRZ+ZOYe04dED5B+GQ==", "dependencies": { "@types/aws-lambda": "^8.10.72" } @@ -10181,9 +10181,9 @@ "dev": true }, "@aws-lambda-powertools/commons": { - "version": "0.2.0-beta.18", - "resolved": "https://registry.npmjs.org/@aws-lambda-powertools/commons/-/commons-0.2.0-beta.18.tgz", - "integrity": "sha512-EXfTMYadBYPo3+uOn57f2Geh3dkcxy2sIRPU8ClfbW5pP2TxKBdA81wTniWrQXcqWIvr4ndz3uA7NOEp4KZPVg==", + "version": "0.2.0-beta.19", + "resolved": "https://registry.npmjs.org/@aws-lambda-powertools/commons/-/commons-0.2.0-beta.19.tgz", + "integrity": "sha512-T1Sjk2VsEWvsUGLQ2iB6TN6EkX/LMge7m8u9ABZmz6gCnhiOvmXU7PoOh4AHk7YLPoBgdRZ+ZOYe04dED5B+GQ==", "requires": { "@types/aws-lambda": "^8.10.72" } diff --git a/packages/metrics/package.json b/packages/metrics/package.json index 61e7e97098..dc0b6a0f2e 100644 --- a/packages/metrics/package.json +++ b/packages/metrics/package.json @@ -80,7 +80,7 @@ "url": "https://github.com/awslabs/aws-lambda-powertools-typescript/issues" }, "dependencies": { - "@aws-lambda-powertools/commons": "^0.2.0-dev.2", + "@aws-lambda-powertools/commons": "0.2.0-beta.19", "@types/aws-lambda": "^8.10.72" } } diff --git a/packages/tracing/package-lock.json b/packages/tracing/package-lock.json index e5b3e6ea9b..2b8149f734 100644 --- a/packages/tracing/package-lock.json +++ b/packages/tracing/package-lock.json @@ -6,13 +6,12 @@ "packages": { "": { "name": "@aws-lambda-powertools/tracer", - "version": "0.2.0-beta.18", + "version": "0.2.0-dev.2", "license": "MIT-0", "dependencies": { - "@aws-lambda-powertools/commons": "^0.2.0-beta.18", + "@aws-lambda-powertools/commons": "0.2.0-beta.19", "@middy/core": "^2.5.3", - "aws-xray-sdk-core": "^3.3.3", - "esbuild": "^0.14.10" + "aws-xray-sdk-core": "^3.3.3" }, "devDependencies": { "@aws-cdk/aws-lambda-nodejs": "^1.137.0", @@ -25,6 +24,7 @@ "@typescript-eslint/parser": "^5.4.0", "aws-cdk": "^1.137.0", "aws-sdk": "^2.1048.0", + "esbuild": "^0.14.10", "eslint": "^8.3.0", "eslint-import-resolver-node": "^0.3.6", "eslint-import-resolver-typescript": "^2.5.0", @@ -5691,6 +5691,7 @@ "version": "0.14.10", "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.10.tgz", "integrity": "sha512-ibZb+NwFqBwHHJlpnFMtg4aNmVK+LUtYMFC9CuKs6lDCBEvCHpqCFZFEirpqt1jOugwKGx8gALNGvX56lQyfew==", + "dev": true, "hasInstallScript": true, "bin": { "esbuild": "bin/esbuild" @@ -5723,6 +5724,7 @@ "cpu": [ "arm64" ], + "dev": true, "optional": true, "os": [ "android" @@ -5735,6 +5737,7 @@ "cpu": [ "x64" ], + "dev": true, "optional": true, "os": [ "darwin" @@ -5747,6 +5750,7 @@ "cpu": [ "arm64" ], + "dev": true, "optional": true, "os": [ "darwin" @@ -5759,6 +5763,7 @@ "cpu": [ "x64" ], + "dev": true, "optional": true, "os": [ "freebsd" @@ -5771,6 +5776,7 @@ "cpu": [ "arm64" ], + "dev": true, "optional": true, "os": [ "freebsd" @@ -5783,6 +5789,7 @@ "cpu": [ "ia32" ], + "dev": true, "optional": true, "os": [ "linux" @@ -5795,6 +5802,7 @@ "cpu": [ "x64" ], + "dev": true, "optional": true, "os": [ "linux" @@ -5807,6 +5815,7 @@ "cpu": [ "arm" ], + "dev": true, "optional": true, "os": [ "linux" @@ -5819,6 +5828,7 @@ "cpu": [ "arm64" ], + "dev": true, "optional": true, "os": [ "linux" @@ -5831,6 +5841,7 @@ "cpu": [ "mips64el" ], + "dev": true, "optional": true, "os": [ "linux" @@ -5843,6 +5854,7 @@ "cpu": [ "ppc64" ], + "dev": true, "optional": true, "os": [ "linux" @@ -5855,6 +5867,7 @@ "cpu": [ "s390x" ], + "dev": true, "optional": true, "os": [ "linux" @@ -5867,6 +5880,7 @@ "cpu": [ "x64" ], + "dev": true, "optional": true, "os": [ "netbsd" @@ -5879,6 +5893,7 @@ "cpu": [ "x64" ], + "dev": true, "optional": true, "os": [ "openbsd" @@ -5891,6 +5906,7 @@ "cpu": [ "x64" ], + "dev": true, "optional": true, "os": [ "sunos" @@ -5903,6 +5919,7 @@ "cpu": [ "ia32" ], + "dev": true, "optional": true, "os": [ "win32" @@ -5915,6 +5932,7 @@ "cpu": [ "x64" ], + "dev": true, "optional": true, "os": [ "win32" @@ -5927,6 +5945,7 @@ "cpu": [ "arm64" ], + "dev": true, "optional": true, "os": [ "win32" @@ -14276,6 +14295,7 @@ "version": "0.14.10", "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.10.tgz", "integrity": "sha512-ibZb+NwFqBwHHJlpnFMtg4aNmVK+LUtYMFC9CuKs6lDCBEvCHpqCFZFEirpqt1jOugwKGx8gALNGvX56lQyfew==", + "dev": true, "requires": { "esbuild-android-arm64": "0.14.10", "esbuild-darwin-64": "0.14.10", @@ -14301,108 +14321,126 @@ "version": "0.14.10", "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.10.tgz", "integrity": "sha512-vzkTafHKoiMX4uIN1kBnE/HXYLpNT95EgGanVk6DHGeYgDolU0NBxjO7yZpq4ZGFPOx8384eAdDrBYhO11TAlQ==", + "dev": true, "optional": true }, "esbuild-darwin-64": { "version": "0.14.10", "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.10.tgz", "integrity": "sha512-DJwzFVB95ZV7C3PQbf052WqaUuuMFXJeZJ0LKdnP1w+QOU0rlbKfX0tzuhoS//rOXUj1TFIwRuRsd0FX6skR7A==", + "dev": true, "optional": true }, "esbuild-darwin-arm64": { "version": "0.14.10", "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.10.tgz", "integrity": "sha512-RNaaoZDg3nsqs5z56vYCjk/VJ76npf752W0rOaCl5lO5TsgV9zecfdYgt7dtUrIx8b7APhVaNYud+tGsDOVC9g==", + "dev": true, "optional": true }, "esbuild-freebsd-64": { "version": "0.14.10", "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.10.tgz", "integrity": "sha512-10B3AzW894u6bGZZhWiJOHw1uEHb4AFbUuBdyml1Ht0vIqd+KqWW+iY/yMwQAzILr2WJZqEhbOXRkJtY8aRqOw==", + "dev": true, "optional": true }, "esbuild-freebsd-arm64": { "version": "0.14.10", "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.10.tgz", "integrity": "sha512-mSQrKB7UaWvuryBTCo9leOfY2uEUSimAvcKIaUWbk5Hth9Sg+Try+qNA/NibPgs/vHkX0KFo/Rce6RPea+P15g==", + "dev": true, "optional": true }, "esbuild-linux-32": { "version": "0.14.10", "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.10.tgz", "integrity": "sha512-lktF09JgJLZ63ANYHIPdYe339PDuVn19Q/FcGKkXWf+jSPkn5xkYzAabboNGZNUgNqSJ/vY7VrOn6UrBbJjgYA==", + "dev": true, "optional": true }, "esbuild-linux-64": { "version": "0.14.10", "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.10.tgz", "integrity": "sha512-K+gCQz2oLIIBI8ZM77e9sYD5/DwEpeYCrOQ2SYXx+R4OU2CT9QjJDi4/OpE7ko4AcYMlMW7qrOCuLSgAlEj4Wg==", + "dev": true, "optional": true }, "esbuild-linux-arm": { "version": "0.14.10", "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.10.tgz", "integrity": "sha512-BYa60dZ/KPmNKYxtHa3LSEdfKWHcm/RzP0MjB4AeBPhjS0D6/okhaBesZIY9kVIGDyeenKsJNOmnVt4+dhNnvQ==", + "dev": true, "optional": true }, "esbuild-linux-arm64": { "version": "0.14.10", "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.10.tgz", "integrity": "sha512-+qocQuQvcp5wo/V+OLXxqHPc+gxHttJEvbU/xrCGE03vIMqraL4wMua8JQx0SWEnJCWP+Nhf//v8OSwz1Xr5kA==", + "dev": true, "optional": true }, "esbuild-linux-mips64le": { "version": "0.14.10", "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.10.tgz", "integrity": "sha512-nmUd2xoBXpGo4NJCEWoaBj+n4EtDoLEvEYc8Z3aSJrY0Oa6s04czD1flmhd0I/d6QEU8b7GQ9U0g/rtBfhtxBg==", + "dev": true, "optional": true }, "esbuild-linux-ppc64le": { "version": "0.14.10", "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.10.tgz", "integrity": "sha512-vsOWZjm0rZix7HSmqwPph9arRVCyPtUpcURdayQDuIhMG2/UxJxpbdRaa//w4zYqcJzAWwuyH2PAlyy0ZNuxqQ==", + "dev": true, "optional": true }, "esbuild-linux-s390x": { "version": "0.14.10", "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.10.tgz", "integrity": "sha512-knArKKZm0ypIYWOWyOT7+accVwbVV1LZnl2FWWy05u9Tyv5oqJ2F5+X2Vqe/gqd61enJXQWqoufXopvG3zULOg==", + "dev": true, "optional": true }, "esbuild-netbsd-64": { "version": "0.14.10", "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.10.tgz", "integrity": "sha512-6Gg8neVcLeyq0yt9bZpReb8ntZ8LBEjthxrcYWVrBElcltnDjIy1hrzsujt0+sC2rL+TlSsE9dzgyuvlDdPp2w==", + "dev": true, "optional": true }, "esbuild-openbsd-64": { "version": "0.14.10", "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.10.tgz", "integrity": "sha512-9rkHZzp10zI90CfKbFrwmQjqZaeDmyQ6s9/hvCwRkbOCHuto6RvMYH9ghQpcr5cUxD5OQIA+sHXi0zokRNXjcg==", + "dev": true, "optional": true }, "esbuild-sunos-64": { "version": "0.14.10", "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.10.tgz", "integrity": "sha512-mEU+pqkhkhbwpJj5DiN3vL0GUFR/yrL3qj8ER1amIVyRibKbj02VM1QaIuk1sy5DRVIKiFXXgCaHvH3RNWCHIw==", + "dev": true, "optional": true }, "esbuild-windows-32": { "version": "0.14.10", "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.10.tgz", "integrity": "sha512-Z5DieUL1N6s78dOSdL95KWf8Y89RtPGxIoMF+LEy8ChDsX+pZpz6uAVCn+YaWpqQXO+2TnrcbgBIoprq2Mco1g==", + "dev": true, "optional": true }, "esbuild-windows-64": { "version": "0.14.10", "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.10.tgz", "integrity": "sha512-LE5Mm62y0Bilu7RDryBhHIX8rK3at5VwJ6IGM3BsASidCfOBTzqcs7Yy0/Vkq39VKeTmy9/66BAfVoZRNznoDw==", + "dev": true, "optional": true }, "esbuild-windows-arm64": { "version": "0.14.10", "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.10.tgz", "integrity": "sha512-OJOyxDtabvcUYTc+O4dR0JMzLBz6G9+gXIHA7Oc5d5Fv1xiYa0nUeo8+W5s2e6ZkPRdIwOseYoL70rZz80S5BA==", + "dev": true, "optional": true }, "escalade": { diff --git a/packages/tracing/package.json b/packages/tracing/package.json index 32216ce7fe..a610f2a04e 100644 --- a/packages/tracing/package.json +++ b/packages/tracing/package.json @@ -58,7 +58,7 @@ "url": "https://github.com/awslabs/aws-lambda-powertools-typescript/issues" }, "dependencies": { - "@aws-lambda-powertools/commons": "^0.2.0-dev.2", + "@aws-lambda-powertools/commons": "0.2.0-beta.19", "@middy/core": "^2.5.3", "aws-xray-sdk-core": "^3.3.3" }