Cleanup dependencies (microsoft#4546)

* Merge VS Code 1.31.1 * Fix missed merge conflict * Fix license in new files * Remove extra extension files * Fix compile error * Fix TSLint errors * Fix integration tests * Fixed saved and recent connections list * Fix tests * move dependecies and delete unused ones * fix test compile
bbbbb38438 · Mar 20, 2019 · 5142f69 · 5142f69
1 parent dfe23f7
commit 5142f69
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 243 deletions.
diff --git a/extensions/admin-pack/package.json b/extensions/admin-pack/package.json
@@ -26,4 +26,4 @@
 		"publisherDisplayName": "Microsoft",
 		"publisherId": "Microsoft"
 	}
-}
+}
diff --git a/extensions/agent/package.json b/extensions/agent/package.json
@@ -53,4 +53,4 @@
 		"publisherDisplayName": "Microsoft",
 		"publisherId": "Microsoft"
 	}
-}
+}
diff --git a/extensions/mssql/package.json b/extensions/mssql/package.json
@@ -23,8 +23,9 @@
     "clipboardy": "^1.2.3",
     "dataprotocol-client": "github:Microsoft/sqlops-dataprotocolclient#0.2.16",
     "error-ex": "^1.3.2",
-    "figures": "^2.0.0",
     "find-remove": "1.2.1",
+    "figures": "^2.0.0",
+    "fs-extra": "^3.0.1",
     "opener": "^1.4.3",
     "request": "^2.88.0",
     "request-promise": "^4.2.2",

diff --git a/extensions/mssql/yarn.lock b/extensions/mssql/yarn.lock
@@ -425,6 +425,15 @@ fs-constants@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
   integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
 
+fs-extra@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-3.0.1.tgz#3794f378c58b342ea7dbbb23095109c4b3b62291"
+  integrity sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^3.0.0"
+    universalify "^0.1.0"
+
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
@@ -462,7 +471,7 @@ glob@^7.0.5:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-graceful-fs@^4.1.10:
+graceful-fs@^4.1.10, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
   version "4.1.15"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
   integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
@@ -588,6 +597,13 @@ json-stringify-safe@~5.0.1:
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
+jsonfile@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.1.tgz#a5ecc6f65f53f662c4415c7675a0331d0992ec66"
+  integrity sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
 jsprim@^1.2.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
@@ -996,6 +1012,11 @@ unbzip2-stream@^1.0.9:
     buffer "^5.2.1"
     through "^2.3.8"
 
+universalify@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
+
 uri-js@^4.2.2:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"

diff --git a/extensions/profiler/package.json b/extensions/profiler/package.json
@@ -86,4 +86,4 @@
 		"publisherDisplayName": "Microsoft",
 		"publisherId": "Microsoft"
 	}
-}
+}
diff --git a/package.json b/package.json
@@ -42,7 +42,6 @@
     "ansi_up": "^3.0.0",
     "applicationinsights": "1.0.8",
     "chart.js": "^2.6.0",
-    "color-convert": "^0.5.3",
     "gc-signals": "^0.0.2",
     "getmac": "1.4.1",
     "graceful-fs": "4.1.11",
@@ -59,7 +58,6 @@
     "native-watchdog": "1.0.0",
     "ng2-charts": "^1.6.0",
     "node-pty": "0.8.1",
-    "nsfw": "1.1.0",
     "pretty-data": "^0.40.0",
     "reflect-metadata": "^0.1.8",
     "rxjs": "5.4.0",
@@ -68,7 +66,6 @@
     "slickgrid": "github:anthonydresser/SlickGrid#2.3.29",
     "spdlog": "0.7.2",
     "sudo-prompt": "8.2.0",
-    "svg.js": "^2.2.5",
     "v8-inspect-profiler": "^0.0.20",
     "vscode-chokidar": "1.6.5",
     "vscode-debugprotocol": "1.34.0",
@@ -98,7 +95,6 @@
     "@types/winreg": "^1.2.30",
     "ansi-colors": "^3.2.3",
     "asar": "^0.14.0",
-    "azure-storage": "^0.3.1",
     "chromium-pickle-js": "^0.2.0",
     "clean-css": "3.4.6",
     "copy-webpack-plugin": "^4.5.2",

diff --git a/src/sql/parts/notebook/notebookActions.ts b/src/sql/parts/notebook/notebookActions.ts
@@ -457,4 +457,4 @@ export class AttachToDropdown extends SelectBox {
 			this._notificationService.notify({ severity: Severity.Error, message: getErrorMessage(error), actions });
 		}
 	}
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,4 +26,4 @@ @@
     		"publisherDisplayName": "Microsoft",
     		"publisherId": "Microsoft"
     	}
-    }
+    }