diff --git a/docker-compose.yml b/docker-compose.yml index c78aad38..e9bedade 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -52,7 +52,7 @@ services: ####### UPLOAD SERVICES ####### ########################################################################### companion: - image: transloadit/companion + image: transloadit/companion:sha-e80a7f7 ports: - "3020:3020" env_file: diff --git a/server/action/organisation/application/addDefault.go b/server/action/organisation/application/addDefault.go index c0855990..e98ef781 100644 --- a/server/action/organisation/application/addDefault.go +++ b/server/action/organisation/application/addDefault.go @@ -67,7 +67,13 @@ func addDefault(w http.ResponseWriter, r *http.Request) { } var userContext model.ContextKey = "application_user" - tx := model.DB.WithContext(context.WithValue(r.Context(), userContext, uID)).Begin() + var organisationUserKey model.ContextKey = "organisation_user" + + // set context value for user and organisation + ctx := context.WithValue(r.Context(), userContext, uID) + ctx = context.WithValue(ctx, organisationUserKey, uID) + + tx := model.DB.WithContext(ctx).Begin() app := model.Application{} err = tx.Model(&model.Application{}).Where(&model.Application{ Base: model.Base{ diff --git a/web/package-lock.json b/web/package-lock.json index 92131c9d..30080ce1 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -35,7 +35,7 @@ "react-lottie": "^1.2.3", "react-redux": "^7.2.0", "react-router-dom": "^5.3.0", - "react-scripts": "3.4.0", + "react-scripts": "^3.4.0", "redux": "^4.0.5", "redux-devtools-extension": "^2.13.8", "redux-thunk": "^2.3.0" @@ -1894,6 +1894,11 @@ "style-mod": "^4.0.0" } }, + "node_modules/@codemirror/commands/node_modules/@codemirror/language/node_modules/@codemirror/state": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.0.1.tgz", + "integrity": "sha512-6vYgaXc4KjSY0BUfSVDJooGcoswg/RJZpq/ZGjsUYmY0KN1lmB8u03nv+jiG1ncUV5qoggyxFT5AGD5Ak+5Zrw==" + }, "node_modules/@codemirror/commands/node_modules/@codemirror/state": { "version": "6.2.0", "license": "MIT" @@ -1907,6 +1912,11 @@ "w3c-keyname": "^2.2.4" } }, + "node_modules/@codemirror/commands/node_modules/@codemirror/view/node_modules/@codemirror/state": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.0.1.tgz", + "integrity": "sha512-6vYgaXc4KjSY0BUfSVDJooGcoswg/RJZpq/ZGjsUYmY0KN1lmB8u03nv+jiG1ncUV5qoggyxFT5AGD5Ak+5Zrw==" + }, "node_modules/@codemirror/commands/node_modules/@lezer/common": { "version": "1.0.2", "license": "MIT" @@ -2047,12 +2057,15 @@ "w3c-keyname": "^2.2.4" } }, + "node_modules/@codemirror/search/node_modules/@codemirror/view/node_modules/@codemirror/state": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.0.1.tgz", + "integrity": "sha512-6vYgaXc4KjSY0BUfSVDJooGcoswg/RJZpq/ZGjsUYmY0KN1lmB8u03nv+jiG1ncUV5qoggyxFT5AGD5Ak+5Zrw==" + }, "node_modules/@codemirror/state": { - "version": "0.19.9", - "license": "MIT", - "dependencies": { - "@codemirror/text": "^0.19.0" - } + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.0.1.tgz", + "integrity": "sha512-6vYgaXc4KjSY0BUfSVDJooGcoswg/RJZpq/ZGjsUYmY0KN1lmB8u03nv+jiG1ncUV5qoggyxFT5AGD5Ak+5Zrw==" }, "node_modules/@codemirror/text": { "version": "0.19.6", @@ -4613,6 +4626,11 @@ "@lezer/common": "^1.0.0" } }, + "node_modules/@uiw/codemirror-extensions-basic-setup/node_modules/@codemirror/autocomplete/node_modules/@codemirror/state": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.0.1.tgz", + "integrity": "sha512-6vYgaXc4KjSY0BUfSVDJooGcoswg/RJZpq/ZGjsUYmY0KN1lmB8u03nv+jiG1ncUV5qoggyxFT5AGD5Ak+5Zrw==" + }, "node_modules/@uiw/codemirror-extensions-basic-setup/node_modules/@codemirror/language": { "version": "6.6.0", "license": "MIT", @@ -4625,6 +4643,11 @@ "style-mod": "^4.0.0" } }, + "node_modules/@uiw/codemirror-extensions-basic-setup/node_modules/@codemirror/language/node_modules/@codemirror/state": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.0.1.tgz", + "integrity": "sha512-6vYgaXc4KjSY0BUfSVDJooGcoswg/RJZpq/ZGjsUYmY0KN1lmB8u03nv+jiG1ncUV5qoggyxFT5AGD5Ak+5Zrw==" + }, "node_modules/@uiw/codemirror-extensions-basic-setup/node_modules/@codemirror/lint": { "version": "6.2.0", "license": "MIT", @@ -4634,6 +4657,11 @@ "crelt": "^1.0.5" } }, + "node_modules/@uiw/codemirror-extensions-basic-setup/node_modules/@codemirror/lint/node_modules/@codemirror/state": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.0.1.tgz", + "integrity": "sha512-6vYgaXc4KjSY0BUfSVDJooGcoswg/RJZpq/ZGjsUYmY0KN1lmB8u03nv+jiG1ncUV5qoggyxFT5AGD5Ak+5Zrw==" + }, "node_modules/@uiw/codemirror-extensions-basic-setup/node_modules/@codemirror/state": { "version": "6.2.0", "license": "MIT" @@ -4647,6 +4675,11 @@ "w3c-keyname": "^2.2.4" } }, + "node_modules/@uiw/codemirror-extensions-basic-setup/node_modules/@codemirror/view/node_modules/@codemirror/state": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.0.1.tgz", + "integrity": "sha512-6vYgaXc4KjSY0BUfSVDJooGcoswg/RJZpq/ZGjsUYmY0KN1lmB8u03nv+jiG1ncUV5qoggyxFT5AGD5Ak+5Zrw==" + }, "node_modules/@uiw/codemirror-extensions-basic-setup/node_modules/@lezer/common": { "version": "1.0.2", "license": "MIT" @@ -4691,6 +4724,11 @@ "style-mod": "^4.0.0" } }, + "node_modules/@uiw/react-codemirror/node_modules/@codemirror/language/node_modules/@codemirror/state": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.0.1.tgz", + "integrity": "sha512-6vYgaXc4KjSY0BUfSVDJooGcoswg/RJZpq/ZGjsUYmY0KN1lmB8u03nv+jiG1ncUV5qoggyxFT5AGD5Ak+5Zrw==" + }, "node_modules/@uiw/react-codemirror/node_modules/@codemirror/state": { "version": "6.2.0", "license": "MIT" @@ -4705,6 +4743,11 @@ "@lezer/highlight": "^1.0.0" } }, + "node_modules/@uiw/react-codemirror/node_modules/@codemirror/theme-one-dark/node_modules/@codemirror/state": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.0.1.tgz", + "integrity": "sha512-6vYgaXc4KjSY0BUfSVDJooGcoswg/RJZpq/ZGjsUYmY0KN1lmB8u03nv+jiG1ncUV5qoggyxFT5AGD5Ak+5Zrw==" + }, "node_modules/@uiw/react-codemirror/node_modules/@codemirror/view": { "version": "6.9.3", "license": "MIT", @@ -4714,6 +4757,11 @@ "w3c-keyname": "^2.2.4" } }, + "node_modules/@uiw/react-codemirror/node_modules/@codemirror/view/node_modules/@codemirror/state": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.0.1.tgz", + "integrity": "sha512-6vYgaXc4KjSY0BUfSVDJooGcoswg/RJZpq/ZGjsUYmY0KN1lmB8u03nv+jiG1ncUV5qoggyxFT5AGD5Ak+5Zrw==" + }, "node_modules/@uiw/react-codemirror/node_modules/@lezer/common": { "version": "1.0.2", "license": "MIT" @@ -7411,6 +7459,11 @@ "@lezer/common": "^1.0.0" } }, + "node_modules/codemirror/node_modules/@codemirror/autocomplete/node_modules/@codemirror/state": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.0.1.tgz", + "integrity": "sha512-6vYgaXc4KjSY0BUfSVDJooGcoswg/RJZpq/ZGjsUYmY0KN1lmB8u03nv+jiG1ncUV5qoggyxFT5AGD5Ak+5Zrw==" + }, "node_modules/codemirror/node_modules/@codemirror/language": { "version": "6.6.0", "license": "MIT", @@ -7423,6 +7476,11 @@ "style-mod": "^4.0.0" } }, + "node_modules/codemirror/node_modules/@codemirror/language/node_modules/@codemirror/state": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.0.1.tgz", + "integrity": "sha512-6vYgaXc4KjSY0BUfSVDJooGcoswg/RJZpq/ZGjsUYmY0KN1lmB8u03nv+jiG1ncUV5qoggyxFT5AGD5Ak+5Zrw==" + }, "node_modules/codemirror/node_modules/@codemirror/lint": { "version": "6.2.0", "license": "MIT", @@ -7432,6 +7490,11 @@ "crelt": "^1.0.5" } }, + "node_modules/codemirror/node_modules/@codemirror/lint/node_modules/@codemirror/state": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.0.1.tgz", + "integrity": "sha512-6vYgaXc4KjSY0BUfSVDJooGcoswg/RJZpq/ZGjsUYmY0KN1lmB8u03nv+jiG1ncUV5qoggyxFT5AGD5Ak+5Zrw==" + }, "node_modules/codemirror/node_modules/@codemirror/state": { "version": "6.2.0", "license": "MIT" @@ -7445,6 +7508,11 @@ "w3c-keyname": "^2.2.4" } }, + "node_modules/codemirror/node_modules/@codemirror/view/node_modules/@codemirror/state": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.0.1.tgz", + "integrity": "sha512-6vYgaXc4KjSY0BUfSVDJooGcoswg/RJZpq/ZGjsUYmY0KN1lmB8u03nv+jiG1ncUV5qoggyxFT5AGD5Ak+5Zrw==" + }, "node_modules/codemirror/node_modules/@lezer/common": { "version": "1.0.2", "license": "MIT" @@ -22807,7 +22875,8 @@ }, "node_modules/react-scripts": { "version": "3.4.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-3.4.0.tgz", + "integrity": "sha512-pBqaAroFoHnFAkuX+uSK9Th1uEh2GYdGY2IG1I9/7HmuEf+ls3lLCk1p2GFYRSrLMz6ieQR/SyN6TLIGK3hKRg==", "dependencies": { "@babel/core": "7.8.4", "@svgr/webpack": "4.3.3", @@ -29458,7 +29527,7 @@ "version": "0.19.15", "requires": { "@codemirror/language": "^0.19.0", - "@codemirror/state": "^0.19.4", + "@codemirror/state": "6.0.1", "@codemirror/text": "^0.19.2", "@codemirror/tooltip": "^0.19.12", "@codemirror/view": "^0.19.0", @@ -29469,7 +29538,7 @@ "version": "6.2.2", "requires": { "@codemirror/language": "^6.0.0", - "@codemirror/state": "^6.2.0", + "@codemirror/state": "6.0.1", "@codemirror/view": "^6.0.0", "@lezer/common": "^1.0.0" }, @@ -29477,12 +29546,19 @@ "@codemirror/language": { "version": "6.6.0", "requires": { - "@codemirror/state": "^6.0.0", + "@codemirror/state": "6.0.1", "@codemirror/view": "^6.0.0", "@lezer/common": "^1.0.0", "@lezer/highlight": "^1.0.0", "@lezer/lr": "^1.0.0", "style-mod": "^4.0.0" + }, + "dependencies": { + "@codemirror/state": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.0.1.tgz", + "integrity": "sha512-6vYgaXc4KjSY0BUfSVDJooGcoswg/RJZpq/ZGjsUYmY0KN1lmB8u03nv+jiG1ncUV5qoggyxFT5AGD5Ak+5Zrw==" + } } }, "@codemirror/state": { @@ -29491,9 +29567,16 @@ "@codemirror/view": { "version": "6.9.3", "requires": { - "@codemirror/state": "^6.1.4", + "@codemirror/state": "6.0.1", "style-mod": "^4.0.0", "w3c-keyname": "^2.2.4" + }, + "dependencies": { + "@codemirror/state": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.0.1.tgz", + "integrity": "sha512-6vYgaXc4KjSY0BUfSVDJooGcoswg/RJZpq/ZGjsUYmY0KN1lmB8u03nv+jiG1ncUV5qoggyxFT5AGD5Ak+5Zrw==" + } } }, "@lezer/common": { @@ -29511,7 +29594,7 @@ "version": "0.19.9", "requires": { "@codemirror/rangeset": "^0.19.0", - "@codemirror/state": "^0.19.0", + "@codemirror/state": "6.0.1", "@codemirror/view": "^0.19.23" } }, @@ -29520,7 +29603,7 @@ "requires": { "@codemirror/language": "^0.19.0", "@codemirror/rangeset": "^0.19.0", - "@codemirror/state": "^0.19.3", + "@codemirror/state": "6.0.1", "@codemirror/view": "^0.19.39", "@lezer/common": "^0.15.0", "style-mod": "^4.0.0" @@ -29532,7 +29615,7 @@ "@codemirror/autocomplete": "^0.19.0", "@codemirror/highlight": "^0.19.6", "@codemirror/language": "^0.19.0", - "@codemirror/state": "^0.19.0", + "@codemirror/state": "6.0.1", "@lezer/css": "^0.15.2" } }, @@ -29544,7 +29627,7 @@ "@codemirror/lang-css": "^0.19.0", "@codemirror/lang-javascript": "^0.19.0", "@codemirror/language": "^0.19.0", - "@codemirror/state": "^0.19.0", + "@codemirror/state": "6.0.1", "@lezer/common": "^0.15.0", "@lezer/html": "^0.15.0" } @@ -29556,7 +29639,7 @@ "@codemirror/highlight": "^0.19.7", "@codemirror/language": "^0.19.0", "@codemirror/lint": "^0.19.0", - "@codemirror/state": "^0.19.0", + "@codemirror/state": "6.0.1", "@codemirror/view": "^0.19.0", "@lezer/javascript": "^0.15.1" } @@ -29572,7 +29655,7 @@ "@codemirror/language": { "version": "0.19.10", "requires": { - "@codemirror/state": "^0.19.0", + "@codemirror/state": "6.0.1", "@codemirror/text": "^0.19.0", "@codemirror/view": "^0.19.0", "@lezer/common": "^0.15.5", @@ -29585,7 +29668,7 @@ "@codemirror/gutter": "^0.19.4", "@codemirror/panel": "^0.19.0", "@codemirror/rangeset": "^0.19.1", - "@codemirror/state": "^0.19.4", + "@codemirror/state": "6.0.1", "@codemirror/tooltip": "^0.19.16", "@codemirror/view": "^0.19.22", "crelt": "^1.0.5" @@ -29594,20 +29677,20 @@ "@codemirror/panel": { "version": "0.19.1", "requires": { - "@codemirror/state": "^0.19.0", + "@codemirror/state": "6.0.1", "@codemirror/view": "^0.19.0" } }, "@codemirror/rangeset": { "version": "0.19.9", "requires": { - "@codemirror/state": "^0.19.0" + "@codemirror/state": "6.0.1" } }, "@codemirror/search": { "version": "6.3.0", "requires": { - "@codemirror/state": "^6.0.0", + "@codemirror/state": "6.0.1", "@codemirror/view": "^6.0.0", "crelt": "^1.0.5" }, @@ -29618,18 +29701,24 @@ "@codemirror/view": { "version": "6.9.3", "requires": { - "@codemirror/state": "^6.1.4", + "@codemirror/state": "6.0.1", "style-mod": "^4.0.0", "w3c-keyname": "^2.2.4" + }, + "dependencies": { + "@codemirror/state": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.0.1.tgz", + "integrity": "sha512-6vYgaXc4KjSY0BUfSVDJooGcoswg/RJZpq/ZGjsUYmY0KN1lmB8u03nv+jiG1ncUV5qoggyxFT5AGD5Ak+5Zrw==" + } } } } }, "@codemirror/state": { - "version": "0.19.9", - "requires": { - "@codemirror/text": "^0.19.0" - } + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.0.1.tgz", + "integrity": "sha512-6vYgaXc4KjSY0BUfSVDJooGcoswg/RJZpq/ZGjsUYmY0KN1lmB8u03nv+jiG1ncUV5qoggyxFT5AGD5Ak+5Zrw==" }, "@codemirror/text": { "version": "0.19.6" @@ -29638,14 +29727,14 @@ "version": "0.19.1", "requires": { "@codemirror/highlight": "^0.19.0", - "@codemirror/state": "^0.19.0", + "@codemirror/state": "6.0.1", "@codemirror/view": "^0.19.0" } }, "@codemirror/tooltip": { "version": "0.19.16", "requires": { - "@codemirror/state": "^0.19.0", + "@codemirror/state": "6.0.1", "@codemirror/view": "^0.19.0" } }, @@ -29653,7 +29742,7 @@ "version": "0.19.48", "requires": { "@codemirror/rangeset": "^0.19.5", - "@codemirror/state": "^0.19.3", + "@codemirror/state": "6.0.1", "@codemirror/text": "^0.19.0", "style-mod": "^4.0.0", "w3c-keyname": "^2.2.4" @@ -31322,7 +31411,7 @@ "@codemirror/language": "^6.0.0", "@codemirror/lint": "^6.0.0", "@codemirror/search": "^6.0.0", - "@codemirror/state": "^6.0.0", + "@codemirror/state": "6.0.1", "@codemirror/view": "^6.0.0" }, "dependencies": { @@ -31330,28 +31419,49 @@ "version": "6.4.2", "requires": { "@codemirror/language": "^6.0.0", - "@codemirror/state": "^6.0.0", + "@codemirror/state": "6.0.1", "@codemirror/view": "^6.6.0", "@lezer/common": "^1.0.0" + }, + "dependencies": { + "@codemirror/state": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.0.1.tgz", + "integrity": "sha512-6vYgaXc4KjSY0BUfSVDJooGcoswg/RJZpq/ZGjsUYmY0KN1lmB8u03nv+jiG1ncUV5qoggyxFT5AGD5Ak+5Zrw==" + } } }, "@codemirror/language": { "version": "6.6.0", "requires": { - "@codemirror/state": "^6.0.0", + "@codemirror/state": "6.0.1", "@codemirror/view": "^6.0.0", "@lezer/common": "^1.0.0", "@lezer/highlight": "^1.0.0", "@lezer/lr": "^1.0.0", "style-mod": "^4.0.0" + }, + "dependencies": { + "@codemirror/state": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.0.1.tgz", + "integrity": "sha512-6vYgaXc4KjSY0BUfSVDJooGcoswg/RJZpq/ZGjsUYmY0KN1lmB8u03nv+jiG1ncUV5qoggyxFT5AGD5Ak+5Zrw==" + } } }, "@codemirror/lint": { "version": "6.2.0", "requires": { - "@codemirror/state": "^6.0.0", + "@codemirror/state": "6.0.1", "@codemirror/view": "^6.0.0", "crelt": "^1.0.5" + }, + "dependencies": { + "@codemirror/state": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.0.1.tgz", + "integrity": "sha512-6vYgaXc4KjSY0BUfSVDJooGcoswg/RJZpq/ZGjsUYmY0KN1lmB8u03nv+jiG1ncUV5qoggyxFT5AGD5Ak+5Zrw==" + } } }, "@codemirror/state": { @@ -31360,9 +31470,16 @@ "@codemirror/view": { "version": "6.9.3", "requires": { - "@codemirror/state": "^6.1.4", + "@codemirror/state": "6.0.1", "style-mod": "^4.0.0", "w3c-keyname": "^2.2.4" + }, + "dependencies": { + "@codemirror/state": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.0.1.tgz", + "integrity": "sha512-6vYgaXc4KjSY0BUfSVDJooGcoswg/RJZpq/ZGjsUYmY0KN1lmB8u03nv+jiG1ncUV5qoggyxFT5AGD5Ak+5Zrw==" + } } }, "@lezer/common": { @@ -31381,7 +31498,7 @@ "requires": { "@babel/runtime": "^7.18.6", "@codemirror/commands": "^6.1.0", - "@codemirror/state": "^6.1.1", + "@codemirror/state": "6.0.1", "@codemirror/theme-one-dark": "^6.0.0", "@uiw/codemirror-extensions-basic-setup": "4.19.11", "codemirror": "^6.0.0" @@ -31390,12 +31507,19 @@ "@codemirror/language": { "version": "6.6.0", "requires": { - "@codemirror/state": "^6.0.0", + "@codemirror/state": "6.0.1", "@codemirror/view": "^6.0.0", "@lezer/common": "^1.0.0", "@lezer/highlight": "^1.0.0", "@lezer/lr": "^1.0.0", "style-mod": "^4.0.0" + }, + "dependencies": { + "@codemirror/state": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.0.1.tgz", + "integrity": "sha512-6vYgaXc4KjSY0BUfSVDJooGcoswg/RJZpq/ZGjsUYmY0KN1lmB8u03nv+jiG1ncUV5qoggyxFT5AGD5Ak+5Zrw==" + } } }, "@codemirror/state": { @@ -31405,17 +31529,31 @@ "version": "6.1.1", "requires": { "@codemirror/language": "^6.0.0", - "@codemirror/state": "^6.0.0", + "@codemirror/state": "6.0.1", "@codemirror/view": "^6.0.0", "@lezer/highlight": "^1.0.0" + }, + "dependencies": { + "@codemirror/state": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.0.1.tgz", + "integrity": "sha512-6vYgaXc4KjSY0BUfSVDJooGcoswg/RJZpq/ZGjsUYmY0KN1lmB8u03nv+jiG1ncUV5qoggyxFT5AGD5Ak+5Zrw==" + } } }, "@codemirror/view": { "version": "6.9.3", "requires": { - "@codemirror/state": "^6.1.4", + "@codemirror/state": "6.0.1", "style-mod": "^4.0.0", "w3c-keyname": "^2.2.4" + }, + "dependencies": { + "@codemirror/state": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.0.1.tgz", + "integrity": "sha512-6vYgaXc4KjSY0BUfSVDJooGcoswg/RJZpq/ZGjsUYmY0KN1lmB8u03nv+jiG1ncUV5qoggyxFT5AGD5Ak+5Zrw==" + } } }, "@lezer/common": { @@ -33249,7 +33387,7 @@ "@codemirror/language": "^6.0.0", "@codemirror/lint": "^6.0.0", "@codemirror/search": "^6.0.0", - "@codemirror/state": "^6.0.0", + "@codemirror/state": "6.0.1", "@codemirror/view": "^6.0.0" }, "dependencies": { @@ -33257,28 +33395,49 @@ "version": "6.4.2", "requires": { "@codemirror/language": "^6.0.0", - "@codemirror/state": "^6.0.0", + "@codemirror/state": "6.0.1", "@codemirror/view": "^6.6.0", "@lezer/common": "^1.0.0" + }, + "dependencies": { + "@codemirror/state": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.0.1.tgz", + "integrity": "sha512-6vYgaXc4KjSY0BUfSVDJooGcoswg/RJZpq/ZGjsUYmY0KN1lmB8u03nv+jiG1ncUV5qoggyxFT5AGD5Ak+5Zrw==" + } } }, "@codemirror/language": { "version": "6.6.0", "requires": { - "@codemirror/state": "^6.0.0", + "@codemirror/state": "6.0.1", "@codemirror/view": "^6.0.0", "@lezer/common": "^1.0.0", "@lezer/highlight": "^1.0.0", "@lezer/lr": "^1.0.0", "style-mod": "^4.0.0" + }, + "dependencies": { + "@codemirror/state": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.0.1.tgz", + "integrity": "sha512-6vYgaXc4KjSY0BUfSVDJooGcoswg/RJZpq/ZGjsUYmY0KN1lmB8u03nv+jiG1ncUV5qoggyxFT5AGD5Ak+5Zrw==" + } } }, "@codemirror/lint": { "version": "6.2.0", "requires": { - "@codemirror/state": "^6.0.0", + "@codemirror/state": "6.0.1", "@codemirror/view": "^6.0.0", "crelt": "^1.0.5" + }, + "dependencies": { + "@codemirror/state": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.0.1.tgz", + "integrity": "sha512-6vYgaXc4KjSY0BUfSVDJooGcoswg/RJZpq/ZGjsUYmY0KN1lmB8u03nv+jiG1ncUV5qoggyxFT5AGD5Ak+5Zrw==" + } } }, "@codemirror/state": { @@ -33287,9 +33446,16 @@ "@codemirror/view": { "version": "6.9.3", "requires": { - "@codemirror/state": "^6.1.4", + "@codemirror/state": "6.0.1", "style-mod": "^4.0.0", "w3c-keyname": "^2.2.4" + }, + "dependencies": { + "@codemirror/state": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.0.1.tgz", + "integrity": "sha512-6vYgaXc4KjSY0BUfSVDJooGcoswg/RJZpq/ZGjsUYmY0KN1lmB8u03nv+jiG1ncUV5qoggyxFT5AGD5Ak+5Zrw==" + } } }, "@lezer/common": { @@ -43592,6 +43758,8 @@ }, "react-scripts": { "version": "3.4.0", + "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-3.4.0.tgz", + "integrity": "sha512-pBqaAroFoHnFAkuX+uSK9Th1uEh2GYdGY2IG1I9/7HmuEf+ls3lLCk1p2GFYRSrLMz6ieQR/SyN6TLIGK3hKRg==", "requires": { "@babel/core": "7.8.4", "@svgr/webpack": "4.3.3", diff --git a/web/package.json b/web/package.json index c2ea9efe..dca5de32 100644 --- a/web/package.json +++ b/web/package.json @@ -8,6 +8,7 @@ "node_modules" ], "dependencies": { + "@ant-design/pro-layout": "^7.2.6", "@codemirror/lang-html": "^0.19.4", "@codemirror/lang-json": "^0.19.2", "@codemirror/theme-one-dark": "^0.19.1", @@ -21,10 +22,9 @@ "@uppy/image-editor": "^0.1.8", "@uppy/react": "^1.10.10", "@uppy/url": "^1.5.13", - "@ant-design/pro-layout": "^7.2.6", "antd": "^5.0.4", - "dayjs": "^1.11.6", "axios": "^0.21.4", + "dayjs": "^1.11.6", "deep-equal": "^2.0.5", "js-cookie": "^2.2.1", "posthog-js": "^1.57.2", @@ -34,7 +34,7 @@ "react-lottie": "^1.2.3", "react-redux": "^7.2.0", "react-router-dom": "^5.3.0", - "react-scripts": "3.4.0", + "react-scripts": "^3.4.0", "redux": "^4.0.5", "redux-devtools-extension": "^2.13.8", "redux-thunk": "^2.3.0"