Skip to content

fix: upgrade babel from 6 to 7 #886

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Jan 26, 2020
Merged

fix: upgrade babel from 6 to 7 #886

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4d3e7ba
feat: upgrade babel from 6 to 7
armano2 Jan 3, 2020
d8633d1
fix: add promise.finally
armano2 Jan 3, 2020
61f9f05
fix: rollback mistaken execa upgrade
armano2 Jan 3, 2020
85762ec
Merge remote-tracking branch 'upstream/master' into upgrade-babel
armano2 Jan 3, 2020
741aade
chore: update rule names (import)
armano2 Jan 3, 2020
12c17ee
test: remove unnecessary arrow function
armano2 Jan 3, 2020
b76937f
chore: remove unnecessary `/index`
armano2 Jan 3, 2020
3ca5fd1
chore: remove some leftovers from merge conflict
armano2 Jan 3, 2020
eba4002
test: drop unnecessary notThrowsAsync
armano2 Jan 3, 2020
fb89e2d
Revert "test: drop unnecessary notThrowsAsync"
armano2 Jan 3, 2020
09dd193
fix: drop some trash files after merge
armano2 Jan 4, 2020
d678d64
Merge branch 'master'
armano2 Jan 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'upstream/master' into upgrade-babel
  • Loading branch information
@armano2
armano2 committed Jan 3, 2020
commit 85762ec1b25eb51b2764b45c0c607940b2b02e48
10 changes: 5 additions & 5 deletions @commitlint/cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"@babel/core": "^7.7.7",
"@babel/register": "^7.7.7",
"@commitlint/test": "8.2.0",
"@commitlint/utils": "^8.3.0",
"@commitlint/utils": "^8.3.4",
"ava": "2.4.0",
"babel-preset-commitlint": "^8.2.0",
"concurrently": "3.6.1",
Expand All @@ -71,10 +71,10 @@
"tmp": "0.1.0"
},
"dependencies": {
"@commitlint/format": "^8.3.2",
"@commitlint/lint": "^8.3.2",
"@commitlint/load": "^8.3.3",
"@commitlint/read": "^8.3.2",
"@commitlint/format": "^8.3.4",
"@commitlint/lint": "^8.3.4",
"@commitlint/load": "^8.3.4",
"@commitlint/read": "^8.3.4",
"chalk": "2.4.2",
"core-js": "^3.6.1",
"get-stdin": "7.0.0",
Expand Down
100 changes: 100 additions & 0 deletions @commitlint/cli/package_BACKUP_43196.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
{
"name": "@commitlint/cli",
"version": "8.3.4",
"description": "Lint your commit messages",
"files": [
"index.js",
"lib",
"!*.test.js*"
],
"bin": {
"commitlint": "./lib/cli.js"
},
"scripts": {
"build": "cross-env NODE_ENV=production babel src --out-dir lib --source-maps",
"deps": "dep-check",
"pkg": "pkg-check",
"start": "concurrently \"ava -c 4 --verbose --watch\" \"yarn run watch\"",
"test": "ava -c 4 --verbose",
"watch": "babel src --out-dir lib --watch --source-maps"
},
"ava": {
"files": [
"lib/**/*.test.js"
],
"source": [
"lib/**/*.js"
]
},
"babel": {
"presets": [
"babel-preset-commitlint"
]
},
"engines": {
"node": ">=4"
},
"repository": {
"type": "git",
"url": "https://github.com/conventional-changelog/commitlint.git"
},
"bugs": {
"url": "https://github.com/conventional-changelog/commitlint/issues"
},
"homepage": "https://github.com/conventional-changelog/commitlint#readme",
"keywords": [
"conventional-changelog",
"commitlint",
"cli"
],
"author": {
"name": "Mario Nebl",
"email": "[email protected]"
},
"license": "MIT",
"devDependencies": {
"@babel/cli": "^7.7.7",
"@babel/core": "^7.7.7",
"@babel/register": "^7.7.7",
"@commitlint/test": "8.2.0",
<<<<<<< HEAD
"@commitlint/utils": "^8.3.0",
"ava": "2.4.0",
=======
"@commitlint/utils": "^8.3.4",
"ava": "0.18.2",
"babel-cli": "6.26.0",
>>>>>>> upstream/master
"babel-preset-commitlint": "^8.2.0",
"concurrently": "3.6.1",
"cross-env": "6.0.3",
"execa": "0.11.0",
"mkdirp": "0.5.1",
"pkg-dir": "4.2.0",
"resolve-bin": "0.4.0",
"sander": "0.6.0",
"string-to-stream": "3.0.1",
"tmp": "0.1.0"
},
"dependencies": {
<<<<<<< HEAD
"@commitlint/format": "^8.3.2",
"@commitlint/lint": "^8.3.2",
"@commitlint/load": "^8.3.3",
"@commitlint/read": "^8.3.2",
=======
"@commitlint/format": "^8.3.4",
"@commitlint/lint": "^8.3.4",
"@commitlint/load": "^8.3.4",
"@commitlint/read": "^8.3.4",
"babel-polyfill": "6.26.0",
>>>>>>> upstream/master
"chalk": "2.4.2",
"core-js": "^3.6.1",
"get-stdin": "7.0.0",
"lodash": "4.17.15",
"meow": "5.0.0",
"resolve-from": "5.0.0",
"resolve-global": "1.0.0"
}
}
85 changes: 85 additions & 0 deletions @commitlint/cli/package_BASE_43196.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
{
"name": "@commitlint/cli",
"version": "8.3.3",
"description": "Lint your commit messages",
"files": [
"index.js",
"lib",
"!*.test.js*"
],
"bin": {
"commitlint": "./lib/cli.js"
},
"scripts": {
"build": "cross-env NODE_ENV=production babel src --out-dir lib --source-maps",
"deps": "dep-check",
"pkg": "pkg-check",
"start": "concurrently \"ava -c 4 --verbose --watch\" \"yarn run watch\"",
"test": "ava -c 4 --verbose",
"watch": "babel src --out-dir lib --watch --source-maps"
},
"ava": {
"files": [
"lib/**/*.test.js"
],
"source": [
"lib/**/*.js"
]
},
"babel": {
"presets": [
"babel-preset-commitlint"
]
},
"engines": {
"node": ">=4"
},
"repository": {
"type": "git",
"url": "https://github.com/conventional-changelog/commitlint.git"
},
"bugs": {
"url": "https://github.com/conventional-changelog/commitlint/issues"
},
"homepage": "https://github.com/conventional-changelog/commitlint#readme",
"keywords": [
"conventional-changelog",
"commitlint",
"cli"
],
"author": {
"name": "Mario Nebl",
"email": "[email protected]"
},
"license": "MIT",
"devDependencies": {
"@commitlint/test": "8.2.0",
"@commitlint/utils": "^8.3.0",
"ava": "0.18.2",
"babel-cli": "6.26.0",
"babel-preset-commitlint": "^8.2.0",
"babel-register": "6.26.0",
"concurrently": "3.6.1",
"cross-env": "6.0.3",
"execa": "0.11.0",
"mkdirp": "0.5.1",
"pkg-dir": "4.2.0",
"resolve-bin": "0.4.0",
"sander": "0.6.0",
"string-to-stream": "3.0.1",
"tmp": "0.1.0"
},
"dependencies": {
"@commitlint/format": "^8.3.2",
"@commitlint/lint": "^8.3.2",
"@commitlint/load": "^8.3.3",
"@commitlint/read": "^8.3.2",
"babel-polyfill": "6.26.0",
"chalk": "2.4.2",
"get-stdin": "7.0.0",
"lodash": "4.17.15",
"meow": "5.0.0",
"resolve-from": "5.0.0",
"resolve-global": "1.0.0"
}
}
86 changes: 86 additions & 0 deletions @commitlint/cli/package_LOCAL_43196.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
{
"name": "@commitlint/cli",
"version": "8.3.3",
"description": "Lint your commit messages",
"files": [
"index.js",
"lib",
"!*.test.js*"
],
"bin": {
"commitlint": "./lib/cli.js"
},
"scripts": {
"build": "cross-env NODE_ENV=production babel src --out-dir lib --source-maps",
"deps": "dep-check",
"pkg": "pkg-check",
"start": "concurrently \"ava -c 4 --verbose --watch\" \"yarn run watch\"",
"test": "ava -c 4 --verbose",
"watch": "babel src --out-dir lib --watch --source-maps"
},
"ava": {
"files": [
"lib/**/*.test.js"
],
"source": [
"lib/**/*.js"
]
},
"babel": {
"presets": [
"babel-preset-commitlint"
]
},
"engines": {
"node": ">=4"
},
"repository": {
"type": "git",
"url": "https://github.com/conventional-changelog/commitlint.git"
},
"bugs": {
"url": "https://github.com/conventional-changelog/commitlint/issues"
},
"homepage": "https://github.com/conventional-changelog/commitlint#readme",
"keywords": [
"conventional-changelog",
"commitlint",
"cli"
],
"author": {
"name": "Mario Nebl",
"email": "[email protected]"
},
"license": "MIT",
"devDependencies": {
"@babel/cli": "^7.7.7",
"@babel/core": "^7.7.7",
"@babel/register": "^7.7.7",
"@commitlint/test": "8.2.0",
"@commitlint/utils": "^8.3.0",
"ava": "2.4.0",
"babel-preset-commitlint": "^8.2.0",
"concurrently": "3.6.1",
"cross-env": "6.0.3",
"execa": "0.11.0",
"mkdirp": "0.5.1",
"pkg-dir": "4.2.0",
"resolve-bin": "0.4.0",
"sander": "0.6.0",
"string-to-stream": "3.0.1",
"tmp": "0.1.0"
},
"dependencies": {
"@commitlint/format": "^8.3.2",
"@commitlint/lint": "^8.3.2",
"@commitlint/load": "^8.3.3",
"@commitlint/read": "^8.3.2",
"chalk": "2.4.2",
"core-js": "^3.6.1",
"get-stdin": "7.0.0",
"lodash": "4.17.15",
"meow": "5.0.0",
"resolve-from": "5.0.0",
"resolve-global": "1.0.0"
}
}
85 changes: 85 additions & 0 deletions @commitlint/cli/package_REMOTE_43196.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
{
"name": "@commitlint/cli",
"version": "8.3.4",
"description": "Lint your commit messages",
"files": [
"index.js",
"lib",
"!*.test.js*"
],
"bin": {
"commitlint": "./lib/cli.js"
},
"scripts": {
"build": "cross-env NODE_ENV=production babel src --out-dir lib --source-maps",
"deps": "dep-check",
"pkg": "pkg-check",
"start": "concurrently \"ava -c 4 --verbose --watch\" \"yarn run watch\"",
"test": "ava -c 4 --verbose",
"watch": "babel src --out-dir lib --watch --source-maps"
},
"ava": {
"files": [
"lib/**/*.test.js"
],
"source": [
"lib/**/*.js"
]
},
"babel": {
"presets": [
"babel-preset-commitlint"
]
},
"engines": {
"node": ">=4"
},
"repository": {
"type": "git",
"url": "https://github.com/conventional-changelog/commitlint.git"
},
"bugs": {
"url": "https://github.com/conventional-changelog/commitlint/issues"
},
"homepage": "https://github.com/conventional-changelog/commitlint#readme",
"keywords": [
"conventional-changelog",
"commitlint",
"cli"
],
"author": {
"name": "Mario Nebl",
"email": "[email protected]"
},
"license": "MIT",
"devDependencies": {
"@commitlint/test": "8.2.0",
"@commitlint/utils": "^8.3.4",
"ava": "0.18.2",
"babel-cli": "6.26.0",
"babel-preset-commitlint": "^8.2.0",
"babel-register": "6.26.0",
"concurrently": "3.6.1",
"cross-env": "6.0.3",
"execa": "0.11.0",
"mkdirp": "0.5.1",
"pkg-dir": "4.2.0",
"resolve-bin": "0.4.0",
"sander": "0.6.0",
"string-to-stream": "3.0.1",
"tmp": "0.1.0"
},
"dependencies": {
"@commitlint/format": "^8.3.4",
"@commitlint/lint": "^8.3.4",
"@commitlint/load": "^8.3.4",
"@commitlint/read": "^8.3.4",
"babel-polyfill": "6.26.0",
"chalk": "2.4.2",
"get-stdin": "7.0.0",
"lodash": "4.17.15",
"meow": "5.0.0",
"resolve-from": "5.0.0",
"resolve-global": "1.0.0"
}
}
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.