Skip to content

Commit 46faa43

Browse files
ggazzoKevLehman
andauthored
chore: update Meteor and package versions to latest stable releases 3.4 (RocketChat#38614)
Co-authored-by: Kevin Aleman <kaleman960@gmail.com>
1 parent f21ed3a commit 46faa43

File tree

9 files changed

+61
-41
lines changed

9 files changed

+61
-41
lines changed

.github/actions/build-docker/action.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,6 @@ runs:
8282
swc_arch='arm64'
8383
fi
8484
85-
find /tmp/build/bundle/programs/server/npm/node_modules/meteor/babel-compiler/node_modules/@meteorjs/swc-core/.swc/node_modules/@swc -type d -name 'core-*' -not -name "*linux-${swc_arch}-gnu*" -exec rm -rf {} +
86-
8785
find /tmp/build/bundle/programs/server/npm/node_modules/@img -type d -name 'sharp-*' -not -name "*-linuxmusl-${swc_arch}" -exec rm -rf {} +
8886
8987
find /tmp/build/bundle/programs/server/npm/node_modules/@napi-rs -type d -name 'pinyin-linux-*' -not -name "*-linux-${swc_arch}-*" -exec rm -rf {} +

apps/meteor/.meteor/packages

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,33 +7,33 @@ rocketchat:mongo-config
77
rocketchat:livechat
88
rocketchat:version
99

10-
accounts-base@3.1.2
10+
accounts-base@3.2.0
1111
accounts-facebook@1.3.4
1212
accounts-google@1.4.1
1313
accounts-meteor-developer@1.5.1
1414
accounts-oauth@1.4.6
15-
accounts-password@3.2.1
15+
accounts-password@3.2.2
1616
accounts-twitter@1.5.2
1717

1818
google-oauth@1.4.5
1919
oauth@3.0.2
2020
oauth2@1.3.3
2121

22-
check@1.4.4
22+
check@1.5.0
2323
ddp-rate-limiter@1.2.2
2424
rate-limit@1.1.2
2525
email@3.1.2
2626

2727
meteor-base@1.5.2
2828
ddp-common@1.4.4
29-
webapp@2.0.7
29+
webapp@2.1.0
3030

31-
mongo@2.1.4
31+
mongo@2.2.0
3232

3333
reload@1.3.2
3434
service-configuration@1.3.5
3535
session@1.2.2
36-
shell-server@0.6.2
36+
shell-server@0.7.0
3737

3838
dispatch:run-as-user
3939
ostrio:cookies
@@ -50,11 +50,10 @@ tracker@1.3.4
5050
reactive-dict@1.3.2
5151
reactive-var@1.0.13
5252

53-
babel-compiler@7.12.2
54-
standard-minifier-css@1.9.3
53+
standard-minifier-css@1.10.0
5554
dynamic-import@0.7.4
56-
ecmascript@0.16.13
57-
typescript@5.6.6
55+
ecmascript@0.17.0
56+
typescript@5.9.3
5857

5958
autoupdate@2.0.1
6059

apps/meteor/.meteor/release

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

apps/meteor/.meteor/versions

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
accounts-base@3.1.2
1+
accounts-base@3.2.0
22
accounts-facebook@1.3.4
33
accounts-google@1.4.1
44
accounts-meteor-developer@1.5.1
55
accounts-oauth@1.4.6
6-
accounts-password@3.2.1
6+
accounts-password@3.2.2
77
accounts-twitter@1.5.2
88
allow-deny@2.1.0
99
autoupdate@2.0.1
10-
babel-compiler@7.12.2
10+
babel-compiler@7.13.0
1111
babel-runtime@1.5.2
1212
base64@1.0.13
1313
binary-heap@1.0.12
14-
boilerplate-generator@2.0.2
14+
boilerplate-generator@2.1.0
1515
callback-hook@1.6.1
16-
check@1.4.4
16+
check@1.5.0
1717
core-runtime@1.0.0
1818
ddp@1.4.2
1919
ddp-client@3.1.1
@@ -23,7 +23,7 @@ ddp-server@3.1.2
2323
diff-sequence@1.1.3
2424
dispatch:run-as-user@1.1.1
2525
dynamic-import@0.7.4
26-
ecmascript@0.16.13
26+
ecmascript@0.17.0
2727
ecmascript-runtime@0.8.3
2828
ecmascript-runtime-client@0.12.3
2929
ecmascript-runtime-server@0.11.1
@@ -41,16 +41,16 @@ id-map@1.2.0
4141
inter-process-messaging@0.1.2
4242
localstorage@1.2.1
4343
logging@1.3.6
44-
meteor@2.1.1
44+
meteor@2.2.0
4545
meteor-base@1.5.2
4646
meteor-developer-oauth@1.3.3
4747
meteorhacks:inject-initial@1.0.5
4848
minifier-css@2.0.1
49-
minimongo@2.0.4
49+
minimongo@2.0.5
5050
modern-browsers@0.2.3
5151
modules@0.20.3
5252
modules-runtime@0.13.2
53-
mongo@2.1.4
53+
mongo@2.2.0
5454
mongo-decimal@0.2.0
5555
mongo-dev-server@1.1.1
5656
mongo-id@1.0.9
@@ -63,7 +63,7 @@ ostrio:cookies@2.7.2
6363
promise@1.0.0
6464
random@1.2.2
6565
rate-limit@1.1.2
66-
react-fast-refresh@0.2.9
66+
react-fast-refresh@0.3.0
6767
reactive-dict@1.3.2
6868
reactive-var@1.0.13
6969
reload@1.3.2
@@ -75,15 +75,15 @@ routepolicy@1.1.2
7575
service-configuration@1.3.5
7676
session@1.2.2
7777
sha@1.0.10
78-
shell-server@0.6.2
78+
shell-server@0.7.0
7979
socket-stream-client@0.6.1
80-
standard-minifier-css@1.9.3
80+
standard-minifier-css@1.10.0
8181
tracker@1.3.4
8282
twitter-oauth@1.3.4
83-
typescript@5.6.6
83+
typescript@5.9.3
8484
underscore@1.6.4
8585
url@1.3.5
86-
webapp@2.0.7
86+
webapp@2.1.0
8787
webapp-hashing@1.1.2
8888
zodern:caching-minifier@0.5.0
8989
zodern:standard-minifier-js@5.3.1

apps/meteor/app/integrations/server/lib/validateOutgoingIntegration.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1+
import { transformSync } from '@babel/core';
2+
import presetEnv from '@babel/preset-env';
13
import type { IUser, INewOutgoingIntegration, IOutgoingIntegration, IUpdateOutgoingIntegration } from '@rocket.chat/core-typings';
24
import { Subscriptions, Users, Rooms } from '@rocket.chat/models';
35
import { pick } from '@rocket.chat/tools';
4-
import { Babel } from 'meteor/babel-compiler';
56
import { Match } from 'meteor/check';
67
import { Meteor } from 'meteor/meteor';
78

@@ -179,13 +180,15 @@ export const validateOutgoingIntegration = async function (
179180
integration.script.trim() !== ''
180181
) {
181182
try {
182-
const babelOptions = Object.assign(Babel.getDefaultOptions({ runtime: false }), {
183+
const result = transformSync(integration.script, {
184+
presets: [presetEnv],
183185
compact: true,
184186
minified: true,
185187
comments: false,
186188
});
187189

188-
integrationData.scriptCompiled = Babel.compile(integration.script, babelOptions).code;
190+
// TODO: Webhook Integration Editor should inform the user if the script is compiled successfully
191+
integrationData.scriptCompiled = result?.code ?? undefined;
189192
integrationData.scriptError = undefined;
190193
} catch (e) {
191194
integrationData.scriptCompiled = undefined;

apps/meteor/app/integrations/server/methods/incoming/addIncomingIntegration.ts

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1+
import { transformSync } from '@babel/core';
2+
import presetEnv from '@babel/preset-env';
13
import type { INewIncomingIntegration, IIncomingIntegration } from '@rocket.chat/core-typings';
24
import type { ServerMethods } from '@rocket.chat/ddp-client';
35
import { Integrations, Subscriptions, Users, Rooms } from '@rocket.chat/models';
46
import { Random } from '@rocket.chat/random';
57
import { removeEmpty } from '@rocket.chat/tools';
6-
import { Babel } from 'meteor/babel-compiler';
78
import { Match, check } from 'meteor/check';
89
import { Meteor } from 'meteor/meteor';
910
import _ from 'underscore';
@@ -111,10 +112,15 @@ export const addIncomingIntegration = async (userId: string, integration: INewIn
111112
integration.script.trim() !== ''
112113
) {
113114
try {
114-
let babelOptions = Babel.getDefaultOptions({ runtime: false });
115-
babelOptions = _.extend(babelOptions, { compact: true, minified: true, comments: false });
115+
const result = transformSync(integration.script, {
116+
presets: [presetEnv],
117+
compact: true,
118+
minified: true,
119+
comments: false,
120+
});
116121

117-
integrationData.scriptCompiled = Babel.compile(integration.script, babelOptions).code;
122+
// TODO: Webhook Integration Editor should inform the user if the script is compiled successfully
123+
integrationData.scriptCompiled = result?.code ?? undefined;
118124
delete integrationData.scriptError;
119125
} catch (e) {
120126
integrationData.scriptCompiled = undefined;

apps/meteor/app/integrations/server/methods/incoming/updateIncomingIntegration.ts

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1+
import { transformSync } from '@babel/core';
2+
import presetEnv from '@babel/preset-env';
13
import type { IIntegration, INewIncomingIntegration, IUpdateIncomingIntegration } from '@rocket.chat/core-typings';
24
import type { ServerMethods } from '@rocket.chat/ddp-client';
35
import { Integrations, Subscriptions, Users, Rooms } from '@rocket.chat/models';
46
import { wrapExceptions } from '@rocket.chat/tools';
5-
import { Babel } from 'meteor/babel-compiler';
67
import { Meteor } from 'meteor/meteor';
7-
import _ from 'underscore';
88

99
import { addUserRolesAsync } from '../../../../../server/lib/roles/addUserRoles';
1010
import { hasAllPermissionAsync, hasPermissionAsync } from '../../../../authorization/server/functions/hasPermission';
@@ -90,10 +90,15 @@ export const updateIncomingIntegration = async (
9090

9191
if (integration.scriptEnabled === true && integration.script && integration.script.trim() !== '') {
9292
try {
93-
let babelOptions = Babel.getDefaultOptions({ runtime: false });
94-
babelOptions = _.extend(babelOptions, { compact: true, minified: true, comments: false });
93+
const result = transformSync(integration.script, {
94+
presets: [presetEnv],
95+
compact: true,
96+
minified: true,
97+
comments: false,
98+
});
9599

96-
scriptCompiled = Babel.compile(integration.script, babelOptions).code;
100+
// TODO: Webhook Integration Editor should inform the user if the script is compiled successfully
101+
scriptCompiled = result?.code ?? undefined;
97102
scriptError = undefined;
98103
await Integrations.updateOne(
99104
{ _id: integrationId },

apps/meteor/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@
6969
"@aws-sdk/client-s3": "^3.862.0",
7070
"@aws-sdk/lib-storage": "^3.862.0",
7171
"@aws-sdk/s3-request-presigner": "^3.862.0",
72+
"@babel/core": "~7.28.6",
73+
"@babel/preset-env": "~7.28.6",
7274
"@babel/runtime": "~7.28.6",
7375
"@bugsnag/js": "~7.20.2",
7476
"@bugsnag/plugin-react": "~7.19.0",
@@ -311,8 +313,6 @@
311313
},
312314
"devDependencies": {
313315
"@axe-core/playwright": "^4.10.2",
314-
"@babel/core": "~7.28.6",
315-
"@babel/preset-env": "~7.28.6",
316316
"@babel/preset-react": "~7.27.1",
317317
"@babel/register": "~7.28.6",
318318
"@faker-js/faker": "~8.0.2",
@@ -334,6 +334,7 @@
334334
"@testing-library/user-event": "~14.6.1",
335335
"@types/adm-zip": "^0.5.7",
336336
"@types/archiver": "~6.0.4",
337+
"@types/babel__preset-env": "^7.10.0",
337338
"@types/bad-words": "^3.0.3",
338339
"@types/bcrypt": "^5.0.2",
339340
"@types/body-parser": "^1.19.6",

yarn.lock

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10071,6 +10071,7 @@ __metadata:
1007110071
"@testing-library/user-event": "npm:~14.6.1"
1007210072
"@types/adm-zip": "npm:^0.5.7"
1007310073
"@types/archiver": "npm:~6.0.4"
10074+
"@types/babel__preset-env": "npm:^7.10.0"
1007410075
"@types/bad-words": "npm:^3.0.3"
1007510076
"@types/bcrypt": "npm:^5.0.2"
1007610077
"@types/body-parser": "npm:^1.19.6"
@@ -13703,6 +13704,13 @@ __metadata:
1370313704
languageName: node
1370413705
linkType: hard
1370513706

13707+
"@types/babel__preset-env@npm:^7.10.0":
13708+
version: 7.10.0
13709+
resolution: "@types/babel__preset-env@npm:7.10.0"
13710+
checksum: 10/7d4d12758d89708afe327079d7d7580e8af3292295f087b8a9a48e12ac1d90aadc18ac3bc00f9b0cbc8778f3ce9fe778801d4d49b7691a75e3f13a901b69fd07
13711+
languageName: node
13712+
linkType: hard
13713+
1370613714
"@types/babel__template@npm:*":
1370713715
version: 7.4.1
1370813716
resolution: "@types/babel__template@npm:7.4.1"

0 commit comments

Comments
 (0)