Merge branch 'master' into feature/player-ui

This commit is contained in:
Tamius Han 2021-06-13 02:19:39 +02:00
commit d92b24a2f6
2 changed files with 12 additions and 10 deletions

View File

@ -504,15 +504,11 @@ const ExtensionConfPatch = [
}, { }, {
forVersion: '5.0.4', forVersion: '5.0.4',
updateFn: (userOptions, defaultOptions) => { updateFn: (userOptions, defaultOptions) => {
try { userOptions.sites['www.disneyplus.com'].DOM.player = {
userOptions.sites['wwww.disneyplus.com'].DOM.player = { ... userOptions.sites['www.disneyplus.com'].DOM.player,
... userOptions.sites['wwww.disneyplus.com'].DOM.player, querySelectors: ".btm-media-client-element",
querySelectors: ".btm-media-client-element", useRelativeAncestor: true,
useRelativeAncestor: false, videoAncestor: 1
videoAncestor: 1
}
} catch (e) {
// do nothing
} }
} }
} }

View File

@ -163,7 +163,10 @@ const config = {
}), }),
new webpack.DefinePlugin({ new webpack.DefinePlugin({
'process.env.BROWSER': JSON.stringify(process.env.BROWSER), 'process.env.BROWSER': JSON.stringify(process.env.BROWSER),
'process.env.CHANNEL': JSON.stringify(process.env.CHANNEL) 'process.env.CHANNEL': JSON.stringify(process.env.CHANNEL),
'__VUE_OPTIONS_API__': true,
'__VUE_PROD_DEVTOOLS__': false
}) })
], ],
optimization: { optimization: {
@ -179,6 +182,9 @@ const config = {
if (config.mode === 'production') { if (config.mode === 'production') {
config.plugins = (config.plugins || []).concat([ config.plugins = (config.plugins || []).concat([
new webpack.DefinePlugin({ new webpack.DefinePlugin({
'__VUE_OPTIONS_API__': true,
'__VUE_PROD_DEVTOOLS__': false,
'process.env': { 'process.env': {
NODE_ENV: '"production"', NODE_ENV: '"production"',
}, },