From cf6ccf137143a88d5571268aaf1fb17438915ebd Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Wed, 17 Jul 2019 16:52:50 +0200 Subject: [PATCH] Use semver umd module --- package.json | 1 + remote/package.json | 1 + remote/web/package.json | 3 ++- remote/web/yarn.lock | 5 +++++ remote/yarn.lock | 12 ++++++------ src/vs/code/browser/workbench/workbench.js | 1 + yarn.lock | 5 +++++ 7 files changed, 21 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index c27f0802eeb..17862c19dbb 100644 --- a/package.json +++ b/package.json @@ -43,6 +43,7 @@ "nsfw": "1.2.5", "onigasm-umd": "^2.2.2", "semver": "^5.5.0", + "semver-umd": "^5.5.0", "spdlog": "^0.9.0", "sudo-prompt": "9.0.0", "v8-inspect-profiler": "^0.0.20", diff --git a/remote/package.json b/remote/package.json index 6fc6471a2ce..16edc649482 100644 --- a/remote/package.json +++ b/remote/package.json @@ -15,6 +15,7 @@ "nsfw": "1.2.5", "onigasm-umd": "^2.2.2", "semver": "^5.5.0", + "semver-umd": "^5.5.0", "spdlog": "^0.9.0", "vscode-chokidar": "2.1.7", "vscode-proxy-agent": "0.4.0", diff --git a/remote/web/package.json b/remote/web/package.json index 38f730e7dab..6c18cb53937 100644 --- a/remote/web/package.json +++ b/remote/web/package.json @@ -6,6 +6,7 @@ "vscode-textmate": "^4.1.1", "xterm": "3.15.0-beta67", "xterm-addon-search": "0.2.0-beta2", - "xterm-addon-web-links": "0.1.0-beta10" + "xterm-addon-web-links": "0.1.0-beta10", + "semver-umd": "^5.5.0" } } \ No newline at end of file diff --git a/remote/web/yarn.lock b/remote/web/yarn.lock index 3f790e1f281..6839b2e5af6 100644 --- a/remote/web/yarn.lock +++ b/remote/web/yarn.lock @@ -19,6 +19,11 @@ oniguruma@^7.2.0: dependencies: nan "^2.14.0" +semver-umd@^5.5.0: + version "5.5.1" + resolved "https://registry.yarnpkg.com/semver-umd/-/semver-umd-5.5.1.tgz#ad0211c4addc9d93b22c807ef5166a3d0581c79b" + integrity sha512-BogOfRyzUCjHU3dENRlf3HxliVcQRjQRy+mx+1/ILZSV6WCOGniAxcg45Rol3CGFfKaCiodeTgfaGAswWBOU+g== + vscode-textmate@^4.1.1: version "4.2.2" resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-4.2.2.tgz#0b4dabc69a6fba79a065cb6b615f66eac07c8f4c" diff --git a/remote/yarn.lock b/remote/yarn.lock index 7d522e2901b..2e8118c8bc3 100644 --- a/remote/yarn.lock +++ b/remote/yarn.lock @@ -876,17 +876,17 @@ safe-regex@^1.1.0: resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== +semver-umd@^5.5.0: + version "5.5.1" + resolved "https://registry.yarnpkg.com/semver-umd/-/semver-umd-5.5.1.tgz#ad0211c4addc9d93b22c807ef5166a3d0581c79b" + integrity sha512-BogOfRyzUCjHU3dENRlf3HxliVcQRjQRy+mx+1/ILZSV6WCOGniAxcg45Rol3CGFfKaCiodeTgfaGAswWBOU+g== + semver@^5.3.0: version "5.6.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004" integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg== -semver@^5.5.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" - integrity sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA== - -semver@^5.6.0: +semver@^5.5.0, semver@^5.6.0: version "5.7.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b" integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA== diff --git a/src/vs/code/browser/workbench/workbench.js b/src/vs/code/browser/workbench/workbench.js index 34f321f90df..2f62dceb9ed 100644 --- a/src/vs/code/browser/workbench/workbench.js +++ b/src/vs/code/browser/workbench/workbench.js @@ -15,6 +15,7 @@ 'xterm': `${window.location.origin}/node_modules/xterm/lib/xterm.js`, 'xterm-addon-search': `${window.location.origin}/node_modules/xterm-addon-search/lib/xterm-addon-search.js`, 'xterm-addon-web-links': `${window.location.origin}/node_modules/xterm-addon-web-links/lib/xterm-addon-web-links.js`, + 'semver': `${window.location.origin}/node_modules/semver-umd/lib/semver-umd.js`, } }); diff --git a/yarn.lock b/yarn.lock index 574bd317d96..6aa4b28cf28 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7975,6 +7975,11 @@ semver-greatest-satisfied-range@^1.1.0: dependencies: sver-compat "^1.5.0" +semver-umd@^5.5.0: + version "5.5.1" + resolved "https://registry.yarnpkg.com/semver-umd/-/semver-umd-5.5.1.tgz#ad0211c4addc9d93b22c807ef5166a3d0581c79b" + integrity sha512-BogOfRyzUCjHU3dENRlf3HxliVcQRjQRy+mx+1/ILZSV6WCOGniAxcg45Rol3CGFfKaCiodeTgfaGAswWBOU+g== + "semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.3.0: version "5.4.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e" -- GitLab