diff --git a/language/move-analyzer/editors/code/package-lock.json b/language/move-analyzer/editors/code/package-lock.json index 11b3500d68..b4126498af 100644 --- a/language/move-analyzer/editors/code/package-lock.json +++ b/language/move-analyzer/editors/code/package-lock.json @@ -2515,24 +2515,12 @@ } }, "node_modules/lru-cache": { -<<<<<<< HEAD - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" -======= "version": "4.1.5", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", "dependencies": { "pseudomap": "^1.0.2", "yallist": "^2.1.2" ->>>>>>> c9b5765f816d773618cc12a70a0095f644bbc68d } }, "node_modules/markdown-it": { @@ -3125,12 +3113,7 @@ "node_modules/pseudomap": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", -<<<<<<< HEAD - "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", - "dev": true -======= "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=" ->>>>>>> c9b5765f816d773618cc12a70a0095f644bbc68d }, "node_modules/pump": { "version": "3.0.0", @@ -3852,8 +3835,6 @@ "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==", "dev": true }, -<<<<<<< HEAD -======= "node_modules/universalify": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", @@ -3863,7 +3844,6 @@ "node": ">= 10.0.0" } }, ->>>>>>> c9b5765f816d773618cc12a70a0095f644bbc68d "node_modules/untildify": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz", @@ -4179,16 +4159,9 @@ } }, "node_modules/yallist": { -<<<<<<< HEAD - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true -======= "version": "2.1.2", "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==" ->>>>>>> c9b5765f816d773618cc12a70a0095f644bbc68d }, "node_modules/yargs": { "version": "16.2.0", @@ -4408,8 +4381,6 @@ "integrity": "sha512-ugsxEJfsCuqMLSuCD4PIJkp5Uk2z6TCMRCgYVuhRo5cYQY3+1xXTQkSlPtkpGHuvWMjS2KTeVQXxkXRACMbM6A==", "dev": true }, -<<<<<<< HEAD -======= "@types/fs-extra": { "version": "9.0.13", "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.13.tgz", @@ -4419,7 +4390,6 @@ "@types/node": "*" } }, ->>>>>>> c9b5765f816d773618cc12a70a0095f644bbc68d "@types/glob": { "version": "7.1.4", "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.4.tgz", @@ -4476,8 +4446,6 @@ "tsutils": "^3.21.0" }, "dependencies": { -<<<<<<< HEAD -======= "lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", @@ -4487,7 +4455,6 @@ "yallist": "^4.0.0" } }, ->>>>>>> c9b5765f816d773618cc12a70a0095f644bbc68d "semver": { "version": "7.3.5", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", @@ -4496,15 +4463,12 @@ "requires": { "lru-cache": "^6.0.0" } -<<<<<<< HEAD -======= }, "yallist": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true ->>>>>>> c9b5765f816d773618cc12a70a0095f644bbc68d } } }, @@ -4565,8 +4529,6 @@ "tsutils": "^3.21.0" }, "dependencies": { -<<<<<<< HEAD -======= "lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", @@ -4576,7 +4538,6 @@ "yallist": "^4.0.0" } }, ->>>>>>> c9b5765f816d773618cc12a70a0095f644bbc68d "semver": { "version": "7.3.5", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", @@ -4585,15 +4546,12 @@ "requires": { "lru-cache": "^6.0.0" } -<<<<<<< HEAD -======= }, "yallist": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true ->>>>>>> c9b5765f816d773618cc12a70a0095f644bbc68d } } }, @@ -5259,33 +5217,11 @@ "sigmund": "^1.0.1" }, "dependencies": { -<<<<<<< HEAD - "lru-cache": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", - "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", - "dev": true, - "requires": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" - } - }, -======= ->>>>>>> c9b5765f816d773618cc12a70a0095f644bbc68d "semver": { "version": "5.7.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", "dev": true -<<<<<<< HEAD - }, - "yallist": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", - "dev": true -======= ->>>>>>> c9b5765f816d773618cc12a70a0095f644bbc68d } } }, @@ -5402,8 +5338,6 @@ "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", "dev": true }, -<<<<<<< HEAD -======= "lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", @@ -5413,7 +5347,6 @@ "yallist": "^4.0.0" } }, ->>>>>>> c9b5765f816d773618cc12a70a0095f644bbc68d "semver": { "version": "7.3.5", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", @@ -5422,15 +5355,12 @@ "requires": { "lru-cache": "^6.0.0" } -<<<<<<< HEAD -======= }, "yallist": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true ->>>>>>> c9b5765f816d773618cc12a70a0095f644bbc68d } } }, @@ -5651,8 +5581,6 @@ "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", "dev": true }, -<<<<<<< HEAD -======= "fs-extra": { "version": "10.0.1", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.1.tgz", @@ -5664,7 +5592,6 @@ "universalify": "^2.0.0" } }, ->>>>>>> c9b5765f816d773618cc12a70a0095f644bbc68d "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -5887,8 +5814,6 @@ "dev": true, "requires": { "lru-cache": "^6.0.0" -<<<<<<< HEAD -======= }, "dependencies": { "lru-cache": { @@ -5906,7 +5831,6 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true } ->>>>>>> c9b5765f816d773618cc12a70a0095f644bbc68d } }, "htmlparser2": { @@ -6095,8 +6019,6 @@ "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", "dev": true }, -<<<<<<< HEAD -======= "jsonfile": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", @@ -6107,7 +6029,6 @@ "universalify": "^2.0.0" } }, ->>>>>>> c9b5765f816d773618cc12a70a0095f644bbc68d "keytar": { "version": "7.7.0", "resolved": "https://registry.npmjs.org/keytar/-/keytar-7.7.0.tgz", @@ -6187,21 +6108,12 @@ } }, "lru-cache": { -<<<<<<< HEAD - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "requires": { - "yallist": "^4.0.0" -======= "version": "4.1.5", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", "requires": { "pseudomap": "^1.0.2", "yallist": "^2.1.2" ->>>>>>> c9b5765f816d773618cc12a70a0095f644bbc68d } }, "markdown-it": { @@ -6673,12 +6585,7 @@ "pseudomap": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", -<<<<<<< HEAD - "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", - "dev": true -======= "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=" ->>>>>>> c9b5765f816d773618cc12a70a0095f644bbc68d }, "pump": { "version": "3.0.0", @@ -7213,15 +7120,12 @@ "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==", "dev": true }, -<<<<<<< HEAD -======= "universalify": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", "dev": true }, ->>>>>>> c9b5765f816d773618cc12a70a0095f644bbc68d "untildify": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz", @@ -7474,16 +7378,9 @@ "dev": true }, "yallist": { -<<<<<<< HEAD - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true -======= "version": "2.1.2", "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==" ->>>>>>> c9b5765f816d773618cc12a70a0095f644bbc68d }, "yargs": { "version": "16.2.0",