Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-27 08:02:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(utils): eliminate side effect from modern utils (#6953)

Browse Source 
[release]
This commit is contained in:
Xin Du (Clark) 2020-02-09 11:17:39 +00:00 committed by GitHub
parent c865cef032
commit 6ae7718a42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
packages/utils/src/modern.js
View File

@ -1,6 +1,3 @@
import UAParser from 'ua-parser-js'
import semver from 'semver'
export const ModernBrowsers = { export const ModernBrowsers = {
Edge: '16', Edge: '16',
Firefox: '60', Firefox: '60',
@ -15,22 +12,29 @@ export const ModernBrowsers = {
'Mobile Safari': '10.3' 'Mobile Safari': '10.3'
} }
const modernBrowsers = Object.keys(ModernBrowsers) const modernBrowsers = new Proxy(ModernBrowsers, {
.reduce((allBrowsers, browser) => { get (browsers, prop) {
allBrowsers[browser] = semver.coerce(ModernBrowsers[browser]) if (browsers[prop] && !browsers[prop].version) {
return allBrowsers const coerce = require('semver/functions/coerce')
}, {}) browsers[prop] = coerce(browsers[prop])
}
return browsers[prop]
}
})
export const isModernBrowser = (ua) => { export const isModernBrowser = (ua) => {
if (!ua) { if (!ua) {
return false return false
} }
const coerce = require('semver/functions/coerce')
const gte = require('semver/functions/gte')
const UAParser = require('ua-parser-js')
const { browser } = UAParser(ua) const { browser } = UAParser(ua)
const browserVersion = semver.coerce(browser.version) const browserVersion = coerce(browser.version)
if (!browserVersion) { if (!browserVersion) {
return false return false
} }
return Boolean(modernBrowsers[browser.name] && semver.gte(browserVersion, modernBrowsers[browser.name])) return Boolean(modernBrowsers[browser.name] && gte(browserVersion, modernBrowsers[browser.name]))
} }
export const isModernRequest = (req, modernMode = false) => { export const isModernRequest = (req, modernMode = false) => {