Skip to content

Commit 59be431

Browse files
authored
Update dependencies (#578)
1 parent eeab33d commit 59be431

File tree

9 files changed

+1542
-1589
lines changed

9 files changed

+1542
-1589
lines changed

.eslintrc.cjs

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
/* eslint-env node */
2+
module.exports = {
3+
extends: [
4+
"eslint:recommended",
5+
"plugin:@typescript-eslint/recommended",
6+
"prettier"
7+
],
8+
parser: "@typescript-eslint/parser",
9+
plugins: ["@typescript-eslint"],
10+
root: true,
11+
rules: {
12+
"@typescript-eslint/no-unnecessary-type-constraint": "warn",
13+
// Svelte doesn't correctly compile if imports of the generated /modules
14+
// aren't imported as 'import type' in other parts of the generated
15+
// querybuilder, so set this option to ensure we always do that
16+
"@typescript-eslint/consistent-type-imports": "error"
17+
}
18+
};

.github/workflows/tests.yml

+4
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,10 @@ jobs:
7272
run: |
7373
yarn lint
7474
75+
- name: ESLint (ignore failures for now)
76+
run: |
77+
yarn eslint || echo "ESLint still failing... Fine for now!"
78+
7579
- name: Build
7680
run: |
7781
yarn workspaces run build

package.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@
66
],
77
"packageManager": "[email protected]",
88
"devDependencies": {
9-
"@types/jest": "^24.0.11",
10-
"@types/node": "^18.11.17",
11-
"jest": "^29.0.0",
12-
"nodemon": "^2.0.13",
13-
"prettier": "^2.3.2",
14-
"ts-jest": "^29.0.0",
15-
"tslint": "^5.20.1",
9+
"@typescript-eslint/eslint-plugin": "^5.59.1",
10+
"@typescript-eslint/parser": "^5.59.1",
11+
"eslint": "^8.39.0",
12+
"eslint-config-prettier": "^8.8.0",
13+
"prettier": "^2.8.8",
14+
"tslint": "^6.1.3",
1615
"tslint-config-prettier": "^1.18.0",
1716
"tslint-plugin-prettier": "^2.3.0",
18-
"tsx": "^3.8.0"
17+
"typescript": "^5.0.4"
1918
},
2019
"scripts": {
2120
"lint": "tslint 'packages/*/src/**/*.ts'",
21+
"eslint": "eslint 'packages/*/src/**/*.ts'",
2222
"format": "prettier --write 'src/**/*.ts' 'test/**/*.ts'",
2323
"generate": "yarn workspace @edgedb/generate generate"
2424
}

packages/driver/package.json

+6-5
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,15 @@
2626
},
2727
"devDependencies": {
2828
"@js-temporal/polyfill": "^0.4.1",
29+
"@types/jest": "^29.5.1",
2930
"get-stdin": "^7.0.0",
3031
"globby": "^13.1.2",
31-
"jest": "*",
32-
"jest-environment-jsdom": "^29.1.2",
32+
"jest": "29.5.0",
33+
"jest-environment-jsdom": "^29.5.0",
3334
"node-fetch": "2.6.7",
34-
"ts-jest": "*",
35-
"tsx": "*",
36-
"typescript": "^4.9"
35+
"ts-jest": "29.1.0",
36+
"tsx": "3.12.6",
37+
"typescript": "^5.0"
3738
},
3839
"scripts": {
3940
"build": "echo 'Building edgedb-js...' && rm -rf dist && yarn build:cjs && yarn build:deno",

packages/driver/src/datatypes/datetime.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -233,10 +233,10 @@ export class LocalDate {
233233

234234
toString(): string {
235235
const year =
236-
this.year < 1000 || this.year > 9999
236+
this.year < 0 || this.year > 9999
237237
? (this.year < 0 ? "-" : "+") +
238238
Math.abs(this.year).toString().padStart(6, "0")
239-
: this.year.toString();
239+
: this.year.toString().padStart(4, "0");
240240
const month = this.month.toString().padStart(2, "0");
241241
const day = this.day.toString().padStart(2, "0");
242242
return `${year}-${month}-${day}`;

packages/generate/package.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,15 @@
2121
"edgedb": "^1.1.0"
2222
},
2323
"devDependencies": {
24+
"@types/jest": "^29.5.1",
2425
"conditional-type-checks": "^1.0.5",
2526
"edgedb": "^1.1.0",
2627
"esbuild": "^0.15.7",
2728
"globby": "^13.1.2",
29+
"jest": "^29.5.0",
2830
"superjson": "^1.7.5",
29-
"typescript": "^4.9",
30-
"jest": "*",
31-
"ts-jest": "*"
31+
"ts-jest": "^29.1.0",
32+
"typescript": "^5.0"
3233
},
3334
"dependencies": {
3435
"chokidar": "^3.5.3"

packages/generate/test/mts/tsconfig.build.json

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"outDir": "dist",
55
"module": "NodeNext",
66
"moduleResolution": "NodeNext",
7-
"importsNotUsedAsValues": "error",
87
},
98
"include": [
109
"edgeql-js",

packages/generate/tsconfig.json

+1-13
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,9 @@
11
{
22
"extends": "../../tsconfig.json",
33
"compilerOptions": {
4-
// "target": "es2017",
5-
// "strictPropertyInitialization": false,
6-
// "baseUrl": ".",
74
"declaration": true,
85
"preserveSymlinks": true,
9-
"noUnusedLocals": false,
10-
// Svelte doesn't correctly compile if imports of the generated /modules
11-
// aren't imported as 'import type' in other parts of the generated
12-
// querybuilder, so set this option to ensure we always do that
13-
"importsNotUsedAsValues": "error",
14-
// "paths": {
15-
// "./*": [
16-
// "./src/syntax/genMock/*"
17-
// ],
18-
// }
6+
"noUnusedLocals": false
197
},
208
"include": [
219
"src",

0 commit comments

Comments
 (0)