Skip to content

Commit 1efd689

Browse files
committed
release v0.10.0
1 parent 4baf5af commit 1efd689

File tree

4 files changed

+41
-9
lines changed

4 files changed

+41
-9
lines changed

.vscodeignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@
44
**/*.map
55
**/tsconfig.json
66
**/tslint.json
7-
**/*/node_modules
87
.cache
98
.vscode
109
**/*/rollup.config.js
1110
**/*/jest.config.js
1211
**/*/yarn-error.log
1312
README.md
1413
**/*/.npmignore
15-
!./node_modules/sqlite3
14+
**/*/node_modules

package.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "sql-language-server",
33
"displayName": "SQL Language Server",
44
"description": "SQL Language Server Extension for VSC",
5-
"version": "0.9.2",
5+
"version": "0.10.7",
66
"main": "./packages/client/out/extension",
77
"repository": {
88
"type": "git",
@@ -15,13 +15,14 @@
1515
"license": "MIT",
1616
"publisher": "joe-re",
1717
"scripts": {
18+
"postinstall": "npm i sqlite3 electron-rebuild",
1819
"compile": "npm run compile:client && npm run compile:server",
1920
"compile:client": "cd ./packages/client && yarn run compile",
2021
"compile:server": "cd ./packages/server && yarn run compile",
2122
"watch": "run-p watch:client watch:server",
2223
"watch:client": "cd ./packages/client && yarn run watch",
2324
"watch:server": "cd ./packages/server && yarn run watch",
24-
"vscode:prepublish": "yarn run compile && rm -rf node_modules/lib/binding"
25+
"vscode:prepublish": "yarn run compile"
2526
},
2627
"engines": {
2728
"vscode": "^1.45.1"
@@ -54,5 +55,9 @@
5455
],
5556
"devDependencies": {
5657
"npm-run-all": "^4.1.3"
58+
},
59+
"dependencies": {
60+
"electron-rebuild": "^1.11.0",
61+
"sqlite3": "^4.2.0"
5762
}
5863
}

packages/client/rebuild.ts

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,35 @@
1-
import electronRebuild from 'electron-rebuild'
1+
import { exec } from 'child_process'
2+
3+
const run = function(cmd): Promise<void> {
4+
const child = exec(cmd, function (error, stdout, stderr) {
5+
if (stderr !== null) {
6+
console.log('' + stderr);
7+
}
8+
if (stdout !== null) {
9+
console.log('' + stdout);
10+
}
11+
if (error !== null) {
12+
console.log('' + error);
13+
}
14+
});
15+
return new Promise((resolve, reject) => {
16+
child.on('exit', (code, signal) => {
17+
if (code === 0) {
18+
resolve()
19+
return
20+
}
21+
reject(new Error(signal))
22+
})
23+
})
24+
}
225

326
const electronVersion = (process.versions as any).electron
27+
428
export function rebuild(): Promise<void> {
5-
return electronRebuild({ buildPath: `${__dirname}/../../../node_modules/sqlite3`, electronVersion, force: true, useCache: false })
29+
const command = `
30+
cd ${__dirname}/../../server &&
31+
npm install sqlite3 electron-rebuild &&
32+
./node_modules/.bin/electron-rebuild node_modules/sqlite3 -v ${electronVersion}
33+
`
34+
return run(command)
635
}

packages/server/package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "sql-language-server",
3-
"version": "0.9.2",
3+
"version": "0.10.0",
44
"main": "index.js",
55
"bin": {
66
"sql-language-server": "./dist/cli.js"
@@ -17,7 +17,6 @@
1717
"dist"
1818
],
1919
"dependencies": {
20-
"@types/node": "12.12.6",
2120
"@types/pg": "^7.4.10",
2221
"jest": "^26.0.1",
2322
"log4js": "^6.2.1",
@@ -37,7 +36,7 @@
3736
"@rollup/plugin-typescript": "^4.1.1",
3837
"@types/jest": "^25.2.2",
3938
"@types/mysql": "^2.15.5",
40-
"@types/node": "^8.10.0",
39+
"@types/node": "12.12.6",
4140
"@types/sqlite3": "^3.1.6",
4241
"jest": "^26.0.1",
4342
"rollup": "^2.10.2",

0 commit comments

Comments
 (0)