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.

Sign up for GitHub

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

Jump to bottom

Depack: Use mainModule for root files #13508

Merged
merged 7 commits into from
Feb 26, 2019
Merged

Depack: Use mainModule for root files #13508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
30cc0f8
Depack: Use mainModule for root files
rodrigok Feb 16, 2019
378c72a
Fix for mobile layout
rodrigok Feb 18, 2019
c6f8597
Merge remote-tracking branch 'origin/develop' into depack/fase-1-root…
rodrigok Feb 19, 2019
5a2aef1
Add migration 138
rodrigok Feb 20, 2019
118eea4
Merge remote-tracking branch 'origin/develop' into depack/fase-1-root…
rodrigok Feb 22, 2019
5bc2728
Merge remote-tracking branch 'origin/develop' into depack/fase-1-root…
rodrigok Feb 22, 2019
a817656
Move head from inject to a html file
rodrigok Feb 25, 2019
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
21 changes: 21 additions & 0 deletions client/head.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<head>
<meta charset="utf-8" />
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<meta http-equiv="expires" content="-1" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="fragment" content="!" />
<meta name="distribution" content="global" />
<meta name="rating" content="general" />
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
<meta name="mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="msapplication-TileImage" content="assets/tile_144.png" />
<meta name="msapplication-config" content="images/browserconfig.xml" />
<meta property="og:image" content="assets/favicon_512.png" />
<meta property="twitter:image" content="assets/favicon_512.png" />
<link rel="manifest" href="images/manifest.json" />
<link rel="chrome-webstore-item" href="https://chrome.google.com/webstore/detail/nocfbnnmjnndkbipkabodnheejiegccf" />
<link rel="mask-icon" href="assets/safari_pinned.svg" color="#04436a">
<link rel="apple-touch-icon" sizes="180x180" href="assets/touchicon_180.png" />
<link rel="apple-touch-icon-precomposed" href="assets/touchicon_180_pre.png" />
</head>
32 changes: 31 additions & 1 deletion client/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,31 @@
import '/imports/startup/client';
import '../imports/startup/client';

import '../lib/RegExp';
import '../lib/francocatena_fix';

import './lib/toastr';
import './helpers/escapeCssUrl';
import './helpers/log';
import './helpers/not';
import './methods/deleteMessage';
import './methods/hideRoom';
import './methods/openRoom';
import './methods/setUserActiveStatus';
import './methods/toggleFavorite';
import './methods/updateMessage';
import './notifications/notification';
import './notifications/updateAvatar';
import './notifications/updateUserState';
import './notifications/UsersNameChanged';
import './routes/adminRouter';
import './routes/pageNotFound.html';
import './routes/roomRoute';
import './routes/router';
import './startup/emailVerification';
import './startup/i18n';
import './startup/loginViaQuery';
import './startup/roomObserve';
import './startup/startup';
import './startup/unread';
import './startup/userSetUtcOffset';
import './startup/usersObserve';
6 changes: 6 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,5 +221,11 @@
"xmlbuilder": "^10.1.1",
"xmldom": "^0.1.27",
"yaqrcode": "^0.2.1"
},
"meteor": {
"mainModule": {
"client": "client/main.js",
"server": "server/main.js"
}
}
}
2 changes: 2 additions & 0 deletions packages/rocketchat-ui-master/client/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import './loading.html';
import './error.html';
import './logoLayout.html';
import './main.html';
import './main';
22 changes: 0 additions & 22 deletions packages/rocketchat-ui-master/client/main.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,3 @@
<head>
<meta charset="utf-8" />
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<meta http-equiv="expires" content="-1" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="fragment" content="!" />
<meta name="distribution" content="global" />
<meta name="rating" content="general" />
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
<meta name="mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="msapplication-TileImage" content="assets/tile_144.png" />
<meta name="msapplication-config" content="images/browserconfig.xml" />
<meta property="og:image" content="assets/favicon_512.png">
<meta property="twitter:image" content="assets/favicon_512.png">
<link rel="manifest" href="images/manifest.json" />
<link rel="chrome-webstore-item" href="https://chrome.google.com/webstore/detail/nocfbnnmjnndkbipkabodnheejiegccf" />
<link rel="mask-icon" href="assets/safari_pinned.svg" color="#04436a">
<link rel="apple-touch-icon" sizes="180x180" href="assets/touchicon_180.png" />
<link rel="apple-touch-icon-precomposed" href="assets/touchicon_180_pre.png">
</head>

<body class="global-font-family color-primary-font-color">
<div id='alert-anchor'></div>
</body>
Expand Down
2 changes: 0 additions & 2 deletions packages/rocketchat-ui-master/package.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ Package.onUse(function(api) {
'rocketchat:ui-sidenav',
'meteorhacks:inject-initial',
]);
api.addFiles('client/main.html', 'client');
api.addFiles('client/main.js', 'client');

api.mainModule('client/index.js', 'client');
api.mainModule('server/index.js', 'server');
Expand Down
82 changes: 81 additions & 1 deletion server/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,81 @@
import '/imports/startup/server';
import '../imports/startup/server';

import '../lib/RegExp';
import '../lib/francocatena_fix';

import './lib/accounts';
import './lib/cordova';
import './lib/roomFiles';
import './startup/migrations';
import './startup/appcache';
import './startup/avatar';
import './startup/cron';
import './startup/initialData';
import './startup/presence';
import './startup/serverRunning';
import './configuration/accounts_meld';
import './methods/OEmbedCacheCleanup';
import './methods/addAllUserToRoom';
import './methods/addRoomLeader';
import './methods/addRoomModerator';
import './methods/addRoomOwner';
import './methods/afterVerifyEmail';
import './methods/browseChannels';
import './methods/canAccessRoom';
import './methods/channelsList';
import './methods/createDirectMessage';
import './methods/deleteFileMessage';
import './methods/deleteUser';
import './methods/eraseRoom';
import './methods/getAvatarSuggestion';
import './methods/getRoomIdByNameOrId';
import './methods/getRoomNameById';
import './methods/getTotalChannels';
import './methods/getUsersOfRoom';
import './methods/hideRoom';
import './methods/ignoreUser';
import './methods/loadHistory';
import './methods/loadLocale';
import './methods/loadMissedMessages';
import './methods/loadNextMessages';
import './methods/loadSurroundingMessages';
import './methods/logoutCleanUp';
import './methods/messageSearch';
import './methods/migrate';
import './methods/muteUserInRoom';
import './methods/openRoom';
import './methods/readMessages';
import './methods/registerUser';
import './methods/removeRoomLeader';
import './methods/removeRoomModerator';
import './methods/removeRoomOwner';
import './methods/removeUserFromRoom';
import './methods/reportMessage';
import './methods/requestDataDownload';
import './methods/resetAvatar';
import './methods/roomNameExists';
import './methods/saveUserPreferences';
import './methods/saveUserProfile';
import './methods/sendConfirmationEmail';
import './methods/sendForgotPasswordEmail';
import './methods/setAvatarFromService';
import './methods/setUserActiveStatus';
import './methods/setUserPassword';
import './methods/toogleFavorite';
import './methods/unmuteUserInRoom';
import './methods/userSetUtcOffset';
import './publications/activeUsers';
import './publications/channelAndPrivateAutocomplete';
import './publications/fullUserData';
import './publications/messages';
import './publications/room';
import './publications/roomFiles';
import './publications/roomFilesWithSearchText';
import './publications/roomSubscriptionsByRole';
import './publications/spotlight';
import './publications/subscription';
import './publications/userAutocomplete';
import './publications/userChannels';
import './publications/userData';
import './stream/messages';
import './stream/streamBroadcast';
139 changes: 139 additions & 0 deletions server/startup/migrations/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
import './v001';
import './v002';
import './v003';
import './v004';
import './v005';
import './v006';
import './v007';
import './v008';
import './v009';
import './v010';
import './v011';
import './v012';
import './v013';
import './v014';
import './v015';
import './v016';
import './v017';
import './v018';
import './v019';
import './v020';
import './v021';
import './v022';
import './v023';
import './v024';
import './v025';
import './v026';
import './v027';
import './v028';
import './v029';
import './v030';
import './v031';
import './v032';
import './v033';
import './v034';
import './v035';
import './v036';
import './v037';
import './v038';
import './v039';
import './v040';
import './v041';
import './v042';
import './v043';
import './v044';
import './v045';
import './v046';
import './v047';
import './v048';
import './v049';
import './v050';
import './v051';
import './v052';
import './v053';
import './v054';
import './v055';
import './v056';
import './v057';
import './v058';
import './v059';
import './v060';
import './v061';
import './v062';
import './v063';
import './v064';
import './v065';
import './v066';
import './v067';
import './v068';
import './v069';
import './v070';
import './v071';
import './v072';
import './v073';
import './v074';
import './v075';
import './v076';
import './v077';
import './v078';
import './v079';
import './v080';
import './v081';
import './v082';
import './v083';
import './v084';
import './v085';
import './v086';
import './v087';
import './v088';
import './v089';
import './v090';
import './v091';
import './v092';
import './v093';
import './v094';
import './v095';
import './v096';
import './v097';
import './v098';
import './v099';
import './v100';
import './v101';
import './v102';
import './v103';
import './v104';
import './v105';
import './v106';
import './v107';
import './v108';
import './v109';
import './v110';
import './v111';
import './v112';
import './v113';
import './v114';
import './v115';
import './v116';
import './v117';
import './v118';
import './v119';
import './v120';
import './v121';
import './v122';
import './v123';
import './v124';
import './v125';
import './v126';
import './v127';
import './v128';
import './v129';
import './v130';
import './v131';
import './v132';
import './v133';
import './v134';
import './v135';
import './v136';
import './v137';
import './v138';
import './xrun';