|
@@ -55,7 +55,9 @@
|
|
|
"dependencies": {
|
|
"dependencies": {
|
|
|
"@browser-bunyan/console-formatted-stream": "^1.6.2",
|
|
"@browser-bunyan/console-formatted-stream": "^1.6.2",
|
|
|
"@google-cloud/storage": "^5.8.5",
|
|
"@google-cloud/storage": "^5.8.5",
|
|
|
|
|
+ "@growi/plugin-attachment-refs": "^4.3.3-RC",
|
|
|
"@growi/plugin-pukiwiki-like-linker": "^4.3.3-RC",
|
|
"@growi/plugin-pukiwiki-like-linker": "^4.3.3-RC",
|
|
|
|
|
+ "@growi/plugin-lsx": "^4.3.3-RC",
|
|
|
"@growi/slack": "^4.3.3-RC",
|
|
"@growi/slack": "^4.3.3-RC",
|
|
|
"@kobalab/socket.io-session": "^1.0.3",
|
|
"@kobalab/socket.io-session": "^1.0.3",
|
|
|
"@promster/express": "^5.0.1",
|
|
"@promster/express": "^5.0.1",
|
|
@@ -77,12 +79,10 @@
|
|
|
"connect-mongo": "^4.4.1",
|
|
"connect-mongo": "^4.4.1",
|
|
|
"connect-redis": "^4.0.4",
|
|
"connect-redis": "^4.0.4",
|
|
|
"cookie-parser": "^1.4.5",
|
|
"cookie-parser": "^1.4.5",
|
|
|
- "cross-env": "^7.0.0",
|
|
|
|
|
"csrf": "^3.1.0",
|
|
"csrf": "^3.1.0",
|
|
|
"date-fns": "^2.0.0",
|
|
"date-fns": "^2.0.0",
|
|
|
"detect-indent": "^6.0.0",
|
|
"detect-indent": "^6.0.0",
|
|
|
"diff": "^5.0.0",
|
|
"diff": "^5.0.0",
|
|
|
- "dotenv-flow": "^3.2.0",
|
|
|
|
|
"elasticsearch": "^16.0.0",
|
|
"elasticsearch": "^16.0.0",
|
|
|
"entities": "^2.0.0",
|
|
"entities": "^2.0.0",
|
|
|
"esa-nodejs": "^0.0.7",
|
|
"esa-nodejs": "^0.0.7",
|
|
@@ -96,10 +96,14 @@
|
|
|
"express-webpack-assets": "^0.1.0",
|
|
"express-webpack-assets": "^0.1.0",
|
|
|
"graceful-fs": "^4.1.11",
|
|
"graceful-fs": "^4.1.11",
|
|
|
"growi-commons": "^5.0.4",
|
|
"growi-commons": "^5.0.4",
|
|
|
|
|
+<<<<<<< HEAD
|
|
|
"growi-plugin-attachment-refs": "^2.0.2",
|
|
"growi-plugin-attachment-refs": "^2.0.2",
|
|
|
"growi-plugin-lsx": "^4.0.3",
|
|
"growi-plugin-lsx": "^4.0.3",
|
|
|
"helmet": "^4.6.0",
|
|
"helmet": "^4.6.0",
|
|
|
"nocache": "^3.0.1",
|
|
"nocache": "^3.0.1",
|
|
|
|
|
+=======
|
|
|
|
|
+ "helmet": "^3.13.0",
|
|
|
|
|
+>>>>>>> f656a3e1b8ac561c4acccae032edc3ee207413a2
|
|
|
"http-errors": "~1.6.2",
|
|
"http-errors": "~1.6.2",
|
|
|
"i18next": "^20.3.2",
|
|
"i18next": "^20.3.2",
|
|
|
"i18next-express-middleware": "^2.0.0",
|
|
"i18next-express-middleware": "^2.0.0",
|
|
@@ -119,7 +123,6 @@
|
|
|
"multer-autoreap": "^1.0.3",
|
|
"multer-autoreap": "^1.0.3",
|
|
|
"nodemailer": "^6.6.2",
|
|
"nodemailer": "^6.6.2",
|
|
|
"nodemailer-ses-transport": "~1.5.0",
|
|
"nodemailer-ses-transport": "~1.5.0",
|
|
|
- "npm-run-all": "^4.1.2",
|
|
|
|
|
"openid-client": "=2.5.0",
|
|
"openid-client": "=2.5.0",
|
|
|
"passport": "^0.4.0",
|
|
"passport": "^0.4.0",
|
|
|
"passport-github": "^1.1.0",
|
|
"passport-github": "^1.1.0",
|
|
@@ -135,14 +138,11 @@
|
|
|
"reconnecting-websocket": "^4.4.0",
|
|
"reconnecting-websocket": "^4.4.0",
|
|
|
"redis": "^3.0.2",
|
|
"redis": "^3.0.2",
|
|
|
"rimraf": "^3.0.0",
|
|
"rimraf": "^3.0.0",
|
|
|
- "socket.io": "^2.3.0",
|
|
|
|
|
|
|
+ "socket.io": "^4.0.0",
|
|
|
"stream-to-promise": "^3.0.0",
|
|
"stream-to-promise": "^3.0.0",
|
|
|
"string-width": "=4.2.2",
|
|
"string-width": "=4.2.2",
|
|
|
"swagger-jsdoc": "^3.4.0",
|
|
"swagger-jsdoc": "^3.4.0",
|
|
|
"swig-templates": "^2.0.2",
|
|
"swig-templates": "^2.0.2",
|
|
|
- "ts-node": "^9.1.1",
|
|
|
|
|
- "tsconfig-paths": "^3.9.0",
|
|
|
|
|
- "typescript": "^4.2.3",
|
|
|
|
|
"uglifycss": "^0.0.29",
|
|
"uglifycss": "^0.0.29",
|
|
|
"universal-bunyan": "^0.9.2",
|
|
"universal-bunyan": "^0.9.2",
|
|
|
"unzipper": "^0.10.5",
|
|
"unzipper": "^0.10.5",
|
|
@@ -160,11 +160,11 @@
|
|
|
"@alienfast/i18next-loader": "^1.0.16",
|
|
"@alienfast/i18next-loader": "^1.0.16",
|
|
|
"@atlaskit/drawer": "^5.3.7",
|
|
"@atlaskit/drawer": "^5.3.7",
|
|
|
"@atlaskit/navigation-next": "^8.0.5",
|
|
"@atlaskit/navigation-next": "^8.0.5",
|
|
|
|
|
+ "@growi/ui": "^4.3.3-RC",
|
|
|
"@handsontable/react": "=2.1.0",
|
|
"@handsontable/react": "=2.1.0",
|
|
|
"@types/compression": "^1.7.0",
|
|
"@types/compression": "^1.7.0",
|
|
|
"@types/express": "^4.17.11",
|
|
"@types/express": "^4.17.11",
|
|
|
"@types/multer": "^1.4.5",
|
|
"@types/multer": "^1.4.5",
|
|
|
- "@types/node": "^14.14.35",
|
|
|
|
|
"@types/react-dom": "^17.0.9",
|
|
"@types/react-dom": "^17.0.9",
|
|
|
"autoprefixer": "^9.0.0",
|
|
"autoprefixer": "^9.0.0",
|
|
|
"bootstrap": "^4.5.0",
|
|
"bootstrap": "^4.5.0",
|
|
@@ -184,8 +184,6 @@
|
|
|
"hard-source-webpack-plugin": "^0.13.1",
|
|
"hard-source-webpack-plugin": "^0.13.1",
|
|
|
"i18next-browser-languagedetector": "^4.0.1",
|
|
"i18next-browser-languagedetector": "^4.0.1",
|
|
|
"imports-loader": "^0.8.0",
|
|
"imports-loader": "^0.8.0",
|
|
|
- "jest": "^27.0.6",
|
|
|
|
|
- "jest-date-mock": "^1.0.8",
|
|
|
|
|
"jquery-slimscroll": "^1.3.8",
|
|
"jquery-slimscroll": "^1.3.8",
|
|
|
"jquery-ui": "^1.12.1",
|
|
"jquery-ui": "^1.12.1",
|
|
|
"jquery.cookie": "~1.4.1",
|
|
"jquery.cookie": "~1.4.1",
|
|
@@ -223,15 +221,13 @@
|
|
|
"react-frame-component": "^4.0.0",
|
|
"react-frame-component": "^4.0.0",
|
|
|
"react-hotkeys": "^2.0.0",
|
|
"react-hotkeys": "^2.0.0",
|
|
|
"react-i18next": "^11.1.0",
|
|
"react-i18next": "^11.1.0",
|
|
|
- "react-images": "1.0.0",
|
|
|
|
|
- "react-motion": "^0.5.2",
|
|
|
|
|
"react-waypoint": "^10.1.0",
|
|
"react-waypoint": "^10.1.0",
|
|
|
"reactstrap": "^8.9.0",
|
|
"reactstrap": "^8.9.0",
|
|
|
"replacestream": "^4.0.3",
|
|
"replacestream": "^4.0.3",
|
|
|
"reveal.js": "^3.5.0",
|
|
"reveal.js": "^3.5.0",
|
|
|
"sass-loader": "^8.0.0",
|
|
"sass-loader": "^8.0.0",
|
|
|
"simple-load-script": "^1.0.2",
|
|
"simple-load-script": "^1.0.2",
|
|
|
- "socket.io-client": "^2.3.0",
|
|
|
|
|
|
|
+ "socket.io-client": "^4.0.0",
|
|
|
"sticky-events": "^3.1.3",
|
|
"sticky-events": "^3.1.3",
|
|
|
"style-loader": "^1.0.0",
|
|
"style-loader": "^1.0.0",
|
|
|
"styled-components": "^5.0.1",
|
|
"styled-components": "^5.0.1",
|
|
@@ -241,7 +237,6 @@
|
|
|
"terser-webpack-plugin": "^4.1.0",
|
|
"terser-webpack-plugin": "^4.1.0",
|
|
|
"throttle-debounce": "^2.0.0",
|
|
"throttle-debounce": "^2.0.0",
|
|
|
"toastr": "^2.1.2",
|
|
"toastr": "^2.1.2",
|
|
|
- "ts-jest": "^27.0.4",
|
|
|
|
|
"ts-loader": "^8.3.0",
|
|
"ts-loader": "^8.3.0",
|
|
|
"ts-node-dev": "^1.1.6",
|
|
"ts-node-dev": "^1.1.6",
|
|
|
"tsc-alias": "^1.2.9",
|
|
"tsc-alias": "^1.2.9",
|