From 4142ecbc41224cc7867f125d49e5a539a144b648 Mon Sep 17 00:00:00 2001 From: mcasimir Date: Wed, 17 Feb 2021 16:31:04 +0100 Subject: [PATCH 1/2] update compass-import-export --- package-lock.json | 22 +++++++++++----------- package.json | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index a68cbdf04db..282a9915264 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1538,9 +1538,9 @@ "integrity": "sha512-4GZcTJtnWPlrMMBcv8n2+yJ+T+Cbu3F9p0n7EGc9v5jIpRBUf+ZzKz5eRoXwS0f3ZHAwNFYQEHEqMDLEWMicpg==" }, "@mongodb-js/compass-import-export": { - "version": "5.2.5", - "resolved": "https://registry.npmjs.org/@mongodb-js/compass-import-export/-/compass-import-export-5.2.5.tgz", - "integrity": "sha512-ZXC+BI97i+1V5YtBPjtvZicvXruTIrNlHJtGFeSW31Y+l84R2qm97t50P8slIzkLIi98x8I+a4wpgVDX2Cy/pw==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/@mongodb-js/compass-import-export/-/compass-import-export-5.3.0.tgz", + "integrity": "sha512-4WhU3HDpbO9B2NUe/5BJDJ4ZEB5r/C0NuPKsfLt2lKE5/FeotuOuFv2e+FvDu6E4ClV6wSdkRL1mTnF7ERVb7Q==", "requires": { "JSONStream": "^1.3.5", "ansi-to-html": "^0.6.11", @@ -1555,7 +1555,7 @@ "marky": "^1.2.1", "mime-types": "^2.1.24", "mongodb-extjson": "^4.0.0-rc1", - "mongodb-query-parser": "^2.1.2", + "mongodb-query-parser": "^2.3.0", "object-sizeof": "^1.5.1", "parse-json": "^5.0.0", "peek-stream": "^1.1.3", @@ -9063,9 +9063,9 @@ } }, "ejson-shell-parser": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/ejson-shell-parser/-/ejson-shell-parser-1.0.2.tgz", - "integrity": "sha512-cXuXDWSrwsNovV8d1wNDvCifiqsj8vk1EyfusI5pWMTvTSVb195z2GMBQ6bgeoVv0or7yCV6aokLBU2aOIWwog==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ejson-shell-parser/-/ejson-shell-parser-1.1.1.tgz", + "integrity": "sha512-I+1FreeR4SmuU8aYtQEyQDQIBLu0xGIWEfwoKp7mX891i6QEjxQz/lLFw1eho3IPYBjfmbTES0Jogi2GE+D1rA==", "requires": { "acorn": "^7.4.0" } @@ -18665,13 +18665,13 @@ "integrity": "sha512-sch/9jd74VjRCmB5U+Fj4WJnkmAtDQgxqJkBInO7zEknXE+lnDEuNBT5/Wp59HMrWUabssGGq08r6Y6F7pkvVA==" }, "mongodb-query-parser": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/mongodb-query-parser/-/mongodb-query-parser-2.2.0.tgz", - "integrity": "sha512-5erPxPLR5l3dvkneNckI7J9ShmtwTxsHVjiYb3xha5M3PBcslY6maAVVzgbfpRMUIfdP0aju/ae9h1Vii6w4cw==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/mongodb-query-parser/-/mongodb-query-parser-2.3.0.tgz", + "integrity": "sha512-pG4WJ9y3+LFVbwk0pJ4Z7sWgCo8cgL4G7gPGShg1t/MEEBqkBuECk9B14oFpwbEpxi/pN3VvV5rhYRdLxV72WQ==", "requires": { "bson": "^4.0.3", "debug": "^4.1.1", - "ejson-shell-parser": "^1.0.2", + "ejson-shell-parser": "^1.1.1", "is-json": "^2.0.1", "javascript-stringify": "^2.0.1", "lodash": "^4.17.15", diff --git a/package.json b/package.json index d10a836002b..524255cd6e6 100644 --- a/package.json +++ b/package.json @@ -254,7 +254,7 @@ "@mongodb-js/compass-field-store": "^6.0.3", "@mongodb-js/compass-find-in-page": "^2.0.4", "@mongodb-js/compass-home": "^4.2.1", - "@mongodb-js/compass-import-export": "^5.2.5", + "@mongodb-js/compass-import-export": "^5.3.0", "@mongodb-js/compass-indexes": "^3.1.0", "@mongodb-js/compass-instance": "^2.0.3", "@mongodb-js/compass-loading": "^1.1.0", @@ -329,7 +329,7 @@ "mongodb-js-metrics": "^6.0.0", "mongodb-language-model": "^1.6.1", "mongodb-ns": "^2.2.0", - "mongodb-query-parser": "^2.2.0", + "mongodb-query-parser": "^2.3.0", "mongodb-query-util": "^0.2.1", "mongodb-schema": "^8.2.5", "mongodb-shell-to-url": "^0.1.0", From b38cef51353bbb4d0c52e14f291ed68fa554513b Mon Sep 17 00:00:00 2001 From: mcasimir Date: Wed, 24 Feb 2021 18:54:04 +0100 Subject: [PATCH 2/2] allow import / export of functions --- package-lock.json | 42 ++++++++++++++++++++++++++++++++---------- package.json | 4 ++-- 2 files changed, 34 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 282a9915264..f3d32534175 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1330,12 +1330,14 @@ "integrity": "sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q==" }, "@mongodb-js/compass-aggregations": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/@mongodb-js/compass-aggregations/-/compass-aggregations-7.3.0.tgz", - "integrity": "sha512-6rFGVNUeEDOlpImD27+JjHQ9MhhdbCImW8zRjrL7VE2vjyCob5j7w3lOdmteBk7N6GClbU8BgOiokJID9nKnlw==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@mongodb-js/compass-aggregations/-/compass-aggregations-7.4.0.tgz", + "integrity": "sha512-8cX6X9BTr6aU0VcSv/r3+7oRLhpwDTG3HFX3zF56rxe9cEQY3Rm2meNWE7/2bmo6d9sBXgdIe50g9Fq4QUbPFA==", "requires": { "@leafygreen-ui/badge": "^4.0.2", "@leafygreen-ui/banner": "^3.0.4", + "acorn-loose": "^8.0.2", + "astring": "^1.7.0", "bson": "^4.0.2", "decomment": "^0.9.2", "is-electron-renderer": "^2.0.1", @@ -3049,6 +3051,21 @@ "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==", "dev": true }, + "acorn-loose": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/acorn-loose/-/acorn-loose-8.0.2.tgz", + "integrity": "sha512-h25FYjJONkLfEq0PWMax9p2Xjhj6Ex9aiOhwayUxT8R5alTt1+00xypWLxUBu7kASwiNTzjmq6ohOY6EdsVbVw==", + "requires": { + "acorn": "^8.0.0" + }, + "dependencies": { + "acorn": { + "version": "8.0.5", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.0.5.tgz", + "integrity": "sha512-v+DieK/HJkJOpFBETDJioequtc3PfxsWMaxIdIwujtF7FEV/MAyDQLlm6/zPvr7Mix07mLh6ccVwIsloceodlg==" + } + } + }, "acorn-node": { "version": "1.8.2", "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz", @@ -4381,9 +4398,9 @@ "dev": true }, "antlr4": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/antlr4/-/antlr4-4.8.0.tgz", - "integrity": "sha512-en/MxQ4OkPgGJQ3wD/muzj1uDnFSzdFIhc2+c6bHZokWkuBb6RRvFjpWhPxWLbgQvaEzldJZ0GSQpfSAaE3hqg==" + "version": "4.7.2", + "resolved": "https://registry.npmjs.org/antlr4/-/antlr4-4.7.2.tgz", + "integrity": "sha512-vZA1xYufXLe3LX+ja9rIVxjRmILb1x3k7KYZHltRbfJtXjJ1DlFIqt+CbPYmghx0EuzY9DajiDw+MdyEt1qAsQ==" }, "any-observable": { "version": "0.3.0", @@ -4928,6 +4945,11 @@ "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==", "dev": true }, + "astring": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/astring/-/astring-1.7.0.tgz", + "integrity": "sha512-43bervUZNvahG1v74a+POdGlAWcOUGSvP9fJVj6sywzM/SquwDkA+CdP938e8tWHUV77fStCiqzaQHAt0u6MVA==" + }, "async": { "version": "1.5.2", "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", @@ -6120,11 +6142,11 @@ } }, "bson-transpilers": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/bson-transpilers/-/bson-transpilers-0.13.3.tgz", - "integrity": "sha512-qSz+4iEchwo7RBYGK/mvDeMSIKqIMiZISaXOuZ/hZoU5Tlj65QR792vN9Bl8sp7ET9QGAbQLpghsdH9LwIhYiw==", + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/bson-transpilers/-/bson-transpilers-0.14.0.tgz", + "integrity": "sha512-Al1UfgD7QUXsG2lYhg1/CxF5PGwkD8BMG+D3eQOwoZY6zJhTjHiN2IrATCDCglUj9nEFA0EWvyKex0+AIWRcpw==", "requires": { - "antlr4": "^4.7.1", + "antlr4": "4.7.2", "bson": "^4.0.2", "chai": "^4.1.2", "context-eval": "^0.1.0", diff --git a/package.json b/package.json index 524255cd6e6..40c7c509b74 100644 --- a/package.json +++ b/package.json @@ -238,7 +238,7 @@ "url": "git://github.com/mongodb-js/compass.git" }, "dependencies": { - "@mongodb-js/compass-aggregations": "^7.3.0", + "@mongodb-js/compass-aggregations": "^7.4.0", "@mongodb-js/compass-app-stores": "^4.0.2", "@mongodb-js/compass-auto-updates": "^2.0.1", "@mongodb-js/compass-collection": "^2.1.2", @@ -280,7 +280,7 @@ "app-migrations": "^1.0.0", "async": "^1.5.2", "bootstrap": "https://github.com/twbs/bootstrap/archive/v3.3.5.tar.gz", - "bson-transpilers": "^0.13.3", + "bson-transpilers": "^0.14.0", "clean-stack": "^2.0.0", "compass-preferences-model": "^0.2.1", "compass-user-model": "^0.2.1",