Skip to content

Update deps #103

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

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
{
"extends": [
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"prettier/@typescript-eslint",
"plugin:prettier/recommended"
],
"extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "plugin:prettier/recommended"],
"env": {
"browser": true,
"es6": true,
Expand Down
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
* text=auto eol=lf
*.{cmd,[cC][mM][dD]} text eol=crlf
*.{bat,[bB][aA][tT]} text eol=crlf
36 changes: 17 additions & 19 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,22 @@ name: Node.js CI
on: [pull_request]

jobs:
build:
build:
runs-on: ubuntu-latest

runs-on: ubuntu-latest
strategy:
matrix:
node-version: [22.x]

strategy:
matrix:
node-version: [12.x]

steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- run: npm install lerna yarn --no-package-lock
- run: yarn bootstrap
- run: yarn lint
- run: yarn build
- run: yarn test
env:
CI: true
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- run: npm install lerna yarn --no-package-lock
- run: yarn lint
- run: yarn build
- run: yarn test
env:
CI: true
9 changes: 3 additions & 6 deletions lerna.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
{
"packages": [
"packages/*"
],
"npmClient": "yarn",
"useWorkspaces": true,
"version": "0.2.1"
"packages": ["packages/*"],
"npmClient": "yarn",
"version": "0.2.1"
}
56 changes: 29 additions & 27 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,36 +12,38 @@
"lint:fix": "eslint --fix \"**/*.{ts,js}\""
},
"devDependencies": {
"@types/chai": "^4.2.7",
"@types/clone": "^0.1.30",
"@types/core-js": "^0.9.43",
"@types/jest": "^24.9.0",
"@types/mongodb": "^3.3.15",
"@types/node": "^8.10.59",
"@types/sinon": "^7.5.1",
"@types/sinon-chai": "^3.2.3",
"@types/uuid": "^3.4.7",
"@typescript-eslint/eslint-plugin": "^2.16.0",
"@typescript-eslint/parser": "^2.16.0",
"chai": "^4.1.2",
"eslint": "^6.8.0",
"eslint-config-prettier": "^6.10.0",
"eslint-plugin-jest": "^23.6.0",
"eslint-plugin-prettier": "^3.1.2",
"lerna": "^3.22.1",
"npm-cli-login": "^0.1.1",
"prettier": "^1.19.1",
"react-dev-utils": "^5.0.2",
"sinon": "^4.1.2",
"sinon-chai": "^2.14.0",
"ts-jest": "^24.3.0",
"ts-node": "^8.6.2",
"tsconfig-paths": "^3.9.0",
"@types/chai": "^5.2.1",
"@types/clone": "^2.1.4",
"@types/core-js": "^2.5.8",
"@types/jest": "^29.5.14",
"@types/node": "^22.13.14",
"@types/sinon": "^17.0.4",
"@types/sinon-chai": "^4.0.0",
"@types/uuid": "^10.0.0",
"@typescript-eslint/eslint-plugin": "^8.28.0",
"@typescript-eslint/parser": "^8.28.0",
"chai": "^5.2.0",
"eslint-config-prettier": "^10.1.1",
"eslint-plugin-jest": "^28.11.0",
"eslint-plugin-prettier": "^5.2.5",
"lerna": "^8.2.1",
"npm-cli-login": "^1.0.0",
"prettier": "^3.5.3",
"react-dev-utils": "^12.0.1",
"sinon": "^20.0.0",
"sinon-chai": "^4.0.0",
"ts-jest": "^29.3.0",
"ts-node": "^10.9.2",
"tsconfig-paths": "^4.2.0",
"tscpaths": "0.0.9",
"typescript": "^3.7.5",
"typescript": "5.8.2",
"yarn": "^1.22.4"
},
"workspaces": [
"packages/*"
]
],
"dependencies": {
"corewar": "0.2.3-alpha.8",
"corewar-api": "0.2.1"
}
}
62 changes: 31 additions & 31 deletions packages/corewar-api/package.json
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
{
"name": "corewar-api",
"version": "0.2.1",
"description": "GraphQL API for corewar.io",
"main": "src/index.js",
"scripts": {
"start": "ts-node -r tsconfig-paths/register src/index.ts",
"start:docker": "cd docker && docker-compose up",
"test": "jest --verbose",
"coverage": "jest --coverage"
},
"repository": {
"type": "git",
"url": "git+https://github.com/corewar/corewar-api.git"
},
"author": "",
"license": "ISC",
"bugs": {
"url": "https://github.com/corewar/corewar-api/issues"
},
"homepage": "https://github.com/corewar/corewar-api#readme",
"dependencies": {
"apollo-server": "^2.9.16",
"corewar": "^0.2.1",
"graphql": "^14.6.0",
"mongodb": "^3.5.2",
"reflect-metadata": "^0.1.13",
"ts-node": "^8.6.2",
"tsconfig-paths": "^3.9.0",
"type-graphql": "^0.17.6",
"uuid": "^3.4.0"
}
"name": "corewar-api",
"version": "0.2.1",
"description": "GraphQL API for corewar.io",
"main": "src/index.js",
"scripts": {
"start": "ts-node -r tsconfig-paths/register src/index.ts",
"start:docker": "cd docker && docker-compose up",
"test": "jest --verbose",
"coverage": "jest --coverage"
},
"repository": {
"type": "git",
"url": "git+https://github.com/corewar/corewar-api.git"
},
"author": "",
"license": "ISC",
"bugs": {
"url": "https://github.com/corewar/corewar-api/issues"
},
"homepage": "https://github.com/corewar/corewar-api#readme",
"dependencies": {
"apollo-server": "^2.9.16",
"corewar": "^0.2.1",
"graphql": "^14.6.0",
"mongodb": "^3.5.2",
"reflect-metadata": "^0.1.13",
"ts-node": "^8.6.2",
"tsconfig-paths": "^3.9.0",
"type-graphql": "^0.17.6",
"uuid": "^3.4.0"
}
}
2 changes: 1 addition & 1 deletion packages/corewar-api/src/database/Repository.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export default class Repository implements IRepository {

return new Promise((resolve, reject) => {
try {
client.connect(err => {
client.connect(err:any => {
if (err) {
reject(err)
}
Expand Down
4 changes: 2 additions & 2 deletions packages/corewar-api/src/resolvers/WarriorResolver.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Resolver, Mutation, ObjectType, Query, Args, Field, ArgsType, InputType } from 'type-graphql'

Check failure on line 1 in packages/corewar-api/src/resolvers/WarriorResolver.ts

View workflow job for this annotation

GitHub Actions / build (22.x)

Definition for rule '@typescript-eslint/interface-name-prefix' was not found
import Warrior from '@/schema/Warrior'
import MutationResult from '@/resolvers/MutationResult'
import { IWarriorService, buildWarriorService } from '@/services/WarriorService'
Expand Down Expand Up @@ -58,7 +58,7 @@
success: true,
result: await this.getService().saveWarrior(warrior.redcode, warrior.id)
}
} catch (e) {
} catch (e: any) {
return {
success: false,
message: e.message
Expand All @@ -73,7 +73,7 @@
success: true,
result: await this.getService().deleteWarrior(id)
}
} catch (e) {
} catch (e: any) {
return {
success: false,
message: e.message
Expand Down
Loading
Loading