Skip to content

Commit

Permalink
working electron-builder configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
@xharris
xharris committed Apr 15, 2020
1 parent aa5adcb commit 8439466
Show file tree
Hide file tree
Showing 18 changed files with 643 additions and 511 deletions.
6 changes: 3 additions & 3 deletions entry.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require("update-electron-app")();
const unhandled = require("electron-unhandled");
unhandled();

const { app: eApp, BrowserWindow, ipcMain } = require("electron");
const path = require("path");

const WIN_WIDTH = 1000;
const WIN_HEIGHT = 700;
Expand Down Expand Up @@ -36,7 +36,7 @@ eApp.on("ready", function () {
main_window.setWindowButtonVisibility(false);

// main_window.webContents.openDevTools();
main_window.loadFile(path.join(__dirname, "src", "index.html"));
main_window.loadFile("index.html");
main_window.on("close", e => {
main_window.webContents.send("close", e);
e.preventDefault();
Expand Down
1 change: 1 addition & 0 deletions entry.less
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@import "src/less/main";
4 changes: 4 additions & 0 deletions ide_game.css
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@font-face {
font-family: '04B_03';
src: url('blankejs/projects/test_zone/04B_03.ttf');
}
105 changes: 55 additions & 50 deletions src/index.html → index.html
View file
Original file line number Diff line number Diff line change
@@ -1,75 +1,80 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />


<script type="text/javascript">
var DEV_MODE = false;
</script>
<!-- meta http-equiv="Content-Security-Policy" content="default-src 'self'" -->
<!-- Material Design Icons -->
<link rel="stylesheet" type="text/css" media="all" href="includes/mdi/css/materialdesignicons.min.css"/>
<link rel="stylesheet" type="text/css" media="all" href="src/includes/mdi/css/materialdesignicons.min.css"/>

<!-- InteractJS -->
<script src="includes/interact.min.js"></script>
<script src="src/includes/interact.min.js"></script>

<!-- BlankE kit -->
<script src="blanke-kit/blanke.js"></script>
<script src="src/blanke-kit/blanke.js"></script>

<!-- Highlight.js -->
<link rel="stylesheet" href="includes/highlight/styles/nord.css">
<script src="includes/highlight/highlight.pack.js"></script>
<link rel="stylesheet" href="src/includes/highlight/styles/nord.css">
<script src="src/includes/highlight/highlight.pack.js"></script>

<!-- CodeMirror -->
<script src="includes/codemirror/lib/codemirror.js"></script>
<link rel="stylesheet" href="includes/codemirror/lib/codemirror.css">
<link rel="stylesheet" href="includes/codemirror/theme/material.css">
<script src="includes/codemirror/mode/moonscript/moonscript.js"></script>
<script src="includes/codemirror/mode/lua/lua.js"></script>
<script src="src/includes/codemirror/lib/codemirror.js"></script>
<link rel="stylesheet" href="src/includes/codemirror/lib/codemirror.css">
<link rel="stylesheet" href="src/includes/codemirror/theme/material.css">
<script src="src/includes/codemirror/mode/moonscript/moonscript.js"></script>
<script src="src/includes/codemirror/mode/lua/lua.js"></script>

<script src="includes/codemirror/addon/comment/comment.js"></script>
<script src="includes/codemirror/addon/dialog/dialog.js"></script>
<link rel="stylesheet" href="includes/codemirror/addon/dialog/dialog.css">
<script src="src/includes/codemirror/addon/comment/comment.js"></script>
<script src="src/includes/codemirror/addon/dialog/dialog.js"></script>
<link rel="stylesheet" href="src/includes/codemirror/addon/dialog/dialog.css">

<script src="includes/codemirror/addon/search/search.js"></script>
<script src="includes/codemirror/addon/search/searchcursor.js"></script>
<script src="src/includes/codemirror/addon/search/search.js"></script>
<script src="src/includes/codemirror/addon/search/searchcursor.js"></script>

<script src="includes/codemirror/addon/scroll/annotatescrollbar.js"></script>
<script src="includes/codemirror/addon/search/matchesonscrollbar.js"></script>
<script src="includes/codemirror/addon/search/match-highlighter.js"></script>
<script src="includes/codemirror/addon/edit/matchbrackets.js"></script>
<script src="src/includes/codemirror/addon/scroll/annotatescrollbar.js"></script>
<script src="src/includes/codemirror/addon/search/matchesonscrollbar.js"></script>
<script src="src/includes/codemirror/addon/search/match-highlighter.js"></script>
<script src="src/includes/codemirror/addon/edit/matchbrackets.js"></script>

<script src="includes/codemirror/addon/hint/show-hint.js"></script>
<script src="src/includes/codemirror/addon/hint/show-hint.js"></script>

<script src="includes/codemirror/addon/mode/overlay.js"></script>
<script src="src/includes/codemirror/addon/mode/overlay.js"></script>

<!-- PixiJS -->
<script src="includes/pixi.min.js"></script>
<script src="src/includes/pixi.min.js"></script>
<script src="src/includes/unsafe-eval.min.js"></script>

<!-- IDE core -->
<script src="js/core/tab.js"></script>
<script src="js/core/dragbox.js"></script>
<script src="js/core/sidewindow.js"></script>
<script src="js/core/fibwindow.js"></script>
<script src="js/core/editor.js"></script>
<script src="js/core/pixi.js"></script>
<script src="src/js/core/tab.js"></script>
<script src="src/js/core/dragbox.js"></script>
<script src="src/js/core/sidewindow.js"></script>
<script src="src/js/core/fibwindow.js"></script>
<script src="src/js/core/editor.js"></script>
<script src="src/js/core/pixi.js"></script>

<!-- IDE features -->
<!-- script src="js/plugin.js"></script -->
<script src="js/code.js"></script>
<script src="js/gamepreview.js"></script>
<script src="src/js/code.js"></script>
<script src="src/js/gamepreview.js"></script>

<!-- Scene Editor -->
<script src="js/sceneeditor.js"></script>
<script src="src/js/sceneeditor.js"></script>

<script src="js/docview.js"></script>
<script src="js/exporter.js"></script>
<script src="js/console.js"></script>
<script src="js/spritesheet.js"></script>
<script src="js/assetmanager.js"></script>
<script src="js/find.js"></script>
<script src="js/settings.js"></script>
<script src="js/plugins.js"></script>
<script src="js/imageeditor.js"></script>
<script src="js/testview.js"></script>
<script src="src/js/docview.js"></script>
<script src="src/js/exporter.js"></script>
<script src="src/js/console.js"></script>
<script src="src/js/spritesheet.js"></script>
<script src="src/js/assetmanager.js"></script>
<script src="src/js/find.js"></script>
<script src="src/js/settings.js"></script>
<script src="src/js/plugins.js"></script>
<script src="src/js/imageeditor.js"></script>
<script src="src/js/testview.js"></script>


<link rel="stylesheet/less" type="text/css" href="entry.less"/>
Expand All @@ -89,8 +94,8 @@
logLevel: 0
}
</script>
<script src="includes/less.min.js"></script>
<script src="main.js"></script>
<script src="src/includes/less.min.js"></script>
<script src="src/main.js"></script>

</head>
<body>
Expand All @@ -106,19 +111,19 @@
</div>

<div class="tool-container">
<button id="btn-play" title="run game"><object class="blanke-icon" data="icons/run.svg" type="image/svg+xml">P</object></button>
<button id="btn-export" title="export game"><object class="blanke-icon" data="icons/package.svg" type="image/svg+xml">E</object></button>
<button id="btn-play" title="run game"><object class="blanke-icon" data="src/icons/run.svg" type="image/svg+xml">P</object></button>
<button id="btn-export" title="export game"><object class="blanke-icon" data="src/icons/package.svg" type="image/svg+xml">E</object></button>
<button id="btn-winvis" title="hide floating windows">
<object class="blanke-icon" data="icons/window_visibility.svg" type="image/svg+xml">V</object>
<object class="blanke-icon" data="src/icons/window_visibility.svg" type="image/svg+xml">V</object>
<p id="dragbox-badge" class="btn-badge"></p>
</button>
<button id="btn-winsplit" title="toggle window splitting (ON)">
<object class="blanke-icon" data="icons/window_split.svg" type="image/svg+xml">W</object>
<object class="blanke-icon" data="src/icons/window_split.svg" type="image/svg+xml">W</object>
<p id="fibwindow-badge" class="btn-badge"></p>
</button>
<button id="btn-docs" title="view documentation"><object class="blanke-icon" data="icons/notebook.svg" type="image/svg+xml">D</object></button>
<button id="btn-plugins" title="view plugins"><object class="blanke-icon" data="icons/plugin.svg" type="image/svg+xml">P</object></button>
<button id="btn-settings" title="IDE/Game settings"><object class="blanke-icon" data="icons/wrench.svg" type="image/svg+xml">S</object></button>
<button id="btn-docs" title="view documentation"><object class="blanke-icon" data="src/icons/notebook.svg" type="image/svg+xml">D</object></button>
<button id="btn-plugins" title="view plugins"><object class="blanke-icon" data="src/icons/plugin.svg" type="image/svg+xml">P</object></button>
<button id="btn-settings" title="IDE/Game settings"><object class="blanke-icon" data="src/icons/wrench.svg" type="image/svg+xml">S</object></button>
<!-- button id="btn-test" onclick="blanke.toast('do stuffs please')"><i class="mdi mdi-test-tube"></i></button -->
</div>

Expand Down
35 changes: 34 additions & 1 deletion package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 31 additions & 4 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,48 @@
"scripts": {
"electron": "electron .",
"build": "electron-builder",
"dist": "node package.js"
"dist": "node package.js",
"release": "build"
},
"build": {
"appId": "com.electron.blanke",
"win": {
"target": "portable",
"icon": "logo.ico"
"icon": "logo.ico",
"target": [
"nsis",
"portable"
],
"publish": [
"github"
]
},
"nsis": {
"oneClick": false,
"allowToChangeInstallationDirectory": true,
"installerIcon": "src/logo.ico",
"installerHeaderIcon": "src/logo.ico"
},
"directories": {
"buildResources": "src"
}
},
"files": [
"index.html",
"entry.js",
"entry.less",
"package.json",
"src/",
"node_modules/"
],
"extraFiles": [
"plugins",
"engines",
"themes"
]
},
"dependencies": {
"adm-zip": "^0.4.13",
"archiver": "^2.1.1",
"electron-unhandled": "^3.0.2",
"fs-extra": "^5.0.0",
"js-yaml": "^3.13.1",
"lodash": "^4.17.15",
Expand Down
2 changes: 1 addition & 1 deletion projects/test_zone/assets/map/platformer.map
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"objects":{"526dedde":{"198231d8":[["",-16,-16]]},"6457c01e":{"198231d8":[["",-48,-16]]}},"layers":[{"name":"layer0","depth":0,"offset":[0,0],"snap":[32,32],"uuid":"198231d8"}],"images":[{"path":"assets/image/megman.png","snap":[32,32],"offset":[0,0],"spacing":[0,0],"align":"top-left","uuid":"5ee2a97f","coords":{"198231d8":[[-32,32,96,128,32,32,false],[-32,64,96,128,32,32,false],[-32,96,96,128,32,32,false]]}}],"settings":{"camera":[121.23900648638903,462.0467172116109],"last_active_layer":"198231d8","last_object_type":"object","last_object_name":"heart"}}
{"objects":{"526dedde":{"198231d8":[["",-16,-16]]},"6457c01e":{"198231d8":[["",-48,-16]]}},"layers":[{"name":"layer0","depth":0,"offset":[0,0],"snap":[32,32],"uuid":"198231d8"}],"images":[{"path":"assets/image/megman.png","snap":[32,32],"offset":[0,0],"spacing":[0,0],"align":"top-left","uuid":"5ee2a97f","coords":{"198231d8":[[-32,32,96,128,32,32,false],[-32,64,96,128,32,32,false],[-32,96,96,128,32,32,false]]}}],"settings":{"camera":[327.87199930005175,354.58173898382995],"last_active_layer":"198231d8","last_object_type":"object","last_object_name":"heart"}}
29 changes: 21 additions & 8 deletions projects/test_zone/config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,24 @@
"window_size": 3,
"quick_access": [
[
"main.lua=script+?",
"main.lua"
"platformer.map=map+?",
"platformer.map"
],
[
"platformer.lua=script+?",
"platformer.lua"
],
[
"conf.lua=script+?",
"conf.lua"
"Open image editor=?",
"Open image editor"
],
[
"bunnymark.lua=script+?",
"bunnymark.lua"
"View assets=?",
"View assets"
],
[
"ecs.lua=script+state+?",
"ecs.lua"
"main.lua=script+?",
"main.lua"
]
],
"autoplay_preview": true,
Expand Down Expand Up @@ -228,6 +228,19 @@
"spacing": 0,
"onion_alpha": 0.3,
"image": "image/blue_robot.png"
},
"image/image5.bmp": {
"frame_size": [
256,
256
],
"frames": 1,
"position": [
0,
0
],
"spacing": 0,
"onion_alpha": 0.3
}
}
}
6 changes: 3 additions & 3 deletions src/blanke-kit/blanke.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -869,7 +869,7 @@ class Toast {
}
set icon(v) {
this.el_icon.style.display = "inline-block";
this.el_icon.data = `icons/${v}.svg`;
this.el_icon.data = `src/icons/${v}.svg`;
}
set style(v) {
let styles = {
Expand Down Expand Up @@ -905,13 +905,13 @@ var blanke = {
createIconButton: function (icon, title) {
let el_btn = app.createElement("button", "icon-button");
let el_icon = app.createElement("object", "blanke-icon");
el_icon.data = "icons/" + icon + ".svg";
el_icon.data = "src/icons/" + icon + ".svg";
el_icon.type = "image/svg+xml";
el_icon.innerHTML = icon[0].toUpperCase();
el_btn.appendChild(el_icon);
el_btn.title = title;
el_btn.change = (icon2, title2) => {
el_icon.data = "icons/" + icon2 + ".svg";
el_icon.data = "src/icons/" + icon2 + ".svg";
el_icon.innerHTML = icon2[0].toUpperCase();
el_btn.title = title2;
};
Expand Down
1 change: 0 additions & 1 deletion src/entry.less
View file

This file was deleted.

Loading

0 comments on commit 8439466

Please sign in to comment.