Skip to content
Snippets Groups Projects
Unverified Commit 44d75edc authored by Diego Sampaio's avatar Diego Sampaio Committed by GitHub
Browse files

Regression: Fix micro services (#26054)

<!-- This is a pull request template, you do not need to uncomment or remove the comments, they won't show up in the PR text. -->

<!-- Your Pull Request name should start with one of the following tags
  [NEW] For new features
  [IMPROVE] For an improvement (performance or little improvements) in existing features
  [FIX] For bug fixes that affect the end-user
  [BREAK] For pull requests including breaking changes
  Chore: For small tasks
  Doc: For documentation
-->

<!-- Checklist!!! If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code. 
  - I have read the Contributing Guide - https://github.com/RocketChat/Rocket.Chat/blob/develop/.github/CONTRIBUTING.md#contributing-to-rocketchat doc
  - I have signed the CLA - https://cla-assistant.io/RocketChat/Rocket.Chat
  - Lint and unit tests pass locally with my changes
  - I have added tests that prove my fix is effective or that my feature works (if applicable)
  - I have added necessary documentation (if applicable)
  - Any dependent changes have been merged and published in downstream modules
-->

## Proposed changes (including videos or screenshots)
<!-- CHANGELOG -->
<!--
  Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request.
  If it fixes a bug or resolves a feature request, be sure to link to that issue below.
  This description will appear in the release notes if we accept the contribution.
-->

<!-- END CHANGELOG -->
This will also make it break during build.

## Issue(s)
<!-- Link the issues being closed by or related to this PR. For example, you can use #594 if this PR closes issue number 594 -->

## Steps to test or reproduce
<!-- Mention how you would reproduce the bug if not mentioned on the issue page already. Also mention which screens are going to have the changes if applicable -->

## Further comments
<!-- If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc... -->
parent 2fc5dff8
No related branches found
No related tags found
No related merge requests found
/* eslint-disable @typescript-eslint/interface-name-prefix */
import 'meteor/meteor';
import { IStreamerConstructor, IStreamer } from 'meteor/rocketchat:streamer';
declare module 'meteor/meteor' {
namespace Meteor {
const Streamer: IStreamerConstructor & IStreamer;
namespace StreamerCentral {
const instances: {
[name: string]: IStreamer;
};
}
interface ErrorStatic {
new (error: string | number, reason?: string, details?: any): Error;
}
......
......@@ -80,17 +80,3 @@ declare module 'meteor/rocketchat:streamer' {
new (name: string, options?: { retransmit?: boolean; retransmitToSelf?: boolean }): IStreamer;
}
}
declare module 'meteor/meteor' {
import { IStreamerConstructor, IStreamer } from 'meteor/rocketchat:streamer';
namespace Meteor {
const Streamer: IStreamerConstructor & IStreamer;
namespace StreamerCentral {
const instances: {
[name: string]: IStreamer;
};
}
}
}
......@@ -9,7 +9,6 @@
"pm2": "pm2",
"start:account": "ts-node --files ./account/service.ts",
"start:authorization": "ts-node --files ./authorization/service.ts",
"start:ddp-streamer": "ts-node --files ./ddp-streamer/service.ts",
"start:presence": "ts-node --files ./presence/service.ts",
"start:stream-hub": "ts-node --files ./stream-hub/service.ts",
"typecheck": "tsc --noEmit --skipLibCheck",
......
......@@ -43,6 +43,6 @@
// "emitDecoratorMetadata": true,
// "experimentalDecorators": true,
},
"include": ["./**/*", "../../../definition"],
"include": ["./**/*", "../../../definition/externals/meteor/rocketchat-streamer.d.ts"],
"exclude": ["./dist", "./ecosystem.config.js", "../../../definition/methods"]
}
......@@ -4,7 +4,7 @@ import { parse } from '@rocket.chat/message-parser';
import { IServiceClass } from '../../sdk/types/ServiceClass';
import { NotificationsModule } from '../notifications/notifications.module';
import { EnterpriseSettings } from '../../sdk/index';
import { settings } from '../../../app/settings/server';
import { settings } from '../../../app/settings/server/cached';
const isMessageParserDisabled = process.env.DISABLE_MESSAGE_PARSER === 'true';
......
import { ServerType, IVoipManagementServerConfig, IVoipCallServerConfig } from '@rocket.chat/core-typings';
import { settings } from '../../../../app/settings/server';
import { settings } from '../../../../app/settings/server/cached';
export function getServerConfigDataFromSettings(type: ServerType): IVoipCallServerConfig | IVoipManagementServerConfig {
switch (type) {
......
......@@ -5,7 +5,8 @@
"description": "Rocket.Chat DDP-Streamer service",
"scripts": {
"build": "tsc -p tsconfig.json",
"test": "echo \"Error: no test specified\" && exit 1"
"test": "echo \"Error: no test specified\" && exit 1",
"typecheck": "tsc --noEmit --skipLibCheck -p tsconfig.json"
},
"keywords": [
"rocketchat"
......
......@@ -24,6 +24,6 @@
"declaration": false,
"declarationMap": false
},
"include": ["./src/**/*", "../../../apps/meteor/definition", "./definition"],
"include": ["./src/**/*", "./definition", "../../../apps/meteor/definition/externals/meteor/rocketchat-streamer.d.ts"],
"exclude": ["./dist", "./ecosystem.config.js"]
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment