Skip to content

Commit 4ae4231

Browse files
v0.12.2 (#62)
* fix(core): prevent case where default was overriding master * chore(build): add lint-staged to pre-commit hook * build(deps-dev): bump codecov from 3.6.1 to 3.6.5 (#61) - @dependabot Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 96c7866 commit 4ae4231

File tree

3 files changed

+445
-63
lines changed

3 files changed

+445
-63
lines changed

package.json

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "firebase-ci",
3-
"version": "0.12.1",
3+
"version": "0.12.2",
44
"description": "Simplified Firebase interaction for continuous integration including deploying hosting, functions, and database/storage rules.",
55
"main": "lib/index.js",
66
"bin": {
@@ -22,7 +22,6 @@
2222
"build": "npm run clean:app && npm run build:lib",
2323
"watch": "npm run build:lib -- --stats --progress --colors --watch",
2424
"prepare": "npm run clean:app && npm run build",
25-
"pre-push": "npm run lint",
2625
"codecov": "cat coverage/lcov.info | codecov",
2726
"semantic-release": "semantic-release"
2827
},
@@ -82,7 +81,7 @@
8281
"babel-plugin-module-resolver": "^4.0.0",
8382
"chai": "^4.2.0",
8483
"chai-files": "^1.4.0",
85-
"codecov": "^3.6.1",
84+
"codecov": "^3.6.5",
8685
"cross-env": "^7.0.0",
8786
"env-cmd": "^10.0.1",
8887
"eslint": "^6.8.0",
@@ -95,12 +94,23 @@
9594
"eslint-plugin-prettier": "^3.1.2",
9695
"eslint-plugin-promise": "^4.2.1",
9796
"eslint-plugin-standard": "^4.0.1",
98-
"husky": "^4.2.1",
97+
"husky": "^4.2.3",
98+
"lint-staged": "^10.0.7",
9999
"mocha": "^7.0.0",
100100
"nyc": "^15.0.0",
101101
"prettier": "^1.19.1",
102102
"rimraf": "^3.0.1",
103103
"sinon": "^8.1.1",
104104
"sinon-chai": "^3.4.0"
105+
},
106+
"husky": {
107+
"hooks": {
108+
"pre-commit": "lint-staged"
109+
}
110+
},
111+
"lint-staged": {
112+
"*.{js}": [
113+
"eslint --fix"
114+
]
105115
}
106116
}

src/utils/ci.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ export function getProjectKey(opts) {
5252
return (
5353
process.env.FIREBASE_CI_PROJECT ||
5454
// Get project from passed options, falling back to branch name
55-
get(opts, 'project', branchName === 'master' ? 'default' : branchName)
55+
(opts && opts.project) ||
56+
branchName
5657
)
5758
}
5859

0 commit comments

Comments
 (0)