From 4c885eee30ba837d257938a29c8e4e55e18b1b10 Mon Sep 17 00:00:00 2001
From: Hirokazu Hata <h.hata.ai.t@gmail.com>
Date: Tue, 10 Mar 2020 10:45:11 +0900
Subject: [PATCH] submodule: update vscode-css-languageserver to
 a4702a9dd03f61b01beff8ad429c560cd8f336e7

vscode-css-languageserver's tsconfig changed.
It extends ../../shared.tsconfig.json that is https://github.com/microsoft/vscode/blob/master/extensions/shared.tsconfig.json now.
So I've changed submodule directory and build.js.
---
 .gitmodules                      |  2 +-
 build.js                         | 14 +++++---------
 package-lock.json                |  6 +++---
 package.json                     |  2 +-
 shared.tsconfig.json             | 12 ++++++++++++
 vendor/vscode-css-languageserver |  1 +
 vscode-css-languageserver        |  1 -
 7 files changed, 23 insertions(+), 15 deletions(-)
 create mode 100644 shared.tsconfig.json
 create mode 160000 vendor/vscode-css-languageserver
 delete mode 160000 vscode-css-languageserver

diff --git a/.gitmodules b/.gitmodules
index f94205c..994d2e5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "vscode-css-languageserver"]
-	path = vscode-css-languageserver
+	path = vendor/vscode-css-languageserver
 	url = https://github.com/vscode-langservers/vscode-css-languageserver.git
 	ignore = dirty
diff --git a/build.js b/build.js
index f1248b1..7f41035 100644
--- a/build.js
+++ b/build.js
@@ -1,4 +1,3 @@
-
 const { readFileSync, writeFileSync, createReadStream, createWriteStream } = require('fs');
 const { spawnSync } = require('child_process');
 const { join } = require('path');
@@ -11,18 +10,15 @@ const throwIfError = res => {
 }
 
 console.log(green(`Installing ${cyan('vscode-css-languageserver')} dependencies`));
-throwIfError(spawnSync('npm', ['install'], {
-	cwd: join(__dirname, 'vscode-css-languageserver'),
+throwIfError(spawnSync('yarn', ['install'], {
+	cwd: join(__dirname, 'vendor/vscode-css-languageserver'),
 	stdio: 'inherit'
 }));
 
 console.log(green(`Compiling ${cyan('vscode-css-languageserver')}`));
-const tsconfig = require('./vscode-css-languageserver/tsconfig.json')
 throwIfError(spawnSync('tsc', [
-	'-p', 'vscode-css-languageserver',
+	'-p', 'vendor/vscode-css-languageserver',
 	'--outDir', 'dist',
-	'--lib', tsconfig.compilerOptions.lib.join(','),
-	'--target', tsconfig.compilerOptions.target,
 	'--listEmittedFiles'
 ], {
 	cwd: __dirname,
@@ -40,7 +36,7 @@ writeFileSync(file, lines.join('\n'), 'utf8')
 
 console.log(green(`Merging package.json files`));
 const currentPackage = require('./package.json');
-const CSSLSPackage = require('./vscode-css-languageserver/package.json');
+const CSSLSPackage = require('./vendor/vscode-css-languageserver/package.json');
 
 writeFileSync(join(__dirname, 'dist', 'package.json'), JSON.stringify(Object.assign(CSSLSPackage, currentPackage, {
 	scripts: {},
@@ -50,4 +46,4 @@ writeFileSync(join(__dirname, 'dist', 'package.json'), JSON.stringify(Object.ass
 
 console.log(green(`Copying README.md and LICENSE`));
 createReadStream(join(__dirname, 'README.md')).pipe(createWriteStream(join(__dirname, 'dist', 'README.md')));
-createReadStream(join(__dirname, 'LICENSE')).pipe(createWriteStream(join(__dirname, 'dist', 'LICENSE')));
\ No newline at end of file
+createReadStream(join(__dirname, 'LICENSE')).pipe(createWriteStream(join(__dirname, 'dist', 'LICENSE')));
diff --git a/package-lock.json b/package-lock.json
index 143bd6f..0f1ad3d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -61,9 +61,9 @@
       }
     },
     "typescript": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.4.2.tgz",
-      "integrity": "sha1-+DlfhdRZJ2BnyYiqQYN6j4KHCEQ=",
+      "version": "3.8.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz",
+      "integrity": "sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==",
       "dev": true
     }
   }
diff --git a/package.json b/package.json
index 59329a9..432e67e 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
   "homepage": "https://github.com/vscode-langservers/vscode-css-languageserver-bin#readme",
   "devDependencies": {
     "chalk": "^2.3.0",
-    "typescript": "^2.4.2"
+    "typescript": "^3.7.3"
   },
   "bin": {
     "css-languageserver": "cssServerMain.js"
diff --git a/shared.tsconfig.json b/shared.tsconfig.json
new file mode 100644
index 0000000..338deb8
--- /dev/null
+++ b/shared.tsconfig.json
@@ -0,0 +1,12 @@
+{
+	"compilerOptions": {
+		"target": "es2018",
+		"module": "commonjs",
+		"strict": true,
+		"alwaysStrict": true,
+		"noImplicitAny": true,
+		"noImplicitReturns": true,
+		"noUnusedLocals": true,
+		"noUnusedParameters": true
+	}
+}
diff --git a/vendor/vscode-css-languageserver b/vendor/vscode-css-languageserver
new file mode 160000
index 0000000..a4702a9
--- /dev/null
+++ b/vendor/vscode-css-languageserver
@@ -0,0 +1 @@
+Subproject commit a4702a9dd03f61b01beff8ad429c560cd8f336e7
diff --git a/vscode-css-languageserver b/vscode-css-languageserver
deleted file mode 160000
index 7959565..0000000
--- a/vscode-css-languageserver
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7959565d7e0b3835d6837dd1c54e30d2de92ba23