Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
ggazzo committed Apr 22, 2022
1 parent 774f526 commit ffd8376
Show file tree
Hide file tree
Showing 9 changed files with 856 additions and 289 deletions.
546 changes: 546 additions & 0 deletions .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@ nodeLinker: node-modules
plugins:
- path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
spec: "@yarnpkg/plugin-workspace-tools"
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
spec: "@yarnpkg/plugin-interactive-tools"

yarnPath: .yarn/releases/yarn-3.2.0.cjs
2 changes: 1 addition & 1 deletion apps/meteor/.eslintrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": ["@rocket.chat/eslint-config", "plugin:prettier/recommended"],
"extends": ["@rocket.chat/eslint-config", "plugin:prettier/recommended", "plugin:import/typescript"],
"parser": "babel-eslint",
"globals": {
"__meteor_bootstrap__": false,
Expand Down
13 changes: 7 additions & 6 deletions apps/meteor/app/api/server/lib/getUploadFormData.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import Busboy from 'busboy';
import busboy from 'busboy';

export const getUploadFormData = async ({ request }) =>
new Promise((resolve, reject) => {
const busboy = new Busboy({ headers: request.headers });
const bb = busboy({ headers: request.headers });

const fields = {};

busboy.on('file', (fieldname, file, filename, encoding, mimetype) => {
bb.on('file', (fieldname, file, { filename, encoding, mimeType: mimetype }) => {
const fileData = [];

console.log(file);
file.on('data', (data) => fileData.push(data));

file.on('end', () => {
Expand All @@ -26,11 +27,11 @@ export const getUploadFormData = async ({ request }) =>
});
});

busboy.on('field', (fieldname, value) => {
bb.on('field', (fieldname, value) => {
fields[fieldname] = value;
});

busboy.on('finish', () => resolve(fields));
bb.on('finish', () => resolve(fields));

request.pipe(busboy);
request.pipe(bb);
});
10 changes: 5 additions & 5 deletions apps/meteor/ee/server/services/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,19 @@
"ajv": "^8.7.1",
"bcrypt": "^5.0.1",
"body-parser": "^1.20.0",
"colorette": "^1.3.0",
"cookie": "^0.4.2",
"colorette": "^1.4.0",
"cookie": "^0.5.0",
"cookie-parser": "^1.4.6",
"ejson": "^2.2.2",
"eventemitter3": "^4.0.7",
"express": "^4.17.3",
"fibers": "^5.0.1",
"jaeger-client": "^3.19.0",
"mem": "^8.1.1",
"moleculer": "^0.14.19",
"moleculer": "^0.14.20",
"mongodb": "^3.6.10",
"nats": "^2.4.0",
"pino": "^7.9.2",
"pino": "^7.10.0",
"sodium-native": "^3.3.0",
"sodium-plus": "^0.9.0",
"underscore.string": "^3.3.6",
Expand All @@ -63,7 +63,7 @@
"@types/mongodb": "^3.6.20",
"@types/node": "^14.18.12",
"@types/ws": "^8.5.3",
"pino-pretty": "^7.6.0",
"pino-pretty": "^7.6.1",
"pm2": "^5.2.0",
"ts-node": "^10.7.0",
"typescript": "~4.3.5"
Expand Down
96 changes: 48 additions & 48 deletions apps/meteor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -138,12 +138,12 @@
"babel-eslint": "^10.1.0",
"babel-loader": "^8.2.2",
"babel-plugin-array-includes": "^2.0.3",
"chai": "^4.3.4",
"chai": "^4.3.6",
"chai-datetime": "^1.8.0",
"chai-dom": "^1.10.0",
"chai-dom": "^1.11.0",
"chai-spies": "^1.0.0",
"cross-env": "^7.0.3",
"cypress": "^7.6.0",
"cypress": "^7.7.0",
"emojione-assets": "^4.5.0",
"eslint": "^6.8.0",
"eslint-config-prettier": "^8.3.0",
Expand All @@ -152,21 +152,21 @@
"eslint-plugin-react": "^7.24.0",
"eslint-plugin-react-hooks": "^4.2.0",
"eslint-plugin-testing-library": "^5.0.0",
"fast-glob": "^3.2.5",
"fast-glob": "^3.2.11",
"i18next": "^20.3.2",
"jsdom-global": "^3.0.2",
"mocha": "^9.1.3",
"mock-require": "^3.0.3",
"outdent": "~0.8.0",
"pino-pretty": "^7.6.0",
"postcss": "~8",
"pino-pretty": "^7.6.1",
"postcss": "~8.4.12",
"postcss-custom-properties": "^11.0.0",
"postcss-easy-import": "^3.0.0",
"postcss-load-config": "^3.1.0",
"postcss-media-minmax": "^5.0.0",
"postcss-nested": "^5.0.5",
"postcss-nested": "^5.0.6",
"postcss-url": "^10.1.3",
"prettier": "2.5.1",
"prettier": "2.6.2",
"rewire": "^5.0.0",
"source-map": "^0.5.7",
"stylelint": "^13.13.1",
Expand All @@ -179,7 +179,7 @@
},
"dependencies": {
"@babel/runtime": "^7.15.4",
"@bugsnag/js": "^7.11.0",
"@bugsnag/js": "^7.16.2",
"@google-cloud/language": "^3.8.0",
"@google-cloud/storage": "^2.5.0",
"@nivo/bar": "0.73.1",
Expand Down Expand Up @@ -218,69 +218,69 @@
"asterisk-manager": "^0.2.0",
"atlassian-crowd-patched": "^0.5.1",
"autolinker": "^3.14.3",
"aws-sdk": "^2.735.0",
"aws-sdk": "^2.1119.0",
"bad-words": "^3.0.4",
"bcrypt": "^5.0.1",
"blockstack": "19.3.0",
"body-parser": "1.19.2",
"bson": "^4.5.1",
"busboy": "^0.3.1",
"body-parser": "1.20.0",
"bson": "^4.6.3",
"busboy": "^1.6.0",
"bytebuffer": "5.0.1",
"cas": "https://github.com/kcbanner/node-cas/tarball/fcd27dad333223b3b75a048bce27973fb3ca0f62",
"change-case": "^4.1.2",
"chart.js": "^2.9.3",
"clipboard": "^2.0.8",
"codemirror": "^5.62.0",
"colorette": "^1.3.0",
"chart.js": "^2.9.4",
"clipboard": "^2.0.10",
"codemirror": "^5.65.3",
"colorette": "^1.4.0",
"connect": "^3.7.0",
"cookie": "^0.4.1",
"cookie": "^0.4.2",
"cookie-parser": "^1.4.6",
"cors": "^2.8.5",
"css-vars-ponyfill": "^2.4.7",
"csv-parse": "^4.16.3",
"cypress-real-events": "^1.7.0",
"cypress-wait-until": "^1.7.2",
"date-fns": "^2.28.0",
"dompurify": "^2.2.9",
"dompurify": "^2.3.6",
"ejson": "^2.2.2",
"emailreplyparser": "^0.0.5",
"emojione": "^4.5.0",
"eslint-plugin-anti-trojan-source": "^1.1.0",
"eventemitter3": "^4.0.7",
"exif-be-gone": "^1.2.0",
"express": "^4.17.1",
"express-rate-limit": "^5.2.6",
"exif-be-gone": "^1.2.2",
"express": "^4.17.3",
"express-rate-limit": "^5.5.1",
"fastq": "^1.13.0",
"fflate": "^0.7.1",
"fflate": "^0.7.3",
"fibers": "^5.0.1",
"file-type": "^10.11.0",
"filenamify": "^4.3.0",
"filesize": "^3.6.1",
"google-libphonenumber": "^3.2.25",
"google-libphonenumber": "^3.2.27",
"googleapis": "^25.0.0",
"grapheme-splitter": "^1.0.4",
"gridfs-stream": "^1.1.1",
"he": "^1.2.0",
"highlight.js": "^9.18.5",
"http-proxy-agent": "^5.0.0",
"i18next-http-backend": "^1.3.1",
"i18next-http-backend": "^1.4.0",
"iconv-lite": "^0.6.3",
"image-size": "^1.0.0",
"image-size": "^1.0.1",
"imap": "^0.8.19",
"ip-range-check": "^0.2.0",
"is-svg": "^4.3.2",
"jquery": "^3.5.1",
"jquery": "^3.6.0",
"jschardet": "^3.0.0",
"jsdom": "^16.6.0",
"jsrsasign": "^10.4.0",
"jsdom": "^16.7.0",
"jsrsasign": "^10.5.18",
"juice": "^8.0.0",
"katex": "^0.11.1",
"ldap-escape": "^2.0.5",
"ldapjs": "^2.3.1",
"ldap-escape": "^2.0.6",
"ldapjs": "^2.3.2",
"less": "https://github.com/meteor/less.js/tarball/8130849eb3d7f0ecf0ca8d0af7c4207b0442e3f6",
"less-plugin-autoprefixer": "^2.1.0",
"limax": "^3.0.0",
"localforage": "^1.9.0",
"localforage": "^1.10.0",
"lodash.clonedeep": "^4.5.0",
"lodash.debounce": "^4.0.8",
"lodash.get": "^4.4.2",
Expand All @@ -291,23 +291,23 @@
"meteor-node-stubs": "^1.1.0",
"mime-db": "^1.48.0",
"mime-type": "^3.1.0",
"mkdirp": "^0.5.5",
"moleculer": "^0.14.19",
"mkdirp": "^0.5.6",
"moleculer": "^0.14.20",
"moment": "^2.29.1",
"moment-timezone": "^0.5.33",
"moment-timezone": "^0.5.34",
"mongodb": "^3.6.10",
"mongodb-memory-server": "^7.4.1",
"mongodb-memory-server": "^7.6.3",
"nats": "^2.4.0",
"node-dogstatsd": "^0.0.7",
"node-gcm": "1.0.0",
"node-rsa": "^1.1.1",
"nodemailer": "^6.6.2",
"nodemailer": "^6.7.3",
"object-path": "^0.11.8",
"path": "^0.12.7",
"path-to-regexp": "^6.2.0",
"pdfjs-dist": "^2.8.335",
"photoswipe": "^4.1.3",
"pino": "^7.9.2",
"pino": "^7.10.0",
"poplib": "^0.1.7",
"postis": "^2.2.0",
"prom-client": "^12.0.0",
Expand All @@ -318,32 +318,32 @@
"rc-scrollbars": "^1.1.3",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-hook-form": "^7.21.0",
"react-i18next": "^11.16.2",
"react-hook-form": "^7.30.0",
"react-i18next": "^11.16.7",
"react-keyed-flatten-children": "^1.3.0",
"react-query": "^3.33.1",
"react-virtuoso": "^1.8.6",
"react-query": "^3.38.0",
"react-virtuoso": "^1.11.1",
"redis": "^2.8.0",
"semver": "^5.7.1",
"sharp": "^0.29.3",
"sip.js": "^0.20.0",
"sodium-native": "^3.2.1",
"sodium-native": "^3.3.0",
"sodium-plus": "^0.9.0",
"speakeasy": "^2.0.0",
"stream-buffers": "^3.0.2",
"string-strip-html": "^7.0.3",
"tar-stream": "^1.6.2",
"tinykeys": "^1.2.0",
"tinykeys": "^1.4.0",
"toastr": "^2.1.4",
"turndown": "^5.0.3",
"twilio": "^3.65.0",
"twilio": "^3.76.1",
"twit": "^2.2.11",
"ua-parser-js": "^1.0.2",
"underscore": "^1.13.1",
"underscore.string": "^3.3.5",
"underscore": "^1.13.2",
"underscore.string": "^3.3.6",
"universal-perf-hooks": "^1.0.1",
"url-polyfill": "^1.1.12",
"use-subscription": "^1.5.1",
"use-subscription": "^1.6.0",
"uuid": "^3.4.0",
"webdav": "^2.10.2",
"xml-crypto": "^2.1.3",
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"storybook": "yarn workspace @rocket.chat/meteor run storybook"
},
"devDependencies": {
"husky": "^7.0.1",
"turbo": "1.2.0"
"husky": "^7.0.4",
"turbo": "1.2.5"
},
"workspaces": [
"apps/*",
Expand Down
2 changes: 1 addition & 1 deletion packages/core-typings/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"@rocket.chat/ui-kit": "^0.31.6",
"@types/mongodb": "^3.6.10",
"eslint": "^8.12.0",
"prettier": "^2.6.1",
"prettier": "^2.6.2",
"typescript": "~4.3.5"
},
"scripts": {
Expand Down
Loading

0 comments on commit ffd8376

Please sign in to comment.