Mastodon/Whalebird-desktop-client-mac-linux-windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1711 from h3poteto/fix/css-loader/4.x.x

Browse Source 
Fix options for css-loader 4.0.0
This commit is contained in:
AkiraFukushima 2020-08-20 22:42:23 +09:00 committed by GitHub
commit d1bff25216
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 82 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
.electron-vue/webpack.renderer.config.js
View File

@ -31,19 +31,59 @@ let rendererConfig = {
}, },
{ {
test: /\.scss$/, test: /\.scss$/,
use: ['vue-style-loader', 'css-loader', 'sass-loader'] use: [
'vue-style-loader',
{
loader: 'css-loader',
options: {
modules: false,
esModule: false
}
},
'sass-loader'
]
}, },
{ {
test: /\.sass$/, test: /\.sass$/,
use: ['vue-style-loader', 'css-loader', 'sass-loader?indentedSyntax'] use: [
'vue-style-loader',
{
loader: 'css-loader',
options: {
modules: false,
esModule: false
}
},
'sass-loader?indentedSyntax'
]
}, },
{ {
test: /\.less$/, test: /\.less$/,
use: ['vue-style-loader', 'css-loader', 'less-loader'] use: [
'vue-style-loader',
{
loader: 'css-loader',
options: {
modules: false,
esModule: false
}
},
'less-loader'
]
}, },
{ {
test: /\.css$/, test: /\.css$/,
use: ['vue-style-loader', 'css-loader'] use: [
'vue-style-loader',
{
loader: 'css-loader',
options: {
modules: false,
esModule: false
}
}
]
}, },
{ {
test: /\.html$/, test: /\.html$/,

10
src/renderer/components/TimelineSpace/Contents/DirectMessages.vue
View File

@ -57,7 +57,7 @@ export default {
unreadNotification: state => state.TimelineSpace.unreadNotification unreadNotification: state => state.TimelineSpace.unreadNotification
}), }),
...mapGetters('TimelineSpace/Modals', ['modalOpened']), ...mapGetters('TimelineSpace/Modals', ['modalOpened']),
shortcutEnabled: function() { shortcutEnabled: function () {
if (this.modalOpened) { if (this.modalOpened) {
return false return false
} }
@ -83,7 +83,7 @@ export default {
// If focusedId does not change, we have to refresh focusedId because Toot component watch change events. // If focusedId does not change, we have to refresh focusedId because Toot component watch change events.
const previousFocusedId = this.focusedId const previousFocusedId = this.focusedId
this.focusedId = 0 this.focusedId = 0
this.$nextTick(function() { this.$nextTick(function () {
this.focusedId = previousFocusedId this.focusedId = previousFocusedId
}) })
}) })
@ -113,14 +113,14 @@ export default {
} }
}, },
watch: { watch: {
startReload: function(newState, oldState) { startReload: function (newState, oldState) {
if (!oldState && newState) { if (!oldState && newState) {
this.reload().finally(() => { this.reload().finally(() => {
this.$store.commit('TimelineSpace/HeaderMenu/changeReload', false) this.$store.commit('TimelineSpace/HeaderMenu/changeReload', false)
}) })
} }
}, },
focusedId: function(newState, _oldState) { focusedId: function (newState, _oldState) {
if (newState && this.heading) { if (newState && this.heading) {
this.$store.commit('TimelineSpace/Contents/DirectMessages/changeHeading', false) this.$store.commit('TimelineSpace/Contents/DirectMessages/changeHeading', false)
} else if (newState === null && !this.heading) { } else if (newState === null && !this.heading) {
@ -253,4 +253,4 @@ export default {
} }
} }
</style> </style>
<style src="@/assets/timeline-transition.scss"></style> <style lang="scss" src="@/assets/timeline-transition.scss"></style>

12
src/renderer/components/TimelineSpace/Contents/Hashtag/Tag.vue
View File

@ -55,7 +55,7 @@ export default {
filter: state => state.TimelineSpace.Contents.Hashtag.Tag.filter filter: state => state.TimelineSpace.Contents.Hashtag.Tag.filter
}), }),
...mapGetters('TimelineSpace/Modals', ['modalOpened']), ...mapGetters('TimelineSpace/Modals', ['modalOpened']),
shortcutEnabled: function() { shortcutEnabled: function () {
if (this.modalOpened) { if (this.modalOpened) {
return false return false
} }
@ -78,27 +78,27 @@ export default {
// If focusedId does not change, we have to refresh focusedId because Toot component watch change events. // If focusedId does not change, we have to refresh focusedId because Toot component watch change events.
const previousFocusedId = this.focusedId const previousFocusedId = this.focusedId
this.focusedId = 0 this.focusedId = 0
this.$nextTick(function() { this.$nextTick(function () {
this.focusedId = previousFocusedId this.focusedId = previousFocusedId
}) })
}) })
}, },
watch: { watch: {
tag: function(newTag, _oldTag) { tag: function (newTag, _oldTag) {
this.$store.commit('TimelineSpace/Contents/changeLoading', true) this.$store.commit('TimelineSpace/Contents/changeLoading', true)
this.reset() this.reset()
this.load(newTag).finally(() => { this.load(newTag).finally(() => {
this.$store.commit('TimelineSpace/Contents/changeLoading', false) this.$store.commit('TimelineSpace/Contents/changeLoading', false)
}) })
}, },
startReload: function(newState, oldState) { startReload: function (newState, oldState) {
if (!oldState && newState) { if (!oldState && newState) {
this.reload().finally(() => { this.reload().finally(() => {
this.$store.commit('TimelineSpace/HeaderMenu/changeReload', false) this.$store.commit('TimelineSpace/HeaderMenu/changeReload', false)
}) })
} }
}, },
focusedId: function(newState, _oldState) { focusedId: function (newState, _oldState) {
if (newState && this.heading) { if (newState && this.heading) {
this.$store.commit('TimelineSpace/Contents/Hashtag/Tag/changeHeading', false) this.$store.commit('TimelineSpace/Contents/Hashtag/Tag/changeHeading', false)
} else if (newState === null && !this.heading) { } else if (newState === null && !this.heading) {
@ -257,4 +257,4 @@ export default {
transition: all 0.5s; transition: all 0.5s;
} }
</style> </style>
<style src="@/assets/timeline-transition.scss"></style> <style lang="scss" src="@/assets/timeline-transition.scss"></style>

2
src/renderer/components/TimelineSpace/Contents/Home.vue
View File

@ -234,4 +234,4 @@ export default {
} }
} }
</style> </style>
<style src="@/assets/timeline-transition.scss"></style> <style lang="scss" src="@/assets/timeline-transition.scss"></style>

12
src/renderer/components/TimelineSpace/Contents/Lists/Show.vue
View File

@ -55,7 +55,7 @@ export default {
filter: state => state.TimelineSpace.Contents.Lists.Show.filter filter: state => state.TimelineSpace.Contents.Lists.Show.filter
}), }),
...mapGetters('TimelineSpace/Modals', ['modalOpened']), ...mapGetters('TimelineSpace/Modals', ['modalOpened']),
shortcutEnabled: function() { shortcutEnabled: function () {
if (this.modalOpened) { if (this.modalOpened) {
return false return false
} }
@ -79,26 +79,26 @@ export default {
// If focusedId does not change, we have to refresh focusedId because Toot component watch change events. // If focusedId does not change, we have to refresh focusedId because Toot component watch change events.
const previousFocusedId = this.focusedId const previousFocusedId = this.focusedId
this.focusedId = 0 this.focusedId = 0
this.$nextTick(function() { this.$nextTick(function () {
this.focusedId = previousFocusedId this.focusedId = previousFocusedId
}) })
}) })
}, },
watch: { watch: {
list_id: function() { list_id: function () {
this.$store.commit('TimelineSpace/Contents/changeLoading', true) this.$store.commit('TimelineSpace/Contents/changeLoading', true)
this.load().finally(() => { this.load().finally(() => {
this.$store.commit('TimelineSpace/Contents/changeLoading', false) this.$store.commit('TimelineSpace/Contents/changeLoading', false)
}) })
}, },
startReload: function(newState, oldState) { startReload: function (newState, oldState) {
if (!oldState && newState) { if (!oldState && newState) {
this.reload().finally(() => { this.reload().finally(() => {
this.$store.commit('TimelineSpace/HeaderMenu/changeReload', false) this.$store.commit('TimelineSpace/HeaderMenu/changeReload', false)
}) })
} }
}, },
focusedId: function(newState, _oldState) { focusedId: function (newState, _oldState) {
if (newState && this.heading) { if (newState && this.heading) {
this.$store.commit('TimelineSpace/Contents/Lists/Show/changeHeading', false) this.$store.commit('TimelineSpace/Contents/Lists/Show/changeHeading', false)
} else if (newState === null && !this.heading) { } else if (newState === null && !this.heading) {
@ -257,4 +257,4 @@ export default {
transition: all 0.5s; transition: all 0.5s;
} }
</style> </style>
<style src="@/assets/timeline-transition.scss"></style> <style lang="scss" src="@/assets/timeline-transition.scss"></style>

10
src/renderer/components/TimelineSpace/Contents/Local.vue
View File

@ -57,7 +57,7 @@ export default {
unreadNotification: state => state.TimelineSpace.unreadNotification unreadNotification: state => state.TimelineSpace.unreadNotification
}), }),
...mapGetters('TimelineSpace/Modals', ['modalOpened']), ...mapGetters('TimelineSpace/Modals', ['modalOpened']),
shortcutEnabled: function() { shortcutEnabled: function () {
if (this.modalOpened) { if (this.modalOpened) {
return false return false
} }
@ -83,7 +83,7 @@ export default {
// If focusedId does not change, we have to refresh focusedId because Toot component watch change events. // If focusedId does not change, we have to refresh focusedId because Toot component watch change events.
const previousFocusedId = this.focusedId const previousFocusedId = this.focusedId
this.focusedId = 0 this.focusedId = 0
this.$nextTick(function() { this.$nextTick(function () {
this.focusedId = previousFocusedId this.focusedId = previousFocusedId
}) })
}) })
@ -113,14 +113,14 @@ export default {
} }
}, },
watch: { watch: {
startReload: function(newState, oldState) { startReload: function (newState, oldState) {
if (!oldState && newState) { if (!oldState && newState) {
this.reload().finally(() => { this.reload().finally(() => {
this.$store.commit('TimelineSpace/HeaderMenu/changeReload', false) this.$store.commit('TimelineSpace/HeaderMenu/changeReload', false)
}) })
} }
}, },
focusedId: function(newState, _oldState) { focusedId: function (newState, _oldState) {
if (newState && this.heading) { if (newState && this.heading) {
this.$store.commit('TimelineSpace/Contents/Local/changeHeading', false) this.$store.commit('TimelineSpace/Contents/Local/changeHeading', false)
} else if (newState === null && !this.heading) { } else if (newState === null && !this.heading) {
@ -246,4 +246,4 @@ export default {
} }
} }
</style> </style>
<style src="@/assets/timeline-transition.scss"></style> <style lang="scss" src="@/assets/timeline-transition.scss"></style>

10
src/renderer/components/TimelineSpace/Contents/Mentions.vue
View File

@ -59,7 +59,7 @@ export default {
}), }),
...mapGetters('TimelineSpace/Modals', ['modalOpened']), ...mapGetters('TimelineSpace/Modals', ['modalOpened']),
...mapGetters('TimelineSpace/Contents/Mentions', ['mentions']), ...mapGetters('TimelineSpace/Contents/Mentions', ['mentions']),
shortcutEnabled: function() { shortcutEnabled: function () {
if (this.modalOpened) { if (this.modalOpened) {
return false return false
} }
@ -78,7 +78,7 @@ export default {
// If focusedId does not change, we have to refresh focusedId because Toot component watch change events. // If focusedId does not change, we have to refresh focusedId because Toot component watch change events.
const previousFocusedId = this.focusedId const previousFocusedId = this.focusedId
this.focusedId = 0 this.focusedId = 0
this.$nextTick(function() { this.$nextTick(function () {
this.focusedId = previousFocusedId this.focusedId = previousFocusedId
}) })
}) })
@ -101,14 +101,14 @@ export default {
} }
}, },
watch: { watch: {
startReload: function(newState, oldState) { startReload: function (newState, oldState) {
if (!oldState && newState) { if (!oldState && newState) {
this.reload().finally(() => { this.reload().finally(() => {
this.$store.commit('TimelineSpace/HeaderMenu/changeReload', false) this.$store.commit('TimelineSpace/HeaderMenu/changeReload', false)
}) })
} }
}, },
focusedId: function(newState, _oldState) { focusedId: function (newState, _oldState) {
if (newState && this.heading) { if (newState && this.heading) {
this.$store.commit('TimelineSpace/Contents/Mentions/changeHeading', false) this.$store.commit('TimelineSpace/Contents/Mentions/changeHeading', false)
} else if (newState === null && !this.heading) { } else if (newState === null && !this.heading) {
@ -225,4 +225,4 @@ export default {
} }
} }
</style> </style>
<style src="@/assets/timeline-transition.scss"></style> <style lang="scss" src="@/assets/timeline-transition.scss"></style>

10
src/renderer/components/TimelineSpace/Contents/Notifications.vue
View File

@ -53,7 +53,7 @@ export default {
filter: state => state.TimelineSpace.Contents.Notifications.filter filter: state => state.TimelineSpace.Contents.Notifications.filter
}), }),
...mapGetters('TimelineSpace/Modals', ['modalOpened']), ...mapGetters('TimelineSpace/Modals', ['modalOpened']),
shortcutEnabled: function() { shortcutEnabled: function () {
if (this.modalOpened) { if (this.modalOpened) {
return false return false
} }
@ -74,7 +74,7 @@ export default {
// If focusedId does not change, we have to refresh focusedId because Toot component watch change events. // If focusedId does not change, we have to refresh focusedId because Toot component watch change events.
const previousFocusedId = this.focusedId const previousFocusedId = this.focusedId
this.focusedId = 0 this.focusedId = 0
this.$nextTick(function() { this.$nextTick(function () {
this.focusedId = previousFocusedId this.focusedId = previousFocusedId
}) })
}) })
@ -97,14 +97,14 @@ export default {
} }
}, },
watch: { watch: {
startReload: function(newState, oldState) { startReload: function (newState, oldState) {
if (!oldState && newState) { if (!oldState && newState) {
this.reload().finally(() => { this.reload().finally(() => {
this.$store.commit('TimelineSpace/HeaderMenu/changeReload', false) this.$store.commit('TimelineSpace/HeaderMenu/changeReload', false)
}) })
} }
}, },
focusedId: function(newState, _oldState) { focusedId: function (newState, _oldState) {
if (newState >= 0 && this.heading) { if (newState >= 0 && this.heading) {
this.$store.commit('TimelineSpace/Contents/Notifications/changeHeading', false) this.$store.commit('TimelineSpace/Contents/Notifications/changeHeading', false)
} else if (newState === null && !this.heading) { } else if (newState === null && !this.heading) {
@ -225,4 +225,4 @@ export default {
} }
} }
</style> </style>
<style src="@/assets/timeline-transition.scss"></style> <style lang="scss" src="@/assets/timeline-transition.scss"></style>

10
src/renderer/components/TimelineSpace/Contents/Public.vue
View File

@ -57,7 +57,7 @@ export default {
unreadNotification: state => state.TimelineSpace.unreadNotification unreadNotification: state => state.TimelineSpace.unreadNotification
}), }),
...mapGetters('TimelineSpace/Modals', ['modalOpened']), ...mapGetters('TimelineSpace/Modals', ['modalOpened']),
shortcutEnabled: function() { shortcutEnabled: function () {
if (this.modalOpened) { if (this.modalOpened) {
return false return false
} }
@ -83,7 +83,7 @@ export default {
// If focusedId does not change, we have to refresh focusedId because Toot component watch change events. // If focusedId does not change, we have to refresh focusedId because Toot component watch change events.
const previousFocusedId = this.focusedId const previousFocusedId = this.focusedId
this.focusedId = 0 this.focusedId = 0
this.$nextTick(function() { this.$nextTick(function () {
this.focusedId = previousFocusedId this.focusedId = previousFocusedId
}) })
}) })
@ -113,14 +113,14 @@ export default {
} }
}, },
watch: { watch: {
startReload: function(newState, oldState) { startReload: function (newState, oldState) {
if (!oldState && newState) { if (!oldState && newState) {
this.reload().finally(() => { this.reload().finally(() => {
this.$store.commit('TimelineSpace/HeaderMenu/changeReload', false) this.$store.commit('TimelineSpace/HeaderMenu/changeReload', false)
}) })
} }
}, },
focusedId: function(newState, _oldState) { focusedId: function (newState, _oldState) {
if (newState && this.heading) { if (newState && this.heading) {
this.$store.commit('TimelineSpace/Contents/Public/changeHeading', false) this.$store.commit('TimelineSpace/Contents/Public/changeHeading', false)
} else if (newState === null && !this.heading) { } else if (newState === null && !this.heading) {
@ -246,4 +246,4 @@ export default {
} }
} }
</style> </style>
<style src="@/assets/timeline-transition.scss"></style> <style lang="scss" src="@/assets/timeline-transition.scss"></style>