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

Move packages to one/root location, fix dev script for windows #1

Open
wants to merge 3 commits into
base: dev
Choose a base branch
from
Open
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
8 changes: 8 additions & 0 deletions .whitesource
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
##########################################################
#### WhiteSource "Bolt for Github" configuration file ####
##########################################################

# Configuration #
#---------------#
ws.repo.scan=true
vulnerable.check.run.conclusion.level=failure
3 changes: 3 additions & 0 deletions app/copy-env.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
var fs = require('fs')

fs.createReadStream('env/dev.env').pipe(fs.createWriteStream('app/dist/.env'))
8 changes: 2 additions & 6 deletions app/package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
{
"name": "dapp",
"main": "src/main",
"dependencies": {
"dotenv": "^4.0.0",
"vue": "^2.5.16",
"vue-router": "^3.0.1"
}
"name": "electron-vue",
"version": "0.0.1"
}
63 changes: 35 additions & 28 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,41 +1,48 @@
{
"scripts": {
"lint": "eslint --ext .js,.vue app/src",
"unit": "jest --config jest.conf.js --coverage",
"test": "run-s lint unit",
"dev": "run-s dev:env && run-p dev:web dev:main",
"dev:env": "cp env/dev.env app/dist/.env",
"dev:main": "dotenv -e env/dev.env electron app --debug",
"dev:web": "dotenv -e env/dev.env parcel app/src/web/index.html",
"build": "run-s build:env build:web build:mac",
"build:env": "cp env/prod.env app/dist/.env",
"build:web": "parcel build app/src/web/index.html -d app/dist/web --public-url ./",
"build:mac": "electron-packager app --overwrite --ignore \"(__test__|\\.map|src\\/web)$\" --platform=darwin --arch=x64 --out=out --icon=assets/app-icon/mac/app.icns --osx-sign.identity='Developer ID Application: GitHub' --extend-info=assets/mac/info.plist"
"dependencies": {
"dotenv": "^5.0.1",
"vue": "^2.5.16",
"vue-router": "^3.0.1"
},
"devDependencies": {
"@vue/component-compiler-utils": "^1.0.0",
"babel-eslint": "^8.2.1",
"babel-jest": "^21.0.2",
"babel-eslint": "^8.2.3",
"babel-jest": "^22.4.3",
"babel-plugin-dynamic-import-node": "^1.2.0",
"babel-plugin-transform-es2015-modules-commonjs": "^6.26.0",
"dotenv-cli": "^1.4.0",
"electron": "^1.8.4",
"electron-packager": "^10.1.1",
"eslint": "^4.15.0",
"eslint-config-standard": "^10.2.1",
"eslint-friendly-formatter": "^3.0.0",
"eslint-loader": "^1.7.1",
"eslint-plugin-import": "^2.7.0",
"eslint-plugin-node": "^5.2.0",
"eslint-plugin-promise": "^3.4.0",
"electron-packager": "^12.0.1",
"eslint": "^4.19.1",
"eslint-config-standard": "^11.0.0",
"eslint-friendly-formatter": "^4.0.1",
"eslint-loader": "^2.0.0",
"eslint-plugin-import": "^2.11.0",
"eslint-plugin-node": "^6.0.1",
"eslint-plugin-promise": "^3.7.0",
"eslint-plugin-standard": "^3.0.1",
"eslint-plugin-vue": "^4.0.0",
"jest": "^22.0.4",
"jest-serializer-vue": "^0.3.0",
"eslint-plugin-vue": "^4.5.0",
"jest": "^22.4.3",
"jest-serializer-vue": "^1.0.0",
"npm-run-all": "^4.1.2",
"parcel-bundler": "^1.7.0",
"parcel-bundler": "^1.7.1",
"vue-hot-reload-api": "^2.3.0",
"vue-jest": "^2.4.1",
"vue-jest": "^2.5.0",
"vue-template-compiler": "^2.5.16"
}
},
"name": "electron-vue",
"scripts": {
"build": "run-s build:env build:web build:mac",
"build:env": "node app/copy-env.js",
"build:mac": "electron-packager app --overwrite --ignore \"(__test__|\\.map|src\\/web)$\" --platform=darwin --arch=x64 --out=out --icon=assets/app-icon/mac/app.icns --osx-sign.identity='Developer ID Application: GitHub' --extend-info=assets/mac/info.plist",
"build:web": "parcel build app/src/web/index.html -d app/dist/web --public-url ./",
"dev": "run-s dev:env && run-p dev:web dev:main",
"dev:env": "node app/copy-env.js",
"dev:main": "dotenv -e env/dev.env electron app --debug",
"dev:web": "dotenv -e env/dev.env parcel app/src/web/index.html",
"lint": "eslint --ext .js,.vue app/src",
"test": "run-s lint unit",
"unit": "jest --config jest.conf.js --coverage"
},
"version": "0.0.1"
}