Skip to content
This repository was archived by the owner on Apr 15, 2019. It is now read-only.

Make commands for building packages from scratch on each platform - Closes #912 #918

Merged
merged 6 commits into from
Oct 27, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
]
}
],
"linebreak-style": 0,
"no-param-reassign": "off"
}
}
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ node('lisk-nano') {
stage ('Run Eslint') {
try {
ansiColor('xterm') {
sh 'npm run --silent clean && npm run --silent copy-files && npm run --silent eslint'
sh 'npm run --silent clean-build && npm run --silent copy-files && npm run --silent eslint'
}
} catch (err) {
echo "Error: ${err}"
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,26 +58,26 @@ npm run start

### Windows

Build package for Windows.
Build package for Windows (on Windows in [Git BASH](https://git-for-windows.github.io/)).

```
npm run dist:win
npm run pack:win
```

### macOS

Build package for macOS.
Build package for macOS (on macOs)

```
npm run dist:mac
npm run pack
```

### Linux

Build package for Linux.
Build package for Linux (on Linux).

```
npm run dist:linux
npm run pack
```

## Run unit tests
Expand Down
8 changes: 1 addition & 7 deletions features/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
{
"extends": "airbnb-base",
"plugins": [
"import"
],
"extends": "../.eslintrc",
"env": {
"protractor": true
},
"rules": {
"no-underscore-dangle": "off"
}
}
11 changes: 8 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,24 @@
"bugs": "https://github.com/LiskHQ/lisk-nano/issues",
"main": "main.js",
"scripts": {
"build": "npm run clean && npm run copy-files && npm run build-prod && npm run build-electron",
"build": "npm run clean-build && npm run copy-files && npm run build-prod && npm run build-electron",
"dev": "webpack-dev-server --config ./config/webpack.config.dev --env.dev --hot",
"build-prod": "webpack --config ./config/webpack.config.prod --env.prod",
"build-electron": "webpack --config ./config/webpack.config.electron",
"e2e-test": "protractor protractor.conf.js",
"test": "karma start",
"test-live": "npm test -- --auto-watch --no-single-run",
"start": "electron ./app/",
"dist": "build --ia32 --x64 --armv7l",
"dist:win": "build --win --ia32 --x64",
"dist:mac": "build --mac",
"dist:linux": "build --linux --ia32 --x64 --armv7l",
"copy-files": "mkdir app/build && cp -r ./src/index.html ./src/assets ./src/locales ./app/build",
"clean": "del app/build -f",
"copy-files": "cpx \"./src/{index.html,assets/**/*,locales/**/*}\" ./app/build/",
"clean-build": "rm -rf app/build",
"clean-dist": "rm -rf dist",
"eslint": "eslint ./src/ ./app/src/ ./app/config/ ./features/",
"pack": "npm install && npm run build && npm run clean-dist && npm run dist",
"pack:win": "cmd /c npm install && npm run clean-build && npm run copy-files && npm run build-prod && npm run build-electron && npm run clean-dist && npm run dist:win",
"storybook": "start-storybook -p 6006 -s ./src/",
"i18n-scanner": "node ./src/i18n-scanner.js",
"build-storybook": "build-storybook"
Expand Down Expand Up @@ -75,6 +79,7 @@
"chai": "4.1.2",
"chai-as-promised": "7.1.1",
"chai-enzyme": "0.8.0",
"cpx": "=1.5.0",
"css-hot-loader": "=1.3.1",
"css-loader": "0.28.7",
"cucumber": "2.2.0",
Expand Down