Skip to content

Commit 081c0c1

Browse files
authored
Merge pull request #164 from netlify/semver
Semver updates and release tweaks
2 parents e86aec8 + 4b7ed95 commit 081c0c1

File tree

4 files changed

+2711
-1204
lines changed

4 files changed

+2711
-1204
lines changed

RELEASE.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
# Release Checklist
22

3+
Make sure you have npm + git credentials set up.
4+
35
- [ ] Make changes and/or merge PRs.
4-
- [ ] Document changes in a gh-release draft. If no draft exists, create one.
56
- [ ] `git checkout master`
67
- [ ] `git pull`
78
- [ ] `npm version [ major | minor | patch ]`
8-
- [ ] `git push && git push --tags`
9-
- [ ] Assign draft gh-release to new tag and publish release notes and double check everything looks right.
10-
- [ ] `npm publish`
9+
- [ ] `npm run publish`

package.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,18 @@
77
"dev": "cross-env NODE_ENV=development webpack-dev-server --inline --progress --config webpack.config.babel.js",
88
"react-demo": "cd example && yarn && yarn start",
99
"prestart": "run-s build",
10-
"version": "run-s release",
10+
"version": "run-s release changelog",
1111
"prepublish": "run-s build",
1212
"build": "run-p build:*",
1313
"build:bundle": "cross-env NODE_ENV=production webpack --config webpack.config.babel.js",
1414
"build:umd": "cross-env NODE_ENV=production webpack --config webpack.umd.config.babel.js",
1515
"prebuild": "rimraf build && mkdirp build",
1616
"test": "eslint src",
1717
"release": "node ./script/release.js",
18+
"changelog": "auto-changelog -p && git add CHANGELOG.md",
1819
"format": "prettier --write 'src/**/*.js'",
19-
"format-preview": "prettier --list-different 'src/**/*.js'"
20+
"format-preview": "prettier --list-different 'src/**/*.js'",
21+
"publish": "git push && git push --tags && gh-release && npm publish"
2022
},
2123
"main": "./build/netlify-identity",
2224
"keywords": [
@@ -27,6 +29,7 @@
2729
"license": "MIT",
2830
"author": "Matt Biilmann <[email protected]>",
2931
"devDependencies": {
32+
"auto-changelog": "^1.10.2",
3033
"babel-cli": "^6.5.2",
3134
"babel-core": "^6.24.0",
3235
"babel-eslint": "^8.2.1",
@@ -67,5 +70,8 @@
6770
"webpack": "^3.0.0",
6871
"webpack-dev-server": "^2.11.1",
6972
"webpack-node-externals": "^1.6.0"
73+
},
74+
"dependencies": {
75+
"gh-release": "^3.4.0"
7076
}
7177
}

src/components/app.js

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -172,16 +172,14 @@ class App extends Component {
172172
>
173173
{this.renderBody()}
174174
{this.renderProviders()}
175-
{!store.user &&
176-
page.link &&
177-
store.gotrue && (
178-
<button
179-
onclick={pageLinkHandler}
180-
className="btnLink forgotPasswordLink"
181-
>
182-
{page.link_text}
183-
</button>
184-
)}
175+
{!store.user && page.link && store.gotrue && (
176+
<button
177+
onclick={pageLinkHandler}
178+
className="btnLink forgotPasswordLink"
179+
>
180+
{page.link_text}
181+
</button>
182+
)}
185183
</Modal>
186184
</div>
187185
);

0 commit comments

Comments
 (0)