chore: dont use default export from golike-defer

- will be removed in future version
- not compatible with ESM implementation in Node

@xen-orchestra/audit-core/src/index.js

@@ -2,9 +2,9 @@
 import 'core-js/features/symbol/async-iterator'
 
 import assert from 'assert'
-import defer from 'golike-defer'
 import hash from 'object-hash'
 import { createLogger } from '@xen-orchestra/log'
+import { defer } from 'golike-defer'
 
 const log = createLogger('xo:audit-core')
 

@xen-orchestra/backups/_deltaVm.js

@@ -1,5 +1,4 @@
 const compareVersions = require('compare-versions')
-const defer = require('golike-defer').default
 const find = require('lodash/find')
 const groupBy = require('lodash/groupBy')
 const ignoreErrors = require('promise-toolbox/ignoreErrors')
@@ -7,6 +6,7 @@ const omit = require('lodash/omit')
 const { asyncMap } = require('@xen-orchestra/async-map')
 const { CancelToken } = require('promise-toolbox')
 const { createVhdStreamWithLength } = require('vhd-lib')
+const { defer } = require('golike-defer')
 
 const { cancelableMap } = require('./_cancelableMap')
 

@xen-orchestra/cr-seed-cli/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
-const defer = require('golike-defer').default
 const { Ref, Xapi } = require('xen-api')
+const { defer } = require('golike-defer')
 
 const pkg = require('./package.json')
 

@xen-orchestra/proxy/src/app/mixins/backups/index.js

@@ -1,4 +1,3 @@
-import defer from 'golike-defer'
 import Disposable from 'promise-toolbox/Disposable'
 import fromCallback from 'promise-toolbox/fromCallback'
 import { asyncMap } from '@xen-orchestra/async-map'
@@ -7,6 +6,7 @@ import { compose } from '@vates/compose'
 import { createLogger } from '@xen-orchestra/log'
 import { decorateWith } from '@vates/decorate-with'
 import { deduped } from '@vates/disposable/deduped'
+import { defer } from 'golike-defer'
 import { DurablePartition } from '@xen-orchestra/backups/DurablePartition'
 import { execFile } from 'child_process'
 import { formatVmBackups } from '@xen-orchestra/backups/formatVmBackups'

@xen-orchestra/xapi/src/vm.js

@@ -1,5 +1,4 @@
 const CancelToken = require('promise-toolbox/CancelToken')
-const defer = require('golike-defer').default
 const groupBy = require('lodash/groupBy')
 const pickBy = require('lodash/pickBy')
 const ignoreErrors = require('promise-toolbox/ignoreErrors')
@@ -8,6 +7,7 @@ const pCatch = require('promise-toolbox/catch')
 const pRetry = require('promise-toolbox/retry')
 const { asyncMap } = require('@xen-orchestra/async-map')
 const { createLogger } = require('@xen-orchestra/log')
+const { defer } = require('golike-defer')
 const { incorrectState } = require('xo-common/api-errors')
 const { Ref } = require('xen-api')
 

packages/xo-server-test/src/_xoConnection.js

@@ -1,8 +1,8 @@
 /* eslint-env jest */
-import defer from 'golike-defer'
 import Xo from 'xo-lib'
 import XoCollection from 'xo-collection'
 import { defaultsDeep, find, forOwn, iteratee, pick } from 'lodash'
+import { defer } from 'golike-defer'
 import { fromEvent } from 'promise-toolbox'
 import { parseDuration } from '@vates/parse-duration'
 

packages/xo-server-test/src/old-tests/token.spec.js

@@ -1,6 +1,6 @@
 /* eslint-env jest */
 
-import defer from 'golike-defer'
+import { defer } from 'golike-defer'
 import { map } from 'lodash'
 
 import { getConnection, rejectionOf, testConnection, xo } from './util.js'

packages/xo-server/src/api/disk.js

@@ -1,8 +1,8 @@
 import * as multiparty from 'multiparty'
-import defer from 'golike-defer'
 import getStream from 'get-stream'
 import pump from 'pump'
 import { createLogger } from '@xen-orchestra/log'
+import { defer } from 'golike-defer'
 import { format } from 'json-rpc-peer'
 import { noSuchObject } from 'xo-common/api-errors'
 import { peekFooterFromVhdStream } from 'vhd-lib'

packages/xo-server/src/api/vdi.js

@@ -1,6 +1,6 @@
 // FIXME: rename to disk.*
 
-import defer from 'golike-defer'
+import { defer } from 'golike-defer'
 import { invalidParameters } from 'xo-common/api-errors'
 import { reduce } from 'lodash'
 

packages/xo-server/src/api/vm.js

@@ -1,8 +1,8 @@
 import * as multiparty from 'multiparty'
 import asyncMapSettled from '@xen-orchestra/async-map/legacy'
-import defer from 'golike-defer'
 import getStream from 'get-stream'
 import { createLogger } from '@xen-orchestra/log'
+import { defer } from 'golike-defer'
 import { FAIL_ON_QUEUE } from 'limit-concurrency-decorator'
 import { format } from 'json-rpc-peer'
 import { ignoreErrors } from 'promise-toolbox'

packages/xo-server/src/api/xosan.js

@@ -1,10 +1,10 @@
 import assert from 'assert'
 import asyncMapSettled from '@xen-orchestra/async-map/legacy'
-import defer from 'golike-defer'
 import execa from 'execa'
 import fs from 'fs-extra'
 import map from 'lodash/map'
 import { createLogger } from '@xen-orchestra/log'
+import { defer } from 'golike-defer'
 import { tap, delay } from 'promise-toolbox'
 import { invalidParameters } from 'xo-common/api-errors'
 import { includes, remove, filter, find, range } from 'lodash'

packages/xo-server/src/xapi/index.js

@@ -2,7 +2,6 @@
 /* eslint-disable camelcase */
 import asyncMapSettled from '@xen-orchestra/async-map/legacy'
 import concurrency from 'limit-concurrency-decorator'
-import deferrable from 'golike-defer'
 import fatfs from 'fatfs'
 import mapToArray from 'lodash/map'
 import mixin from '@xen-orchestra/mixin/legacy'
@@ -13,6 +12,7 @@ import { asyncMap } from '@xen-orchestra/async-map'
 import { vmdkToVhd } from 'xo-vmdk-to-vhd'
 import { cancelable, defer, fromEvents, ignoreErrors, pCatch, pRetry } from 'promise-toolbox'
 import { createLogger } from '@xen-orchestra/log'
+import { defer as deferrable } from 'golike-defer'
 import { parseDuration } from '@vates/parse-duration'
 import { PassThrough } from 'stream'
 import { forbiddenOperation, operationFailed } from 'xo-common/api-errors'

packages/xo-server/src/xapi/mixins/patching.js

@@ -1,7 +1,7 @@
-import deferrable from 'golike-defer'
 import unzip from 'unzipper'
 import { createLogger } from '@xen-orchestra/log'
 import { decorateWith } from '@vates/decorate-with'
+import { defer as deferrable } from 'golike-defer'
 import { filter, find, groupBy, mapValues, pickBy, some } from 'lodash'
 import { timeout } from 'promise-toolbox'
 

packages/xo-server/src/xapi/mixins/storage.js

@@ -1,4 +1,4 @@
-import defer from 'golike-defer'
+import { defer } from 'golike-defer'
 import { createLogger } from '@xen-orchestra/log'
 import { filter, forEach, groupBy } from 'lodash'
 

packages/xo-server/src/xapi/mixins/vm.js

@@ -1,4 +1,4 @@
-import deferrable from 'golike-defer'
+import { defer as deferrable } from 'golike-defer'
 import { find, gte, includes, isEmpty, lte, map as mapToArray, mapValues, noop } from 'lodash'
 import { cancelable, ignoreErrors, pCatch } from 'promise-toolbox'
 import { Ref } from 'xen-api'

packages/xo-server/src/xo-mixins/backups.js

@@ -1,5 +1,4 @@
 import asyncMapSettled from '@xen-orchestra/async-map/legacy'
-import deferrable from 'golike-defer'
 import execa from 'execa'
 import splitLines from 'split-lines'
 import { CancelToken, fromEvent, ignoreErrors, pReflect } from 'promise-toolbox'
@@ -7,6 +6,7 @@ import { createLogger } from '@xen-orchestra/log'
 import { createParser as createPairsParser } from 'parse-pairs'
 import { createReadStream, readdir, stat } from 'fs'
 import { decorateWith } from '@vates/decorate-with'
+import { defer as deferrable } from 'golike-defer'
 import { satisfies as versionSatisfies } from 'semver'
 import { utcFormat } from 'd3-time-format'
 import { basename, dirname } from 'path'

packages/xo-server/src/xo-mixins/proxies.js

@@ -1,7 +1,6 @@
 import assert from 'assert'
 import contentType from 'content-type'
 import cookie from 'cookie'
-import defer from 'golike-defer'
 import hrp from 'http-request-plus'
 import parseSetCookie from 'set-cookie-parser'
 import pumpify from 'pumpify'
@@ -9,6 +8,7 @@ import split2 from 'split2'
 import synchronized from 'decorator-synchronized'
 import { compileTemplate } from '@xen-orchestra/template'
 import { createLogger } from '@xen-orchestra/log'
+import { defer } from 'golike-defer'
 import { format, parse } from 'json-rpc-peer'
 import { incorrectState, noSuchObject } from 'xo-common/api-errors'
 import { isEmpty, mapValues, some, omit } from 'lodash'

packages/xo-server/src/xo-mixins/resource-sets.js

@@ -1,6 +1,6 @@
 import asyncMapSettled from '@xen-orchestra/async-map/legacy'
-import deferrable from 'golike-defer'
 import synchronized from 'decorator-synchronized'
+import { defer as deferrable } from 'golike-defer'
 import { difference, every, forEach, isObject, keyBy, map as mapToArray, remove, some } from 'lodash'
 import { noSuchObject, notEnoughResources, unauthorized } from 'xo-common/api-errors'