Remove references to vue.js

This commit is contained in:
Pavel Djundik 2019-11-12 17:51:40 +02:00
parent 54a1e11f50
commit 17365d9967
7 changed files with 44 additions and 43 deletions

View File

@ -5,6 +5,8 @@
</template> </template>
<script> <script>
const socket = require("../js/socket");
export default { export default {
name: "InlineChannel", name: "InlineChannel",
props: { props: {
@ -18,8 +20,6 @@ export default {
this.$root.switchToChannel(existingChannel); this.$root.switchToChannel(existingChannel);
} }
// TODO: Required here because it breaks tests
const socket = require("../js/socket");
socket.emit("input", { socket.emit("input", {
target: this.$store.state.activeChannel.channel.id, target: this.$store.state.activeChannel.channel.id,
text: "/join " + this.channel, text: "/join " + this.channel,

View File

@ -3,7 +3,6 @@
const socket = require("../socket"); const socket = require("../socket");
const webpush = require("../webpush"); const webpush = require("../webpush");
const storage = require("../localStorage"); const storage = require("../localStorage");
const {initChannel} = require("../vue");
const {router, switchToChannel, navigate} = require("../router"); const {router, switchToChannel, navigate} = require("../router");
const store = require("../store").default; const store = require("../store").default;
@ -60,7 +59,7 @@ function mergeNetworkData(newNetworks) {
if (!currentNetwork) { if (!currentNetwork) {
network.isJoinChannelShown = false; network.isJoinChannelShown = false;
network.isCollapsed = collapsedNetworks.has(network.uuid); network.isCollapsed = collapsedNetworks.has(network.uuid);
network.channels.forEach(initChannel); network.channels.forEach(store.getters.initChannel);
continue; continue;
} }
@ -96,7 +95,7 @@ function mergeChannelData(oldChannels, newChannels) {
// This is a new channel that was joined while client was disconnected, initialize it // This is a new channel that was joined while client was disconnected, initialize it
if (!currentChannel) { if (!currentChannel) {
initChannel(channel); store.getters.initChannel(channel);
continue; continue;
} }

View File

@ -1,12 +1,11 @@
"use strict"; "use strict";
const socket = require("../socket"); const socket = require("../socket");
const {initChannel} = require("../vue");
const store = require("../store").default; const store = require("../store").default;
const {switchToChannel} = require("../router"); const {switchToChannel} = require("../router");
socket.on("join", function(data) { socket.on("join", function(data) {
initChannel(data.chan); store.getters.initChannel(data.chan);
const network = store.getters.findNetwork(data.network); const network = store.getters.findNetwork(data.network);

View File

@ -3,7 +3,6 @@
import Vue from "vue"; import Vue from "vue";
const socket = require("../socket"); const socket = require("../socket");
const {initChannel} = require("../vue");
const store = require("../store").default; const store = require("../store").default;
const {switchToChannel} = require("../router"); const {switchToChannel} = require("../router");
@ -12,7 +11,7 @@ socket.on("network", function(data) {
network.isJoinChannelShown = false; network.isJoinChannelShown = false;
network.isCollapsed = false; network.isCollapsed = false;
network.channels.forEach(initChannel); network.channels.forEach(store.getters.initChannel);
store.commit("networks", [...store.state.networks, network]); store.commit("networks", [...store.state.networks, network]);
switchToChannel(network.channels[0]); switchToChannel(network.channels[0]);

View File

@ -146,6 +146,24 @@ const store = new Vuex.Store({
return alertEventCount + channelname + appName; return alertEventCount + channelname + appName;
}, },
initChannel: () => (channel) => {
// TODO: This should be a mutation
channel.pendingMessage = "";
channel.inputHistoryPosition = 0;
channel.inputHistory = [""];
channel.historyLoading = false;
channel.scrolledToBottom = true;
channel.editTopic = false;
channel.moreHistoryAvailable = channel.totalMessages > channel.messages.length;
delete channel.totalMessages;
if (channel.type === "channel") {
channel.usersOutdated = true;
}
return channel;
},
}, },
}); });

View File

@ -8,9 +8,15 @@ const localetime = require("./helpers/localetime");
const storage = require("./localStorage"); const storage = require("./localStorage");
const {router, navigate} = require("./router"); const {router, navigate} = require("./router");
const constants = require("./constants"); const constants = require("./constants");
const socket = require("./socket");
Vue.filter("localetime", localetime); Vue.filter("localetime", localetime);
require("./socket-events");
require("./contextMenuFactory");
require("./webpush");
require("./keybinds");
const favicon = document.getElementById("favicon"); const favicon = document.getElementById("favicon");
const faviconNormal = favicon.getAttribute("href"); const faviconNormal = favicon.getAttribute("href");
const faviconAlerted = favicon.dataset.other; const faviconAlerted = favicon.dataset.other;
@ -19,19 +25,7 @@ const vueApp = new Vue({
el: "#viewport", el: "#viewport",
router, router,
mounted() { mounted() {
// TODO: Hackfix because socket-events require vueApp somewhere socket.open();
// and that breaks due to cyclical depenency as by this point vue.js
// does not export anything yet.
setTimeout(() => {
const socket = require("./socket");
require("./socket-events");
require("./contextMenuFactory");
require("./webpush");
require("./keybinds");
socket.open();
}, 1);
}, },
methods: { methods: {
switchToChannel(channel) { switchToChannel(channel) {
@ -85,24 +79,3 @@ Vue.config.errorHandler = function(e) {
store.commit("currentUserVisibleError", `Vue error: ${e.message}`); store.commit("currentUserVisibleError", `Vue error: ${e.message}`);
console.error(e); // eslint-disable-line console.error(e); // eslint-disable-line
}; };
function initChannel(channel) {
channel.pendingMessage = "";
channel.inputHistoryPosition = 0;
channel.inputHistory = [""];
channel.historyLoading = false;
channel.scrolledToBottom = true;
channel.editTopic = false;
channel.moreHistoryAvailable = channel.totalMessages > channel.messages.length;
delete channel.totalMessages;
if (channel.type === "channel") {
channel.usersOutdated = true;
}
}
module.exports = {
vueApp,
initChannel,
};

View File

@ -1,5 +1,7 @@
"use strict"; "use strict";
const webpack = require("webpack");
const path = require("path");
const config = require("./webpack.config.js"); const config = require("./webpack.config.js");
config.target = "node"; config.target = "node";
@ -17,4 +19,15 @@ for (const rule of config.module.rules) {
// - https://github.com/webpack/webpack/issues/6727#issuecomment-372589122 // - https://github.com/webpack/webpack/issues/6727#issuecomment-372589122
config.optimization.splitChunks = false; config.optimization.splitChunks = false;
// "Fixes" Critical dependency: the request of a dependency is an expression
config.plugins.push(new webpack.ContextReplacementPlugin(/vue-server-renderer$/));
// Client tests that require Vue may end up requireing socket.io
config.plugins.push(
new webpack.NormalModuleReplacementPlugin(
/js(\/|\\)socket\.js/,
path.resolve(__dirname, "scripts/noop.js")
)
);
module.exports = config; module.exports = config;