diff --git a/build.js b/build.js index 01743a0..6990097 100644 --- a/build.js +++ b/build.js @@ -11,17 +11,14 @@ const throwIfError = res => { console.log(green(`Installing ${cyan('vscode-html-languageserver')} dependencies`)); throwIfError(spawnSync('npm', ['install'], { - cwd: join(__dirname, 'vscode-html-languageserver'), + cwd: join(__dirname, 'submodule/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', 'submodule/vscode-html-languageserver', '--outDir', 'dist', - '--lib', tsconfig.compilerOptions.lib.concat(['dom']).join(','), - '--target', tsconfig.compilerOptions.target, '--listEmittedFiles' ], { cwd: __dirname, @@ -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('./submodule/vscode-html-languageserver/package.json'); writeFileSync(join(__dirname, 'dist', 'package.json'), JSON.stringify(Object.assign(HTMLLSPackage, currentPackage, { scripts: {}, diff --git a/package-lock.json b/package-lock.json index a8de52a..538ef44 100644 --- a/package-lock.json +++ b/package-lock.json @@ -61,9 +61,9 @@ } }, "typescript": { - "version": "2.9.1", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.1.tgz", - "integrity": "sha512-h6pM2f/GDchCFlldnriOhs1QHuwbnmj6/v7499eMHqPeW4V2G0elua2eIc2nu8v2NdHV0Gm+tzX83Hr6nUFjQA==" + "version": "3.7.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.7.3.tgz", + "integrity": "sha512-Mcr/Qk7hXqFBXMN7p7Lusj1ktCBydylfQM/FZCk5glCNQJrCUKPkMHdo9R0MTFWsC/4kPFvDS0fDPvukfCkFsw==" } } } diff --git a/package.json b/package.json index e5747c3..5230181 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,6 @@ "chalk": "^2.3.0" }, "dependencies": { - "typescript": "^2.9.1" + "typescript": "^3.7.3" } } diff --git a/shared.tsconfig.json b/shared.tsconfig.json new file mode 100644 index 0000000..be648b9 --- /dev/null +++ b/shared.tsconfig.json @@ -0,0 +1,16 @@ + +{ + "compilerOptions": { + "target": "es2018", + "module": "commonjs", + "strict": true, + "alwaysStrict": true, + "noImplicitAny": true, + "noImplicitReturns": true, + "noUnusedLocals": true, + "noUnusedParameters": true + }, + "include": [ + "./dir/vscode-html-hanguageserver/src/**/*" + ] +}