nuxt-i18n
Advanced tools
Comparing version 6.27.0 to 6.27.1
{ | ||
"name": "nuxt-i18n", | ||
"version": "6.27.0", | ||
"version": "6.27.1", | ||
"description": "i18n for Nuxt", | ||
@@ -90,4 +90,4 @@ "license": "MIT", | ||
"dependencies": { | ||
"@babel/parser": "^7.14.1", | ||
"@babel/traverse": "^7.14.0", | ||
"@babel/parser": "^7.14.5", | ||
"@babel/traverse": "^7.14.5", | ||
"@intlify/vue-i18n-extensions": "^1.0.2", | ||
@@ -97,24 +97,25 @@ "@intlify/vue-i18n-loader": "^1.1.0", | ||
"devalue": "^2.0.1", | ||
"is-https": "^4.0.0", | ||
"js-cookie": "^2.2.1", | ||
"klona": "^2.0.4", | ||
"lodash.merge": "^4.6.2", | ||
"ufo": "^0.7.2", | ||
"ufo": "^0.7.5", | ||
"vue-i18n": "^8.24.4" | ||
}, | ||
"devDependencies": { | ||
"@babel/core": "7.14.0", | ||
"@babel/preset-env": "7.14.1", | ||
"@babel/runtime": "7.14.0", | ||
"@babel/core": "7.14.5", | ||
"@babel/preset-env": "7.14.5", | ||
"@babel/runtime": "7.14.5", | ||
"@nuxt/types": "2.15.4", | ||
"@nuxtjs/composition-api": "0.23.4", | ||
"@nuxtjs/eslint-config-typescript": "6.0.0", | ||
"@nuxtjs/composition-api": "0.24.4", | ||
"@nuxtjs/eslint-config-typescript": "6.0.1", | ||
"@nuxtjs/module-test-utils": "1.6.3", | ||
"@release-it/conventional-changelog": "2.0.1", | ||
"@types/argparse": "2.0.5", | ||
"@release-it/conventional-changelog": "3.0.1", | ||
"@types/argparse": "2.0.8", | ||
"@types/cookie": "0.4.0", | ||
"@types/express": "4.17.11", | ||
"@types/express": "4.17.12", | ||
"@types/jest": "26.0.23", | ||
"@types/jest-dev-server": "4.2.0", | ||
"@types/js-cookie": "2.2.6", | ||
"@types/jsdom": "16.2.10", | ||
"@types/jsdom": "16.2.11", | ||
"@types/lodash.merge": "4.6.6", | ||
@@ -127,13 +128,13 @@ "@types/request-promise-native": "1.0.17", | ||
"codecov": "3.8.2", | ||
"core-js": "3.12.0", | ||
"eslint": "7.25.0", | ||
"core-js": "3.14.0", | ||
"eslint": "7.28.0", | ||
"express": "4.17.1", | ||
"husky": "4.3.8", | ||
"jest": "26.6.3", | ||
"jest": "27.0.4", | ||
"jest-dev-server": "5.0.3", | ||
"jsdom": "16.5.3", | ||
"jsdom": "16.6.0", | ||
"messageformat": "2.3.0", | ||
"nuxt": "2.15.4", | ||
"playwright-chromium": "1.10.0", | ||
"release-it": "14.6.1", | ||
"playwright-chromium": "1.12.2", | ||
"release-it": "14.9.0", | ||
"serve-static": "1.14.1", | ||
@@ -140,0 +141,0 @@ "typescript": "4.2.4" |
@@ -107,2 +107,6 @@ import { resolve, join } from 'path' | ||
this.options.render.bundleRenderer.directives.t = i18nExtensionsDirective | ||
// Transpile is-https (IE11) | ||
this.options.build.transpile = this.options.build.transpile || [] | ||
this.options.build.transpile.push('is-https') | ||
} |
import Cookie from 'cookie' | ||
import JsCookie from 'js-cookie' | ||
import isHTTPS from 'is-https' | ||
import { hasProtocol } from 'ufo' | ||
@@ -123,2 +125,5 @@ /** @typedef {import('../../types/internal').ResolvedOptions} ResolvedOptions */ | ||
if (lang && lang.domain) { | ||
if (hasProtocol(lang.domain)) { | ||
return lang.domain | ||
} | ||
let protocol | ||
@@ -138,31 +143,2 @@ if (process.server) { | ||
/** | ||
* Determines if a server-side request is using HTTPS. | ||
* | ||
* @param {import('http').IncomingMessage} req | ||
* @param {Boolean} [trustProxy=true] | ||
* @return {Boolean | undefined}. | ||
*/ | ||
function isHTTPS (req, trustProxy = true) { | ||
// Check x-forwarded-proto header | ||
const _xForwardedProto = (trustProxy && req.headers) ? req.headers['x-forwarded-proto'] : undefined | ||
const protoCheck = typeof _xForwardedProto === 'string' ? _xForwardedProto.includes('https') : undefined | ||
if (protoCheck) { | ||
return true | ||
} | ||
const socket = /** @type {import('tls').TLSSocket} */(req.socket) | ||
const _encrypted = socket ? socket.encrypted : undefined | ||
const encryptedCheck = _encrypted !== undefined ? _encrypted === true : undefined | ||
if (encryptedCheck) { | ||
return true | ||
} | ||
if (protoCheck === undefined && encryptedCheck === undefined) { | ||
return undefined | ||
} | ||
return false | ||
} | ||
/** | ||
* Get locale code that corresponds to current hostname | ||
@@ -169,0 +145,0 @@ * |
@@ -71,3 +71,3 @@ import VueI18n from 'vue-i18n' | ||
langDir?: string | null | ||
lazy?: boolean | ||
lazy?: boolean | {skipNuxtState?: boolean} | ||
// see https://goo.gl/NbzX3f | ||
@@ -74,0 +74,0 @@ pages?: { |
Sorry, the diff of this file is not supported yet
82597
12
2082
+ Addedis-https@^4.0.0
+ Addedis-https@4.0.0(transitive)
Updated@babel/parser@^7.14.5
Updated@babel/traverse@^7.14.5
Updatedufo@^0.7.5