From 09e241804620ff2ad869eea21d01f3aae423abb7 Mon Sep 17 00:00:00 2001 From: Remco Haszing Date: Wed, 31 Mar 2021 22:45:20 +0200 Subject: [PATCH] Fix js-yaml dependency --- package.json | 2 +- src/fillers/monaco-editor-amd.ts | 12 ++++++++++++ yarn.lock | 16 ++++++---------- 3 files changed, 19 insertions(+), 11 deletions(-) create mode 100644 src/fillers/monaco-editor-amd.ts diff --git a/package.json b/package.json index 87604e7..dd656d7 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "url": "https://github.com/pengx17/monaco-yaml/issues" }, "dependencies": { - "js-yaml": "^4.0.0", + "js-yaml": "^3.14.1", "yaml-ast-parser-custom-tags": "^0.0.43" }, "devDependencies": { diff --git a/src/fillers/monaco-editor-amd.ts b/src/fillers/monaco-editor-amd.ts new file mode 100644 index 0000000..e870a73 --- /dev/null +++ b/src/fillers/monaco-editor-amd.ts @@ -0,0 +1,12 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +// Resolves with the global monaco API + +declare var define; + +define([], function () { + return (self).monaco; +}); diff --git a/yarn.lock b/yarn.lock index 72a52af..062a293 100644 --- a/yarn.lock +++ b/yarn.lock @@ -87,11 +87,6 @@ argparse@^1.0.7: dependencies: sprintf-js "~1.0.2" -argparse@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" - integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== - astral-regex@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" @@ -460,12 +455,13 @@ js-yaml@^3.13.1: argparse "^1.0.7" esprima "^4.0.0" -js-yaml@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.0.0.tgz#f426bc0ff4b4051926cd588c71113183409a121f" - integrity sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q== +js-yaml@^3.14.1: + version "3.14.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" + integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== dependencies: - argparse "^2.0.1" + argparse "^1.0.7" + esprima "^4.0.0" json-parse-even-better-errors@^2.3.0: version "2.3.1"