Skip to content
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.

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

release v2.1.0 #165

Merged
merged 16 commits into from
Apr 20, 2019
Prev Previous commit
Next Next commit
adjust package script
  • Loading branch information
HyunMo Ahn committed Apr 15, 2019
commit 7cee9e2d28365236aa011837889a45655dc475f9
2 changes: 0 additions & 2 deletions .gitattributes

This file was deleted.

46 changes: 0 additions & 46 deletions CODE_OF_CONDUCT.md

This file was deleted.

18 changes: 10 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,23 +64,25 @@ This project use [yarn](https://yarnpkg.com/lang/en/) for package manager.
git clone https://github.com/AhKi/oh-my-desk.git
cd oh-my-desk
```
**Download Dependency**
```
yarn
```

**Start Project**

```
yarn && yarn start
yarn start
```

**Show Unit test coverage**

**Unit test**
```
yarn && yarn test
yarn test
yarn show:coverage // if you want to show coverage
```

**Build**

**Packaging(Make install file)**
```
yarn && yarn package
yarn package
```

## Documentation
Expand Down
30 changes: 16 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,30 @@
"description": "desktop widget application",
"main": "./build/main.prod.js",
"scripts": {
"build:main": "cross-env NODE_ENV=production webpack --config webpack.main.prod.js",
"start": "yarn start:renderer",
"start-devtools": "cross-env IS_DEVTOOLS=true yarn start",
"start:main": "cross-env NODE_ENV=development electron -r @babel/register ./app/main.js",
"start:renderer": "cross-env NODE_ENV=development node -r @babel/register ./node_modules/webpack-dev-server/bin/webpack-dev-server --config webpack.dev.config.js --hot --inline --watch",
"watch:main": "nodemon --exec \"yarn start:main\" --ext js --ignore build/ --ignore dist/ --ignore coverage/",
"build": "concurrently \"yarn build:app\" \"yarn build:webview\"",
"build:app": "cross-env NODE_ENV=production webpack --config webpack.prod.config.js",
"build:webview": "cross-env NODE_ENV=production webpack --config webpack.main.prod.js",
"build:app:watch": "cross-env NODE_ENV=production webpack --watch --config webpack.prod.config.js",
"build:test": "cross-env NODE_ENV=test webpack --config webpack.prod.config.js",
"coveralls": "cat ./coverage/lcov.info | ./node_modules/.bin/coveralls",
"dev": "cross-env NODE_ENV=development electron -r @babel/register ./app/main.js",
"start": "lint-staged && cross-env NODE_ENV=development node -r @babel/register ./node_modules/webpack-dev-server/bin/webpack-dev-server --config webpack.dev.config.js --hot --inline --watch",
"start-devtools": "cross-env IS_DEVTOOLS=true yarn start",
"package": "yarn build:app && yarn build:main && build -c electron-builder.yml --mac --win",
"package:prod": "yarn build:app && yarn build:main && build --mac --win -p always -c electron-builder.yml",
"package:mac": "yarn build:app && yarn build:main && build -c electron-builder.yml --mac",
"package:win": "yarn build:app && yarn build:main && build -c electron-builder.yml --win",
"package": "yarn build && build -c electron-builder.yml -mw",
"package:mac": "yarn build && build -c electron-builder.yml -m",
"package:win": "yarn build && build -c electron-builder.yml -w",
"package:release": "yarn build && build -c electron-builder.yml -mw -p always ",
"test": "jest --config jest.config.js",
"test:watch": "yarn test -- --watch",
"test:coverage": "yarn test -- --coverage",
"show:coverage": "yarn test:coverage && open ./coverage/lcov-report/index.html",
"e2e": "jest --config jest.e2e.config.js",
"e2e:watch": "yarn e2e -- --watch",
"open:coverage": "open ./coverage/lcov-report/index.html",
"e2e:build": "cross-env NODE_ENV=test webpack --config webpack.prod.config.js",
"e2e:watch": "yarn e2e:build && yarn e2e -- --watch",
"coveralls": "cat ./coverage/lcov.info | ./node_modules/.bin/coveralls",
"lint": "eslint app --ext .js,.jsx",
"precommit": "lint-staged",
"prepush": "yarn lint",
"watch": "nodemon --exec \"npm run dev\" --ext js --ignore build/ --ignore dist/ --ignore coverage/"
"prepush": "yarn lint"
},
"lint-staged": {
"*.{js,jsx}": "eslint"
Expand Down
3 changes: 1 addition & 2 deletions webpack.dev.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ module.exports = webpackMerge(webpackBaseConfig, {
before() {
console.log('Start Main Process...');
spawn(
'yarn',
['watch'],
'yarn watch:main',
{ shell: true, env: process.env, stdio: 'inherit' },
)
.on('close', code => process.exit(code))
Expand Down