Skip to content

Commit c37d967

Browse files
author
topboy
committed
build fixes
1 parent 2785489 commit c37d967

File tree

12 files changed

+2505
-27507
lines changed

12 files changed

+2505
-27507
lines changed

‎package-lock.json‎

Lines changed: 0 additions & 19882 deletions
This file was deleted.

‎package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
"chalk": "^4.1.2",
6161
"compression-webpack-plugin": "^11.1.0",
6262
"copy-webpack-plugin": "^12.0.2",
63+
"callsite": "^1.0.0",
6364
"css-loader": "^7.1.2",
6465
"css-minimizer-webpack-plugin": "^7.0.0",
6566
"dotenv": "^16.4.5",
@@ -100,10 +101,10 @@
100101
"stylelint": "^16.7.0",
101102
"stylelint-config-recess-order": "^5.0.1",
102103
"stylelint-config-recommended": "^14.0.1",
104+
"stylelint-config-recommended-scss": "^14.1.0",
103105
"stylelint-config-recommended-vue": "^1.5.0",
104106
"stylelint-config-standard": "^36.0.1",
105107
"stylelint-config-standard-scss": "^13.1.0",
106-
"stylelint-config-recommended-scss": "^14.1.0",
107108
"stylelint-order": "^6.0.4",
108109
"stylelint-webpack-plugin": "5.0.1",
109110
"vue-eslint-parser": "^8.3.0",

‎src/components/MessageListMessageCompact.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ const buildMessageFooter = (props, context, cache) => {
5858
}));
5959
}
6060
61-
return buildPluginSection('append')(props,context,cache).concat(footer);
61+
return buildPluginSection('append')(props, context, cache).concat(footer);
6262
};
6363
6464
const messageCompact = (props, context) => {
@@ -146,7 +146,7 @@ const messageCompact = (props, context) => {
146146
}, messageChildren);
147147
};
148148
149-
messageCompact.props = ['ml', 'append','prepend', 'message'];
149+
messageCompact.props = ['ml', 'append', 'prepend', 'message'];
150150
151151
export default messageCompact;
152152
</script>

‎src/components/MessageListMessageInline.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ const buildInline = (props, context, cache) => {
4141
h('a', [
4242
createTextVNode(props.message.nick ? `${props.message.nick}:` : ''),
4343
]),
44-
...buildPluginSection('prepend')(props, context, cache)
44+
...buildPluginSection('prepend')(props, context, cache),
4545
]));
4646
4747
inline.push(buildMessageBody(props, context, cache));
@@ -86,7 +86,7 @@ const buildMessageFooter = (props, context, cache) => {
8686
}));
8787
}
8888
89-
return buildPluginSection('append')(props,context,cache).concat(footer);
89+
return buildPluginSection('append')(props, context, cache).concat(footer);
9090
};
9191
9292
const messageInline = (props, context) => {

‎src/components/MessageListMessageModern.vue‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { urlRegex } from '@/helpers/TextFormatting';
55
import UserAvatar from './UserAvatar';
66
import MessageInfo from './MessageInfo';
77
import MediaViewer from './MediaViewer';
8+
import buildPluginSection from './utils/build-plugin-section';
89
910
const messageTypes = ['privmsg', 'action', 'notice', 'message'];
1011
const isMessage = (message) => messageTypes.indexOf(message.type) > -1;
@@ -180,7 +181,7 @@ const buildMessageFooter = (props, context, cache) => {
180181
}));
181182
}
182183
183-
return buildPluginSection('append')(props,context,cache).concat(footer);
184+
return buildPluginSection('append')(props, context, cache).concat(footer);
184185
};
185186
186187
const messageModern = (props, context) => {
@@ -232,7 +233,7 @@ const messageModern = (props, context) => {
232233
h('div', {
233234
class: ['kiwi-messagelist-top'],
234235
}, buildMessageTop(props, context, cache)),
235-
...buildPluginSection(prepend)(props,context,cache),
236+
...buildPluginSection('prepend')(props, context, cache),
236237
buildMessageBody(props, context, cache),
237238
...buildMessageFooter(props, context, cache),
238239
]),

‎src/components/utils/build-plugin-section.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
import { h } from 'vue';
22

33
const buildPluginSection = (prop) => (props, context, cache) => {
4+
kiwi.log.debug("building plugin section....", props, context, cache)
45
if (!(props[prop] instanceof Array)) return [];
56
if (!props[prop].length) return [];
6-
const plugins = props[prop].map(plugin => h(plugin.component, {
7+
const plugins = props[prop].map((plugin) => h(plugin.component, {
78
key: plugin.id,
89
messagelist: props.ml,
910
buffer: props.ml.buffer,
1011
message: props.message,
1112
color: props.ml.userColour(props.message.user),
1213
pluginProps: plugin.props,
13-
...(plugin.props || {})
14+
...(plugin.props || {}),
1415
}));
1516
return [h('div', {
1617
class: `kiwi-messagelist-body kiwi-messagelist-body-${prop}-addons`,
17-
}, plugins)]
18-
19-
}
20-
export default buildPluginSection;
18+
}, plugins)];
19+
};
20+
export default buildPluginSection;

‎src/libs/Logger.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
'kiwi public';
22

3+
// eslint-disable-next-line
34
import callsite from 'callsite';
45

56
const defaultLogger = makeLogger();

‎src/libs/iconLibrary.js‎

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
/*
2+
--== DO NOT EDIT ==--
3+
4+
This file is auto generated
5+
*/
6+
7+
import { faAngleRight as fasAngleRight } from '@fortawesome/free-solid-svg-icons/faAngleRight';
8+
import { faArrowsRotate as fasArrowsRotate } from '@fortawesome/free-solid-svg-icons/faArrowsRotate';
9+
import { faBackwardStep as fasBackwardStep } from '@fortawesome/free-solid-svg-icons/faBackwardStep';
10+
import { faBan as fasBan } from '@fortawesome/free-solid-svg-icons/faBan';
11+
import { faBars as fasBars } from '@fortawesome/free-solid-svg-icons/faBars';
12+
import { faCaretDown as fasCaretDown } from '@fortawesome/free-solid-svg-icons/faCaretDown';
13+
import { faCaretRight as fasCaretRight } from '@fortawesome/free-solid-svg-icons/faCaretRight';
14+
import { faCaretUp as fasCaretUp } from '@fortawesome/free-solid-svg-icons/faCaretUp';
15+
import { faCircleArrowRight as fasCircleArrowRight } from '@fortawesome/free-solid-svg-icons/faCircleArrowRight';
16+
import { faCircleHalfStroke as fasCircleHalfStroke } from '@fortawesome/free-solid-svg-icons/faCircleHalfStroke';
17+
import { faCog as fasCog } from '@fortawesome/free-solid-svg-icons/faCog';
18+
import { faEye as fasEye } from '@fortawesome/free-solid-svg-icons/faEye';
19+
import { faForwardStep as fasForwardStep } from '@fortawesome/free-solid-svg-icons/faForwardStep';
20+
import { faGears as fasGears } from '@fortawesome/free-solid-svg-icons/faGears';
21+
import { faGlobe as fasGlobe } from '@fortawesome/free-solid-svg-icons/faGlobe';
22+
import { faInfo as fasInfo } from '@fortawesome/free-solid-svg-icons/faInfo';
23+
import { faLock as fasLock } from '@fortawesome/free-solid-svg-icons/faLock';
24+
import { faMagnifyingGlass as fasMagnifyingGlass } from '@fortawesome/free-solid-svg-icons/faMagnifyingGlass';
25+
import { faMapPin as fasMapPin } from '@fortawesome/free-solid-svg-icons/faMapPin';
26+
import { faPaperPlane as fasPaperPlane } from '@fortawesome/free-solid-svg-icons/faPaperPlane';
27+
import { faPencil as fasPencil } from '@fortawesome/free-solid-svg-icons/faPencil';
28+
import { faPlus as fasPlus } from '@fortawesome/free-solid-svg-icons/faPlus';
29+
import { faRectangleXmark as fasRectangleXmark } from '@fortawesome/free-solid-svg-icons/faRectangleXmark';
30+
import { faRefresh as fasRefresh } from '@fortawesome/free-solid-svg-icons/faRefresh';
31+
import { faRightFromBracket as fasRightFromBracket } from '@fortawesome/free-solid-svg-icons/faRightFromBracket';
32+
import { faRotate as fasRotate } from '@fortawesome/free-solid-svg-icons/faRotate';
33+
import { faRotateLeft as fasRotateLeft } from '@fortawesome/free-solid-svg-icons/faRotateLeft';
34+
import { faScrewdriverWrench as fasScrewdriverWrench } from '@fortawesome/free-solid-svg-icons/faScrewdriverWrench';
35+
import { faSearch as fasSearch } from '@fortawesome/free-solid-svg-icons/faSearch';
36+
import { faServer as fasServer } from '@fortawesome/free-solid-svg-icons/faServer';
37+
import { faShareFromSquare as fasShareFromSquare } from '@fortawesome/free-solid-svg-icons/faShareFromSquare';
38+
import { faTimes as fasTimes } from '@fortawesome/free-solid-svg-icons/faTimes';
39+
import { faTrashCan as fasTrashCan } from '@fortawesome/free-solid-svg-icons/faTrashCan';
40+
import { faTriangleExclamation as fasTriangleExclamation } from '@fortawesome/free-solid-svg-icons/faTriangleExclamation';
41+
import { faUnlock as fasUnlock } from '@fortawesome/free-solid-svg-icons/faUnlock';
42+
import { faUser as fasUser } from '@fortawesome/free-solid-svg-icons/faUser';
43+
import { faUsers as fasUsers } from '@fortawesome/free-solid-svg-icons/faUsers';
44+
import { faXmark as fasXmark } from '@fortawesome/free-solid-svg-icons/faXmark';
45+
46+
import { faCircleQuestion as farCircleQuestion } from '@fortawesome/free-regular-svg-icons/faCircleQuestion';
47+
import { faCircleRight as farCircleRight } from '@fortawesome/free-regular-svg-icons/faCircleRight';
48+
import { faComment as farComment } from '@fortawesome/free-regular-svg-icons/faComment';
49+
import { faFaceFrown as farFaceFrown } from '@fortawesome/free-regular-svg-icons/faFaceFrown';
50+
import { faFaceSmile as farFaceSmile } from '@fortawesome/free-regular-svg-icons/faFaceSmile';
51+
import { faSquareMinus as farSquareMinus } from '@fortawesome/free-regular-svg-icons/faSquareMinus';
52+
import { faSquarePlus as farSquarePlus } from '@fortawesome/free-regular-svg-icons/faSquarePlus';
53+
import { faStar as farStar } from '@fortawesome/free-regular-svg-icons/faStar';
54+
55+
import { library } from '@fortawesome/fontawesome-svg-core';
56+
57+
library.add(
58+
fasAngleRight,
59+
fasArrowsRotate,
60+
fasBackwardStep,
61+
fasBan,
62+
fasBars,
63+
fasCaretDown,
64+
fasCaretRight,
65+
fasCaretUp,
66+
fasCircleArrowRight,
67+
fasCircleHalfStroke,
68+
fasCog,
69+
fasEye,
70+
fasForwardStep,
71+
fasGears,
72+
fasGlobe,
73+
fasInfo,
74+
fasLock,
75+
fasMagnifyingGlass,
76+
fasMapPin,
77+
fasPaperPlane,
78+
fasPencil,
79+
fasPlus,
80+
fasRectangleXmark,
81+
fasRefresh,
82+
fasRightFromBracket,
83+
fasRotate,
84+
fasRotateLeft,
85+
fasScrewdriverWrench,
86+
fasSearch,
87+
fasServer,
88+
fasShareFromSquare,
89+
fasTimes,
90+
fasTrashCan,
91+
fasTriangleExclamation,
92+
fasUnlock,
93+
fasUser,
94+
fasUsers,
95+
fasXmark,
96+
farCircleQuestion,
97+
farCircleRight,
98+
farComment,
99+
farFaceFrown,
100+
farFaceSmile,
101+
farSquareMinus,
102+
farSquarePlus,
103+
farStar,
104+
);

‎src/main.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import VueVirtualScroller from 'vue-virtual-scroller';
99
import 'vue-virtual-scroller/dist/vue-virtual-scroller.css';
1010

1111
import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
12+
import { config as faConfig } from '@fortawesome/fontawesome-svg-core';
1213

1314
// fetch polyfill
1415
import 'whatwg-fetch';
@@ -45,9 +46,7 @@ import TransitionExpand from '@/components/utils/TransitionExpand';
4546
import AvailableLocales from '@/res/locales/available.json';
4647
import FallbackLocale from '@/../static/locales/dev.json';
4748

48-
import SvgSpinner from '@/res/icons/ring-resize.svg';
49-
50-
import { config as faConfig } from '@fortawesome/fontawesome-svg-core';
49+
import SvgSpinner from './res/icons/ring-resize.svg';
5150

5251
Object.assign(faConfig, {
5352
observeMutations: false,

‎src/res/icons/ring-resize.svg‎

Lines changed: 6 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)