Skip to content
This repository has been archived by the owner on Mar 14, 2023. It is now read-only.

Commit

Permalink
Merge pull request #221 from shipitjs/upgrade-deps
Browse files Browse the repository at this point in the history
Upgrade deps
  • Loading branch information
gregberge authored Nov 4, 2018
2 parents 2454cac + d79301c commit 129b00f
Show file tree
Hide file tree
Showing 15 changed files with 3,207 additions and 964 deletions.
11 changes: 0 additions & 11 deletions .babelrc

This file was deleted.

13 changes: 13 additions & 0 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
module.exports = {
presets: [
[
'@babel/preset-env',
{
targets: {
node: '6',
},
loose: true,
},
],
],
}
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"lerna": "2.1.0",
"lerna": "3.4.3",
"npmClient": "yarn",
"version": "4.1.1",
"useWorkspaces": true
Expand Down
45 changes: 24 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,36 @@
"license": "MIT",
"private": true,
"scripts": {
"build": "lerna-build",
"ci": "yarn build && yarn lint && yarn test",
"dev": "lerna bootstrap && yarn build && lerna-watch",
"format": "prettier --write \"packages/*/src/**/*.js\"",
"lint": "eslint --cache .",
"release": "yarn build && lerna publish --conventional-commits && conventional-github-releaser --preset angular",
"test": "jest --runInBand --coverage && codecov"
"build": "lerna run build",
"ci": "yarn build && yarn lint && yarn test --ci --coverage && codecov",
"dev": "lerna run build --parallel -- --watch",
"format": "prettier --write \"**/*.{js,json,md}\"",
"lint": "eslint .",
"release": "lerna publish --conventional-commits && conventional-github-releaser --preset angular",
"test": "jest --runInBand"
},
"devDependencies": {
"babel-cli": "^6.24.1",
"babel-core": "^6.26.3",
"babel-eslint": "^8.2.2",
"babel-plugin-transform-object-rest-spread": "^6.23.0",
"@babel/cli": "^7.1.2",
"@babel/core": "^7.1.2",
"@babel/node": "^7.0.0",
"@babel/preset-env": "^7.1.0",
"babel-core": "^7.0.0-0",
"babel-eslint": "^10.0.1",
"babel-jest": "^23.6.0",
"babel-preset-env": "^1.7.0",
"chalk": "^2.4.1",
"codecov": "^3.0.2",
"eslint": "^4.19.0",
"eslint-config-airbnb-base": "^12.1.0",
"eslint-config-prettier": "^2.9.0",
"eslint-plugin-import": "^2.12.0",
"glob": "^7.1.2",
"jest": "^23.0.1",
"lerna": "^2.11.0",
"lerna-tools": "^1.0.0",
"codecov": "^3.1.0",
"eslint": "^5.8.0",
"eslint-config-airbnb-base": "^13.1.0",
"eslint-config-prettier": "^3.1.0",
"eslint-plugin-import": "^2.14.0",
"glob": "^7.1.3",
"jest": "^23.6.0",
"lerna": "^3.4.3",
"micromatch": "^3.1.9",
"mkdirp": "^0.5.1",
"prettier": "^1.13.2",
"mock-utf8-stream": "^0.1.1",
"prettier": "^1.14.3",
"std-mocks": "^1.0.1",
"string-length": "^2.0.0"
},
Expand Down
33 changes: 15 additions & 18 deletions packages/shipit-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
"name": "shipit-cli",
"version": "4.1.1",
"description": "Universal automation and deployment tool written in JavaScript.",
"engines": {
"node": ">=6"
},
"author": "Greg Bergé <[email protected]>",
"license": "MIT",
"repository": "https://github.com/shipitjs/shipit/tree/master/packages/shipit-deploy",
"main": "lib/index.js",
"keywords": [
"shipit",
Expand All @@ -10,6 +16,14 @@
"deploy",
"ssh"
],
"scripts": {
"prebuild": "rm -rf lib/",
"build": "babel --config-file ../../babel.config.js -d lib --ignore \"**/*.test.js\" src",
"prepublishOnly": "yarn run build"
},
"bin": {
"shipit": "./bin/shipit"
},
"dependencies": {
"chalk": "^2.4.1",
"commander": "^2.15.0",
Expand All @@ -20,22 +34,5 @@
"ssh-pool": "^4.1.0",
"stream-line-wrapper": "^0.1.1",
"v8flags": "^3.1.0"
},
"devDependencies": {
"babel-cli": "^6.26.0",
"mock-utf8-stream": "^0.1.1"
},
"bin": {
"shipit": "./bin/shipit"
},
"repository": {
"type": "git",
"url": "https://github.com/shipitjs/shipit.git"
},
"author": "Greg Bergé <[email protected]>",
"license": "MIT",
"bugs": {
"url": "https://github.com/shipitjs/shipit/issues"
},
"homepage": "https://github.com/shipitjs/shipit"
}
}
5 changes: 4 additions & 1 deletion packages/shipit-cli/src/Shipit.js
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,10 @@ class Shipit extends Orchestrator {
...this.options,
key: this.config.key,
strict: this.config.strict,
verbosityLevel: (this.config.verboseSSHLevel === undefined) ? 0 : this.config.verboseSSHLevel
verbosityLevel:
this.config.verboseSSHLevel === undefined
? 0
: this.config.verboseSSHLevel,
}

this.pool = new ConnectionPool(servers, options)
Expand Down
9 changes: 5 additions & 4 deletions packages/shipit-cli/src/Shipit.test.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import stream from 'mock-utf8-stream'
/* eslint-disable import/no-extraneous-dependencies */
import Stream from 'mock-utf8-stream'
import { ConnectionPool } from 'ssh-pool'
import Shipit from './Shipit'

Expand All @@ -8,8 +9,8 @@ describe('Shipit', () => {
let stderr

beforeEach(() => {
stdout = new stream.MockWritableStream()
stderr = new stream.MockWritableStream()
stdout = new Stream.MockWritableStream()
stderr = new Stream.MockWritableStream()
shipit = new Shipit({
stdout,
stderr,
Expand All @@ -28,7 +29,7 @@ describe('Shipit', () => {

shipit.initConfig(config)

expect(shipit.config).toEqual({"foo": "bar", "kung": "foo", "servers": ["3"]})
expect(shipit.config).toEqual({ foo: 'bar', kung: 'foo', servers: ['3'] })

expect(shipit.globalConfig).toBe(config)
})
Expand Down
24 changes: 11 additions & 13 deletions packages/shipit-deploy/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
"name": "shipit-deploy",
"version": "4.1.1",
"description": "Official set of deploy tasks for Shipit.",
"engines": {
"node": ">=6"
},
"author": "Greg Bergé <[email protected]>",
"license": "MIT",
"repository": "https://github.com/shipitjs/shipit/tree/master/packages/shipit-deploy",
"main": "lib/index.js",
"keywords": [
"shipit",
Expand All @@ -10,6 +16,11 @@
"deploy",
"ssh"
],
"scripts": {
"prebuild": "rm -rf lib/",
"build": "babel --config-file ../../babel.config.js -d lib --ignore \"**/*.test.js\" src",
"prepublishOnly": "yarn run build"
},
"peerDependencies": {
"shipit-cli": "^4.1.0"
},
Expand All @@ -21,18 +32,5 @@
"rmfr": "^1.0.8",
"shipit-utils": "^1.1.3",
"tmp-promise": "^1.0.4"
},
"repository": {
"type": "git",
"url": "https://github.com/shipitjs/shipit.git"
},
"author": "Greg Bergé <[email protected]>",
"license": "MIT",
"bugs": {
"url": "https://github.com/shipitjs/shipit/issues"
},
"homepage": "https://github.com/shipitjs/shipit",
"devDependencies": {
"ssh-pool": "^4.1.0"
}
}
1 change: 1 addition & 0 deletions packages/shipit-deploy/tests/integration.test.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable import/no-extraneous-dependencies */
import path from 'path'
import { exec } from 'ssh-pool'

Expand Down
4 changes: 2 additions & 2 deletions packages/shipit-deploy/tests/sandbox/shipitfile.babel.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable no-console */
import shipitDeploy from '../../'
import shipitDeploy from '../..'

export default shipit => {
shipitDeploy(shipit)
Expand All @@ -11,7 +11,7 @@ export default shipit => {
deployTo: '/tmp/shipit',
repositoryUrl: 'https://github.com/shipitjs/shipit.git',
ignores: ['.git', 'node_modules'],
shallowClone: true
shallowClone: true,
},
test: {
servers: '[email protected]',
Expand Down
21 changes: 17 additions & 4 deletions packages/ssh-pool/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,24 @@
"name": "ssh-pool",
"version": "4.1.0",
"description": "Run remote commands over a pool of server using SSH.",
"main": "lib/index.js",
"repository": "https://github.com/babel/babel/tree/master/packages/babel-traverse",
"author": "Bergé Greg <[email protected]>",
"engines": {
"node": ">=6"
},
"author": "Greg Bergé <[email protected]>",
"license": "MIT",
"homepage": "https://github.com/shipitjs/shipit",
"repository": "https://github.com/shipitjs/shipit/tree/master/packages/shipit-deploy",
"main": "lib/index.js",
"keywords": [
"shipit",
"automation",
"deployment",
"ssh"
],
"scripts": {
"prebuild": "rm -rf lib/",
"build": "babel --config-file ../../babel.config.js -d lib --ignore \"**/*.test.js\" src",
"prepublishOnly": "yarn run build"
},
"dependencies": {
"stream-line-wrapper": "^0.1.1",
"tmp": "^0.0.33",
Expand Down
Empty file modified ssh/id_rsa
100755 → 100644
Empty file.
Empty file modified ssh/id_rsa.pub
100755 → 100644
Empty file.
Loading

0 comments on commit 129b00f

Please sign in to comment.