Fix file references after moving from packages

.circleci/config.yml

@@ -149,12 +149,9 @@ jobs:
       - run:
           name: Build Rocket.Chat
           environment:
-            TOOL_NODE_FLAGS: --max_old_space_size=4096
+            TOOL_NODE_FLAGS: --max_old_space_size=3072
           command: |
             if [[ $CIRCLE_TAG ]]; then meteor reset; fi
-            set +e
-            meteor add rocketchat:lib
-            set -e
             meteor build --server-only --directory /tmp/build-test
 
       - run:

.eslintignore

@@ -2,22 +2,23 @@ node_modules
 packages/autoupdate/
 packages/meteor-streams/
 packages/meteor-timesync/
-packages/rocketchat-emoji-emojione/generateEmojiIndex.js
-packages/rocketchat-favico/favico.js
-packages/rocketchat-katex/client/katex/katex.min.js
+app/emoji-emojione/generateEmojiIndex.js
+app/favico/favico.js
+app/katex/client/katex/katex.min.js
 packages/rocketchat-livechat/.app/node_modules
 packages/rocketchat-livechat/.app/.meteor
 packages/rocketchat-livechat/assets/rocketchat-livechat.min.js
 packages/rocketchat-livechat/assets/rocket-livechat.js
-packages/rocketchat_theme/client/minicolors/jquery.minicolors.js
-packages/rocketchat_theme/client/vendor/
-packages/rocketchat-ui/client/lib/customEventPolyfill.js
-packages/rocketchat-ui/client/lib/Modernizr.js
-packages/rocketchat-ui/client/public/mp3-realtime-worker.js
-packages/rocketchat-ui/client/public/lame.min.js
-packages/rocketchat-videobridge/client/public/external_api.js
+app/theme/client/minicolors/jquery.minicolors.js
+app/theme/client/vendor/
+app/ui/client/lib/customEventPolyfill.js
+app/ui/client/lib/Modernizr.js
+public/mp3-realtime-worker.js
+public/lame.min.js
+public/packages/rocketchat_videobridge/client/public/external_api.js
 packages/tap-i18n/lib/tap_i18next/tap_i18next-1.7.3.js
 private/moment-locales/
 public/livechat/
 !.scripts
 !packages/rocketchat-livechat/.app
+public/pdf.worker.min.js

.meteor/packages

@@ -78,3 +78,27 @@ tap:i18n
 underscore@1.0.10
 juliancwirko:postcss
 littledata:synced-cron
+
+edgee:slingshot
+jalik:ufs-local@0.2.5
+accounts-base
+accounts-oauth
+autoupdate
+babel-compiler
+emojione:emojione@2.2.6
+google-oauth
+htmljs
+less
+matb33:collection-hooks
+meteorhacks:inject-initial
+oauth
+oauth2
+raix:eventemitter
+routepolicy
+sha
+swydo:graphql
+templating
+webapp
+webapp-hashing
+rocketchat:oauth2-server
+rocketchat:i18n

.scripts/npm-postinstall.js

@@ -0,0 +1,11 @@
+
+const { execSync } = require('child_process');
+
+console.log('Running npm-postinstall.js');
+
+execSync('cp node_modules/katex/dist/katex.min.css app/katex/');
+
+execSync('mkdir -p public/fonts/');
+execSync('cp node_modules/katex/dist/fonts/* public/fonts/');
+
+execSync('cp node_modules/pdfjs-dist/build/pdf.worker.min.js public/');

.stylelintignore

@@ -1,2 +1,3 @@
-packages/rocketchat_theme/client/vendor/fontello/css/fontello.css
+app/theme/client/vendor/fontello/css/fontello.css
 packages/meteor-autocomplete/client/autocomplete.css
+app/katex/katex.min.css

app/2fa/client/TOTPPassword.js

@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Accounts } from 'meteor/accounts-base';
-import { modal } from 'meteor/rocketchat:ui-utils';
-import { t } from 'meteor/rocketchat:utils';
+import { modal } from '/app/ui-utils';
+import { t } from '/app/utils';
 import toastr from 'toastr';
 
 function reportError(error, callback) {

app/2fa/client/accountSecurity.js

@@ -1,9 +1,9 @@
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Template } from 'meteor/templating';
-import { modal } from 'meteor/rocketchat:ui-utils';
-import { settings } from 'meteor/rocketchat:settings';
-import { t } from 'meteor/rocketchat:utils';
+import { modal } from '/app/ui-utils';
+import { settings } from '/app/settings';
+import { t } from '/app/utils';
 import toastr from 'toastr';
 import qrcode from 'yaqrcode';
 

app/2fa/index.js

@@ -0,0 +1,8 @@
+import { Meteor } from 'meteor/meteor';
+
+if (Meteor.isClient) {
+	module.exports = require('./client/index.js');
+}
+if (Meteor.isServer) {
+	module.exports = require('./server/index.js');
+}

app/2fa/package.js

@@ -1,25 +0,0 @@
-Package.describe({
-	name: 'rocketchat:2fa',
-	version: '0.0.1',
-	summary: '',
-	git: '',
-	documentation: 'README.md',
-});
-
-Package.onUse(function(api) {
-	api.use([
-		'accounts-base',
-		'ecmascript',
-		'templating',
-		'rocketchat:settings',
-		'sha',
-		'random',
-		'rocketchat:ui-utils',
-		'rocketchat:utils',
-		'rocketchat:models',
-		'rocketchat:callbacks',
-	]);
-
-	api.mainModule('client/index.js', 'client');
-	api.mainModule('server/index.js', 'server');
-});

app/2fa/server/lib/totp.js

@@ -1,7 +1,7 @@
 import { SHA256 } from 'meteor/sha';
 import { Random } from 'meteor/random';
-import { Users } from 'meteor/rocketchat:models';
-import { settings } from 'meteor/rocketchat:settings';
+import { Users } from '/app/models';
+import { settings } from '/app/settings';
 import speakeasy from 'speakeasy';
 
 export const TOTP = {

app/2fa/server/loginHandler.js

@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Accounts } from 'meteor/accounts-base';
-import { settings } from 'meteor/rocketchat:settings';
-import { callbacks } from 'meteor/rocketchat:callbacks';
+import { settings } from '/app/settings';
+import { callbacks } from '/app/callbacks';
 import { TOTP } from './lib/totp';
 
 Accounts.registerLoginHandler('totp', function(options) {

app/2fa/server/methods/disable.js

@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { Users } from 'meteor/rocketchat:models';
+import { Users } from '/app/models';
 import { TOTP } from '../lib/totp';
 
 Meteor.methods({

app/2fa/server/methods/enable.js

@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { Users } from 'meteor/rocketchat:models';
+import { Users } from '/app/models';
 import { TOTP } from '../lib/totp';
 
 Meteor.methods({

app/2fa/server/methods/regenerateCodes.js

@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { Users } from 'meteor/rocketchat:models';
+import { Users } from '/app/models';
 import { TOTP } from '../lib/totp';
 
 Meteor.methods({

app/2fa/server/methods/validateTempToken.js

@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { Users } from 'meteor/rocketchat:models';
+import { Users } from '/app/models';
 import { TOTP } from '../lib/totp';
 
 Meteor.methods({

app/2fa/server/startup/settings.js

@@ -1,4 +1,4 @@
-import { settings } from 'meteor/rocketchat:settings';
+import { settings } from '/app/settings';
 
 settings.addGroup('Accounts', function() {
 	this.section('Two Factor Authentication', function() {

app/accounts/index.js

@@ -0,0 +1,5 @@
+import { Meteor } from 'meteor/meteor';
+
+if (Meteor.isServer) {
+	module.exports = require('./server/index.js');
+}

app/accounts/package.js

@@ -1,17 +0,0 @@
-Package.describe({
-	name: 'rocketchat:accounts',
-	version: '0.0.1',
-	summary: 'JS-Accounts integration',
-	git: '',
-});
-
-Package.onUse(function(api) {
-	api.use([
-		'underscore',
-		'ecmascript',
-	]);
-
-	api.use('mongo', ['client', 'server']);
-
-	api.mainModule('server/index.js', 'server');
-});

app/action-links/both/lib/actionLinks.js

@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { Messages, Subscriptions } from 'meteor/rocketchat:models';
+import { Messages, Subscriptions } from '/app/models';
 
 // Action Links namespace creation.
 export const actionLinks = {

app/action-links/client/init.js

@@ -1,7 +1,7 @@
 import { Blaze } from 'meteor/blaze';
 import { Template } from 'meteor/templating';
-import { handleError } from 'meteor/rocketchat:utils';
-import { fireGlobalEvent, Layout } from 'meteor/rocketchat:ui-utils';
+import { handleError } from '/app/utils';
+import { fireGlobalEvent, Layout } from '/app/ui-utils';
 import { actionLinks } from '../both/lib/actionLinks';
 
 Template.room.events({

app/action-links/client/lib/actionLinks.js

@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { handleError } from 'meteor/rocketchat:utils';
+import { handleError } from '/app/utils';
 import { actionLinks } from '../../both/lib/actionLinks';
 // Action Links Handler. This method will be called off the client.
 

app/action-links/index.js

@@ -0,0 +1,8 @@
+import { Meteor } from 'meteor/meteor';
+
+if (Meteor.isClient) {
+	module.exports = require('./client/index.js');
+}
+if (Meteor.isServer) {
+	module.exports = require('./server/index.js');
+}

app/action-links/package.js

@@ -1,20 +0,0 @@
-Package.describe({
-	name: 'rocketchat:action-links',
-	version: '0.0.1',
-	summary: 'Add custom actions that call functions',
-	git: '',
-});
-
-Package.onUse(function(api) {
-	api.use([
-		'ecmascript',
-		'templating',
-		'rocketchat:ui-utils',
-		'rocketchat:utils',
-		'rocketchat:theme',
-		'rocketchat:models',
-	]);
-	api.addFiles('client/stylesheets/actionLinks.css', 'client');
-	api.mainModule('client/index.js', 'client');
-	api.mainModule('server/index.js', 'server');
-});

app/analytics/client/loadScript.js

@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 import { Template } from 'meteor/templating';
-import { settings } from 'meteor/rocketchat:settings';
+import { settings } from '/app/settings';
 
 Template.body.onRendered(() => {
 	Tracker.autorun((c) => {

app/analytics/client/trackEvents.js

@@ -1,8 +1,8 @@
 import { Meteor } from 'meteor/meteor';
 import { FlowRouter } from 'meteor/kadira:flow-router';
-import { settings } from 'meteor/rocketchat:settings';
-import { callbacks } from 'meteor/rocketchat:callbacks';
-import { ChatRoom } from 'meteor/rocketchat:models';
+import { settings } from '/app/settings';
+import { callbacks } from '/app/callbacks';
+import { ChatRoom } from '/app/models';
 import { Tracker } from 'meteor/tracker';
 
 function trackEvent(category, action, label) {

app/analytics/index.js

@@ -0,0 +1,8 @@
+import { Meteor } from 'meteor/meteor';
+
+if (Meteor.isClient) {
+	module.exports = require('./client/index.js');
+}
+if (Meteor.isServer) {
+	module.exports = require('./server/index.js');
+}

app/analytics/package.js

@@ -1,25 +0,0 @@
-Package.describe({
-	name: 'rocketchat:analytics',
-	version: '0.0.2',
-	summary: 'Analytics integeration for Rocket.Chat',
-	git: '',
-});
-
-// Note: Piwik respects Google Chrome's No Track: http://piwik.org/docs/privacy/#step-4-respect-donottrack-preference
-
-Package.onUse(function(api) {
-	api.use([
-		'ecmascript',
-		'rocketchat:models',
-		'rocketchat:callbacks',
-		'rocketchat:settings',
-		'tracker',
-	]);
-	api.use([
-		'templating',
-		'kadira:flow-router',
-	], 'client');
-
-	api.mainModule('client/index.js', 'client');
-	api.mainModule('server/index.js', 'server');
-});

app/analytics/server/settings.js

@@ -1,4 +1,4 @@
-import { settings } from 'meteor/rocketchat:settings';
+import { settings } from '/app/settings';
 
 settings.addGroup('Analytics', function addSettings() {
 	this.section('Piwik', function() {

app/api/index.js

@@ -0,0 +1,5 @@
+import { Meteor } from 'meteor/meteor';
+
+if (Meteor.isServer) {
+	module.exports = require('./server/index.js');
+}

app/api/package.js

@@ -1,24 +0,0 @@
-Package.describe({
-	name: 'rocketchat:api',
-	version: '0.0.1',
-	summary: 'Rest API',
-	git: '',
-});
-
-Package.onUse(function(api) {
-	api.use([
-		'ecmascript',
-		'nimble:restivus',
-		'rate-limit',
-		'rocketchat:lib',
-		'rocketchat:models',
-		'rocketchat:settings',
-		'rocketchat:assets',
-		'rocketchat:utils',
-		'rocketchat:metrics',
-		'rocketchat:authorization',
-		'rocketchat:file-upload',
-		'rocketchat:authorization',
-	]);
-	api.mainModule('server/index.js', 'server');
-});

app/api/server/api.js

@@ -3,12 +3,12 @@ import { DDPCommon } from 'meteor/ddp-common';
 import { DDP } from 'meteor/ddp';
 import { Accounts } from 'meteor/accounts-base';
 import { Restivus } from 'meteor/nimble:restivus';
-import { Logger } from 'meteor/rocketchat:logger';
-import { settings } from 'meteor/rocketchat:settings';
-import { metrics } from 'meteor/rocketchat:metrics';
-import { hasPermission } from 'meteor/rocketchat:authorization';
+import { Logger } from '/app/logger';
+import { settings } from '/app/settings';
+import { metrics } from '/app/metrics';
+import { hasPermission } from '/app/authorization';
 import { RateLimiter } from 'meteor/rate-limit';
-import { hasAllPermission } from 'meteor/rocketchat:authorization';
+import { hasAllPermission } from '/app/authorization';
 import _ from 'underscore';
 
 const logger = new Logger('API', {});

app/api/server/default/info.js

@@ -1,5 +1,5 @@
-import { hasRole } from 'meteor/rocketchat:authorization';
-import { Info } from 'meteor/rocketchat:utils';
+import { hasRole } from '/app/authorization';
+import { Info } from '/app/utils';
 import { API } from '../api';
 
 API.default.addRoute('info', { authRequired: false }, {

app/api/server/helpers/composeRoomWithLastMessage.js

@@ -1,4 +1,4 @@
-import { composeMessageObjectWithUser } from 'meteor/rocketchat:utils';
+import { composeMessageObjectWithUser } from '/app/utils';
 import { API } from '../api';
 
 API.helperMethods.set('composeRoomWithLastMessage', function _composeRoomWithLastMessage(room, userId) {

app/api/server/helpers/getLoggedInUser.js

@@ -1,5 +1,5 @@
 import { Accounts } from 'meteor/accounts-base';
-import { Users } from 'meteor/rocketchat:models';
+import { Users } from '/app/models';
 import { API } from '../api';
 
 API.helperMethods.set('getLoggedInUser', function _getLoggedInUser() {

app/api/server/helpers/getPaginationItems.js

@@ -1,7 +1,7 @@
 // If the count query param is higher than the "API_Upper_Count_Limit" setting, then we limit that
 // If the count query param isn't defined, then we set it to the "API_Default_Count" setting
 // If the count is zero, then that means unlimited and is only allowed if the setting "API_Allow_Infinite_Count" is true
-import { settings } from 'meteor/rocketchat:settings';
+import { settings } from '/app/settings';
 import { API } from '../api';
 
 API.helperMethods.set('getPaginationItems', function _getPaginationItems() {

app/api/server/helpers/getUserFromParams.js

@@ -1,6 +1,6 @@
 // Convenience method, almost need to turn it into a middleware of sorts
 import { Meteor } from 'meteor/meteor';
-import { Users } from 'meteor/rocketchat:models';
+import { Users } from '/app/models';
 import { API } from '../api';
 
 API.helperMethods.set('getUserFromParams', function _getUserFromParams() {

app/api/server/helpers/getUserInfo.js

@@ -1,5 +1,5 @@
-import { settings } from 'meteor/rocketchat:settings';
-import { getUserPreference } from 'meteor/rocketchat:utils';
+import { settings } from '/app/settings';
+import { getUserPreference } from '/app/utils';
 import { API } from '../api';
 
 const getInfoFromUserObject = (user) => {

app/api/server/helpers/insertUserObject.js

@@ -1,4 +1,4 @@
-import { Users } from 'meteor/rocketchat:models';
+import { Users } from '/app/models';
 import { API } from '../api';
 
 API.helperMethods.set('insertUserObject', function _addUserToObject({ object, userId }) {

app/api/server/helpers/parseJsonQuery.js

@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { hasPermission } from 'meteor/rocketchat:authorization';
+import { hasPermission } from '/app/authorization';
 import { EJSON } from 'meteor/ejson';
 import { API } from '../api';
 

app/api/server/settings.js

@@ -1,4 +1,4 @@
-import { settings } from 'meteor/rocketchat:settings';
+import { settings } from '/app/settings';
 
 settings.addGroup('General', function() {
 	this.section('REST API', function() {

app/api/server/v1/assets.js

@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { RocketChatAssets } from 'meteor/rocketchat:assets';
+import { RocketChatAssets } from '/app/assets';
 import Busboy from 'busboy';
 import { API } from '../api';
 

app/api/server/v1/channels.js

@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
-import { Rooms, Subscriptions, Messages, Uploads, Integrations, Users } from 'meteor/rocketchat:models';
-import { hasPermission } from 'meteor/rocketchat:authorization';
-import { composeMessageObjectWithUser } from 'meteor/rocketchat:utils';
+import { Rooms, Subscriptions, Messages, Uploads, Integrations, Users } from '/app/models';
+import { hasPermission } from '/app/authorization';
+import { composeMessageObjectWithUser } from '/app/utils';
 import { API } from '../api';
 import _ from 'underscore';
 

app/api/server/v1/chat.js

@@ -1,9 +1,9 @@
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
-import { Messages } from 'meteor/rocketchat:models';
-import { hasPermission } from 'meteor/rocketchat:authorization';
-import { composeMessageObjectWithUser } from 'meteor/rocketchat:utils';
-import { processWebhookMessage } from 'meteor/rocketchat:lib';
+import { Messages } from '/app/models';
+import { hasPermission } from '/app/authorization';
+import { composeMessageObjectWithUser } from '/app/utils';
+import { processWebhookMessage } from '/app/lib';
 import { API } from '../api';
 
 API.v1.addRoute('chat.delete', { authRequired: true }, {

app/api/server/v1/commands.js

@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Random } from 'meteor/random';
-import { slashCommands } from 'meteor/rocketchat:utils';
-import { Rooms } from 'meteor/rocketchat:models';
+import { slashCommands } from '/app/utils';
+import { Rooms } from '/app/models';
 import { API } from '../api';
 
 API.v1.addRoute('commands.get', { authRequired: true }, {

app/api/server/v1/emoji-custom.js

@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { EmojiCustom } from 'meteor/rocketchat:models';
+import { EmojiCustom } from '/app/models';
 import { API } from '../api';
 import Busboy from 'busboy';
 

app/api/server/v1/groups.js

@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
-import { Subscriptions, Rooms, Messages, Uploads, Integrations, Users } from 'meteor/rocketchat:models';
-import { hasPermission } from 'meteor/rocketchat:authorization';
-import { composeMessageObjectWithUser } from 'meteor/rocketchat:utils';
+import { Subscriptions, Rooms, Messages, Uploads, Integrations, Users } from '/app/models';
+import { hasPermission } from '/app/authorization';
+import { composeMessageObjectWithUser } from '/app/utils';
 import { API } from '../api';
 import _ from 'underscore';
 

app/api/server/v1/im.js

@@ -1,9 +1,9 @@
 import { Meteor } from 'meteor/meteor';
-import { getRoomByNameOrIdWithOptionToJoin } from 'meteor/rocketchat:lib';
-import { Subscriptions, Uploads, Users, Messages, Rooms } from 'meteor/rocketchat:models';
-import { hasPermission } from 'meteor/rocketchat:authorization';
-import { composeMessageObjectWithUser } from 'meteor/rocketchat:utils';
-import { settings } from 'meteor/rocketchat:settings';
+import { getRoomByNameOrIdWithOptionToJoin } from '/app/lib';
+import { Subscriptions, Uploads, Users, Messages, Rooms } from '/app/models';
+import { hasPermission } from '/app/authorization';
+import { composeMessageObjectWithUser } from '/app/utils';
+import { settings } from '/app/settings';
 import { API } from '../api';
 
 function findDirectMessageRoom(params, user) {

app/api/server/v1/integrations.js

@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
-import { hasPermission } from 'meteor/rocketchat:authorization';
-import { IntegrationHistory, Integrations } from 'meteor/rocketchat:models';
+import { hasPermission } from '/app/authorization';
+import { IntegrationHistory, Integrations } from '/app/models';
 import { API } from '../api';
 
 API.v1.addRoute('integrations.create', { authRequired: true }, {

app/api/server/v1/misc.js

@@ -1,10 +1,10 @@
 import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
 import { TAPi18n } from 'meteor/tap:i18n';
-import { hasRole } from 'meteor/rocketchat:authorization';
-import { Info } from 'meteor/rocketchat:utils';
-import { Users } from 'meteor/rocketchat:models';
-import { settings } from 'meteor/rocketchat:settings';
+import { hasRole } from '/app/authorization';
+import { Info } from '/app/utils';
+import { Users } from '/app/models';
+import { settings } from '/app/settings';
 import { API } from '../api';
 
 API.v1.addRoute('info', { authRequired: false }, {

app/api/server/v1/permissions.js

@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
-import { hasPermission } from 'meteor/rocketchat:authorization';
-import { Permissions, Roles } from 'meteor/rocketchat:models';
+import { hasPermission } from '/app/authorization';
+import { Permissions, Roles } from '/app/models';
 import { API } from '../api';
 
 /**

app/api/server/v1/roles.js

@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
-import { Roles } from 'meteor/rocketchat:models';
+import { Roles } from '/app/models';
 import { API } from '../api';
 
 API.v1.addRoute('roles.list', { authRequired: true }, {

app/api/server/v1/rooms.js

@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
-import { FileUpload } from 'meteor/rocketchat:file-upload';
-import { Rooms } from 'meteor/rocketchat:models';
+import { FileUpload } from '/app/file-upload';
+import { Rooms } from '/app/models';
 import Busboy from 'busboy';
 import { API } from '../api';
 

app/api/server/v1/settings.js

@@ -1,8 +1,8 @@
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
 import { ServiceConfiguration } from 'meteor/service-configuration';
-import { Settings } from 'meteor/rocketchat:models';
-import { hasPermission } from 'meteor/rocketchat:authorization';
+import { Settings } from '/app/models';
+import { hasPermission } from '/app/authorization';
 import { API } from '../api';
 import _ from 'underscore';
 

app/api/server/v1/stats.js

@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
-import { hasPermission } from 'meteor/rocketchat:authorization';
-import { Statistics } from 'meteor/rocketchat:models';
+import { hasPermission } from '/app/authorization';
+import { Statistics } from '/app/models';
 import { API } from '../api';
 
 API.v1.addRoute('statistics', { authRequired: true }, {

app/api/server/v1/subscriptions.js

@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
-import { Subscriptions } from 'meteor/rocketchat:models';
+import { Subscriptions } from '/app/models';
 import { API } from '../api';
 
 API.v1.addRoute('subscriptions.get', { authRequired: true }, {

app/api/server/v1/users.js

@@ -1,10 +1,10 @@
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
 import { TAPi18n } from 'meteor/tap:i18n';
-import { Users, Subscriptions } from 'meteor/rocketchat:models';
-import { hasPermission } from 'meteor/rocketchat:authorization';
-import { settings } from 'meteor/rocketchat:settings';
-import { getURL } from 'meteor/rocketchat:utils';
+import { Users, Subscriptions } from '/app/models';
+import { hasPermission } from '/app/authorization';
+import { settings } from '/app/settings';
+import { getURL } from '/app/utils';
 import {
 	validateCustomFields,
 	saveUser,
@@ -12,7 +12,7 @@ import {
 	checkUsernameAvailability,
 	setUserAvatar,
 	saveCustomFields,
-} from 'meteor/rocketchat:lib';
+} from '/app/lib';
 import { API } from '../api';
 import _ from 'underscore';
 import Busboy from 'busboy';

app/api/server/v1/video-conference.js

@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { Rooms } from 'meteor/rocketchat:models';
+import { Rooms } from '/app/models';
 import { API } from '../api';
 
 API.v1.addRoute('video-conference/jitsi.update-timeout', { authRequired: true }, {

app/apps/client/admin/appInstall.js

@@ -10,7 +10,7 @@
 import { ReactiveVar } from 'meteor/reactive-var';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
-import { APIClient } from 'meteor/rocketchat:utils';
+import { APIClient } from '/app/utils';
 
 Template.appInstall.helpers({
 	appFile() {

app/apps/client/admin/appLogs.js

@@ -2,7 +2,7 @@ import { ReactiveVar } from 'meteor/reactive-var';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
 import { TAPi18n } from 'meteor/tap:i18n';
-import { APIClient } from 'meteor/rocketchat:utils';
+import { APIClient } from '/app/utils';
 import moment from 'moment';
 import hljs from 'highlight.js';
 

app/apps/client/admin/appManage.js

@@ -4,9 +4,9 @@ import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
 import { TAPi18n } from 'meteor/tap:i18n';
 import { TAPi18next } from 'meteor/tap:i18n';
-import { isEmail, Info, APIClient } from 'meteor/rocketchat:utils';
-import { settings } from 'meteor/rocketchat:settings';
-import { Markdown } from 'meteor/rocketchat:markdown';
+import { isEmail, Info, APIClient } from '/app/utils';
+import { settings } from '/app/settings';
+import { Markdown } from '/app/markdown';
 import _ from 'underscore';
 import s from 'underscore.string';
 import toastr from 'toastr';

app/apps/client/admin/apps.js

@@ -2,7 +2,7 @@ import toastr from 'toastr';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
-import { t, Info, APIClient } from 'meteor/rocketchat:utils';
+import { t, Info, APIClient } from '/app/utils';
 import { AppEvents } from '../communication';
 import { Apps } from '../orchestrator';
 

app/apps/client/communication/websockets.js

@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
-import { slashCommands, APIClient } from 'meteor/rocketchat:utils';
-import { CachedCollectionManager } from 'meteor/rocketchat:ui-cached-collection';
+import { slashCommands, APIClient } from '/app/utils';
+import { CachedCollectionManager } from '/app/ui-cached-collection';
 
 export const AppEvents = Object.freeze({
 	APP_ADDED: 'app/added',

app/apps/client/orchestrator.js

@@ -4,10 +4,10 @@ import { Utilities } from '../lib/misc/Utilities';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { BlazeLayout } from 'meteor/kadira:blaze-layout';
 import { TAPi18next } from 'meteor/tap:i18n';
-import { APIClient } from 'meteor/rocketchat:utils';
-import { AdminBox } from 'meteor/rocketchat:ui-utils';
-import { CachedCollectionManager } from 'meteor/rocketchat:ui-cached-collection';
-import { hasAtLeastOnePermission } from 'meteor/rocketchat:authorization';
+import { APIClient } from '/app/utils';
+import { AdminBox } from '/app/ui-utils';
+import { CachedCollectionManager } from '/app/ui-cached-collection';
+import { hasAtLeastOnePermission } from '/app/authorization';
 
 export let Apps;
 

app/apps/index.js

@@ -0,0 +1,8 @@
+import { Meteor } from 'meteor/meteor';
+
+if (Meteor.isClient) {
+	module.exports = require('./client/index.js');
+}
+if (Meteor.isServer) {
+	module.exports = require('./server/index.js');
+}

app/apps/package.js

@@ -1,28 +0,0 @@
-Package.describe({
-	name: 'rocketchat:apps',
-	version: '1.0.0',
-});
-
-Package.onUse(function(api) {
-	api.use([
-		'ecmascript',
-		'rocketchat:markdown',
-		'rocketchat:utils',
-		'rocketchat:settings',
-		'rocketchat:models',
-		'rocketchat:notifications',
-		'rocketchat:ui-utils',
-		'rocketchat:authorization',
-		'rocketchat:ui-cached-collection',
-		'templating',
-	]);
-	api.use([
-		'reactive-var',
-		'kadira:flow-router',
-		'kadira:blaze-layout',
-		'underscore',
-	], 'client');
-	api.addFiles('assets/stylesheets/apps.css', 'client');
-	api.mainModule('client/index.js', 'client');
-	api.mainModule('server/index.js', 'server');
-});

app/apps/server/bridges/commands.js

@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { slashCommands } from 'meteor/rocketchat:utils';
+import { slashCommands } from '/app/utils';
 import { SlashCommandContext } from '@rocket.chat/apps-engine/definition/slashcommands';
 import { Utilities } from '../../lib/misc/Utilities';
 

app/apps/server/bridges/internal.js

@@ -1,4 +1,4 @@
-import { Subscriptions } from 'meteor/rocketchat:models';
+import { Subscriptions } from '/app/models';
 
 export class AppInternalBridge {
 	constructor(orch) {

app/apps/server/bridges/messages.js

@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Random } from 'meteor/random';
-import { Messages, Users, Subscriptions } from 'meteor/rocketchat:models';
-import { Notifications } from 'meteor/rocketchat:notifications';
+import { Messages, Users, Subscriptions } from '/app/models';
+import { Notifications } from '/app/notifications';
 
 export class AppMessageBridge {
 	constructor(orch) {
@@ -29,7 +29,7 @@ export class AppMessageBridge {
 	async update(message, appId) {
 		console.log(`The App ${ appId } is updating a message.`);
 		if (!this.updateMessage) {
-			const { updateMessage } = await import('meteor/rocketchat:lib');
+			const { updateMessage } = await import('/app/lib');
 			this.updateMessage = updateMessage;
 		}
 

app/apps/server/bridges/rooms.js

@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { Rooms, Subscriptions, Users } from 'meteor/rocketchat:models';
+import { Rooms, Subscriptions, Users } from '/app/models';
 import { RoomType } from '@rocket.chat/apps-engine/definition/rooms';
 
 export class AppRoomBridge {
@@ -102,7 +102,7 @@ export class AppRoomBridge {
 		console.log(`The App ${ appId } is updating a room.`);
 
 		if (!this.addUserToRoom) {
-			const { addUserToRoom } = await import('meteor/rocketchat:lib');
+			const { addUserToRoom } = await import('/app/lib');
 			this.addUserToRoom = addUserToRoom;
 		}
 

app/apps/server/bridges/settings.js

@@ -1,4 +1,4 @@
-import { Settings } from 'meteor/rocketchat:models';
+import { Settings } from '/app/models';
 
 export class AppSettingBridge {
 	constructor(orch) {

app/apps/server/communication/methods.js

@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
-import { settings } from 'meteor/rocketchat:settings';
-import { hasPermission } from 'meteor/rocketchat:authorization';
+import { settings } from '/app/settings';
+import { hasPermission } from '/app/authorization';
 
 const waitToLoad = function(orch) {
 	return new Promise((resolve) => {

app/apps/server/communication/rest.js

@@ -33,7 +33,7 @@ export class AppsRestApi {
 	}
 
 	async loadAPI() {
-		const { API } = await import('meteor/rocketchat:api');
+		const { API } = await import('/app/api');
 		_API = API;
 		this.api = new API.ApiClass({
 			version: 'apps',

app/apps/server/converters/messages.js

@@ -1,5 +1,5 @@
 import { Random } from 'meteor/random';
-import { Messages, Rooms, Users } from 'meteor/rocketchat:models';
+import { Messages, Rooms, Users } from '/app/models';
 
 export class AppMessagesConverter {
 	constructor(orch) {

app/apps/server/converters/rooms.js

@@ -1,4 +1,4 @@
-import { Rooms, Users } from 'meteor/rocketchat:models';
+import { Rooms, Users } from '/app/models';
 import { RoomType } from '@rocket.chat/apps-engine/definition/rooms';
 
 export class AppRoomsConverter {

app/apps/server/converters/settings.js

@@ -1,4 +1,4 @@
-import { Settings } from 'meteor/rocketchat:models';
+import { Settings } from '/app/models';
 import { SettingType } from '@rocket.chat/apps-engine/definition/settings';
 
 export class AppSettingsConverter {

app/apps/server/converters/users.js

@@ -1,4 +1,4 @@
-import { Users } from 'meteor/rocketchat:models';
+import { Users } from '/app/models';
 import { UserStatusConnection, UserType } from '@rocket.chat/apps-engine/definition/users';
 
 export class AppUsersConverter {

app/apps/server/orchestrator.js

@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
-import { Permissions, AppsLogsModel, AppsModel, AppsPersistenceModel } from 'meteor/rocketchat:models';
-import { settings } from 'meteor/rocketchat:settings';
+import { Permissions, AppsLogsModel, AppsModel, AppsPersistenceModel } from '/app/models';
+import { settings } from '/app/settings';
 import { RealAppBridges } from './bridges';
 import { AppMethods, AppsRestApi, AppServerNotifier } from './communication';
 import { AppMessagesConverter, AppRoomsConverter, AppSettingsConverter, AppUsersConverter } from './converters';

app/assets/index.js

@@ -0,0 +1,5 @@
+import { Meteor } from 'meteor/meteor';
+
+if (Meteor.isServer) {
+	module.exports = require('./server/index.js');
+}

app/assets/package.js

@@ -1,21 +0,0 @@
-Package.describe({
-	name: 'rocketchat:assets',
-	version: '0.0.1',
-	summary: '',
-	git: '',
-});
-
-Package.onUse(function(api) {
-	api.use([
-		'ecmascript',
-		'webapp',
-		'rocketchat:file',
-		'rocketchat:authorization',
-		'rocketchat:models',
-		'rocketchat:settings',
-		'rocketchat:utils',
-		'webapp-hashing',
-	]);
-
-	api.mainModule('server/index.js', 'server');
-});

app/assets/server/assets.js

@@ -1,10 +1,10 @@
 import { Meteor } from 'meteor/meteor';
 import { WebApp } from 'meteor/webapp';
-import { settings } from 'meteor/rocketchat:settings';
-import { Settings } from 'meteor/rocketchat:models';
-import { getURL } from 'meteor/rocketchat:utils';
-import { hasPermission } from 'meteor/rocketchat:authorization';
-import { RocketChatFile } from 'meteor/rocketchat:file';
+import { settings } from '/app/settings';
+import { Settings } from '/app/models';
+import { getURL } from '/app/utils';
+import { hasPermission } from '/app/authorization';
+import { RocketChatFile } from '/app/file';
 import { WebAppHashing } from 'meteor/webapp-hashing';
 import { WebAppInternals } from 'meteor/webapp';
 import _ from 'underscore';

app/authorization/client/hasPermission.js

@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Template } from 'meteor/templating';
-import * as Models from 'meteor/rocketchat:models';
+import * as Models from '/app/models';
 import { ChatPermissions } from './lib/ChatPermissions';
 
 function atLeastOne(permissions = [], scope) {

app/authorization/client/hasRole.js

@@ -1,4 +1,4 @@
-import { Roles } from 'meteor/rocketchat:models';
+import { Roles } from '/app/models';
 
 export const hasRole = (userId, roleNames, scope) => {
 	roleNames = [].concat(roleNames);

app/authorization/client/lib/ChatPermissions.js

@@ -1,3 +1,3 @@
-import { AuthzCachedCollection } from 'meteor/rocketchat:models';
+import { AuthzCachedCollection } from '/app/models';
 
 export const ChatPermissions = AuthzCachedCollection.collection;

app/authorization/client/route.js

@@ -1,6 +1,6 @@
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { BlazeLayout } from 'meteor/kadira:blaze-layout';
-import { t } from 'meteor/rocketchat:utils';
+import { t } from '/app/utils';
 
 FlowRouter.route('/admin/permissions', {
 	name: 'admin-permissions',

app/authorization/client/startup.js

@@ -1,9 +1,9 @@
 import { Meteor } from 'meteor/meteor';
-import { CachedCollectionManager } from 'meteor/rocketchat:ui-cached-collection';
+import { CachedCollectionManager } from '/app/ui-cached-collection';
 import { hasAllPermission } from './hasPermission';
 
 Meteor.startup(async() => {
-	const { AdminBox } = await import('meteor/rocketchat:ui-utils');
+	const { AdminBox } = await import('/app/ui-utils');
 
 	CachedCollectionManager.onLogin(() => Meteor.subscribe('roles'));
 

app/authorization/client/usersNameChanged.js

@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
-import { Notifications } from 'meteor/rocketchat:notifications';
-import { RoomRoles } from 'meteor/rocketchat:models';
+import { Notifications } from '/app/notifications';
+import { RoomRoles } from '/app/models';
 
 Meteor.startup(function() {
 	Notifications.onLogged('Users:NameChanged', function({ _id, name }) {

app/authorization/client/views/permissions.js

@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Tracker } from 'meteor/tracker';
 import { Template } from 'meteor/templating';
-import { Roles } from 'meteor/rocketchat:models';
+import { Roles } from '/app/models';
 import { ChatPermissions } from '../lib/ChatPermissions';
 import { hasAllPermission } from '../hasPermission';
 

app/authorization/client/views/permissionsRole.js

@@ -2,8 +2,8 @@ import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
-import { t, handleError } from 'meteor/rocketchat:utils';
-import { Roles } from 'meteor/rocketchat:models';
+import { t, handleError } from '/app/utils';
+import { Roles } from '/app/models';
 import { hasAllPermission } from '../hasPermission';
 import toastr from 'toastr';
 
@@ -114,7 +114,7 @@ Template.permissionsRole.helpers({
 Template.permissionsRole.events({
 	async 'click .remove-user'(e, instance) {
 		if (!_modal) {
-			const { modal } = await import('meteor/rocketchat:ui-utils');
+			const { modal } = await import('/app/ui-utils');
 			_modal = modal;
 		}
 		e.preventDefault();

app/authorization/index.js

@@ -0,0 +1,8 @@
+import { Meteor } from 'meteor/meteor';
+
+if (Meteor.isClient) {
+	module.exports = require('./client/index.js');
+}
+if (Meteor.isServer) {
+	module.exports = require('./server/index.js');
+}

app/authorization/package.js

@@ -1,27 +0,0 @@
-Package.describe({
-	name: 'rocketchat:authorization',
-	version: '0.0.1',
-	summary: 'Role based authorization of actions',
-	git: '',
-	documentation: 'README.md',
-});
-
-Package.onUse(function(api) {
-	api.use([
-		'ecmascript',
-		'mongo',
-		'rocketchat:utils',
-		'rocketchat:models',
-		'rocketchat:notifications',
-		'rocketchat:ui-cached-collection',
-	]);
-	api.use([
-		'templating',
-		'tracker',
-		'kadira:flow-router',
-		'kadira:blaze-layout',
-	], 'client');
-	api.addFiles('client/stylesheets/permissions.css', 'client');
-	api.mainModule('client/index.js', 'client');
-	api.mainModule('server/index.js', 'server');
-});

app/authorization/server/functions/addUserRoles.js

@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { Users, Roles } from 'meteor/rocketchat:models';
+import { Users, Roles } from '/app/models';
 import { getRoles } from './getRoles';
 import _ from 'underscore';
 

app/authorization/server/functions/canAccessRoom.js

@@ -1,5 +1,5 @@
-import { settings } from 'meteor/rocketchat:settings';
-import { Subscriptions } from 'meteor/rocketchat:models';
+import { settings } from '/app/settings';
+import { Subscriptions } from '/app/models';
 import { hasPermission } from './hasPermission';
 
 export const roomAccessValidators = [

app/authorization/server/functions/getRoles.js

@@ -1,3 +1,3 @@
-import { Roles } from 'meteor/rocketchat:models';
+import { Roles } from '/app/models';
 
 export const getRoles = () => Roles.find().fetch();

app/authorization/server/functions/getUsersInRole.js

@@ -1,4 +1,4 @@
-import { Roles } from 'meteor/rocketchat:models';
+import { Roles } from '/app/models';
 
 export const getUsersInRole = (roleName, scope, options) => Roles.findUsersInRole(roleName, scope, options);
 

app/authorization/server/functions/hasPermission.js

@@ -1,4 +1,4 @@
-import { Roles, Permissions } from 'meteor/rocketchat:models';
+import { Roles, Permissions } from '/app/models';
 
 function atLeastOne(userId, permissions = [], scope) {
 	return permissions.some((permissionId) => {

app/authorization/server/functions/hasRole.js

@@ -1,4 +1,4 @@
-import { Roles } from 'meteor/rocketchat:models';
+import { Roles } from '/app/models';
 
 export const hasRole = (userId, roleNames, scope) => {
 	roleNames = [].concat(roleNames);

app/authorization/server/functions/removeUserFromRoles.js

@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { Users, Roles } from 'meteor/rocketchat:models';
+import { Users, Roles } from '/app/models';
 import { getRoles } from './getRoles';
 import _ from 'underscore';
 

app/authorization/server/methods/addPermissionToRole.js

@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { Permissions } from 'meteor/rocketchat:models';
+import { Permissions } from '/app/models';
 import { hasPermission } from '../functions/hasPermission';
 
 Meteor.methods({

app/authorization/server/methods/addUserToRole.js

@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
-import { Users, Roles } from 'meteor/rocketchat:models';
-import { settings } from 'meteor/rocketchat:settings';
-import { Notifications } from 'meteor/rocketchat:notifications';
+import { Users, Roles } from '/app/models';
+import { settings } from '/app/settings';
+import { Notifications } from '/app/notifications';
 import { hasPermission } from '../functions/hasPermission';
 import _ from 'underscore';
 

app/authorization/server/methods/deleteRole.js

@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import * as Models from 'meteor/rocketchat:models';
+import * as Models from '/app/models';
 import { hasPermission } from '../functions/hasPermission';
 
 Meteor.methods({