diff --git a/packages/xen-api/.gitignore b/packages/xen-api/.gitignore index d5cad6a33..490275a64 100644 --- a/packages/xen-api/.gitignore +++ b/packages/xen-api/.gitignore @@ -1,10 +1,9 @@ -/.nyc_output/ -/bower_components/ /dist/ +/node_modules/ npm-debug.log npm-debug.log.* +pnpm-debug.log +pnpm-debug.log.* -!node_modules/* -node_modules/*/ /plot.dat diff --git a/packages/xen-api/.mocha.js b/packages/xen-api/.mocha.js deleted file mode 100644 index e6d84e403..000000000 --- a/packages/xen-api/.mocha.js +++ /dev/null @@ -1,5 +0,0 @@ -Error.stackTraceLimit = 100 - -try { require('trace') } catch (_) {} -try { require('clarify') } catch (_) {} -try { require('source-map-support/register') } catch (_) {} diff --git a/packages/xen-api/.mocha.opts b/packages/xen-api/.mocha.opts deleted file mode 100644 index 6cfd94898..000000000 --- a/packages/xen-api/.mocha.opts +++ /dev/null @@ -1 +0,0 @@ ---require ./.mocha.js diff --git a/packages/xen-api/.travis.yml b/packages/xen-api/.travis.yml index a9b136ea6..ae52e87e6 100644 --- a/packages/xen-api/.travis.yml +++ b/packages/xen-api/.travis.yml @@ -1,8 +1,8 @@ language: node_js node_js: - 'stable' + - '6' - '4' - - '0.12' # Use containers. # http://docs.travis-ci.com/user/workers/container-based-infrastructure/ diff --git a/packages/xen-api/README.md b/packages/xen-api/README.md index 1a121acaf..b6734f481 100644 --- a/packages/xen-api/README.md +++ b/packages/xen-api/README.md @@ -7,6 +7,7 @@ Tested with: - Xen Server 5.6 - Xen Server 6.2 - Xen Server 6.5 +- Xen Server 7 ## Install diff --git a/packages/xen-api/package.json b/packages/xen-api/package.json index 6657aced7..1ec4eb15b 100644 --- a/packages/xen-api/package.json +++ b/packages/xen-api/package.json @@ -30,60 +30,60 @@ ".mocha.js" ], "engines": { - "node": ">=0.12" + "node": ">=4" }, "dependencies": { "babel-polyfill": "^6.8.0", "blocked": "^1.1.0", - "clarify": "^2.0.0", "debug": "^2.1.3", "event-to-promise": "^0.7.0", "exec-promise": "^0.6.1", "kindof": "^2.0.0", - "lodash.filter": "^4.3.0", - "lodash.find": "^4.3.0", - "lodash.foreach": "^4.2.0", - "lodash.isarray": "^4.0.0", - "lodash.isobject": "^3.0.1", - "lodash.map": "^4.3.0", - "lodash.startswith": "^4.0.1", + "lodash": "^4.16.4", "make-error": "^1.0.2", "minimist": "^1.1.1", "ms": "^0.7.1", "promise-toolbox": "^0.6.0", "pw": "0.0.4", - "source-map-support": "^0.4.0", - "trace": "^2.0.1", "xmlrpc": "^1.3.0", "xo-collection": "^0.4.0" }, "devDependencies": { "babel-cli": "^6.8.0", "babel-eslint": "^7.0.0", - "babel-preset-es2015": "^6.6.0", + "babel-plugin-lodash": "^3.2.9", + "babel-preset-babili": "^0.0.5", + "babel-preset-latest": "^6.16.0", "babel-preset-stage-0": "^6.5.0", + "cross-env": "^3.1.2", "dependency-check": "^2.5.1", "ghooks": "^1.2.1", - "mocha": "^3.0.0", - "must": "^0.13.1", - "nyc": "^8.1.0", "standard": "^8.0.0" }, "scripts": { - "build": "NODE_ENV=production babel --source-maps --out-dir=dist/ src/", + "build": "cross-env NODE_ENV=production babel --source-maps --out-dir=dist/ src/", "depcheck": "dependency-check ./package.json", - "dev": "babel --watch --source-maps --out-dir=dist/ src/", - "dev-test": "mocha --opts .mocha.opts --watch --reporter=min \"dist/**/*.spec.js\"", + "dev": "cross-env NODE_ENV=development babel --watch --source-maps --out-dir=dist/ src/", "lint": "standard", "plot": "gnuplot -p memory-test.gnu", "posttest": "npm run lint && npm run depcheck", - "prepublish": "npm run build", - "test": "nyc mocha --opts .mocha.opts \"dist/**/*.spec.js\"" + "prepublish": "npm run build" }, "babel": { + "env": { + "production": { + "comments": false, + "presets": [ + "babili" + ] + } + }, + "plugins": [ + "lodash" + ], "presets": [ - "stage-0", - "es2015" + "latest", + "stage-0" ] }, "standard": { diff --git a/packages/xen-api/src/cli.js b/packages/xen-api/src/cli.js index f384168c6..0b4201d6d 100755 --- a/packages/xen-api/src/cli.js +++ b/packages/xen-api/src/cli.js @@ -2,18 +2,14 @@ import 'babel-polyfill' -// Imports utils for better stacktraces. -import '../.mocha' - import blocked from 'blocked' import createDebug from 'debug' import eventToPromise from 'event-to-promise' import execPromise from 'exec-promise' -import filter from 'lodash.filter' -import find from 'lodash.find' import minimist from 'minimist' import pw from 'pw' import { asCallback, fromCallback } from 'promise-toolbox' +import { filter, find } from 'lodash' import { start as createRepl } from 'repl' import { createClient } from './' diff --git a/packages/xen-api/src/index.js b/packages/xen-api/src/index.js index ae00242f6..08ebcce0d 100644 --- a/packages/xen-api/src/index.js +++ b/packages/xen-api/src/index.js @@ -1,15 +1,10 @@ import Collection from 'xo-collection' import createDebug from 'debug' -import filter from 'lodash.filter' -import forEach from 'lodash.foreach' -import isArray from 'lodash.isarray' -import isObject from 'lodash.isobject' import kindOf from 'kindof' -import map from 'lodash.map' import ms from 'ms' -import startsWith from 'lodash.startswith' import { BaseError } from 'make-error' import { EventEmitter } from 'events' +import { filter, forEach, isArray, isObject, map, startsWith } from 'lodash' import { catchPlus as pCatch, delay as pDelay, diff --git a/packages/xen-api/src/index.spec.js b/packages/xen-api/src/index.spec.js deleted file mode 100644 index 2319bd7d5..000000000 --- a/packages/xen-api/src/index.spec.js +++ /dev/null @@ -1,17 +0,0 @@ -/* eslint-env mocha */ - -import expect from 'must' - -// =================================================================== - -import myLib from './' - -// =================================================================== - -describe.skip('myLib', () => { - it('does something', () => { - // TODO: some real tests. - - expect(myLib).to.exists() - }) -})