Skip to content

Commit 3fb5402

Browse files
t3chguyt3chguy
committed
Fix packaged functionality
Improve dependency management for Electron main process deps Dependencies in /electron/package.json will be installed through a script in /package.json and will be bundled via electron-builder Does not affect standard webapp whatsoever Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
1 parent 76008e8 commit 3fb5402

3 files changed

Lines changed: 13 additions & 5 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
/key.pem
66
/lib
77
/node_modules
8+
/electron/node_modules
89
/packages/
910
/webapp
1011
/.npmrc

‎electron/package.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"description": "Electron main process dependencies",
3+
"dependencies": {
4+
"electron-window-state": "^4.1.0"
5+
}
6+
}

‎package.json‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
"build": "node scripts/babelcheck.js && npm run build:res && npm run build:bundle",
3737
"build:dev": "node scripts/babelcheck.js && npm run build:res && npm run build:bundle:dev",
3838
"dist": "scripts/package.sh",
39+
"postinstall": "cd electron && npm i",
3940
"start:res": "node scripts/copy-res.js -w",
4041
"start:js": "webpack-dev-server --output-filename=bundles/_dev_/[name].js --output-chunk-file=bundles/_dev_/[name].js -w --progress",
4142
"start:js:prod": "NODE_ENV=production webpack-dev-server -w --progress",
@@ -96,7 +97,6 @@
9697
"css-raw-loader": "^0.1.1",
9798
"electron-builder": "^11.2.4",
9899
"electron-builder-squirrel-windows": "^11.2.1",
99-
"electron-window-state": "^4.1.0",
100100
"emojione": "^2.2.7",
101101
"eslint": "^3.14.0",
102102
"eslint-config-google": "^0.7.1",
@@ -145,6 +145,7 @@
145145
"dereference": true,
146146
"//files": "We bundle everything, so we only need to include webapp/",
147147
"files": [
148+
"electron/node_modules/**",
148149
"electron/src/**",
149150
"electron/img/**",
150151
"webapp/**",
@@ -159,10 +160,10 @@
159160
},
160161
"win": {
161162
"target": "squirrel"
163+
},
164+
"directories": {
165+
"buildResources": "electron/build",
166+
"output": "electron/dist"
162167
}
163-
},
164-
"directories": {
165-
"buildResources": "electron/build",
166-
"output": "electron/dist"
167168
}
168169
}

0 commit comments

Comments
 (0)