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

Fix npm run dist:mac - Closes #866 #867

Merged
merged 2 commits into from
Oct 13, 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 .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ coverage
e2e-test-screenshots
app/report.html
app/*.map
app/build
*.sw[pon]
app/app.js
.vscode
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ node('lisk-nano') {

stage ('Deploy') {
try {
sh 'rsync -axl --delete --rsync-path="mkdir -p /var/www/test/lisk-nano/$BRANCH_NAME/ && rsync" $WORKSPACE/app/dist/ jenkins@master-01:/var/www/test/lisk-nano/$BRANCH_NAME/'
sh 'rsync -axl --delete --rsync-path="mkdir -p /var/www/test/lisk-nano/$BRANCH_NAME/ && rsync" $WORKSPACE/app/build/ jenkins@master-01:/var/www/test/lisk-nano/$BRANCH_NAME/'
githubNotify context: 'Jenkins test deployment', description: 'Commit was deployed to test', status: 'SUCCESS', targetUrl: "${HUDSON_URL}test/lisk-nano/${BRANCH_NAME}"
} catch (err) {
echo "Error: ${err}"
Expand Down
2 changes: 1 addition & 1 deletion app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "lisk-nano",
"version": "1.1.0",
"description": "Lisk Nano",
"main": "./dist/main.js",
"main": "./build/main.js",
"author":{
"name": "Lisk Foundation",
"email": "admin@lisk.io"
Expand Down
2 changes: 1 addition & 1 deletion config/webpack.config.electron.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const baseConfig = require('./webpack.config');
module.exports = merge(baseConfig, {
entry: `${resolve(__dirname, '../app/src')}/main.js`,
output: {
path: resolve(__dirname, '../app/dist'),
path: resolve(__dirname, '../app/build'),
filename: 'main.js',
},
target: 'electron-renderer',
Expand Down
2 changes: 1 addition & 1 deletion config/webpack.config.prod.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const reactToolboxVariables = require('./reactToolbox.config');

module.exports = merge(baseConfig, reactConfig, {
output: {
path: resolve(__dirname, '../app', '../app/dist'),
path: resolve(__dirname, '../app', '../app/build'),
filename: 'bundle.[name].js',
},
plugins: [
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"dist:win": "build --win --ia32 --x64",
"dist:mac": "build --mac",
"dist:linux": "build --linux --ia32 --x64 --armv7l",
"copy-files": "mkdir app/dist && cp -r ./src/index.html ./src/assets ./app/dist",
"clean": "del app/dist -f",
"copy-files": "mkdir app/build && cp -r ./src/index.html ./src/assets ./app/build",
"clean": "del app/build -f",
"eslint": "eslint ./src/ ./app/src/ ./app/config/ ./features/",
"storybook": "start-storybook -p 6006 -s ./src/",
"i18n-scanner": "node ./src/i18n-scanner.js",
Expand Down