Skip to content

Commit

Permalink
move: bundle files to ./bundle folder
Browse files Browse the repository at this point in the history
  • Loading branch information
khanhas committed Jan 21, 2019
1 parent 5642457 commit 2b7e02e
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 12 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,5 @@ bin/
auto-top.gypi
auto.gypi

*/api-key.js
*/api-key.js
bundle/
8 changes: 4 additions & 4 deletions electron-builder-config.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
directories:
output: dist
buildResources: build
buildResources: bundle

files:
- build/**/*.js
- build/**/*.css
- bundle/**/*.js
- bundle/**/*.css
- main.html
- img/**/*

npmRebuild: false

extraFiles:
- {
from: "build",
from: "bundle",
to: "./",
filter: ["*.node"]
}
Expand Down
2 changes: 1 addition & 1 deletion main.html
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@
</div>

<script>
require('./build/renderer.js');
require('./bundle/renderer.js');
</script>
</body>

Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "ueli",
"productName": "ueli",
"version": "4.4.0",
"version": "4.6.0",
"author": {
"name": "Oliver Schwendener",
"email": "[email protected]",
"url": "https://github.com/oliverschwendener"
},
"description": "A cross-platform alt+space launcher",
"main": "./build/main.js",
"main": "./bundle/main.js",
"scripts": {
"build": "webpack --progress",
"build:watch": "webpack -w --progress",
Expand All @@ -22,8 +22,8 @@
"package:publish": "yarn clean & yarn build:publish && electron-builder --config electron-builder-config.yml --publish onTag",
"package": "yarn build && electron-builder --dir --config electron-builder-config.yml --publish never",
"link:taskbar": "mklink /J \"D:/ueli/node_modules/taskbar-node\" \"D:/taskbar-node/\"",
"clean": "rmdir \"./build\" \"./dist\" /S /Q",
"build:util": "node-gyp configure build && ndts . > \"./native-util/lib-types.d.ts\"",
"clean": "rmdir bundle dist /S /Q",
"build:util": "node-gyp configure build && ndts . > \"./src/ts/native-lib.d.ts\" && electron-rebuild --only nbind -f",
"el": "electron-rebuild",
"elf": "rmdir \"./build\" /S /Q & yarn el && yarn build && yarn start",
"noti": "C:/SnoreToast.exe -t \"Build Done\" -m \"VSCode\"",
Expand Down Expand Up @@ -55,7 +55,7 @@
"autogypi": "^0.2.2",
"coveralls": "^3.0.1",
"css-loader": "^0.28.11",
"electron": "^3.0.7",
"electron": "^3.0.8",
"electron-builder": "^20.18.0",
"electron-rebuild": "^1.7.3",
"extract-loader": "^2.0.1",
Expand Down
2 changes: 1 addition & 1 deletion scripts/custom-node-loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ module.exports = function(content) {
this.emitFile(url, content);

var publicPath = `__webpack_public_path__ + ${JSON.stringify(url)}`;
var devPath = `__webpack_public_path__ + ${JSON.stringify(join("build", url))}`;
var devPath = `__webpack_public_path__ + ${JSON.stringify(join("bundle", url))}`;

return `try {
global.process.dlopen(module, ${publicPath});
Expand Down

0 comments on commit 2b7e02e

Please sign in to comment.