Skip to content

Commit

Permalink
Merge branch 'version-0.x' into release-gateway-0.45.0
Browse files Browse the repository at this point in the history
  • Loading branch information
trevor-scheer committed Nov 25, 2021
2 parents e44c374 + da7446a commit e490145
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 105 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -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"
Expand Down
97 changes: 1 addition & 96 deletions 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

0 comments on commit e490145

Please sign in to comment.