Skip to content

Commit a23ceb6

Browse files
ConnoropolousConnoropolous
committed
fix htmlwebpackplugin
1 parent dc279bc commit a23ceb6

File tree

11 files changed

+28
-15
lines changed

11 files changed

+28
-15
lines changed

‎.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,16 +95,16 @@ jobs:
9595
env:
9696
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
9797
run: |
98-
gh release upload "${GITHUB_REF#refs/tags/}" "electron/out/Acorn-0.9.0-alpha2.AppImage" --clobber
98+
gh release upload "${GITHUB_REF#refs/tags/}" "electron/out/Acorn-0.9.0-alpha3.AppImage" --clobber
9999
- name: upload binary (macos only)
100100
if: ${{ runner.os == 'macOs' }}
101101
env:
102102
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
103103
run: |
104-
gh release upload "${GITHUB_REF#refs/tags/}" "electron/out/Acorn-0.9.0-alpha2.dmg" --clobber
104+
gh release upload "${GITHUB_REF#refs/tags/}" "electron/out/Acorn-0.9.0-alpha3.dmg" --clobber
105105
- name: upload binary (Windows only)
106106
if: ${{ runner.os == 'Windows' }}
107107
env:
108108
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
109109
run: |
110-
gh release upload "$($env:GITHUB_REF -replace "refs/tags/")" "electron/out/Acorn.Setup.0.9.0-alpha2.exe" --clobber
110+
gh release upload "$($env:GITHUB_REF -replace "refs/tags/")" "electron/out/Acorn.Setup.0.9.0-alpha3.exe" --clobber

‎electron/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎electron/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "acorn",
3-
"version": "0.9.0-alpha2",
3+
"version": "0.9.0-alpha3",
44
"description": "Create the future",
55
"main": "dist/index.js",
66
"scripts": {

‎package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "acorn",
3-
"version": "0.9.0-alpha2",
3+
"version": "0.9.0-alpha3",
44
"description": "Acorn is software that helps people create the future",
55
"repository": {
66
"type": "git",

‎web/dist/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<!doctype html><html><head><title>Acorn</title></head><body><div id="react"/><script src="./main.js"></script></body></html>

‎web/dist/splashscreen.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<!doctype html><html><head><title>Acorn</title><link rel="stylesheet" href="splashscreen.css"/></head><body><div class="splash-wrapper"><div class="splash-image-wrapper"><div class="splash-image-caption">Photograph by Andrey Svistunov</div></div><div class="splash-content-wrapper"><div><div class="splash-logo">acorn</div><div class="splash-version">version 0.9.0-alpha3</div></div><div class="splash-loading-message" id="activity">Setting up Holochain...</div><div class="splash-description">Acorn is a way of organizing intended outcomes and outcomes in tree-like structures. You can think of it as a virtual whiteboard for collaborative planning. It could have many uses, and one that it has served is organizing the vision and work allocation of distributed teams of software developers. Other uses could be as a personal planning tool, for teams completely aside from software, or anything where linked/inter-related nodes in a structured form would be helpful.</div><div class="splash-license">© 2020-2021 Harris-Braun Enterprises, LLC.<br/>Licensed under the Cryptographic Autonomy License v1.0.</div></div></div><script>const el = document.getElementById('activity')
2+
require('electron').ipcRenderer.on('status', (event, message) => {
3+
el.innerHTML = message
4+
})</script></body></html>

‎web/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎web/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "acorn-ui",
3-
"version": "0.9.0-alpha2",
3+
"version": "0.9.0-alpha3",
44
"devDependencies": {
55
"@babel/core": "^7.5.5",
66
"@babel/preset-env": "7.5.5",

‎web/src/splashscreen.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<div class="splash-content-wrapper">
1313
<div>
1414
<div class="splash-logo">acorn</div>
15-
<div class="splash-version">version 0.9.0-alpha2</div>
15+
<div class="splash-version">version 0.9.0-alpha3</div>
1616
</div>
1717
<div class="splash-loading-message" id="activity">
1818
Setting up Holochain...

‎web/webpack.prod.js

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
const fs = require('fs')
22
const path = require('path')
33
const webpack = require('webpack')
4+
const HTMLWebpackPlugin = require('html-webpack-plugin')
45
const mainAppId = fs.readFileSync(
56
path.join(__dirname, '../config-main-app-id'),
67
'utf-8'
78
)
89

9-
const storyDir = path.join(__dirname, 'src/stories')
10-
1110
module.exports = {
1211
mode: 'production',
1312
output: {
@@ -22,6 +21,15 @@ module.exports = {
2221
__ADMIN_PORT__: 1235,
2322
__APP_PORT__: 8889,
2423
}),
24+
new HTMLWebpackPlugin({
25+
template: './src/index.html', //source
26+
filename: 'index.html', //destination
27+
}),
28+
new HTMLWebpackPlugin({
29+
template: './src/splashscreen.html', //source
30+
filename: 'splashscreen.html', //destination
31+
chunks: ['splash'],
32+
}),
2533
],
2634
entry: {
2735
app: './src/index.js',

0 commit comments

Comments
 (0)