diff --git a/.gitignore b/.gitignore index 502475a8d..ad240e5d2 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ coverage e2e-test-screenshots app/report.html app/*.map +app/build *.sw[pon] app/app.js .vscode diff --git a/Jenkinsfile b/Jenkinsfile index 4fd48e7c3..b4dcf5e5b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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}" diff --git a/app/package.json b/app/package.json index 8fdbb19c7..41bd67b6c 100644 --- a/app/package.json +++ b/app/package.json @@ -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" diff --git a/config/webpack.config.electron.js b/config/webpack.config.electron.js index f08d7e74f..a8f340b62 100644 --- a/config/webpack.config.electron.js +++ b/config/webpack.config.electron.js @@ -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', diff --git a/config/webpack.config.prod.js b/config/webpack.config.prod.js index aa5b7e2e0..df5be53b7 100644 --- a/config/webpack.config.prod.js +++ b/config/webpack.config.prod.js @@ -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: [ diff --git a/package.json b/package.json index fe6b51f56..4e0840b11 100644 --- a/package.json +++ b/package.json @@ -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",