Skip to content
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"vsc-compile": "yarn vsc-compile:client && yarn vsc-compile:server",
"vsc-compile:client": "cd ./packages/client && yarn run compile",
"vsc-compile:server": "yarn build:sqlint && cd ./packages/server && yarn run prepare-vsc-extension",
"test": "run-p test:server test:parser test:sqlint",
"test:server": "cd ./packages/server && yarn run test",
"test:parser": "cd ./packages/sql-parser && yarn run test",
"test:sqlint": "cd ./packages/sqlint && yarn run test",
Expand Down Expand Up @@ -113,6 +114,21 @@
"sqlite3": "^5.0.3"
},
"resolutions": {
"tar": ">4.4.18"
"tar": "^7.5.2",
"axios": "^1.13.2",
"semver": "^7.7.3",
"cross-spawn": "^7.0.6",
"brace-expansion": "^2.0.2",
"node-forge": "^1.3.2",
"ssh2": "^1.17.0",
"ip": "^2.0.1",
"micromatch": "^4.0.8",
"braces": "^3.0.3",
"js-yaml": "^4.1.1",
"@octokit/request-error": "^7.1.0",
"@octokit/request": "^10.0.7",
"@octokit/plugin-paginate-rest": "^14.0.0",
"tmp": "^0.2.5",
"socks": "^2.8.7"
}
}
11 changes: 7 additions & 4 deletions packages/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,17 @@
"autocompletion"
],
"license": "MIT",
"engines": {
"node": ">=18.0.0"
},
"scripts": {
"compile:cli": "esbuild bin/cli.ts --bundle --platform=node --external:pg-native --external:aws-sdk --external:mock-aws-s3 --external:nock --outfile=dist/cli.js",
"compile:vscode": "esbuild bin/vscodeExtensionServer.ts --bundle --platform=node --external:pg-native --external:aws-sdk --external:mock-aws-s3 --external:nock --outfile=dist/vscodeExtensionServer.js",
"compile:cli": "esbuild bin/cli.ts --bundle --platform=node --external:pg-native --external:aws-sdk --external:mock-aws-s3 --external:nock --external:ssh2 --external:cpu-features --outfile=dist/cli.js",
"compile:vscode": "esbuild bin/vscodeExtensionServer.ts --bundle --platform=node --external:pg-native --external:aws-sdk --external:mock-aws-s3 --external:nock --external:ssh2 --external:cpu-features --outfile=dist/vscodeExtensionServer.js",
"compile:index": "tsc -p .",
"clean": "rm -rf dist",
"watch:cli": "yarn compile:cli --watch",
"watch:index": "tsc -w",
"watch:vscode": "esbuild bin/vscodeExtensionServer.ts --bundle --platform=node --external:pg-native --external:aws-sdk --external:mock-aws-s3 --external:nock --outfile=dist/vscodeExtensionServer.js --watch",
"watch:vscode": "esbuild bin/vscodeExtensionServer.ts --bundle --platform=node --external:pg-native --external:aws-sdk --external:mock-aws-s3 --external:nock --external:ssh2 --external:cpu-features --outfile=dist/vscodeExtensionServer.js --watch",
"test": "jest",
"prepare-vsc-extension": "yarn clean && yarn compile:vscode",
"prepublish": "yarn clean && yarn compile:index"
Expand All @@ -41,7 +44,7 @@
"dependencies": {
"@deepnote/sql-parser": "^2.0.0",
"@deepnote/sqlint": "^2.0.0",
"@google-cloud/bigquery": "^5.9.0",
"@google-cloud/bigquery": "^8.1.1",
"@types/pg": "^8.6.6",
"@types/yargs": "^17.0.8",
"cardinal": "^2.1.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/sqlint/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@
"@deepnote/sql-parser": "^2.0.0",
"ajv": "^6.12.2",
"chalk": "^4.0.0",
"js-yaml": "^3.14.0",
"js-yaml": "^4.1.1",
"yargs": "^17.3.1"
},
"devDependencies": {
"@types/ajv": "^1.0.0",
"@types/js-yaml": "^3.12.4",
"@types/js-yaml": "^4.0.9",
"@types/node": "14.0.26",
"@types/yargs": "^17.0.0",
"jest": "^26.0.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/sqlint/src/cli/loadConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ export function loadConfig(directoryOrFile: string): Config {
break
case '.yaml':
case '.yml':
config = yaml.safeLoad(fileContent) as RawConfig
config = yaml.load(fileContent) as RawConfig
break
default:
config = JSON.parse(fileContent)
Expand Down
3 changes: 2 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@
"declaration": true,
"baseUrl": ".",
"composite": true,
"skipLibCheck": true,
"paths": {
"@deepnote/sql-language-server": ["packages/server/*"],
"@deepnote/sql-parser": ["packages/sql-parser/*"],
"@deepnote/sqlint": ["packages/sqlint/*"]
}
},
}
}
Loading