Skip to content

Commit d2aa88c

Browse files
committed
Merge branch 'hotfix/2.0.1'
2 parents 485b7fe + 9cdd45d commit d2aa88c

File tree

4 files changed

+76
-30
lines changed

4 files changed

+76
-30
lines changed

CHANGELOG.md

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased]
88

9+
## [2.0.1] - 2018-02-05
10+
`v2.0.1` is a minor hotfix release patched the `NODE_ENV` not set on Windows
11+
issue.
12+
13+
### Added
14+
- Package `cross-env` as `devDependencies`.
15+
- README section "Author".
16+
17+
### Fixed
18+
- NPM scripts won't set environment variables on Windows issue.
19+
920
## 2.0.0 - 2018-02-04
10-
v2.0.0 is a major release that most part of the boilerplate has been rewritten.
21+
`v2.0.0` is a major release that most part of the boilerplate has been rewritten.
1122

1223
### Added
1324
- ESLint for code checking on Javascript files.
@@ -55,4 +66,5 @@ v2.0.0 is a major release that most part of the boilerplate has been rewritten.
5566
isn't based on this boilerplate.
5667
- Separated Webpack config files for `development` & `production` mode.
5768

58-
[Unreleased]: https://github.com/Devtography/electron-react-typescript-webpack-boilerplate/compare/v2.0.0...HEAD
69+
[Unreleased]: https://github.com/Devtography/electron-react-typescript-webpack-boilerplate/compare/v2.0.1...HEAD
70+
[2.0.1]: https://github.com/Devtography/electron-react-typescript-webpack-boilerplate/compare/v2.0.0...v2.0.1

README.md

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,26 @@ git clone https://github.com/iamWing/electron-react-typescript-base-proj.git
1414
```json
1515
// edit the following fields in package.json for your own project
1616
{
17-
"name": {your-project-name},
18-
"version": {whatever-you-like},
19-
"description": {your-own-description},
17+
"name": your-project-name,
18+
"version": whatever-you-like,
19+
"description": your-own-description,
2020
"build": {
21-
"appId": {your-app-id},
22-
"productName": {your-product-name},
23-
"buildVersion": {whatever-you-like}
21+
"appId": your-app-id,
22+
"productName": your-product-name,
23+
"buildVersion": whatever-you-like
2424
},
25-
"author": {who's-the-author?},
26-
"license": {if-you-don't-want-to-use-MIT},
27-
"repository": {type-and-link-of-your-repo},
28-
"keywords": {keywords-of-your-project},
29-
"bugs": {issue-page-of-your-repo},
30-
"homepage": {homepage-of-your-repo}
25+
"author": who's-the-author?,
26+
"license": if-you-don't-want-to-use-MIT,
27+
"repository": type-and-link-of-your-repo,
28+
"keywords": keywords-of-your-project,
29+
"bugs": issue-page-of-your-repo,
30+
"homepage": homepage-of-your-repo
3131
}
3232
```
3333

3434
Then install all the `node_modules` needed by executing the following command:
3535
```bash
36-
cd {folder-containing-the-cloned-boilerplate}
36+
cd folder-containing-the-cloned-boilerplate
3737
npm run install
3838
```
3939

@@ -111,6 +111,10 @@ electron-react-typescript-base-proj/
111111
| - webpack.config.js //- Webpack config
112112
```
113113

114+
## Author
115+
116+
[Wing Chau](https://github.com/iamWing) [@Devtography](https://github.com/Devtography)
117+
114118
## License
115119
Electron React TypeScript Webpack Boilerplate is open source software
116120
[licensed as MIT](LICENSE).

package-lock.json

Lines changed: 41 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"name": "electron-react-typescript-webpack-boilerplate",
3-
"version": "2.0.0",
3+
"version": "2.0.1",
44
"description": "Pre-configured boilerplate for Electron + React + TypeScript",
55
"main": "./dist/main.bundle.js",
66
"scripts": {
77
"start": "electron ./dist/main.bundle.js",
8-
"dev": "rimraf dist && NODE_ENV=development webpack --watch --progress --colors",
9-
"prod": "rimraf dist && NODE_ENV=production webpack --progress --colors",
8+
"dev": "rimraf dist && cross-env NODE_ENV=development webpack --watch --progress --colors",
9+
"prod": "rimraf dist && cross-env NODE_ENV=production webpack --progress --colors",
1010
"test": "mocha -r ts-node/register -r tsconfig-paths/register \"test/**/*.ts\"",
1111
"build:win": "electron-builder build --win --x64",
1212
"build:mac": "electron-builder build --mac --x64"
@@ -39,6 +39,7 @@
3939
"acorn": "^6.0.5",
4040
"ajv": "^6.6.2",
4141
"copy-pkg-json-webpack-plugin": "0.0.38",
42+
"cross-env": "^5.2.0",
4243
"css-loader": "^1.0.1",
4344
"electron": "^3.1.2",
4445
"electron-builder": "^20.38.5",

0 commit comments

Comments
 (0)