Skip to content

Commit

Permalink
- Updated .gitignore
Browse files Browse the repository at this point in the history
- Updated package.json
  • Loading branch information
OzymandiasTheGreat committed Feb 15, 2020
1 parent e08eb8f commit 77ff75b
Show file tree
Hide file tree
Showing 11 changed files with 14 additions and 17 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
/dist/release
/dist/angular
/tmp
/out-tsc
/app-builds
Expand All @@ -14,6 +15,7 @@ src/**/*.js
# dependencies
/node_modules
/.venv
/*.egg-info

# IDEs and editors
/.idea
Expand Down
1 change: 1 addition & 0 deletions dist/resources/icon/icon-128x128.png
1 change: 1 addition & 0 deletions dist/resources/icon/icon-16x16.png
1 change: 1 addition & 0 deletions dist/resources/icon/icon-24x24.png
1 change: 1 addition & 0 deletions dist/resources/icon/icon-256x256.png
1 change: 1 addition & 0 deletions dist/resources/icon/icon-32x32.png
1 change: 1 addition & 0 deletions dist/resources/icon/icon-48x48.png
1 change: 1 addition & 0 deletions dist/resources/icon/icon-64x64.png
1 change: 1 addition & 0 deletions dist/resources/icon/icon.svg
12 changes: 0 additions & 12 deletions electron-builder.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,6 @@
"!karma.conf.js",
"!.vscode"
],
"win": {
"icon": "dist",
"target": [
"portable"
]
},
"mac": {
"icon": "dist",
"target": [
"dmg"
]
},
"linux": {
"icon": "dist/resources/icon",
"category": "Utility",
Expand Down
7 changes: 3 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
macpy{
{
"name": "emoji-keyboard",
"version": "3.0.0rc0",
"description": "Type emoji easily! Virtual keyboard-like emoji palette for Linux with lots of features.",
Expand All @@ -22,13 +22,12 @@ macpy{
"build": "npm run electron:serve-tsc && ng build",
"build:dev": "npm run build -- -c dev",
"build:prod": "npm run build -- -c production",
"build:py": "shiv -c main.py -o dist/resources/main.pyz .",
"ng:serve": "ng serve",
"electron:serve-tsc": "tsc -p tsconfig-serve.json",
"electron:serve": "wait-on http-get://localhost:4200/ && npm run electron:serve-tsc && electron . --dev",
"electron:local": "npm run build:prod && electron .",
"electron:linux": "npm run build:prod && electron-builder build --linux",
"electron:windows": "npm run build:prod && electron-builder build --windows",
"electron:mac": "npm run build:prod && electron-builder build --mac",
"electron:linux": "npm run build:py && npm run build:prod && electron-builder build --linux",
"lint": "ng lint"
},
"devDependencies": {
Expand Down

0 comments on commit 77ff75b

Please sign in to comment.