Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: apollographql/apollo-server
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a725306525a99650af46effb72ae9afe780ed88b
Choose a base ref
...
head repository: apollographql/apollo-server
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bcfd36cdd01f9d26d0a225aa62a79c6642cd743f
Choose a head ref
13 contributors

Commits on Aug 31, 2019

  1. v3

    @abernix
    abernix committed Aug 31, 2019
    Copy the full SHA
    0d8360c View commit details

  2. Renovate for v3. 

    Essentially, to make sure it's always using the latest dependency from the
v2 that it (temporarily, until we roll them up into v3) depends on.
    @abernix
    abernix committed Aug 31, 2019
    Copy the full SHA
    c281201 View commit details

  3. Add graphql into devDependencies for the v3 release.

    @abernix
    abernix committed Aug 31, 2019
    Copy the full SHA
    0d60043 View commit details

  4. Add .npmignore for v3, same as v2.

    @abernix
    abernix committed Aug 31, 2019
    Copy the full SHA
    577ff59 View commit details

  5. Renovate both master and release-3.x.

    @abernix
    abernix committed Aug 31, 2019
    Copy the full SHA
    20885e4 View commit details

  6. Add jest.config.js in a broken state. 

    This is pulled directly from the root's `jest.config.base.js`, but needs
adjusting.
    @abernix
    abernix committed Aug 31, 2019
    Copy the full SHA
    cd148f0 View commit details

  7. Add currently broken tsconfig.json from ../tsconfig.base.json. 

    This excludes project references, but otherwise hasn't had any changes to it
yet.
    @abernix
    abernix committed Aug 31, 2019
    Copy the full SHA
    06c5af0 View commit details

  8. The noInplicitAny: true setting is already achieved through `srict:… 

    … true`.

Ref: https://www.typescriptlang.org/docs/handbook/compiler-options.html
    @abernix
    abernix committed Aug 31, 2019
    Copy the full SHA
    729b488 View commit details

  9. Bump the compilation target to ES2018, supporting >= Node.js v10.

    @abernix
    abernix committed Aug 31, 2019
    Copy the full SHA
    b263140 View commit details

  10. Add a README.md for the WIP v3.

    @abernix
    abernix committed Aug 31, 2019
    Copy the full SHA
    745c7e8 View commit details

  11. Add the necessary publishConfig for scoped npm packages.

    @abernix
    abernix committed Aug 31, 2019
    Copy the full SHA
    e42816a View commit details

  12. Create an initial src/index.ts.

    @abernix
    abernix committed Aug 31, 2019
    Copy the full SHA
    3f7ddda View commit details

  13. Switch from file: references to real version numbers.

    @abernix
    abernix committed Aug 31, 2019
    Copy the full SHA
    2f2610a View commit details

  14. Add a package-lock.json file to @apollo/server. 

    Ultimately, there won't be a Lerna repository present here to manage this at
a higher level.
    @abernix
    abernix committed Aug 31, 2019
    Copy the full SHA
    140e67f View commit details

  15. Add CHANGELOG.md for @apollo/server.

    @abernix
    abernix committed Aug 31, 2019
    Copy the full SHA
    d661ad8 View commit details

  16. Remove setupFiles, currently only necessitated by apollo-server-env. 

    The `apollo-server-env` package will not be included in `@apollo/server`.
    @abernix
    abernix committed Aug 31, 2019
    Copy the full SHA
    fd62570 View commit details

  17. We will not be doing this cross-package module mapping in `@apollo/se… 

    …rver`.

I'm pretty sure.
    @abernix
    abernix committed Aug 31, 2019
    Copy the full SHA
    2b3226a View commit details

  18. Remove moduleNameMapper. 

    This shouldn't be necessary in v3.
    @abernix
    abernix committed Aug 31, 2019
    Copy the full SHA
    2e63fb6 View commit details

  19. Remove now unused moduleNameMapper block.

    @abernix
    abernix committed Aug 31, 2019
    Copy the full SHA
    6844b69 View commit details

  20. Add "engines: { node >= 10 }" suggestion to package.json for v3.

    @abernix
    abernix committed Aug 31, 2019
    Copy the full SHA
    60133f2 View commit details

  21. Specify rootDir as the root of v3.

    @abernix
    abernix committed Aug 31, 2019
    Copy the full SHA
    1985031 View commit details

  22. The default moduleFileExtensions with ts-jest handles /tsx?/. 

    Let's try any avoid `js` files until proven necessary.
    @abernix
    abernix committed Aug 31, 2019
    Copy the full SHA
    e05c3d9 View commit details

  23. Try to use the default jest configuration for simplicity. 

    Jest already matches almost precisely this, and their defaults seem well
thought out:

Default: [ "**/__tests__/**/*.[jt]s?(x)", "**/?(*.)+(spec|test).[jt]s?(x)" ]

Ref: https://jestjs.io/docs/en/configuration#testmatch-array-string
    @abernix
    abernix committed Aug 31, 2019
    Copy the full SHA
    f7296de View commit details

  24. Use the same tsconfig.json for tests and the project. 

    Until we don't need to!
    @abernix
    abernix committed Aug 31, 2019
    Copy the full SHA
    a6751e6 View commit details

  25. Remove explicit rootDir, which should be the default already. 

    Since the default is based on the presence of `package.json` or a
`jest.config.js`, the setting of `rootDir` to `.` should be unnecessary.

Ref: https://jestjs.io/docs/en/configuration#rootdir-string
    @abernix
    abernix committed Aug 31, 2019
    Copy the full SHA
    b8d8510 View commit details

  26. Make the ignore patterns more concrete with explicit <rootDir> tokens.

    @abernix
    abernix committed Aug 31, 2019
    Copy the full SHA
    73c114e View commit details

  27. Fix peculiar indentation of jest.config.js file.

    @abernix
    abernix committed Aug 31, 2019
    Copy the full SHA
    f0da5f8 View commit details

  28. Be OCD about the proper capitalization of "JavaScript".

    @abernix
    abernix committed Aug 31, 2019
    Copy the full SHA
    92b0d85 View commit details

  29. Use string version of "bugs" property in package.json for brevity.

    @abernix
    abernix committed Aug 31, 2019
    Copy the full SHA
    6907d4c View commit details

  30. Add the core packages which @apollo/server@3 will initially consume… 

    … from.
    @abernix
    abernix committed Aug 31, 2019
    Copy the full SHA
    e34f25a View commit details

  31. Subjectively optimize package.json format.

    @abernix
    abernix committed Aug 31, 2019
    Copy the full SHA
    e2fb630 View commit details

  32. Introduce scripts to package.json.

    @abernix
    abernix committed Aug 31, 2019
    Copy the full SHA
    b3957b8 View commit details

  33. Introduce core scripts for v3.

    @abernix
    abernix committed Aug 31, 2019
    Copy the full SHA
    ffabee7 View commit details

  34. Add many devDependencies which are currently provided by the monorepo.

    @abernix
    abernix committed Aug 31, 2019
    Copy the full SHA
    2c57750 View commit details

  35. Allow npm install to brutally and unnecessarily re-format keywords.

    @abernix
    abernix committed Aug 31, 2019
    Copy the full SHA
    63b8a10 View commit details

  36. Add @types/jest, as is necessary!

    @abernix
    abernix committed Aug 31, 2019
    Copy the full SHA
    74ecbcd View commit details

  37. Sort packages in devDependencies alphabetically. 

    Because!
    @abernix
    abernix committed Aug 31, 2019
    Copy the full SHA
    db4e35d View commit details

  38. Remove unused import from jest.config.js.

    @abernix
    abernix committed Aug 31, 2019
    Copy the full SHA
    410fb4c View commit details

  39. Use a separate tsconfig.json for tests called tsconfig.test.json.

    @abernix
    abernix committed Aug 31, 2019
    Copy the full SHA
    22896c5 View commit details

  40. tests: Provide at least one test, for now.

    @abernix
    abernix committed Aug 31, 2019
    Copy the full SHA
    9d205bd View commit details

Commits on Sep 1, 2019

  1. Merge branch 'master' into release-3.x

    @abernix
    abernix committed Sep 1, 2019
    Copy the full SHA
    16b3346 View commit details

  2. v3: Run compile on prepare

    @abernix
    abernix committed Sep 1, 2019
    Copy the full SHA
    61489af View commit details

  3. v3: Make Lerna aware of it in the most minimally way. 

    This should still provide some benefit, while mostly keeping things out of
the way and ensuring that the v3 package will not be dependent on the
monorepo structure.
    @abernix
    abernix committed Sep 1, 2019
    Copy the full SHA
    35a01b9 View commit details

  4. v3: Remove the package-lock.json, temporarily managed by Lerna.

    @abernix
    abernix committed Sep 1, 2019
    Copy the full SHA
    2cef144 View commit details

Commits on Sep 2, 2019

  1. Switch to using CircleCI 2.1 with reusable commands and executors.

    @abernix
    abernix committed Sep 2, 2019
    Copy the full SHA
    e71e69d View commit details

  2. Automate publishing process through CircleCI workflows.

    @abernix
    abernix committed Sep 2, 2019
    Copy the full SHA
    55c85bf View commit details

Commits on Sep 3, 2019

  1. Merge branch 'abernix/publish-from-circleci' into release-3.x

    @abernix
    abernix committed Sep 3, 2019
    Copy the full SHA
    3a8069f View commit details

  2. Partially revert 22896c5. 

    This inadvertently went too far and also modified the root (v2) rules.
    @abernix
    abernix committed Sep 3, 2019
    Copy the full SHA
    f961e6c View commit details

  3. okay

    @abernix
    abernix committed Sep 3, 2019
    Copy the full SHA
    ca93394 View commit details

Commits on Sep 6, 2019

  1. Merge remote-tracking branch 'origin/master' into release-3.x

    @abernix
    abernix committed Sep 6, 2019
    Copy the full SHA
    b80e59e View commit details
Showing 317 changed files with 80,710 additions and 36,568 deletions.
43 changes: 15 additions & 28 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
@@ -17,7 +17,8 @@ commands:
common_test_steps:
description: "Commands to run on every Node.js environment"
steps:
- oss/install_specific_npm_version
- oss/install_specific_npm_version:
version: '7'
- checkout
- oss/npm_clean_install_with_caching
- run:
@@ -37,19 +38,9 @@ jobs:
# The docker tag represents the Node.js version and the full list is available
# at https://hub.docker.com/r/circleci/node/.

# NODE: Note certain tests are currently being skipped for Node.js 6.
# NodeJS 6:
# executor: { name: oss/node, tag: '6' }
# steps:
# - common_test_steps

NodeJS 8:
executor: { name: oss/node, tag: '8' }
steps:
- common_test_steps

NodeJS 10:
executor: { name: oss/node, tag: '10' }
NodeJS 12:
docker:
- image: cimg/node:12.22.1
steps:
- common_test_steps
# We will save the results of this one particular invocation to use in
@@ -62,13 +53,15 @@ jobs:
paths:
- ./**

NodeJS 12:
executor: { name: oss/node, tag: '12' }
NodeJS 14:
docker:
- image: cimg/node:14.16.1
steps:
- common_test_steps

NodeJS 14:
executor: { name: oss/node, tag: '14' }
NodeJS 16:
docker:
- image: cimg/node:16.0.0
steps:
- common_test_steps

@@ -116,33 +109,27 @@ workflows:
version: 2
Build:
jobs:
- NodeJS 8:
<<: *common_non_publish_filters
- NodeJS 10:
<<: *common_non_publish_filters
- NodeJS 12:
<<: *common_non_publish_filters
- NodeJS 14:
<<: *common_non_publish_filters
- NodeJS 16:
<<: *common_non_publish_filters
- "Check for FIXM\x45"
- oss/lerna_tarballs:
name: Package tarballs
<<: *common_non_publish_filters
requires:
# - NodeJS 6
- NodeJS 8
- NodeJS 10
- NodeJS 12
- NodeJS 14
- NodeJS 16
- oss/dry_run:
name: Dry-run
<<: *common_publish_filters
requires:
# - NodeJS 6
- NodeJS 8
- NodeJS 10
- NodeJS 12
- NodeJS 14
- NodeJS 16
- oss/confirmation:
name: Confirmation
type: approval
1 change: 1 addition & 0 deletions .npmrc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
engine-strict=true
2 changes: 1 addition & 1 deletion .nvmrc
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v14
v16
3 changes: 2 additions & 1 deletion .vscode/settings.json
View file
Original file line number Diff line number Diff line change
@@ -11,5 +11,6 @@
"editor.wordWrapColumn": 80,
"files.trimTrailingWhitespace": true,
"files.insertFinalNewline": true,
"typescript.tsdk": "./node_modules/typescript/lib"
"typescript.tsdk": "./node_modules/typescript/lib",
"typescript.enablePromptUseWorkspaceTsdk": true
}
60 changes: 28 additions & 32 deletions .vscode/tasks.json
View file
Original file line number Diff line number Diff line change
@@ -1,42 +1,38 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "TypeScript watch",
"type": "shell",
"command": "./node_modules/.bin/tsc",
"args": [
"--build",
"tsconfig.build.json",
"--watch"
],
"isBackground": true,
"problemMatcher": [
"$tsc-watch"
],
"presentation": {
"version": "2.0.0",
"tasks": [
{
"label": "TypeScript watch",
"type": "typescript",
"tsconfig": "tsconfig.json",
"option": "watch",
"problemMatcher": ["$tsc-watch"],
"presentation": {
"clear": true,
"group": "tsc-and-shell"
}
},
},
"isBackground": true
},
{
"label": "Shell",
"type": "shell",
"command": "bash",
"args": [
"-l",
],
"isBackground": true,
"presentation": {
"label": "Shell",
"type": "shell",
"command": "bash",
"args": ["-l"],
"isBackground": true,
"presentation": {
"group": "tsc-and-shell"
}
},
}
},
{
"label": "TS and shell",
"dependsOn": ["TypeScript watch", "Shell"],
"group": {
"kind": "build",
"isDefault": true
}
"kind": "build",
"isDefault": true
},
"runOptions": {
"runOn": "folderOpen"
}
}
]
]
}
Loading