Skip to content

Commit ea2bf1c

Browse files
committed
fixing some conflicts
1 parent eb87201 commit ea2bf1c

File tree

1 file changed

+4
-28
lines changed

1 file changed

+4
-28
lines changed

package.json

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,6 @@
1717
"engines": {
1818
"node": ">=6.0.0"
1919
},
20-
<<<<<<< HEAD
21-
"eslintConfig": {
22-
"extends": [
23-
"plugin:@typescript-eslint/recommended",
24-
"prettier",
25-
"prettier/@typescript-eslint"
26-
],
27-
"parser": "@typescript-eslint/parser",
28-
"parserOptions": {
29-
"project": "./tsconfig.eslint.json"
30-
}
31-
},
32-
=======
33-
>>>>>>> c1ad3d9f0abdc1c196b98e10587b844e4a6ec518
3420
"browserify": {
3521
"transform": [
3622
"babelify"
@@ -43,21 +29,18 @@
4329
"postinstall": "npm run download && npm run build",
4430
"start": "node lib/server",
4531
"watch": "babel scripts/watch.js | node",
46-
<<<<<<< HEAD
47-
"test": "npm run lint && npm run test:only",
48-
=======
4932
"test": "npm run lint && npm run check && npm run test:only",
50-
>>>>>>> c1ad3d9f0abdc1c196b98e10587b844e4a6ec518
5133
"test:only": "jest",
5234
"lint": "eslint src handler",
5335
"lint:fix": "eslint --fix src handler",
36+
"check": "flow check",
5437
"cover": "babel-node node_modules/.bin/isparta cover --root src --report html node_modules/.bin/_mocha -- $npm_package_options_mocha",
5538
"coveralls": "babel-node node_modules/.bin/isparta cover --root src --report lcovonly node_modules/.bin/_mocha -- $npm_package_options_mocha && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js",
5639
"build": "rimraf lib && babel src --ignore __tests__,public --out-dir lib/ && npm run build:lambda",
5740
"build:lambda": "NODE_ENV=development netlify-lambda build handler",
5841
"download": "babel-node scripts/download.js cache/data.json",
5942
"serve-public": "babel-node scripts/serve-public",
60-
"prettier": "prettier --write 'src/**/*.ts'",
43+
"prettier": "prettier --write 'src/**/*.js'",
6144
"print-schema": "babel-node scripts/print-schema.js",
6245
"store-schema": "babel-node scripts/store-schema.js"
6346
},
@@ -69,15 +52,10 @@
6952
"express": "^4.17.1",
7053
"express-graphql": "^0.9.0",
7154
"graphql": "14.5.8",
72-
"graphql-relay": "^0.6.0"
55+
"graphql-relay": "0.6.0"
7356
},
7457
"devDependencies": {
7558
"@babel/core": "^7.12.3",
76-
<<<<<<< HEAD
77-
"@types/graphql-relay": "^0.6.0",
78-
"@types/jest": "^26.0.15",
79-
=======
80-
>>>>>>> c1ad3d9f0abdc1c196b98e10587b844e4a6ec518
8159
"babel-cli": "^6.26.0",
8260
"babel-core": "^6.26.3",
8361
"babel-eslint": "^10.0.3",
@@ -99,8 +77,6 @@
9977
"jest": "^26.6.3",
10078
"netlify-lambda": "^1.6.3",
10179
"prettier": "^1.18.2",
102-
"sane": "^4.1.0",
103-
"ts-jest": "^26.4.4",
104-
"typescript": "^4.1.2"
80+
"sane": "^4.1.0"
10581
}
10682
}

0 commit comments

Comments
 (0)