Fix lint & tests

build/plugins/webpack/import-icons.js

@@ -166,15 +166,15 @@ function writeIfChanged(file, _data) {
     fs.writeFileSync(file, data);
 }
 
-function getFiles(sourceDir) {
+function getFiles(src) {
     const files = [];
 
     const readDir = (dirPath) => fs.readdirSync(dirPath).forEach((name) => {
         const entry = path.join(dirPath, name);
         fs.lstatSync(entry).isDirectory() ? readDir(entry) : files.push(entry);
     });
 
-    readDir(sourceDir);
+    readDir(src);
 
     return files.filter(
         (file) => (fileRegex.test(file) && file !== outputFile)

jest.config.js

@@ -14,9 +14,11 @@ module.exports = {
         '^.+\\.vue$': require.resolve('@vue/vue3-jest'),
         '^.+\\.jsx?$': require.resolve('babel-jest'),
     },
-    transformIgnorePatterns: ['/node_modules/'],
+    transformIgnorePatterns: ['/node_modules/(?!(ip-regex)/)'],
     moduleNameMapper: {
         '^@/(.*)$': '<rootDir>/src/$1',
+        '\\.(jpg|ico|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': '<rootDir>/tests/mocks/fileMock.js',
+        '\\.(css|less)$': '<rootDir>/tests/mocks/fileMock.js',
     },
     testMatch: [
         '**/tests/unit/**/*.spec.[jt]s?(x)',

package.json

@@ -7,9 +7,9 @@
         "dev": "node build/commands/dev.js",
         "build": "node build/commands/build.js",
         "stats": "node build/commands/build.js --stats",
-        "lint": "npm-run-all lint:*",
+        "lint": "npm-run-all \"lint:*\"",
         "lint:js": "eslint --ext .js,.vue ./",
-        "lint:style": "stylelint \"./src/**/*.vue\" \"./src/**/*.scss\"",
+        "lint:style": "stylelint --allow-empty-input \"./src/**/*.{vue,html,css,less,scss,sass}\"",
         "test": "jest",
         "gendocs": "rm -rf srcdocs/ && jsdoc -c jsdoc.json"
     },
@@ -52,7 +52,7 @@
         "@stylistic/stylelint-plugin": "^2.1.3",
         "@vue/compiler-sfc": "^3.5.13",
         "@vue/eslint-config-airbnb": "^7.0.1",
-        "@vue/vue3-jest": "^29.2.6",
+        "@vue/vue3-jest": "29",
         "autoprefixer": "^10.4.20",
         "babel-jest": "^29.7.0",
         "babel-loader": "^9.2.1",

src/components/Container.vue

@@ -40,7 +40,7 @@
                     <server-view :network="network" />
                 </template>
                 <template v-else>
-                    <message-list :buffer="buffer" :key="buffer.id" />
+                    <message-list :key="buffer.id" :buffer="buffer" />
                     <sidebar
                         v-if="!buffer.isSpecial()"
                         :network="network"

src/components/MessageList.vue

@@ -259,7 +259,7 @@ export default {
         },
     },
     mounted() {
-        console.log('mounted');
+        // console.log('mounted');
         if (!this.showMessages) {
             setTimeout(() => {
                 this.showMessages = true;
@@ -304,7 +304,7 @@ export default {
         });
     },
     updated() {
-        console.log('updated');
+        // console.log('updated');
         if (this.showMessages && this.showOverlay) {
             setTimeout(() => {
                 this.showOverlay = false;

src/components/UserBox.vue

@@ -212,7 +212,7 @@
 <script>
 'kiwi public';
 
-import * as ipRegex from 'ip-regex';
+import ipRegex from 'ip-regex';
 import * as TextFormatting from '@/helpers/TextFormatting';
 import * as IrcdDiffs from '@/helpers/IrcdDiffs';
 import * as Misc from '@/helpers/Misc';

tests/unit/NetworkState.spec.js

@@ -8,7 +8,7 @@ describe('NetworkState', () => {
         expect(network).toBeInstanceOf(NetworkState);
         expect(network.name).toBe('TestNetwork');
         expect(network.connection.nick).toBe('TestNick');
-        expect(network.appState).toBe(s);
+        expect(network.appState).toEqual(s);
     });
 
     it('should add a NetworkState to the global state', () => {

tests/unit/StartupError.spec.js

@@ -1,20 +1,24 @@
-import Vue from 'vue';
+import { createApp } from 'vue';
 import StartupError from '@/components/StartupError';
 
-Vue.mixin({
-    computed: {
-        $t() {
-            return (key, options) => key;
-        },
-    },
-});
-
 describe('StartupError.vue', () => {
     it('should render correct contents', () => {
-        const vm = new Vue({
-            el: document.createElement('div'),
-            render: (h) => h(StartupError, { props: { error: 'some error' } }),
+        const app = createApp(
+            StartupError,
+            { error: 'some error' }
+        );
+
+        app.mixin({
+            computed: {
+                $t() {
+                    return (key, options) => key;
+                },
+            },
         });
-        expect(vm.$el.querySelector('span.kiwi-error-text').textContent).toEqual('some error');
+
+        const el = document.createElement('div');
+        app.mount(el);
+
+        expect(el.querySelector('span.kiwi-error-text').textContent).toEqual('some error');
     });
 });

yarn.lock

@@ -2833,7 +2833,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vue/vue3-jest@npm:^29.2.6":
+"@vue/vue3-jest@npm:29":
   version: 29.2.6
   resolution: "@vue/vue3-jest@npm:29.2.6"
   dependencies:
@@ -8569,7 +8569,7 @@ __metadata:
     "@stylistic/stylelint-plugin": "npm:^2.1.3"
     "@vue/compiler-sfc": "npm:^3.5.13"
     "@vue/eslint-config-airbnb": "npm:^7.0.1"
-    "@vue/vue3-jest": "npm:^29.2.6"
+    "@vue/vue3-jest": "npm:29"
     autoprefixer: "npm:^10.4.20"
     babel-jest: "npm:^29.7.0"
     babel-loader: "npm:^9.2.1"