Skip to content
This repository was archived by the owner on Apr 9, 2021. It is now read-only.
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
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[submodule "vscode-html-languageserver"]
path = vscode-html-languageserver
path = vendor/vscode-html-languageserver
url = https://github.com/vscode-langservers/vscode-html-languageserver.git
ignore = dirty
11 changes: 4 additions & 7 deletions build.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,15 @@ const throwIfError = res => {
}

console.log(green(`Installing ${cyan('vscode-html-languageserver')} dependencies`));
throwIfError(spawnSync('npm', ['install'], {
cwd: join(__dirname, 'vscode-html-languageserver'),
throwIfError(spawnSync('yarn', ['install'], {
cwd: join(__dirname, 'vendor/vscode-html-languageserver'),
stdio: 'inherit'
}));

console.log(green(`Compiling ${cyan('vscode-html-languageserver')}`));
const tsconfig = require('./vscode-html-languageserver/tsconfig.json')
throwIfError(spawnSync('tsc', [
'-p', 'vscode-html-languageserver',
'-p', 'vendor/vscode-html-languageserver',
'--outDir', 'dist',
'--lib', tsconfig.compilerOptions.lib.concat(['dom']).join(','),
'--target', tsconfig.compilerOptions.target,
'--listEmittedFiles'
], {
cwd: __dirname,
Expand All @@ -39,7 +36,7 @@ writeFileSync(file, lines.join('\n'), 'utf8')

console.log(green(`Merging package.json files`));
const currentPackage = require('./package.json');
const HTMLLSPackage = require('./vscode-html-languageserver/package.json');
const HTMLLSPackage = require('./vendor/vscode-html-languageserver/package.json');

writeFileSync(join(__dirname, 'dist', 'package.json'), JSON.stringify(Object.assign(HTMLLSPackage, currentPackage, {
scripts: {},
Expand Down
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@
"chalk": "^2.3.0"
},
"dependencies": {
"typescript": "^2.9.1"
"typescript": "^3.7.3"
}
}
12 changes: 12 additions & 0 deletions shared.tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"compilerOptions": {
"target": "es2018",
"module": "commonjs",
"strict": true,
"alwaysStrict": true,
"noImplicitAny": true,
"noImplicitReturns": true,
"noUnusedLocals": true,
"noUnusedParameters": true
}
}
1 change: 1 addition & 0 deletions vendor/vscode-html-languageserver
1 change: 0 additions & 1 deletion vscode-html-languageserver
Submodule vscode-html-languageserver deleted from 18bed6