Skip to content

Commit

Permalink
Merge branch 'master' into tgriesser/feat/894-context-lifecycle-subsc…
Browse files Browse the repository at this point in the history
…ription

* master: (211 commits)
  Update deps (graphql#2844)
  resources: use named groups in RegExp (graphql#2840)
  TS: exclude integration tests from root tsconfig.json (graphql#2838)
  Flow: remove support for measuring Flow coverage (graphql#2837)
  CI: test on node 15 (graphql#2836)
  Update deps (graphql#2835)
  build: add support for experimental releases (graphql#2831)
  15.4.0
  Update deps (graphql#2827)
  Update deps (graphql#2825)
  integrationTests: add Flow test (graphql#2819)
  fix: ensure variance of types matches how values are used (graphql#2786)
  Cleanup '__fixtures__' leftovers (graphql#2818)
  Convert fixtures to be JS files (graphql#2816)
  Update deps (graphql#2815)
  benchmark: extract benchmarks into separate folder and run them on NPM package
  Update deps (graphql#2810)
  Update outdated documentation (graphql#2806)
  Make print() break arguments over multiple lines (graphql#2797)
  Added check for specific symbols in polyfills/symbols (graphql#2804)
  ...
  • Loading branch information
tgriesser committed Nov 13, 2020
2 parents 27fb3f3 + 00eab30 commit 7fd451d
Show file tree
Hide file tree
Showing 395 changed files with 16,708 additions and 10,756 deletions.
13 changes: 13 additions & 0 deletions .babelrc-deno.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"plugins": [
"@babel/plugin-transform-flow-strip-types",
["./resources/add-extension-to-import-paths", { "extension": "js" }],
"./resources/inline-invariant"
],
"overrides": [
{
"include": "src/error/GraphQLError.js",
"plugins": [["@babel/plugin-transform-classes", { "loose": false }]]
}
]
}
24 changes: 17 additions & 7 deletions .babelrc.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
{
"presets": [["@babel/preset-env", { "targets": { "node": "current" } }]],
"plugins": [
"./resources/inline-invariant",
"@babel/plugin-transform-flow-strip-types"
],
"plugins": ["@babel/plugin-transform-flow-strip-types"],
"overrides": [
{
"exclude": ["**/__tests__/**/*", "**/__fixtures__/**/*"],
"exclude": ["src/__testUtils__/**/*", "**/__tests__/**/*"],
"presets": ["@babel/preset-env"],
"plugins": [
["@babel/plugin-transform-classes", { "loose": true }],
Expand All @@ -16,11 +13,24 @@
],
"env": {
"cjs": {
"presets": [["@babel/preset-env", { "modules": "commonjs" }]]
"presets": [["@babel/preset-env", { "modules": "commonjs" }]],
"plugins": [
[
"./resources/add-extension-to-import-paths",
{ "extension": "js" }
],
"./resources/inline-invariant"
]
},
"mjs": {
"presets": [["@babel/preset-env", { "modules": false }]],
"plugins": ["./resources/add-extension-to-import-paths"]
"plugins": [
[
"./resources/add-extension-to-import-paths",
{ "extension": "mjs" }
],
"./resources/inline-invariant"
]
}
}
},
Expand Down
13 changes: 13 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Copied from '.gitignore', please keep it in sync.
/.eslintcache
/node_modules
/coverage
/npmDist
/denoDist
/npm
/deno

# Ignore Flow typings for 3rd-party libraries
/flow-typed
# Ignore TS files inside integration test
/integrationTests/ts/*.ts
Loading

0 comments on commit 7fd451d

Please sign in to comment.