From 02be2eec83afac2488bc5b1ab0769a0ff810e32d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 23 Nov 2021 13:41:41 -0800 Subject: [PATCH 1/3] chore(deps): pin dependency ts-jest to 27.0.7 (#1235) Co-authored-by: Renovate Bot --- package-lock.json | 17 ++++++++++------- package.json | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0d0ff76126..0962e89007 100644 --- a/package-lock.json +++ b/package-lock.json @@ -58,7 +58,7 @@ "rollup": "2.60.1", "rollup-plugin-node-polyfills": "0.2.1", "strip-indent": "3.0.0", - "ts-jest": "^27.0.7", + "ts-jest": "27.0.7", "typescript": "4.5.2", "winston": "3.3.3", "winston-transport": "4.4.0" @@ -76,6 +76,9 @@ "apollo-graphql": "^0.9.5", "graphql-tag": "^2.10.4", "pretty-format": "^27.3.1" + }, + "peerDependencies": { + "graphql": "^15.7.2" } }, "federation-integration-testsuite-js/node_modules/@jest/types": { @@ -22246,9 +22249,9 @@ } }, "node_modules/ts-jest/node_modules/yargs-parser": { - "version": "20.2.7", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz", - "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==", + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", "dev": true, "engines": { "node": ">=10" @@ -41631,9 +41634,9 @@ } }, "yargs-parser": { - "version": "20.2.7", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz", - "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==", + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", "dev": true } } diff --git a/package.json b/package.json index ff6b526a84..01d824b1eb 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,7 @@ "rollup": "2.60.1", "rollup-plugin-node-polyfills": "0.2.1", "strip-indent": "3.0.0", - "ts-jest": "^27.0.7", + "ts-jest": "27.0.7", "typescript": "4.5.2", "winston": "3.3.3", "winston-transport": "4.4.0" From d0cb06d125791b76609cffc8c0e69aedc9bd8f28 Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Tue, 23 Nov 2021 16:10:31 -0800 Subject: [PATCH 2/3] Bump orb version, see: apollographql/CircleCI-Orbs#5 (#1238) --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f6246c97c6..d861d0e991 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,7 @@ orbs: # `oss` is a local reference to the package. The source for Apollo Orbs can # be found at http://github.com/apollographql/CircleCI-Orbs/. # We could use Renovate to bump this version via PR, but that's not set up now. - oss: apollo/oss-ci-cd-tooling@0.0.19 + oss: apollo/oss-ci-cd-tooling@0.0.20 # Rust steps which are used below (like `rust/install`, `rust/test`) are # defined in this orb. For reference, the orb can be found here: # https://github.com/CircleCI-Public/rust-orb From da7446af74d2c9d765d2cd8b6e962ab9eb643af4 Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Wed, 24 Nov 2021 14:24:42 -0800 Subject: [PATCH 3/3] Add note to renovate config for version-0.x branch --- renovate.json5 | 97 +------------------------------------------------- 1 file changed, 1 insertion(+), 96 deletions(-) diff --git a/renovate.json5 b/renovate.json5 index a882970dac..22d32fbd19 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -1,96 +1 @@ -{ - "extends": [ - // Our default configuration. See - // https://github.com/apollographql/renovate-config-apollo-open-source/blob/master/package.json - "apollo-open-source", - // Bundle together Jest/TS-Jest updates (even major ones). - "group:jestMonorepo", - "group:jestPlusTSJest", - // Bundle together graphql-codegen updates (even major ones). - "group:graphqlcodegeneratorMonorepo", - ], - schedule: null, - "dependencyDashboard": true, - // The "circleci" manager is intentionally disabled right now (e.g., not - // included in this list). While we do benefit from its updating of "Orb" - // versions, the CircleCI manager also attempts to update Docker images using - // its "Docker" datasource. This is really handy, in theory, but we have - // intentionally varying major Node.js docker image identifiers in our - // CircleCI configuration to test on each major Node.js platform. Enabling - // the "circleci" manager would cause all of these to update to the latest - // version (e.g., 16) when we want them to be intentionally different! - // I'm going to try to craft an fix for this, but I might do it upstream - // on Renovate itself using its Regex manager. It's also worth noting that - // there is other configuration that could be used to _only_ renovate "orbs" - // on this file, but I'm taking the short-cut route and not juggling with - // that right now. I can test the repository locally with my own copy of - // Renovate and come up with another solution given some free time. -Jesse - "enabledManagers": ["npm", "cargo"], - postUpdateOptions: ["npmDedupe"], - "packageRules": [ - // We set this to the lowest supported Node.js version to ensure we don't - // use newer Node.js APIs unknowingly during development which are going to - // fail in CI anyway when they're run against the full range of Node.js - // versions we support. - { - "matchPackageNames": ["@types/node"], - "allowedVersions": "12.x" - }, - // make-fetch-happen is used by the HttpRequestCache in gateway, which uses - // a cache API that is removed in v9. - { - "matchPackageNames": ["make-fetch-happen"], - "allowedVersions": "8.x" - }, - // node-fetch v3 only ships as ESM. We currently build to CommonJS and even - // if we start publishing as ESM we're not going to go ESM-only for a while. - // (Plus it requires Node v12.20 and we support v12.13.) So let's stay on - // v2. (Perhaps we could swap to undici instead if this pin gets to be a - // problem.) - { - "matchPackageNames": ["node-fetch", "@types/node-fetch"], - "allowedVersions": "2.x" - }, - // strip-indent v4 can only be imported from ESM modules, and we don't currently - // build as ESM. Maybe we'll change our build strategy eventually, but until then - // we can continue using an old version of a simple indentation stripper in our tests. - // See https://gist.github.com/sindresorhus/a39789f98801d908bbc7ff3ecc99d99c - { - matchPackageNames: ["strip-indent"], - allowedVersions: "3.x", - }, - // Bunch up all non-major npm dependencies into a single PR. In the common case - // where the upgrades apply cleanly, this causes less noise and is resolved faster - // than starting a bunch of upgrades in parallel for what may turn out to be - // a suite of related packages all released at once. - { - groupName: "all non-major dependencies", - matchUpdateTypes: ["patch", "minor"], - groupSlug: "all-npm-minor-patch", - matchManagers: [ "npm" ], - }, - { - "matchPaths": [ - "docs/package.json" - ], - "extends": [ - "apollo-docs" - ], - // "Past" major version branches, preserved as - // "version-[0-9]" branches, should be added here! - // See Apollo Server or Apollo Client repos for examples. - "baseBranches": [ - "main" - ] - }, - // The current Apollo Gatsby theme does not support a version of Gatsby - // that supports React 17. - { - "matchPaths": [ - "docs/package.json" - ], - "matchPackageNames": ["react", "react-dom"], - "allowedVersions": "16.x", - }, - ] -} +// Changes to this file should only be made on the `main` branch as they have no effect here \ No newline at end of file