Merge pull request #12 from adamvoss/noSubmodules

Eliminate use of submodules
adamvoss · Aug 28, 2017 · 6fcb474 · 6fcb474
2 parents 788fc62 + fdd3ccd
commit 6fcb474
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 out
 node_modules
 npm-debug.log
+package-lock.json
diff --git a/.gitmodules b/.gitmodules
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## 0.0.8
+- Update **vscode-json-languageservice** to the current latest version (2.0.14) by updating **vscode-yaml-languageservice**.
+- **vscode-yaml-languageservice** dependency is now managed by `npm`.  This makes development easier.
+
 ## 0.0.7
 - Add support for multiple documents in a single file.
 

diff --git a/README.md b/README.md
@@ -31,7 +31,6 @@ This extension would not have been possible without numerous open source project
 Contributions are welcome!  To install dependencies and begin work, run:
 
 ```sh
-git submodule update --init --recursive
 npm install
 ```
 

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "yaml",
   "displayName": "YAML",
   "description": "YAML for Visual Studio Code",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "publisher": "adamvoss",
   "license": "MIT",
   "repository": {
@@ -28,7 +28,7 @@
   "main": "./client/out/yamlMain",
   "scripts": {
     "compile": "tsc -p server/ && tsc -p client/",
-    "prepublish": "npm run update-vscode && cd server && ./npminstall.sh",
+    "prepublish": "npm run update-vscode && cd server && npm install",
     "update-vscode": "node ./node_modules/vscode/bin/install",
     "vscode:prepublish": "npm run compile"
   },

diff --git a/server/npminstall.sh b/server/npminstall.sh
diff --git a/server/package.json b/server/package.json
@@ -12,7 +12,7 @@
     "request-light": "^0.2.1",
     "vscode-languageserver": "^3.1.0-alpha.1",
     "vscode-nls": "^2.0.2",
-    "vscode-yaml-languageservice": "file:./vscode-yaml-languageservice"
+    "vscode-yaml-languageservice": "^0.1.0"
   },
   "devDependencies": {
     "@types/node": "^6.0.51"

diff --git a/server/vscode-yaml-languageservice b/server/vscode-yaml-languageservice
-Original file line number
+Diff line change
@@ Expand Up @@
     Contributions are welcome!  To install dependencies and begin work, run:
     ```sh
-    git submodule update --init --recursive
     npm install
     ```
@@ Expand Down @@