Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop support for older browsers #2918

Merged
merged 1 commit into from Feb 15, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 0 additions & 6 deletions .babelrc-deno.json
Expand Up @@ -3,11 +3,5 @@
"@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 }]]
}
]
}
27 changes: 27 additions & 0 deletions .babelrc-npm.json
@@ -0,0 +1,27 @@
{
"plugins": [
"@babel/plugin-transform-flow-strip-types",
"./resources/inline-invariant"
],
"env": {
"cjs": {
"presets": [
[
"@babel/preset-env",
{ "modules": "commonjs", "targets": { "node": "10" } }
]
],
"plugins": [
["./resources/add-extension-to-import-paths", { "extension": "js" }]
]
},
"mjs": {
"presets": [
["@babel/preset-env", { "modules": false, "targets": { "node": "10" } }]
],
"plugins": [
["./resources/add-extension-to-import-paths", { "extension": "mjs" }]
]
}
}
}
40 changes: 1 addition & 39 deletions .babelrc.json
@@ -1,42 +1,4 @@
{
"presets": [["@babel/preset-env", { "targets": { "node": "current" } }]],
"plugins": ["@babel/plugin-transform-flow-strip-types"],
"overrides": [
{
"exclude": ["src/__testUtils__/**/*", "**/__tests__/**/*"],
"presets": ["@babel/preset-env"],
"plugins": [
["@babel/plugin-transform-classes", { "loose": true }],
["@babel/plugin-transform-destructuring", { "loose": true }],
["@babel/plugin-transform-spread", { "loose": true }],
["@babel/plugin-transform-for-of", { "assumeArray": true }]
],
"env": {
"cjs": {
"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",
{ "extension": "mjs" }
],
"./resources/inline-invariant"
]
}
}
},
{
"include": "src/error/GraphQLError.js",
"plugins": [["@babel/plugin-transform-classes", { "loose": false }]]
}
]
"presets": [["@babel/preset-env", { "targets": { "node": "current" } }]]
}
6 changes: 0 additions & 6 deletions .browserslistrc

This file was deleted.

4 changes: 2 additions & 2 deletions .eslintrc.yml
Expand Up @@ -51,8 +51,8 @@ rules:
node/no-unpublished-import: error
node/no-unpublished-require: error
node/no-unsupported-features/es-builtins: error
node/no-unsupported-features/es-syntax: off # TODO enable
node/no-unsupported-features/node-builtins: off # TODO enable
node/no-unsupported-features/es-syntax: [error, { ignores: [modules] }]
node/no-unsupported-features/node-builtins: error
node/process-exit-as-throw: error
node/shebang: error

Expand Down
3 changes: 0 additions & 3 deletions package.json
Expand Up @@ -21,9 +21,6 @@
"graphql-js"
],
"engines": {
"node": ">= 14.2"
},
"engines_on_npm": {
"node": ">= 10.x"
},
"scripts": {
Expand Down
10 changes: 6 additions & 4 deletions resources/build-npm.js
Expand Up @@ -46,7 +46,12 @@ if (require.main === module) {
}

function babelBuild(srcPath, options) {
return babel.transformFileSync(srcPath, options).code + '\n';
const { code } = babel.transformFileSync(srcPath, {
babelrc: false,
configFile: './.babelrc-npm.json',
...options,
});
return code + '\n';
}

function buildPackageJSON() {
Expand All @@ -55,9 +60,6 @@ function buildPackageJSON() {
delete packageJSON.scripts;
delete packageJSON.devDependencies;

packageJSON.engines = packageJSON.engines_on_npm;
delete packageJSON.engines_on_npm;

const { version } = packageJSON;
const versionMatch = /^\d+\.\d+\.\d+-?(?<preReleaseTag>.*)?$/.exec(version);
if (!versionMatch) {
Expand Down
3 changes: 2 additions & 1 deletion tsconfig.json
Expand Up @@ -2,7 +2,8 @@
"exclude": ["integrationTests/ts/**/*"],
"compilerOptions": {
"module": "commonjs",
"lib": ["es6", "esnext.asynciterable"],
"lib": ["es2018"],
"target": "es2018",
"noImplicitAny": true,
"noImplicitThis": true,
"strictNullChecks": true,
Expand Down