Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): adjust codeql workflow for dependabot and bump moment from 2.29.4 to 2.30.1 #33964

Merged
merged 6 commits into from
Nov 20, 2024
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ name: 'Code scanning - action'

on:
push:
branches-ignore:
- dependabot/**
pull_request:
schedule:
- cron: '0 13 * * *'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { ILivechatBusinessHour, IBusinessHourTimezone } from '@rocket.chat/
import { LivechatBusinessHourTypes } from '@rocket.chat/core-typings';
import type { AgendaCronJobs } from '@rocket.chat/cron';
import { LivechatBusinessHours, LivechatDepartment, Users } from '@rocket.chat/models';
import moment from 'moment';
import moment from 'moment-timezone';

import type { IBusinessHourBehavior, IBusinessHourType } from './AbstractBusinessHour';
import { closeBusinessHour } from './closeBusinessHour';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { Messages, SmarshHistory, Users, Rooms } from '@rocket.chat/models';
import { Meteor } from 'meteor/meteor';
import moment from 'moment';
import 'moment-timezone';
import moment from 'moment-timezone';

import { sendEmail } from './sendEmail';
import { i18n } from '../../../../server/lib/i18n';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import moment from 'moment-timezone';

import 'moment/locale/fa';
import { getMomentChartLabelsAndData } from './getMomentChartLabelsAndData';

moment.tz.setDefault('UTC');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import moment from 'moment';
import moment from 'moment-timezone';

export const getMomentChartLabelsAndData = (timestamp = Date.now()) => {
const timingLabels = [];
Expand Down
3 changes: 1 addition & 2 deletions apps/meteor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@
"@types/meteor-collection-hooks": "^0.8.9",
"@types/mkdirp": "^1.0.2",
"@types/mocha": "github:whitecolor/mocha-types",
"@types/moment-timezone": "^0.5.30",
"@types/node": "~20.16.15",
"@types/node-gcm": "^1.0.5",
"@types/node-rsa": "^1.1.4",
Expand Down Expand Up @@ -385,7 +384,7 @@
"mime-type": "^4.0.0",
"mkdirp": "^1.0.4",
"moleculer": "^0.14.35",
"moment": "^2.29.4",
"moment": "^2.30.1",
"moment-timezone": "^0.5.46",
"mongo-message-queue": "^1.1.0",
"mongodb": "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import moment from 'moment';
import moment from 'moment-timezone';

const HOURS_IN_DAY = 24;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable new-cap */
import type { ILivechatRoomsModel } from '@rocket.chat/model-typings';
import { expect } from 'chai';
import moment from 'moment';
import moment from 'moment-timezone';
import sinon from 'sinon';

import { AgentOverviewData } from '../../../../../server/services/omnichannel-analytics/AgentData';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable new-cap */
import { expect } from 'chai';
import moment from 'moment';
import moment from 'moment-timezone';
import sinon from 'sinon';

import { conversations } from './mockData';
Expand Down
2 changes: 1 addition & 1 deletion apps/uikit-playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@rocket.chat/ui-contexts": "workspace:~",
"codemirror": "^6.0.1",
"eslint4b-prebuilt": "^6.7.2",
"moment": "^2.29.4",
"moment": "^2.30.1",
"rc-scrollbars": "^1.1.6",
"react": "^17.0.2",
"react-beautiful-dnd": "^13.1.1",
Expand Down
2 changes: 1 addition & 1 deletion ee/packages/pdf-worker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"@rocket.chat/fuselage-tokens": "^0.33.2",
"emoji-assets": "^7.0.1",
"emoji-toolkit": "^7.0.1",
"moment": "^2.29.4",
"moment": "^2.30.1",
"moment-timezone": "^0.5.46",
"react": "~18.3.1"
},
Expand Down
39 changes: 18 additions & 21 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9276,7 +9276,6 @@ __metadata:
"@types/meteor-collection-hooks": "npm:^0.8.9"
"@types/mkdirp": "npm:^1.0.2"
"@types/mocha": "github:whitecolor/mocha-types"
"@types/moment-timezone": "npm:^0.5.30"
"@types/node": "npm:~20.16.15"
"@types/node-gcm": "npm:^1.0.5"
"@types/node-rsa": "npm:^1.1.4"
Expand Down Expand Up @@ -9423,7 +9422,7 @@ __metadata:
mkdirp: "npm:^1.0.4"
mocha: "npm:^9.2.2"
moleculer: "npm:^0.14.35"
moment: "npm:^2.29.4"
moment: "npm:^2.30.1"
moment-timezone: "npm:^0.5.46"
mongo-message-queue: "npm:^1.1.0"
mongodb: "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch"
Expand Down Expand Up @@ -9733,7 +9732,7 @@ __metadata:
emoji-toolkit: "npm:^7.0.1"
eslint: "npm:~8.45.0"
jest: "npm:~29.7.0"
moment: "npm:^2.29.4"
moment: "npm:^2.30.1"
moment-timezone: "npm:^0.5.46"
react: "npm:~18.3.1"
react-dom: "npm:~18.3.1"
Expand Down Expand Up @@ -10408,7 +10407,7 @@ __metadata:
eslint-plugin-react-hooks: "npm:^5.0.0"
eslint-plugin-react-refresh: "npm:^0.4.14"
eslint4b-prebuilt: "npm:^6.7.2"
moment: "npm:^2.29.4"
moment: "npm:^2.30.1"
rc-scrollbars: "npm:^1.1.6"
react: "npm:^17.0.2"
react-beautiful-dnd: "npm:^13.1.1"
Expand Down Expand Up @@ -12909,15 +12908,6 @@ __metadata:
languageName: node
linkType: hard

"@types/moment-timezone@npm:^0.5.30":
version: 0.5.30
resolution: "@types/moment-timezone@npm:0.5.30"
dependencies:
moment-timezone: "npm:*"
checksum: 10/488b5880b346101f15e3f90267eb8d848ce20a41ea8b51305b1fee25f4fac57b93d553dc0de6f2eb8412be764bd74c9c347ed678c9a6d20d800a06c106b674f9
languageName: node
linkType: hard

"@types/ms@npm:*":
version: 0.7.31
resolution: "@types/ms@npm:0.7.31"
Expand Down Expand Up @@ -29029,21 +29019,21 @@ __metadata:
languageName: node
linkType: hard

"moment-timezone@npm:*, moment-timezone@npm:^0.5.x":
version: 0.5.43
resolution: "moment-timezone@npm:0.5.43"
"moment-timezone@npm:^0.5.46, moment-timezone@npm:~0.5.46":
version: 0.5.46
resolution: "moment-timezone@npm:0.5.46"
dependencies:
moment: "npm:^2.29.4"
checksum: 10/f8b66f8562960d6c2ec90ea7e2ca8c10bd5f5cf5ced2eaaac83deb1011b145d0154e8d77018cf5e913d489898a343122a3d815768809653ab039306dce1db1eb
checksum: 10/7613ba388fa6004af62675fb9945cb0d37758b559d07470a5e188419ffe1ac03eb2ed16fe80aa34d1e7dd39fc5bd67dc02cd59e8dcdab95504cface2c78e4b3d
languageName: node
linkType: hard

"moment-timezone@npm:^0.5.46, moment-timezone@npm:~0.5.46":
version: 0.5.46
resolution: "moment-timezone@npm:0.5.46"
"moment-timezone@npm:^0.5.x":
version: 0.5.43
resolution: "moment-timezone@npm:0.5.43"
dependencies:
moment: "npm:^2.29.4"
checksum: 10/7613ba388fa6004af62675fb9945cb0d37758b559d07470a5e188419ffe1ac03eb2ed16fe80aa34d1e7dd39fc5bd67dc02cd59e8dcdab95504cface2c78e4b3d
checksum: 10/f8b66f8562960d6c2ec90ea7e2ca8c10bd5f5cf5ced2eaaac83deb1011b145d0154e8d77018cf5e913d489898a343122a3d815768809653ab039306dce1db1eb
languageName: node
linkType: hard

Expand All @@ -29054,6 +29044,13 @@ __metadata:
languageName: node
linkType: hard

"moment@npm:^2.30.1":
version: 2.30.1
resolution: "moment@npm:2.30.1"
checksum: 10/ae42d876d4ec831ef66110bdc302c0657c664991e45cf2afffc4b0f6cd6d251dde11375c982a5c0564ccc0fa593fc564576ddceb8c8845e87c15f58aa6baca69
languageName: node
linkType: hard

"mongo-message-queue@npm:^1.1.0":
version: 1.1.0
resolution: "mongo-message-queue@npm:1.1.0"
Expand Down
Loading