diff --git a/package.json b/package.json index b95b98d6f..6009e7fdc 100644 --- a/package.json +++ b/package.json @@ -31,26 +31,27 @@ "dependencies": { "async": "^2.6.0", "browserify-zlib": "^0.2.0", - "chalk": "^2.3.0", + "chalk": "^2.4.1", + "clarify": "^2.1.0", "clean-documentation-theme": "^0.5.2", - "codecov": "^3.0.0", - "conventional-changelog": "^1.1.7", - "conventional-github-releaser": "^2.0.0", - "coveralls": "^3.0.0", + "codecov": "^3.0.1", + "conventional-changelog": "^1.1.24", + "conventional-github-releaser": "^2.0.2", + "coveralls": "^3.0.1", "detect-node": "^2.0.3", - "documentation": "^5.3.3", - "es6-promisify": "^5.0.0", - "eslint": "^4.13.0", + "documentation": "^6.3.2", + "es6-promisify": "^6.0.0", + "eslint": "^4.19.1", "eslint-config-aegir": "^1.0.1", - "execa": "^0.8.0", - "filesize": "^3.5.11", + "execa": "^0.10.0", + "filesize": "^3.6.1", "findup-sync": "^2.0.0", - "fs-extra": "^4.0.3", + "fs-extra": "^6.0.0", "gh-pages": "^1.1.0", "glob": "^7.1.2", - "joi": "^13.0.2", + "joi": "^13.2.0", "json-loader": "^0.5.7", - "karma": "^1.7.1", + "karma": "^2.0.2", "karma-chrome-launcher": "^2.2.0", "karma-firefox-launcher": "^1.1.0", "karma-junit-reporter": "^1.2.0", @@ -58,31 +59,32 @@ "karma-mocha-own-reporter": "git+https://github.com/dryajov/karma-mocha-own-reporter#d562a92a12d5c76469a05d67cee19bcb8db22b23", "karma-mocha-webworker": "^1.3.0", "karma-sourcemap-loader": "^0.3.7", - "karma-webpack": "^2.0.6", - "listr": "^0.13.0", + "karma-webpack": "^3.0.0", + "listr": "^0.14.0", "listr-update-renderer": "^0.4.0", "listr-verbose-renderer": "^0.4.1", - "lodash": "^4.17.4", - "mocha": "^4.0.1", - "mocha-jenkins-reporter": "^0.3.10", + "lodash": "^4.17.10", + "mocha": "^5.1.1", + "mocha-jenkins-reporter": "^0.3.12", "npm-which": "^3.0.1", - "nyc": "^11.3.0", + "nyc": "^11.7.1", "p-map": "^1.2.0", "pify": "^3.0.0", "pre-push": "^0.1.1", "pretty-hrtime": "^1.0.3", "rimraf": "^2.6.2", - "safe-buffer": "^5.1.1", - "semver": "^5.4.1", - "simple-git": "^1.85.0", - "stream-http": "^2.7.2", + "safe-buffer": "^5.1.2", + "semver": "^5.5.0", + "simple-git": "^1.92.0", + "stream-http": "^2.8.1", "through": "^2.3.8", + "trace": "^3.1.0", "transform-loader": "^0.2.4", - "uglify-es": "^3.2.2", - "update-notifier": "^2.3.0", - "webpack": "^3.10.0", - "webpack-merge": "^4.1.1", - "yargs": "^10.0.3" + "uglify-es": "^3.3.9", + "update-notifier": "^2.5.0", + "webpack": "^4.7.0", + "webpack-merge": "^4.1.2", + "yargs": "^11.0.0" }, "repository": { "type": "git", @@ -113,8 +115,8 @@ ], "devDependencies": { "chai": "^4.1.2", - "cross-env": "^5.1.1", - "mock-require": "^2.0.2", - "sinon": "^4.1.3" + "cross-env": "^5.1.4", + "mock-require": "^3.0.2", + "sinon": "^5.0.5" } } diff --git a/src/build/browser.js b/src/build/browser.js index 118ad738f..b9ce351bd 100644 --- a/src/build/browser.js +++ b/src/build/browser.js @@ -1,5 +1,6 @@ 'use strict' +require('any-observable/register')('rxjs') const webpack = require('webpack') const Uglify = require('uglify-es') const path = require('path') diff --git a/src/config/user.js b/src/config/user.js index 942063a1b..959535ac9 100644 --- a/src/config/user.js +++ b/src/config/user.js @@ -2,7 +2,7 @@ const _ = require('lodash') const Joi = require('joi') -const promisify = require('es6-promisify') +const { promisify } = require('es6-promisify') const path = require('path') const utils = require('../utils') diff --git a/src/config/webpack/index.js b/src/config/webpack/index.js index 1dc027af3..0fa1c11ea 100644 --- a/src/config/webpack/index.js +++ b/src/config/webpack/index.js @@ -27,7 +27,9 @@ function webpackConfig (env) { } const sourcemap = env === 'test' ? 'inline-source-map' : 'source-map' + const webpackMode = process.env.AEGIR_WEBPACK_MODE || 'development' return merge(base, { + mode: webpackMode, entry: [ entry ], diff --git a/src/coverage/index.js b/src/coverage/index.js index 65ef47011..7bdbd2695 100644 --- a/src/coverage/index.js +++ b/src/coverage/index.js @@ -1,15 +1,18 @@ 'use strict' -const path = require('path') -const _ = require('lodash') -const Listr = require('listr') - const providers = require('./providers') -const testNode = require('../test/node') -const utils = require('../utils') -const userConfig = require('../config/user') function coverage (opts) { + require('any-observable/register')('rxjs') + + const path = require('path') + const _ = require('lodash') + const Listr = require('listr') + + const testNode = require('../test/node') + const utils = require('../utils') + const userConfig = require('../config/user') + opts.hooks = userConfig().hooks const getCoverage = (ctx) => testNode(Object.assign({}, ctx, { diff --git a/src/docs/index.js b/src/docs/index.js index 994847871..b566a02e5 100644 --- a/src/docs/index.js +++ b/src/docs/index.js @@ -1,5 +1,6 @@ 'use strict' +require('any-observable/register')('rxjs') const Listr = require('listr') const utils = require('../utils') diff --git a/src/release/index.js b/src/release/index.js index 5a577a44e..2143ad4d3 100644 --- a/src/release/index.js +++ b/src/release/index.js @@ -1,5 +1,6 @@ 'use strict' +require('any-observable/register')('rxjs') const Listr = require('listr') const lint = require('../lint')