Skip to content

Commit a7932bf

Browse files
ggazzosampaiodiego
ggazzo
and
sampaiodiego
authored
Chore: Meteor 2.2 and bump dependencies (RocketChat#22399)
Co-authored-by: Diego Sampaio <chinello@gmail.com>
1 parent 6236ec0 commit a7932bf

169 files changed

Lines changed: 8410 additions & 9662 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.eslintignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public/livechat/
1414
!.scripts
1515
public/pdf.worker.min.js
1616
public/workers/**/*
17-
imports/client/
17+
imports/client/**/*
1818
!/.storybook/
1919
ee/server/services/dist/**
2020
!/.mocharc.js

‎.eslintrc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@
8181
"prefer-single"
8282
],
8383
"indent": "off",
84+
"no-dupe-class-members": "off",
8485
"no-extra-parens": "off",
8586
"no-spaced-func": "off",
8687
"no-unused-vars": "off",
@@ -116,6 +117,7 @@
116117
"enforceForArrowConditionals": false
117118
}
118119
],
120+
"@typescript-eslint/no-dupe-class-members": "error",
119121
"@typescript-eslint/no-explicit-any": "off",
120122
"@typescript-eslint/no-unused-vars": ["error", {
121123
"argsIgnorePattern": "^_",

‎.github/workflows/build_and_test.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
path: |
6464
./node_modules
6565
./ee/server/services/node_modules
66-
key: ${{ runner.OS }}-node_modules-2-${{ hashFiles('**/package-lock.json', '.github/workflows/build_and_test.yml') }}
66+
key: ${{ runner.OS }}-node_modules-4-${{ hashFiles('**/package-lock.json', '.github/workflows/build_and_test.yml') }}
6767

6868
- name: Cache meteor local
6969
uses: actions/cache@v2
@@ -242,7 +242,7 @@ jobs:
242242
path: |
243243
./node_modules
244244
./ee/server/services/node_modules
245-
key: ${{ runner.OS }}-node_modules-2-${{ hashFiles('**/package-lock.json', '.github/workflows/build_and_test.yml') }}
245+
key: ${{ runner.OS }}-node_modules-4-${{ hashFiles('**/package-lock.json', '.github/workflows/build_and_test.yml') }}
246246

247247
- name: NPM install
248248
if: steps.cache-nodemodules.outputs.cache-hit != 'true' || steps.cache-cypress.outputs.cache-hit != 'true'
@@ -306,7 +306,7 @@ jobs:
306306
path: |
307307
./node_modules
308308
./ee/server/services/node_modules
309-
key: ${{ runner.OS }}-node_modules-2-${{ hashFiles('**/package-lock.json', '.github/workflows/build_and_test.yml') }}
309+
key: ${{ runner.OS }}-node_modules-4-${{ hashFiles('**/package-lock.json', '.github/workflows/build_and_test.yml') }}
310310

311311
- name: Cache meteor local
312312
uses: actions/cache@v2

‎.meteor/packages‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ check@1.3.1
1717
ddp-rate-limiter@1.0.9
1818
ddp-common@1.4.0
1919
dynamic-import@0.6.0
20-
ecmascript@0.15.0
21-
typescript@4.1.2
20+
ecmascript@0.15.1
21+
typescript@4.2.2
2222
ejson@1.1.1
2323
email@2.0.0
2424
fastclick@1.0.13
2525
http@1.4.2
2626
logging@1.2.0
2727
meteor-base@1.4.0
2828
mobile-experience@1.1.0
29-
mongo@1.10.1
29+
mongo@1.11.0
3030
random@1.2.0
3131
rate-limit@1.0.9
3232
reactive-dict@1.3.0
@@ -62,16 +62,16 @@ pauli:accounts-linkedin
6262
raix:handlebar-helpers
6363
raix:ui-dropped-event
6464

65-
rocketchat:tap-i18n
65+
rocketchat:tap-i18n@1.10.1
6666
underscore@1.0.10
6767
littledata:synced-cron
6868

6969
edgee:slingshot
7070
jalik:ufs-local@1.0.2
71-
accounts-base@1.8.0
71+
accounts-base@1.9.0
7272
accounts-oauth@1.2.0
7373
autoupdate@1.7.0
74-
babel-compiler@7.6.0
74+
babel-compiler@7.6.1
7575
google-oauth@1.3.0
7676
htmljs
7777
less
@@ -82,7 +82,7 @@ oauth2@1.3.0
8282
routepolicy@1.1.0
8383
sha@1.0.9
8484
templating
85-
webapp@1.10.0
85+
webapp@1.10.1
8686
webapp-hashing@1.1.0
8787
rocketchat:oauth2-server
8888
rocketchat:i18n

‎.meteor/release‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
METEOR@2.1.1
1+
METEOR@2.2

‎.meteor/versions‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,70 @@
1-
accounts-base@1.8.0
1+
accounts-base@1.9.0
22
accounts-facebook@1.3.2
33
accounts-github@1.4.3
44
accounts-google@1.3.3
55
accounts-meteor-developer@1.4.2
66
accounts-oauth@1.2.0
7-
accounts-password@1.7.0
7+
accounts-password@1.7.1
88
accounts-twitter@1.4.2
99
aldeed:simple-schema@1.5.4
1010
allow-deny@1.1.0
1111
autoupdate@1.7.0
12-
babel-compiler@7.6.0
12+
babel-compiler@7.6.1
1313
babel-runtime@1.5.0
1414
base64@1.0.12
1515
binary-heap@1.0.11
16-
blaze@2.3.4
17-
blaze-html-templates@1.1.2
18-
blaze-tools@1.0.10
16+
blaze@2.5.0
17+
blaze-html-templates@1.2.1
18+
blaze-tools@1.1.2
1919
boilerplate-generator@1.7.1
2020
caching-compiler@1.2.2
21-
caching-html-compiler@1.1.3
21+
caching-html-compiler@1.2.0
2222
callback-hook@1.3.0
2323
cfs:http-methods@0.0.32
2424
check@1.3.1
2525
coffeescript@1.0.17
2626
dandv:caret-position@2.1.1
2727
ddp@1.4.0
28-
ddp-client@2.4.0
28+
ddp-client@2.4.1
2929
ddp-common@1.4.0
3030
ddp-rate-limiter@1.0.9
31-
ddp-server@2.3.2
31+
ddp-server@2.3.3
3232
deps@1.0.12
3333
diff-sequence@1.1.1
3434
dispatch:run-as-user@1.1.1
3535
dynamic-import@0.6.0
36-
ecmascript@0.15.0
36+
ecmascript@0.15.1
3737
ecmascript-runtime@0.7.0
38-
ecmascript-runtime-client@0.11.0
39-
ecmascript-runtime-server@0.10.0
38+
ecmascript-runtime-client@0.11.1
39+
ecmascript-runtime-server@0.10.1
4040
edgee:slingshot@0.7.1
4141
ejson@1.1.1
4242
email@2.0.0
4343
es5-shim@4.8.0
44-
facebook-oauth@1.7.4
44+
facebook-oauth@1.8.0
4545
facts-base@1.0.1
4646
fastclick@1.0.13
4747
fetch@0.1.1
4848
geojson-utils@1.0.10
4949
github-oauth@1.2.3
5050
google-oauth@1.3.0
5151
hot-code-push@1.0.4
52-
html-tools@1.0.11
53-
htmljs@1.0.11
54-
http@1.4.3
55-
id-map@1.1.0
52+
html-tools@1.1.2
53+
htmljs@1.1.1
54+
http@1.4.4
55+
id-map@1.1.1
5656
inter-process-messaging@0.1.1
5757
jalik:ufs@1.0.2
5858
jalik:ufs-gridfs@1.0.2
5959
jalik:ufs-local@1.0.2
6060
jparker:crypto-core@0.1.0
6161
jparker:crypto-md5@0.1.1
6262
jparker:gravatar@0.5.1
63-
jquery@1.11.11
63+
jquery@3.0.0
6464
kadira:flow-router@2.12.1
6565
konecty:multiple-instances-status@1.1.0
6666
konecty:user-presence@2.6.3
67-
launch-screen@1.2.0
67+
launch-screen@1.2.1
6868
less@3.0.1
6969
littledata:synced-cron@1.5.1
7070
livedata@1.0.18
@@ -75,37 +75,37 @@ mdg:validation-error@0.5.1
7575
meteor@1.9.3
7676
meteor-base@1.4.0
7777
meteor-developer-oauth@1.2.3
78-
meteorhacks:inject-initial@1.0.4
78+
meteorhacks:inject-initial@1.0.5
7979
meteorspark:util@0.2.0
80-
minifier-css@1.5.3
80+
minifier-css@1.5.4
8181
minifier-js@2.6.0
82-
minimongo@1.6.1
82+
minimongo@1.6.2
8383
mizzao:timesync@0.3.4
8484
mobile-experience@1.1.0
8585
mobile-status-bar@1.1.0
8686
modern-browsers@0.1.5
8787
modules@0.16.0
8888
modules-runtime@0.12.0
89-
mongo@1.10.1
89+
mongo@1.11.1
9090
mongo-decimal@0.1.2
9191
mongo-dev-server@1.1.0
92-
mongo-id@1.0.7
92+
mongo-id@1.0.8
9393
mrt:reactive-store@0.0.1
9494
mystor:device-detection@0.2.0
9595
nimble:restivus@0.8.12
9696
nooitaf:colors@1.1.2_1
97-
npm-bcrypt@0.9.3
98-
npm-mongo@3.8.1
97+
npm-bcrypt@0.9.4
98+
npm-mongo@3.9.0
9999
oauth@1.3.2
100100
oauth1@1.3.0
101101
oauth2@1.3.0
102-
observe-sequence@1.0.16
102+
observe-sequence@1.0.18
103103
ordered-dict@1.1.0
104104
ostrio:cookies@2.7.0
105105
pauli:accounts-linkedin@5.0.0
106106
pauli:linkedin-oauth@5.0.0
107107
promise@0.11.2
108-
raix:eventemitter@0.1.3
108+
raix:eventemitter@1.0.0
109109
raix:handlebar-helpers@0.2.5
110110
raix:ui-dropped-event@0.0.7
111111
random@1.2.0
@@ -122,28 +122,28 @@ rocketchat:mongo-config@0.0.1
122122
rocketchat:oauth2-server@2.1.0
123123
rocketchat:postcss@1.0.0
124124
rocketchat:streamer@1.1.0
125-
rocketchat:tap-i18n@1.9.1
125+
rocketchat:tap-i18n@1.10.1
126126
rocketchat:version@1.0.0
127127
routepolicy@1.1.0
128128
service-configuration@1.0.11
129129
session@1.2.0
130130
sha@1.0.9
131131
shell-server@0.5.0
132132
simple:json-routes@2.1.0
133-
socket-stream-client@0.3.1
134-
spacebars@1.0.15
135-
spacebars-compiler@1.1.3
133+
socket-stream-client@0.3.3
134+
spacebars@1.2.0
135+
spacebars-compiler@1.2.1
136136
srp@1.1.0
137137
standard-minifier-js@2.6.0
138-
templating@1.3.2
139-
templating-compiler@1.3.3
140-
templating-runtime@1.3.2
141-
templating-tools@1.1.2
138+
templating@1.4.1
139+
templating-compiler@1.4.1
140+
templating-runtime@1.5.0
141+
templating-tools@1.2.0
142142
tracker@1.2.0
143143
twitter-oauth@1.2.0
144-
typescript@4.1.2
144+
typescript@4.2.2
145145
ui@1.0.13
146146
underscore@1.0.10
147-
url@1.3.1
148-
webapp@1.10.0
147+
url@1.3.2
148+
webapp@1.10.1
149149
webapp-hashing@1.1.0

‎.postcssrc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
"preserve": true
66
},
77
"postcss-media-minmax": {},
8-
"postcss-selector-not": {},
98
"postcss-nested": {},
109
"autoprefixer": {}
1110
},

‎.storybook/main.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ module.exports = {
2424
plugins: [
2525
require('postcss-custom-properties')({ preserve: true }),
2626
require('postcss-media-minmax')(),
27-
require('postcss-selector-not')(),
2827
require('postcss-nested')(),
2928
require('autoprefixer')(),
3029
require('postcss-url')({ url: ({ absolutePath, relativePath, url }) => {

‎app/2fa/server/functions/resetTOTP.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { Users } from '../../../models/server/raw/index';
77
import { IUser } from '../../../../definition/IUser';
88

99
const sendResetNotification = async function(uid: string): Promise<void> {
10-
const user: IUser = await Users.findOneById(uid, { projection: { language: 1, emails: 1 } });
10+
const user = await Users.findOneById<Pick<IUser, 'language' | 'emails'>>(uid, { projection: { language: 1, emails: 1 } });
1111
if (!user) {
1212
throw new Meteor.Error('invalid-user');
1313
}

‎app/livechat/server/business-hour/AbstractBusinessHour.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export interface IBusinessHourBehavior {
2323

2424
export interface IBusinessHourType {
2525
name: string;
26-
getBusinessHour(id: string): Promise<ILivechatBusinessHour | undefined>;
26+
getBusinessHour(id?: string): Promise<ILivechatBusinessHour | null>;
2727
saveBusinessHour(businessHourData: ILivechatBusinessHour): Promise<ILivechatBusinessHour>;
2828
removeBusinessHourById(id: string): Promise<void>;
2929
}

0 commit comments

Comments
 (0)