Skip to content

Commit

Permalink
Update Meteor to 1.11 (#18754)
Browse files Browse the repository at this point in the history
* Update Meteor to 1.11

* Update Node version

* Fix livechat view creation
  • Loading branch information
sampaiodiego authored and Felipe Parreira committed Sep 11, 2020
1 parent b4c2851 commit 04022ff
Show file tree
Hide file tree
Showing 9 changed files with 51 additions and 40 deletions.
2 changes: 1 addition & 1 deletion .docker-mongo/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:12.16.1-buster-slim
FROM node:12.18.3-buster-slim

LABEL maintainer="[email protected]"

Expand Down
2 changes: 1 addition & 1 deletion .docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:12.16.1-buster-slim
FROM node:12.18.3-buster-slim

LABEL maintainer="[email protected]"

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ jobs:
echo "github.event_name: ${{ github.event_name }}"
cat $GITHUB_EVENT_PATH
- name: Use Node.js 12.16.1
- name: Use Node.js 12.18.3
uses: actions/setup-node@v1
with:
node-version: "12.16.1"
node-version: "12.18.3"

- uses: actions/checkout@v2

Expand Down Expand Up @@ -175,7 +175,7 @@ jobs:

strategy:
matrix:
node-version: ["12.16.1"]
node-version: ["12.18.3"]
mongodb-version: ["3.4", "3.6", "4.0"]

steps:
Expand Down Expand Up @@ -290,10 +290,10 @@ jobs:
path: ~/.meteor
key: ${{ runner.OS }}-meteor-${{ hashFiles('.meteor/release') }}-${{ hashFiles('.github/workflows/build_and_test.yml') }}

- name: Use Node.js 12.16.1
- name: Use Node.js 12.18.3
uses: actions/setup-node@v1
with:
node-version: "12.16.1"
node-version: "12.18.3"

- name: Install Meteor
run: |
Expand Down
8 changes: 4 additions & 4 deletions .meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ [email protected]
[email protected]
[email protected]
[email protected]
[email protected].0
[email protected].2
[email protected]
blaze-html-templates
[email protected]
[email protected].7
[email protected].9
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
email@1.2.3
email@2.0.0
[email protected]
[email protected]
[email protected]
Expand Down Expand Up @@ -70,7 +70,7 @@ littledata:synced-cron

edgee:slingshot
jalik:[email protected]
accounts-base@1.6.0
accounts-base@1.7.0
[email protected]
[email protected]
[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .meteor/release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
METEOR@1.10.2
METEOR@1.11
14 changes: 7 additions & 7 deletions .meteor/versions
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
accounts-base@1.6.0
accounts-base@1.7.0
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected].1
[email protected].2
[email protected]
aldeed:[email protected]
[email protected]
Expand All @@ -27,7 +27,7 @@ dandv:[email protected]
[email protected]
[email protected]
[email protected]
[email protected].8
[email protected].9
[email protected]
deepwell:[email protected]
[email protected]
Expand All @@ -36,11 +36,11 @@ dispatch:[email protected]
[email protected]
[email protected]
[email protected]
ecmascript-runtime-client@0.10.0
ecmascript-runtime-server@0.9.0
ecmascript-runtime-client@0.11.0
ecmascript-runtime-server@0.10.0
edgee:[email protected]
[email protected]
email@1.2.3
email@2.0.0
[email protected]
[email protected]
[email protected]
Expand Down Expand Up @@ -97,7 +97,7 @@ mystor:[email protected]
nimble:[email protected]
nooitaf:[email protected]_1
[email protected]
npm-mongo@3.7.1
npm-mongo@3.8.0
[email protected]
[email protected]
[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .snapcraft/resources/preparenode
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

node_version="v12.16.1"
node_version="v12.18.3"

unamem="$(uname -m)"
if [[ $unamem == *aarch64* ]]; then
Expand Down
10 changes: 8 additions & 2 deletions app/livechat/server/lib/Helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,16 @@ export const createLivechatSubscription = (rid, name, guest, agent) => {
return Subscriptions.insert(subscriptionData);
};

export const createLivechatQueueView = () => {
export const createLivechatQueueView = async () => {
const { mongo } = MongoInternals.defaultRemoteCollectionDriver();

mongo.db.createCollection('view_livechat_queue_status', { // name of the view to create
// recreate the view on every startup
const list = await mongo.db.listCollections({ name: 'view_livechat_queue_status' }).toArray();
if (list.length > 0) {
await mongo.db.dropCollection('view_livechat_queue_status');
}

await mongo.db.createCollection('view_livechat_queue_status', { // name of the view to create
viewOn: 'rocketchat_room', // name of source collection from which to create the view
pipeline: [
{
Expand Down
41 changes: 23 additions & 18 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 04022ff

Please sign in to comment.