From 59f04b4a6bc6fdf70259963c6d5f3904fc19bd7c Mon Sep 17 00:00:00 2001 From: Julien Fontanet Date: Mon, 20 Nov 2023 12:34:30 +0100 Subject: [PATCH] chore: format with Prettier --- @vates/multi-key-map/index.js | 4 +- @vates/read-chunk/index.js | 130 +++++++++--------- @xen-orchestra/lite/src/libs/xapi-stats.ts | 4 +- packages/vhd-cli/commands/index.js | 4 +- packages/xen-api/examples/export-vdi | 25 ++-- packages/xen-api/examples/export-vm | 13 +- packages/xen-api/examples/import-vm | 8 +- packages/xen-api/examples/log-events | 17 +-- packages/xen-api/src/_makeCallSetting.js | 8 +- packages/xen-api/src/index.js | 4 +- packages/xo-server/src/xapi/index.mjs | 4 +- .../xo-server/src/xo-mixins/xen-servers.mjs | 4 +- packages/xo-web/src/common/scheduling.js | 4 +- .../src/common/select-cores-per-socket.js | 8 +- packages/xo-web/src/common/select-objects.js | 14 +- packages/xo-web/src/common/selectors.js | 4 +- packages/xo-web/src/common/utils.js | 12 +- .../src/xo-app/backup/new/mirror/index.js | 4 +- .../xo-web/src/xo-app/host/tab-advanced.js | 4 +- .../xo-app/logs/backup-ng/log-alert-body.js | 4 +- packages/xo-web/src/xo-app/logs/index.js | 8 +- .../xo-web/src/xo-app/new/network/index.js | 48 +++---- .../xo-web/src/xo-app/pool/tab-advanced.js | 8 +- .../xo-web/src/xo-app/pool/tab-patches.js | 4 +- packages/xo-web/src/xo-app/vm-import/utils.js | 8 +- packages/xo-web/src/xo-app/vm/tab-network.js | 4 +- packages/xo-web/tools/update-locales | 54 ++++---- scripts/gen-deps-list.js | 4 +- 28 files changed, 206 insertions(+), 211 deletions(-) diff --git a/@vates/multi-key-map/index.js b/@vates/multi-key-map/index.js index aa4707b96..f0d3fab6f 100644 --- a/@vates/multi-key-map/index.js +++ b/@vates/multi-key-map/index.js @@ -42,8 +42,8 @@ function get(node, i, keys) { ? node.value : node : node instanceof Node - ? get(node.children.get(keys[i]), i + 1, keys) - : undefined + ? get(node.children.get(keys[i]), i + 1, keys) + : undefined } function set(node, i, keys, value) { diff --git a/@vates/read-chunk/index.js b/@vates/read-chunk/index.js index 421c53a28..c20bc7fec 100644 --- a/@vates/read-chunk/index.js +++ b/@vates/read-chunk/index.js @@ -22,41 +22,41 @@ const readChunk = (stream, size) => stream.errored != null ? Promise.reject(stream.errored) : stream.closed || stream.readableEnded - ? Promise.resolve(null) - : new Promise((resolve, reject) => { - if (size !== undefined) { - assert(size > 0) + ? Promise.resolve(null) + : new Promise((resolve, reject) => { + if (size !== undefined) { + assert(size > 0) - // per Node documentation: - // > The size argument must be less than or equal to 1 GiB. - assert(size < 1073741824) - } + // per Node documentation: + // > The size argument must be less than or equal to 1 GiB. + assert(size < 1073741824) + } - function onEnd() { - resolve(null) - removeListeners() - } - function onError(error) { - reject(error) - removeListeners() - } - function onReadable() { - const data = stream.read(size) - if (data !== null) { - resolve(data) + function onEnd() { + resolve(null) removeListeners() } - } - function removeListeners() { - stream.removeListener('end', onEnd) - stream.removeListener('error', onError) - stream.removeListener('readable', onReadable) - } - stream.on('end', onEnd) - stream.on('error', onError) - stream.on('readable', onReadable) - onReadable() - }) + function onError(error) { + reject(error) + removeListeners() + } + function onReadable() { + const data = stream.read(size) + if (data !== null) { + resolve(data) + removeListeners() + } + } + function removeListeners() { + stream.removeListener('end', onEnd) + stream.removeListener('error', onError) + stream.removeListener('readable', onReadable) + } + stream.on('end', onEnd) + stream.on('error', onError) + stream.on('readable', onReadable) + onReadable() + }) exports.readChunk = readChunk /** @@ -111,42 +111,42 @@ async function skip(stream, size) { return stream.errored != null ? Promise.reject(stream.errored) : size === 0 || stream.closed || stream.readableEnded - ? Promise.resolve(0) - : new Promise((resolve, reject) => { - let left = size - function onEnd() { - resolve(size - left) - removeListeners() - } - function onError(error) { - reject(error) - removeListeners() - } - function onReadable() { - const data = stream.read() - left -= data === null ? 0 : data.length - if (left > 0) { - // continue to read - } else { - // if more than wanted has been read, push back the rest - if (left < 0) { - stream.unshift(data.slice(left)) - } - - resolve(size) + ? Promise.resolve(0) + : new Promise((resolve, reject) => { + let left = size + function onEnd() { + resolve(size - left) removeListeners() } - } - function removeListeners() { - stream.removeListener('end', onEnd) - stream.removeListener('error', onError) - stream.removeListener('readable', onReadable) - } - stream.on('end', onEnd) - stream.on('error', onError) - stream.on('readable', onReadable) - onReadable() - }) + function onError(error) { + reject(error) + removeListeners() + } + function onReadable() { + const data = stream.read() + left -= data === null ? 0 : data.length + if (left > 0) { + // continue to read + } else { + // if more than wanted has been read, push back the rest + if (left < 0) { + stream.unshift(data.slice(left)) + } + + resolve(size) + removeListeners() + } + } + function removeListeners() { + stream.removeListener('end', onEnd) + stream.removeListener('error', onError) + stream.removeListener('readable', onReadable) + } + stream.on('end', onEnd) + stream.on('error', onError) + stream.on('readable', onReadable) + onReadable() + }) } exports.skip = skip diff --git a/@xen-orchestra/lite/src/libs/xapi-stats.ts b/@xen-orchestra/lite/src/libs/xapi-stats.ts index 442f95c1d..f8c3b8e68 100644 --- a/@xen-orchestra/lite/src/libs/xapi-stats.ts +++ b/@xen-orchestra/lite/src/libs/xapi-stats.ts @@ -82,8 +82,8 @@ const testMetric = ( typeof test === "string" ? test === type : typeof test === "function" - ? test(type) - : test.exec(type); + ? test(type) + : test.exec(type); const findMetric = (metrics: any, metricType: string) => { let testResult; diff --git a/packages/vhd-cli/commands/index.js b/packages/vhd-cli/commands/index.js index 23d0ab27d..f6e205d2f 100644 --- a/packages/vhd-cli/commands/index.js +++ b/packages/vhd-cli/commands/index.js @@ -23,8 +23,8 @@ function r(p) { return v && v.__esModule ? v : typeof v === 'object' || typeof v === 'function' - ? Object.create(v, { default: { enumerable: true, value: v } }) - : { default: v } + ? Object.create(v, { default: { enumerable: true, value: v } }) + : { default: v } } function e(p, i) { dl(defaults, i, function () { diff --git a/packages/xen-api/examples/export-vdi b/packages/xen-api/examples/export-vdi index 63667dc6c..4ed6cc387 100755 --- a/packages/xen-api/examples/export-vdi +++ b/packages/xen-api/examples/export-vdi @@ -10,16 +10,14 @@ const { CancelToken } = require('promise-toolbox') const { createClient } = require('../') -const { - createOutputStream, - formatProgress, - pipeline, - resolveRecord, - throttle, -} = require('./utils') +const { createOutputStream, formatProgress, pipeline, resolveRecord, throttle } = require('./utils') defer(async ($defer, rawArgs) => { - const { raw, throttle: bps, _: args } = getopts(rawArgs, { + const { + raw, + throttle: bps, + _: args, + } = getopts(rawArgs, { boolean: 'raw', alias: { raw: 'r', @@ -28,9 +26,7 @@ defer(async ($defer, rawArgs) => { }) if (args.length < 2) { - return console.log( - 'Usage: export-vdi [--raw] []' - ) + return console.log('Usage: export-vdi [--raw] []') } const xapi = createClient({ @@ -67,10 +63,5 @@ defer(async ($defer, rawArgs) => { }, 1e3) ) - await pipeline( - exportStream, - progressStream, - throttle(bps), - createOutputStream(args[2]) - ) + await pipeline(exportStream, progressStream, throttle(bps), createOutputStream(args[2])) })(process.argv.slice(2)).catch(console.error.bind(console, 'error')) diff --git a/packages/xen-api/examples/export-vm b/packages/xen-api/examples/export-vm index 13f2f1e0f..069a43d6b 100755 --- a/packages/xen-api/examples/export-vm +++ b/packages/xen-api/examples/export-vm @@ -9,15 +9,14 @@ const { CancelToken } = require('promise-toolbox') const { createClient } = require('../') -const { - createOutputStream, - formatProgress, - pipeline, - resolveRecord, -} = require('./utils') +const { createOutputStream, formatProgress, pipeline, resolveRecord } = require('./utils') defer(async ($defer, rawArgs) => { - const { gzip, zstd, _: args } = getopts(rawArgs, { + const { + gzip, + zstd, + _: args, + } = getopts(rawArgs, { boolean: ['gzip', 'zstd'], }) diff --git a/packages/xen-api/examples/import-vm b/packages/xen-api/examples/import-vm index 8a0106399..af52ab0a2 100755 --- a/packages/xen-api/examples/import-vm +++ b/packages/xen-api/examples/import-vm @@ -17,7 +17,7 @@ defer(async ($defer, args) => { const xapi = createClient({ allowUnauthorized: true, url: args[0], - watchEvents: false + watchEvents: false, }) await xapi.connect() @@ -28,8 +28,6 @@ defer(async ($defer, args) => { // https://xapi-project.github.io/xen-api/importexport.html await xapi.putResource(token, createInputStream(args[1]), '/import/', { - query: args[2] && { sr_id: await resolveRef(xapi, 'SR', args[2]) } + query: args[2] && { sr_id: await resolveRef(xapi, 'SR', args[2]) }, }) -})(process.argv.slice(2)).catch( - console.error.bind(console, 'error') -) +})(process.argv.slice(2)).catch(console.error.bind(console, 'error')) diff --git a/packages/xen-api/examples/log-events b/packages/xen-api/examples/log-events index a76aabc0a..1c5767205 100755 --- a/packages/xen-api/examples/log-events +++ b/packages/xen-api/examples/log-events @@ -17,20 +17,21 @@ if (process.argv.length < 3) { const xapi = createClient({ allowUnauthorized: true, - url: process.argv[2] + url: process.argv[2], }) // =================================================================== // Method call xapi.connect().then(() => { - xapi.call('VM.get_all_records') - .then(function (vms) { - console.log('%s VMs fetched', size(vms)) - }) - .catch(function (error) { - console.error(error) - }) + xapi + .call('VM.get_all_records') + .then(function (vms) { + console.log('%s VMs fetched', size(vms)) + }) + .catch(function (error) { + console.error(error) + }) }) // =================================================================== diff --git a/packages/xen-api/src/_makeCallSetting.js b/packages/xen-api/src/_makeCallSetting.js index d530fad93..abfb0c94d 100644 --- a/packages/xen-api/src/_makeCallSetting.js +++ b/packages/xen-api/src/_makeCallSetting.js @@ -2,7 +2,7 @@ export default (setting, defaultValue) => setting === undefined ? () => defaultValue : typeof setting === 'function' - ? setting - : typeof setting === 'object' - ? method => setting[method] ?? setting['*'] ?? defaultValue - : () => setting + ? setting + : typeof setting === 'object' + ? method => setting[method] ?? setting['*'] ?? defaultValue + : () => setting diff --git a/packages/xen-api/src/index.js b/packages/xen-api/src/index.js index c60b06261..e12559864 100644 --- a/packages/xen-api/src/index.js +++ b/packages/xen-api/src/index.js @@ -282,8 +282,8 @@ export class Xapi extends EventEmitter { return isReadOnlyCall(method, args) ? this._roCall(method, args) : this._readOnly - ? Promise.reject(new Error(`cannot call ${method}() in read only mode`)) - : this._sessionCall(method, args) + ? Promise.reject(new Error(`cannot call ${method}() in read only mode`)) + : this._sessionCall(method, args) } @cancelable diff --git a/packages/xo-server/src/xapi/index.mjs b/packages/xo-server/src/xapi/index.mjs index 9c48cb84b..bb0c01e93 100644 --- a/packages/xo-server/src/xapi/index.mjs +++ b/packages/xo-server/src/xapi/index.mjs @@ -536,8 +536,8 @@ export default class Xapi extends XapiBase { mapVdisSrs[vdi.$id] !== undefined ? hostXapi.getObject(mapVdisSrs[vdi.$id]).$ref : isSrConnected(vdi.$SR) - ? vdi.$SR.$ref - : getDefaultSrRef() + ? vdi.$SR.$ref + : getDefaultSrRef() } } diff --git a/packages/xo-server/src/xo-mixins/xen-servers.mjs b/packages/xo-server/src/xo-mixins/xen-servers.mjs index 92d13df2a..25f84cf08 100644 --- a/packages/xo-server/src/xo-mixins/xen-servers.mjs +++ b/packages/xo-server/src/xo-mixins/xen-servers.mjs @@ -546,8 +546,8 @@ export default class XenServers { return xapi === undefined ? 'disconnected' : this._serverIdsByPool[xapi.pool?.$id] === id - ? 'connected' - : 'connecting' + ? 'connected' + : 'connecting' } async getAllXenServers() { diff --git a/packages/xo-web/src/common/scheduling.js b/packages/xo-web/src/common/scheduling.js index 66d2ab55f..310404524 100644 --- a/packages/xo-web/src/common/scheduling.js +++ b/packages/xo-web/src/common/scheduling.js @@ -285,8 +285,8 @@ const TimePicker = decorate([ step === 1 ? optionsValues : step !== undefined - ? optionsValues.filter((_, i) => i % step === 0) - : value.split(',').map(Number), + ? optionsValues.filter((_, i) => i % step === 0) + : value.split(',').map(Number), // '*' => 1 // '*/2' => 2 diff --git a/packages/xo-web/src/common/select-cores-per-socket.js b/packages/xo-web/src/common/select-cores-per-socket.js index 18341075e..28efa3ecf 100644 --- a/packages/xo-web/src/common/select-cores-per-socket.js +++ b/packages/xo-web/src/common/select-cores-per-socket.js @@ -93,10 +93,10 @@ const SelectCoresPerSocket = decorate([ state.valueExceedsCoresLimit ? _('vmCoresPerSocketExceedsCoresLimit', { maxCores }) : state.valueExceedsSocketsLimit - ? _('vmCoresPerSocketExceedsSocketsLimit', { - maxSockets: MAX_VM_SOCKETS, - }) - : _('vmCoresPerSocketNotDivisor') + ? _('vmCoresPerSocketExceedsSocketsLimit', { + maxSockets: MAX_VM_SOCKETS, + }) + : _('vmCoresPerSocketNotDivisor') } > diff --git a/packages/xo-web/src/common/select-objects.js b/packages/xo-web/src/common/select-objects.js index 29725c6de..ea758a948 100644 --- a/packages/xo-web/src/common/select-objects.js +++ b/packages/xo-web/src/common/select-objects.js @@ -67,8 +67,8 @@ const getIds = value => value == null || typeof value === 'string' || isInteger(value) ? value : Array.isArray(value) - ? map(value, getIds) - : value.id + ? map(value, getIds) + : value.id const getOption = (object, container) => ({ label: container ? `${getLabel(object)} ${getLabel(container)}` : getLabel(object), @@ -159,11 +159,11 @@ class GenericSelect extends React.Component { return isEmpty(missingObjects) ? objects : withContainers - ? { - ...objects, - missingObjects, - } - : [...objects, ...missingObjects] + ? { + ...objects, + missingObjects, + } + : [...objects, ...missingObjects] } ) diff --git a/packages/xo-web/src/common/selectors.js b/packages/xo-web/src/common/selectors.js index 6e53d635c..a4cfb331a 100644 --- a/packages/xo-web/src/common/selectors.js +++ b/packages/xo-web/src/common/selectors.js @@ -156,8 +156,8 @@ export const createFilter = (collection, predicate) => ? EMPTY_ARRAY : EMPTY_OBJECT : predicate - ? (isArrayLike(collection) ? filter : pickBy)(collection, predicate) - : collection + ? (isArrayLike(collection) ? filter : pickBy)(collection, predicate) + : collection ) ) diff --git a/packages/xo-web/src/common/utils.js b/packages/xo-web/src/common/utils.js index 3abdd936f..edcf9f628 100644 --- a/packages/xo-web/src/common/utils.js +++ b/packages/xo-web/src/common/utils.js @@ -673,12 +673,12 @@ export const getDetachedBackupsOrSnapshots = (backupsOrSnapshots, { jobs, schedu vm === undefined ? 'missingVm' : job === undefined - ? 'missingJob' - : schedules[scheduleId] === undefined - ? 'missingSchedule' - : !createPredicate(omit(job.vms, 'power_state'))(vm) - ? 'missingVmInJob' - : undefined + ? 'missingJob' + : schedules[scheduleId] === undefined + ? 'missingSchedule' + : !createPredicate(omit(job.vms, 'power_state'))(vm) + ? 'missingVmInJob' + : undefined if (reason !== undefined) { detachedBackupsOrSnapshots.push({ diff --git a/packages/xo-web/src/xo-app/backup/new/mirror/index.js b/packages/xo-web/src/xo-app/backup/new/mirror/index.js index 2b99a7eb4..d772a26db 100644 --- a/packages/xo-web/src/xo-app/backup/new/mirror/index.js +++ b/packages/xo-web/src/xo-app/backup/new/mirror/index.js @@ -351,8 +351,8 @@ const NewMirrorBackup = decorate([ state.isMissingBackupMode ? 'mirrorBackupVms' : state.isFull - ? 'mirrorFullBackup' - : 'mirrorIncrementalBackup' + ? 'mirrorFullBackup' + : 'mirrorIncrementalBackup' )} {_('remotesSettings')} diff --git a/packages/xo-web/src/xo-app/host/tab-advanced.js b/packages/xo-web/src/xo-app/host/tab-advanced.js index 5def6dcae..005e1af1b 100644 --- a/packages/xo-web/src/xo-app/host/tab-advanced.js +++ b/packages/xo-web/src/xo-app/host/tab-advanced.js @@ -525,8 +525,8 @@ export default class extends Component { {isHtEnabled === null ? _('hyperThreadingNotAvailable') : isHtEnabled - ? _('stateEnabled') - : _('stateDisabled')} + ? _('stateEnabled') + : _('stateDisabled')} diff --git a/packages/xo-web/src/xo-app/logs/backup-ng/log-alert-body.js b/packages/xo-web/src/xo-app/logs/backup-ng/log-alert-body.js index 1734e26c4..e16c71f53 100644 --- a/packages/xo-web/src/xo-app/logs/backup-ng/log-alert-body.js +++ b/packages/xo-web/src/xo-app/logs/backup-ng/log-alert-body.js @@ -507,8 +507,8 @@ export default decorate([ type === 'VM' ? get(() => vms[task.data.id].name_label) : type === 'pool' - ? get(() => pools[task.data.id].name_label) - : 'xo' + ? get(() => pools[task.data.id].name_label) + : 'xo' if (task.tasks !== undefined) { const subTaskWithIsFull = task.tasks.find(({ data = {} }) => data.isFull !== undefined) diff --git a/packages/xo-web/src/xo-app/logs/index.js b/packages/xo-web/src/xo-app/logs/index.js index 9b5c69675..4ba141a30 100644 --- a/packages/xo-web/src/xo-app/logs/index.js +++ b/packages/xo-web/src/xo-app/logs/index.js @@ -62,10 +62,10 @@ const JobCallStateInfos = ({ end, error, isJobInterrupted }) => { ? ['skipped', 'jobCallSkipped'] : ['halted', 'failedJobCall'] : end !== undefined - ? ['running', 'successfulJobCall'] - : isJobInterrupted - ? ['halted', 'jobInterrupted'] - : ['busy', 'jobCallInProgess'] + ? ['running', 'successfulJobCall'] + : isJobInterrupted + ? ['halted', 'jobInterrupted'] + : ['busy', 'jobCallInProgess'] return ( diff --git a/packages/xo-web/src/xo-app/new/network/index.js b/packages/xo-web/src/xo-app/new/network/index.js index 9de9a6e3a..e26345928 100644 --- a/packages/xo-web/src/xo-app/new/network/index.js +++ b/packages/xo-web/src/xo-app/new/network/index.js @@ -213,33 +213,33 @@ const NewNetwork = decorate([ pool: pool.id, }) : isPrivate - ? (() => { - const poolIds = [pool.id] - const pifIds = [pif.id] - for (const network of networks) { - poolIds.push(network.pool.id) - pifIds.push(network.pif.id) - } - return createPrivateNetwork({ - poolIds, - pifIds, - name, + ? (() => { + const poolIds = [pool.id] + const pifIds = [pif.id] + for (const network of networks) { + poolIds.push(network.pool.id) + pifIds.push(network.pif.id) + } + return createPrivateNetwork({ + poolIds, + pifIds, + name, + description, + encapsulation, + encrypted, + mtu, + preferredCenter: networkCenter, + }) + })() + : createNetwork({ description, - encapsulation, - encrypted, mtu, - preferredCenter: networkCenter, + name, + nbd, + pif: pif == null ? undefined : pif.id, + pool: pool.id, + vlan, }) - })() - : createNetwork({ - description, - mtu, - name, - nbd, - pif: pif == null ? undefined : pif.id, - pool: pool.id, - vlan, - }) } _selectPool = pool => { diff --git a/packages/xo-web/src/xo-app/pool/tab-advanced.js b/packages/xo-web/src/xo-app/pool/tab-advanced.js index f3b1c3cc2..c1b7bfa69 100644 --- a/packages/xo-web/src/xo-app/pool/tab-advanced.js +++ b/packages/xo-web/src/xo-app/pool/tab-advanced.js @@ -157,10 +157,10 @@ const BindLicensesButton = decorate([ getXoaPlan() === SOURCES ? _('poolSupportSourceUsers') : !state.isXcpngPool - ? _('poolSupportXcpngOnly') - : state.isBindLicenseAvailable - ? undefined - : _('poolLicenseAlreadyFullySupported') + ? _('poolSupportXcpngOnly') + : state.isBindLicenseAvailable + ? undefined + : _('poolLicenseAlreadyFullySupported') } > {_('bindXcpngLicenses')} diff --git a/packages/xo-web/src/xo-app/pool/tab-patches.js b/packages/xo-web/src/xo-app/pool/tab-patches.js index e839fb2d8..fcec1b767 100644 --- a/packages/xo-web/src/xo-app/pool/tab-patches.js +++ b/packages/xo-web/src/xo-app/pool/tab-patches.js @@ -205,8 +205,8 @@ export default class TabPatches extends Component { pool.HA_enabled ? _('highAvailabilityNotDisabledTooltip') : needsCredentials - ? _('xsCredentialsMissingShort') - : undefined + ? _('xsCredentialsMissingShort') + : undefined } /> diff --git a/packages/xo-web/src/xo-app/vm-import/utils.js b/packages/xo-web/src/xo-app/vm-import/utils.js index d72e383bd..0999867e8 100644 --- a/packages/xo-web/src/xo-app/vm-import/utils.js +++ b/packages/xo-web/src/xo-app/vm-import/utils.js @@ -6,8 +6,8 @@ export const getRedirectionUrl = (vms = []) => { return vmIds.length === 0 ? undefined // no redirect : vmIds.length === 1 - ? `/vms/${vmIds[0]}` - : `/home?s=${encodeURIComponent( - new CM.Property('id', new CM.Or(vmIds.map(vm => new CM.String(vm)))).toString() - )}&t=VM` + ? `/vms/${vmIds[0]}` + : `/home?s=${encodeURIComponent( + new CM.Property('id', new CM.Or(vmIds.map(vm => new CM.String(vm)))).toString() + )}&t=VM` } diff --git a/packages/xo-web/src/xo-app/vm/tab-network.js b/packages/xo-web/src/xo-app/vm/tab-network.js index 6ef30de04..0bb57fb0f 100644 --- a/packages/xo-web/src/xo-app/vm/tab-network.js +++ b/packages/xo-web/src/xo-app/vm/tab-network.js @@ -206,8 +206,8 @@ class VifAllowedIps extends BaseComponent { lockingMode === 'locked' && noIps ? _('vifLockedNetworkNoIps') : lockingMode !== 'locked' && !noIps - ? _('vifUnlockedNetworkWithIps') - : undefined + ? _('vifUnlockedNetworkWithIps') + : undefined return ( diff --git a/packages/xo-web/tools/update-locales b/packages/xo-web/tools/update-locales index 4295fb12c..606ffa23d 100755 --- a/packages/xo-web/tools/update-locales +++ b/packages/xo-web/tools/update-locales @@ -16,19 +16,17 @@ require('@babel/register') // =================================================================== -function defaultRequire (module) { +function defaultRequire(module) { var value = require(module) return value && value.__esModule ? value.default : value } // See https://github.com/joliss/js-string-escape/blob/master/index.js -function quote (string, q) { +function quote(string, q) { string = string.split('') if (q === undefined) { - q = string.indexOf("'") !== -1 && string.indexOf('"') === -1 - ? '"' - : "'" + q = string.indexOf("'") !== -1 && string.indexOf('"') === -1 ? '"' : "'" } var replacements = { @@ -36,7 +34,7 @@ function quote (string, q) { '\n': '\\n', '\r': '\\r', '\u2028': '\\u2028', - '\u2029': '\\u2029' + '\u2029': '\\u2029', } replacements[q] = '\\' + q @@ -55,7 +53,7 @@ var LOCALES_DIR = join(__dirname, '../src/common/intl/locales/') var LOCALE_RE = /^(.+)\.js(?:on)?$/ var messages = defaultRequire('../src/common/intl/messages') -function updateLocale (locale) { +function updateLocale(locale) { var path = join(LOCALES_DIR, locale + '.js') try { @@ -71,24 +69,31 @@ function updateLocale (locale) { var content = [ '// See http://momentjs.com/docs/#/use-it/browserify/', - 'import \'moment/locale/' + locale + '\'', + "import 'moment/locale/" + locale + "'", '', - 'import reactIntlData from \'react-intl/locale-data/' + locale + '\'', - 'import { addLocaleData } from \'react-intl\'', + "import reactIntlData from 'react-intl/locale-data/" + locale + "'", + "import { addLocaleData } from 'react-intl'", 'addLocaleData(reactIntlData)', '', '// ===================================================================', '', - 'export default {' + 'export default {', ] - content.push(map(messages, function (message, id) { - var translation = translations && translations[id] - return [ - ' // Original text: ', quote(message.defaultMessage, translation && '"'), '\n', - ' ', id, ': ', translation ? quote(translation) : 'undefined' - ].join('') - }).join(',\n\n')) + content.push( + map(messages, function (message, id) { + var translation = translations && translations[id] + return [ + ' // Original text: ', + quote(message.defaultMessage, translation && '"'), + '\n', + ' ', + id, + ': ', + translation ? quote(translation) : 'undefined', + ].join('') + }).join(',\n\n') + ) content.push('}', '') @@ -97,14 +102,15 @@ function updateLocale (locale) { // =================================================================== -(function main (args) { +;(function main(args) { var locales = args.length ? args - : filter(map(readDir(LOCALES_DIR), function (entry) { - var matches = LOCALE_RE.exec(entry) - return matches && matches[1] - })) + : filter( + map(readDir(LOCALES_DIR), function (entry) { + var matches = LOCALE_RE.exec(entry) + return matches && matches[1] + }) + ) forEach(locales, updateLocale) })(process.argv.slice(2)) - diff --git a/scripts/gen-deps-list.js b/scripts/gen-deps-list.js index ee23024de..f7989f64c 100755 --- a/scripts/gen-deps-list.js +++ b/scripts/gen-deps-list.js @@ -211,8 +211,8 @@ function versionToReleaseWeight(version) { return semver.major(version) > 0 ? RELEASE_WEIGHT.MAJOR : semver.minor(version) > 0 - ? RELEASE_WEIGHT.MINOR - : RELEASE_WEIGHT.PATCH + ? RELEASE_WEIGHT.MINOR + : RELEASE_WEIGHT.PATCH } /**