From 61695f1e2b5d99aa04fa2dbdb83453f4ed870e5f Mon Sep 17 00:00:00 2001 From: David Glasser Date: Fri, 8 Oct 2021 16:46:44 -0700 Subject: [PATCH] npmignore: Don't include the source of tests (#5799) We know of no reason that including the source of tests in built npm packages would be helpful, and we've heard reports that including the RSA private key fixture as we do in apollo-server-core can trigger security scans. Change how we drop tests from "dist" to drop the whole test directory in case some other files sneak in there. Add a comment to the one npmignore file that differs from the others. Fixes #5781. --- CHANGELOG.md | 1 + packages/apollo-datasource-rest/.npmignore | 3 ++- packages/apollo-datasource/.npmignore | 3 ++- packages/apollo-reporting-protobuf/.npmignore | 7 ++++++- packages/apollo-server-azure-functions/.npmignore | 3 ++- packages/apollo-server-cache-memcached/.npmignore | 3 ++- packages/apollo-server-cache-redis/.npmignore | 3 ++- packages/apollo-server-caching/.npmignore | 3 ++- packages/apollo-server-cloud-functions/.npmignore | 3 ++- packages/apollo-server-core/.npmignore | 3 ++- packages/apollo-server-env/.npmignore | 3 ++- packages/apollo-server-errors/.npmignore | 3 ++- packages/apollo-server-express/.npmignore | 3 ++- packages/apollo-server-fastify/.npmignore | 3 ++- packages/apollo-server-hapi/.npmignore | 3 ++- packages/apollo-server-integration-testsuite/.npmignore | 3 ++- packages/apollo-server-koa/.npmignore | 3 ++- packages/apollo-server-lambda/.npmignore | 3 ++- packages/apollo-server-micro/.npmignore | 3 ++- packages/apollo-server-plugin-base/.npmignore | 3 ++- packages/apollo-server-plugin-response-cache/.npmignore | 3 ++- packages/apollo-server-types/.npmignore | 3 ++- packages/apollo-server/.npmignore | 3 ++- 23 files changed, 49 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 41c6f622b0f..4f2a279b049 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,7 @@ The version headers in this history reflect the versions of Apollo Server itself - `apollo-datasource-rest@3.2.1`: When choosing whether or not to parse a response as JSON, treat any `content-type` ending in `+json` as JSON rather than just `application/hal+json` (in addition to `application/json`). [PR #5737](https://github.com/apollographql/apollo-server/pull/5737) - `apollo-server`: You can now configure the health check URL path with the `healthCheckPath` constructor option, or disable serving health checks by passing `null` for this option. (This option is specific to the batteries-included `apollo-server` package; if you're using a framework integration package and want to serve a health check at a different path, just use your web framework directly.) [PR #5270](https://github.com/apollographql/apollo-server/pull/5270) [Issue #3577](https://github.com/apollographql/apollo-server/issues/3577) - `apollo-server-azure-functions`: This package now supports health checks like all of the other supported Apollo Server packages; they are on by default and can be customized with `disableHealthCheck` and `onHealthCheck`. [PR #5003](https:// github.com/apollographql/apollo-server/pull/5003) [Issue #4925](https://github.com/apollographql/apollo-server/issues/4925) +- Tests are no longer distributed inside published npm modules. [PR #5799](https://github.com/apollographql/apollo-server/pull/5799) [Issue #5781](https://github.com/apollographql/apollo-server/issues/5781) ## v3.3.0 diff --git a/packages/apollo-datasource-rest/.npmignore b/packages/apollo-datasource-rest/.npmignore index a165046d359..311075fe3ea 100644 --- a/packages/apollo-datasource-rest/.npmignore +++ b/packages/apollo-datasource-rest/.npmignore @@ -1,6 +1,7 @@ * !src/**/* +src/**/__tests__/** !dist/**/* -dist/**/*.test.* +dist/**/__tests__/** !package.json !README.md diff --git a/packages/apollo-datasource/.npmignore b/packages/apollo-datasource/.npmignore index a165046d359..311075fe3ea 100644 --- a/packages/apollo-datasource/.npmignore +++ b/packages/apollo-datasource/.npmignore @@ -1,6 +1,7 @@ * !src/**/* +src/**/__tests__/** !dist/**/* -dist/**/*.test.* +dist/**/__tests__/** !package.json !README.md diff --git a/packages/apollo-reporting-protobuf/.npmignore b/packages/apollo-reporting-protobuf/.npmignore index 14364dddf5b..88f31dc29d2 100644 --- a/packages/apollo-reporting-protobuf/.npmignore +++ b/packages/apollo-reporting-protobuf/.npmignore @@ -1,6 +1,11 @@ +# Note that this npmignore file differs from the others because this package +# puts its generated files in "generated" and checks them in to git rather than +# unversioned in "dist". + * !src/**/* +src/**/__tests__/** !generated/**/* -generated/**/*.test.* +generated/**/__tests__/** !package.json !README.md diff --git a/packages/apollo-server-azure-functions/.npmignore b/packages/apollo-server-azure-functions/.npmignore index a165046d359..311075fe3ea 100644 --- a/packages/apollo-server-azure-functions/.npmignore +++ b/packages/apollo-server-azure-functions/.npmignore @@ -1,6 +1,7 @@ * !src/**/* +src/**/__tests__/** !dist/**/* -dist/**/*.test.* +dist/**/__tests__/** !package.json !README.md diff --git a/packages/apollo-server-cache-memcached/.npmignore b/packages/apollo-server-cache-memcached/.npmignore index a165046d359..311075fe3ea 100644 --- a/packages/apollo-server-cache-memcached/.npmignore +++ b/packages/apollo-server-cache-memcached/.npmignore @@ -1,6 +1,7 @@ * !src/**/* +src/**/__tests__/** !dist/**/* -dist/**/*.test.* +dist/**/__tests__/** !package.json !README.md diff --git a/packages/apollo-server-cache-redis/.npmignore b/packages/apollo-server-cache-redis/.npmignore index a165046d359..311075fe3ea 100644 --- a/packages/apollo-server-cache-redis/.npmignore +++ b/packages/apollo-server-cache-redis/.npmignore @@ -1,6 +1,7 @@ * !src/**/* +src/**/__tests__/** !dist/**/* -dist/**/*.test.* +dist/**/__tests__/** !package.json !README.md diff --git a/packages/apollo-server-caching/.npmignore b/packages/apollo-server-caching/.npmignore index a165046d359..311075fe3ea 100644 --- a/packages/apollo-server-caching/.npmignore +++ b/packages/apollo-server-caching/.npmignore @@ -1,6 +1,7 @@ * !src/**/* +src/**/__tests__/** !dist/**/* -dist/**/*.test.* +dist/**/__tests__/** !package.json !README.md diff --git a/packages/apollo-server-cloud-functions/.npmignore b/packages/apollo-server-cloud-functions/.npmignore index a165046d359..311075fe3ea 100644 --- a/packages/apollo-server-cloud-functions/.npmignore +++ b/packages/apollo-server-cloud-functions/.npmignore @@ -1,6 +1,7 @@ * !src/**/* +src/**/__tests__/** !dist/**/* -dist/**/*.test.* +dist/**/__tests__/** !package.json !README.md diff --git a/packages/apollo-server-core/.npmignore b/packages/apollo-server-core/.npmignore index a165046d359..311075fe3ea 100644 --- a/packages/apollo-server-core/.npmignore +++ b/packages/apollo-server-core/.npmignore @@ -1,6 +1,7 @@ * !src/**/* +src/**/__tests__/** !dist/**/* -dist/**/*.test.* +dist/**/__tests__/** !package.json !README.md diff --git a/packages/apollo-server-env/.npmignore b/packages/apollo-server-env/.npmignore index a165046d359..311075fe3ea 100644 --- a/packages/apollo-server-env/.npmignore +++ b/packages/apollo-server-env/.npmignore @@ -1,6 +1,7 @@ * !src/**/* +src/**/__tests__/** !dist/**/* -dist/**/*.test.* +dist/**/__tests__/** !package.json !README.md diff --git a/packages/apollo-server-errors/.npmignore b/packages/apollo-server-errors/.npmignore index a165046d359..311075fe3ea 100644 --- a/packages/apollo-server-errors/.npmignore +++ b/packages/apollo-server-errors/.npmignore @@ -1,6 +1,7 @@ * !src/**/* +src/**/__tests__/** !dist/**/* -dist/**/*.test.* +dist/**/__tests__/** !package.json !README.md diff --git a/packages/apollo-server-express/.npmignore b/packages/apollo-server-express/.npmignore index a165046d359..311075fe3ea 100644 --- a/packages/apollo-server-express/.npmignore +++ b/packages/apollo-server-express/.npmignore @@ -1,6 +1,7 @@ * !src/**/* +src/**/__tests__/** !dist/**/* -dist/**/*.test.* +dist/**/__tests__/** !package.json !README.md diff --git a/packages/apollo-server-fastify/.npmignore b/packages/apollo-server-fastify/.npmignore index a165046d359..311075fe3ea 100644 --- a/packages/apollo-server-fastify/.npmignore +++ b/packages/apollo-server-fastify/.npmignore @@ -1,6 +1,7 @@ * !src/**/* +src/**/__tests__/** !dist/**/* -dist/**/*.test.* +dist/**/__tests__/** !package.json !README.md diff --git a/packages/apollo-server-hapi/.npmignore b/packages/apollo-server-hapi/.npmignore index a165046d359..311075fe3ea 100644 --- a/packages/apollo-server-hapi/.npmignore +++ b/packages/apollo-server-hapi/.npmignore @@ -1,6 +1,7 @@ * !src/**/* +src/**/__tests__/** !dist/**/* -dist/**/*.test.* +dist/**/__tests__/** !package.json !README.md diff --git a/packages/apollo-server-integration-testsuite/.npmignore b/packages/apollo-server-integration-testsuite/.npmignore index a165046d359..311075fe3ea 100644 --- a/packages/apollo-server-integration-testsuite/.npmignore +++ b/packages/apollo-server-integration-testsuite/.npmignore @@ -1,6 +1,7 @@ * !src/**/* +src/**/__tests__/** !dist/**/* -dist/**/*.test.* +dist/**/__tests__/** !package.json !README.md diff --git a/packages/apollo-server-koa/.npmignore b/packages/apollo-server-koa/.npmignore index a165046d359..311075fe3ea 100644 --- a/packages/apollo-server-koa/.npmignore +++ b/packages/apollo-server-koa/.npmignore @@ -1,6 +1,7 @@ * !src/**/* +src/**/__tests__/** !dist/**/* -dist/**/*.test.* +dist/**/__tests__/** !package.json !README.md diff --git a/packages/apollo-server-lambda/.npmignore b/packages/apollo-server-lambda/.npmignore index a165046d359..311075fe3ea 100644 --- a/packages/apollo-server-lambda/.npmignore +++ b/packages/apollo-server-lambda/.npmignore @@ -1,6 +1,7 @@ * !src/**/* +src/**/__tests__/** !dist/**/* -dist/**/*.test.* +dist/**/__tests__/** !package.json !README.md diff --git a/packages/apollo-server-micro/.npmignore b/packages/apollo-server-micro/.npmignore index a165046d359..311075fe3ea 100644 --- a/packages/apollo-server-micro/.npmignore +++ b/packages/apollo-server-micro/.npmignore @@ -1,6 +1,7 @@ * !src/**/* +src/**/__tests__/** !dist/**/* -dist/**/*.test.* +dist/**/__tests__/** !package.json !README.md diff --git a/packages/apollo-server-plugin-base/.npmignore b/packages/apollo-server-plugin-base/.npmignore index a165046d359..311075fe3ea 100644 --- a/packages/apollo-server-plugin-base/.npmignore +++ b/packages/apollo-server-plugin-base/.npmignore @@ -1,6 +1,7 @@ * !src/**/* +src/**/__tests__/** !dist/**/* -dist/**/*.test.* +dist/**/__tests__/** !package.json !README.md diff --git a/packages/apollo-server-plugin-response-cache/.npmignore b/packages/apollo-server-plugin-response-cache/.npmignore index a165046d359..311075fe3ea 100644 --- a/packages/apollo-server-plugin-response-cache/.npmignore +++ b/packages/apollo-server-plugin-response-cache/.npmignore @@ -1,6 +1,7 @@ * !src/**/* +src/**/__tests__/** !dist/**/* -dist/**/*.test.* +dist/**/__tests__/** !package.json !README.md diff --git a/packages/apollo-server-types/.npmignore b/packages/apollo-server-types/.npmignore index a165046d359..311075fe3ea 100644 --- a/packages/apollo-server-types/.npmignore +++ b/packages/apollo-server-types/.npmignore @@ -1,6 +1,7 @@ * !src/**/* +src/**/__tests__/** !dist/**/* -dist/**/*.test.* +dist/**/__tests__/** !package.json !README.md diff --git a/packages/apollo-server/.npmignore b/packages/apollo-server/.npmignore index a165046d359..311075fe3ea 100644 --- a/packages/apollo-server/.npmignore +++ b/packages/apollo-server/.npmignore @@ -1,6 +1,7 @@ * !src/**/* +src/**/__tests__/** !dist/**/* -dist/**/*.test.* +dist/**/__tests__/** !package.json !README.md