From b878efaa8db51040f1354af6c56d6e769aa06dfc Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Tue, 26 Feb 2019 10:59:31 -0300 Subject: [PATCH] Depack: Use mainModule for root files (#13508) * Depack: Use mainModule for root files * Fix for mobile layout * Add migration 138 * Move head from inject to a html file --- client/head.html | 21 +++ client/main.js | 32 +++- package.json | 6 + packages/rocketchat-ui-master/client/index.js | 2 + .../rocketchat-ui-master/client/main.html | 22 --- packages/rocketchat-ui-master/package.js | 2 - server/main.js | 82 ++++++++++- server/startup/migrations/index.js | 139 ++++++++++++++++++ 8 files changed, 280 insertions(+), 26 deletions(-) create mode 100644 client/head.html create mode 100644 server/startup/migrations/index.js diff --git a/client/head.html b/client/head.html new file mode 100644 index 000000000000..e92d2c10606a --- /dev/null +++ b/client/head.html @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/client/main.js b/client/main.js index 090ed9e37925..3b521e12d7df 100644 --- a/client/main.js +++ b/client/main.js @@ -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'; diff --git a/package.json b/package.json index b61ff03003b9..320a7980acb4 100644 --- a/package.json +++ b/package.json @@ -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" + } } } diff --git a/packages/rocketchat-ui-master/client/index.js b/packages/rocketchat-ui-master/client/index.js index f6f55f64a219..b5870d194100 100644 --- a/packages/rocketchat-ui-master/client/index.js +++ b/packages/rocketchat-ui-master/client/index.js @@ -1,3 +1,5 @@ import './loading.html'; import './error.html'; import './logoLayout.html'; +import './main.html'; +import './main'; diff --git a/packages/rocketchat-ui-master/client/main.html b/packages/rocketchat-ui-master/client/main.html index 31f68d91c121..1382b864963e 100644 --- a/packages/rocketchat-ui-master/client/main.html +++ b/packages/rocketchat-ui-master/client/main.html @@ -1,25 +1,3 @@ - - - - - - - - - - - - - - - - - - - - - -
diff --git a/packages/rocketchat-ui-master/package.js b/packages/rocketchat-ui-master/package.js index 47cfbfbbbd07..816ded091ca3 100644 --- a/packages/rocketchat-ui-master/package.js +++ b/packages/rocketchat-ui-master/package.js @@ -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'); diff --git a/server/main.js b/server/main.js index 282492e67e21..4ce9bf6410ff 100644 --- a/server/main.js +++ b/server/main.js @@ -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'; diff --git a/server/startup/migrations/index.js b/server/startup/migrations/index.js new file mode 100644 index 000000000000..ea224eaf4e93 --- /dev/null +++ b/server/startup/migrations/index.js @@ -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';