Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build for release, auto-updater, website #65

Merged
merged 88 commits into from
May 17, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
96b38f4
Update build.js
terreng Feb 5, 2022
ec91462
Versions URL
terreng Feb 5, 2022
38c375c
Update banner
terreng Feb 5, 2022
680c0c3
Create 404.html
terreng Feb 5, 2022
fbbebf1
Update versions.json
terreng Feb 5, 2022
eeac1b8
Update check
terreng Feb 6, 2022
65536cc
Update check
terreng Feb 6, 2022
36733dc
Only show Stop & Quit button when Keep running when closed option is …
terreng Feb 10, 2022
341832b
Custom update banner text
terreng Feb 12, 2022
c5f0901
Add option to display update banner with high priority color
terreng Feb 12, 2022
96a0999
update build platforms
terreng Feb 19, 2022
251df84
Merge from main
terreng Mar 22, 2022
21f1b0f
Start working on VuePress static docs site
terreng Mar 22, 2022
88c3ac4
Add versions generate script to vue docs site
terreng Mar 22, 2022
425f9d1
Move to www
terreng Mar 22, 2022
54e0ffc
Revert "Move to www"
terreng Mar 22, 2022
081fa80
Update .gitignore
terreng Mar 22, 2022
4019961
Move to www
terreng Mar 22, 2022
e94f311
Move to www
terreng Mar 22, 2022
8233340
Remove template files
terreng Mar 22, 2022
05edcea
Fix build
terreng Mar 22, 2022
c94a46d
Update .gitignore
terreng Mar 22, 2022
6390818
Remove old site files
terreng Mar 22, 2022
cf3d4d1
Fixes
terreng Mar 22, 2022
4a4c034
App Settings
terreng Mar 22, 2022
9177639
Remove old docs
terreng Mar 22, 2022
b5fa7c7
Add guides
terreng Mar 22, 2022
6370daa
Add TODOS for home and download pages
terreng Mar 22, 2022
1ba2b1e
Update config.js
terreng Mar 22, 2022
a24339c
Update config.js
terreng Mar 23, 2022
48631a3
Merge branch 'main' into new-ui
terreng Mar 27, 2022
478f669
Update UI when IP(s) change
terreng Apr 1, 2022
d6b3c0d
Add HTTP compression option
terreng Apr 1, 2022
398311a
Remove compression option from UI
terreng Apr 1, 2022
d0ecf0e
Show an error when formatting error in config.json, instead of resett…
terreng Apr 1, 2022
8e04dd4
Remove compression option from docs
terreng Apr 1, 2022
02fa115
Update open_source_licenses.txt
terreng Apr 4, 2022
9023d48
Add favicon
terreng Apr 4, 2022
53264dd
Update build.js
terreng Apr 4, 2022
aa48b84
Favicon
terreng Apr 4, 2022
8797c28
add keywords meta tag
terreng Apr 4, 2022
2f5a601
Homepage features and footer
terreng Apr 4, 2022
7eaad2b
Add coming from wsc guide
terreng Apr 4, 2022
75352dc
Merge branch 'main' into new-ui
terreng Apr 5, 2022
0d810d4
Add ipv6 option
terreng Apr 5, 2022
fdd193a
Update wsc.md
terreng Apr 5, 2022
61f7782
indexOf -> includes
terreng Apr 6, 2022
a45f439
Merge branch 'main' into new-ui
terreng Apr 13, 2022
29cf606
Homepage
terreng Apr 16, 2022
a6e9c12
Update README.md
terreng Apr 17, 2022
cf58346
Update options docs
terreng Apr 17, 2022
b2da54a
Merge branch 'new-ui' of https://github.com/terreng/simple-web-server…
terreng Apr 17, 2022
f8636ec
Fixes
terreng Apr 19, 2022
beef3d9
fixes
ethanaobrien Apr 20, 2022
388ff25
fix url encoding
ethanaobrien Apr 21, 2022
85b30c7
Add config.json docs
terreng Apr 21, 2022
c7d1b93
Using HTTPS docs
terreng Apr 21, 2022
ed835c9
Catch errors with https create server
terreng Apr 21, 2022
6958a61
Update https.md
terreng May 11, 2022
dfde8e4
fix
Apr 28, 2022
696ab53
undo testing layout
ethanaobrien Apr 28, 2022
e5ea155
Add help page
terreng May 11, 2022
f7f6d71
finish coming from wsc page
terreng May 11, 2022
5fb19e0
Add Windows firewall prompt screenshot
terreng May 12, 2022
6970854
Add date and time to log messages
terreng May 12, 2022
1ec87c0
Add logs guide, add example config file, reorganize
terreng May 12, 2022
5cf7034
Add IPV6 option to docs
terreng May 12, 2022
6a8a917
Add option to enable logging, default to disabled, update docs
terreng May 12, 2022
ee684f4
Fix local logging on macOS
terreng May 12, 2022
beddd82
Apply b2a0e1e
terreng May 12, 2022
fb20243
Switch to electron-builder, www -> website
terreng May 13, 2022
8142881
Update package.json
terreng May 13, 2022
c9bc56c
Update WSC.js
terreng May 13, 2022
72f4074
Update package.json
terreng May 13, 2022
0b26612
Add Linux build
terreng May 13, 2022
3b3fb61
Update package.json
terreng May 13, 2022
673dd62
Update package.json
terreng May 13, 2022
a494934
Update index.js
terreng May 13, 2022
d415119
Update package.json
terreng May 13, 2022
2e3108d
Update README.md
terreng May 13, 2022
9f7629c
Update download instructions, add build from source instructions
terreng May 16, 2022
ca254cc
add download page and portable make commands
terreng May 17, 2022
14aee2a
Update package.json
terreng May 17, 2022
38f3e9d
update check: install source dependent links
terreng May 17, 2022
f423660
Update open_source_licenses.txt
terreng May 17, 2022
ebc0143
Update package.json
terreng May 17, 2022
dd737c3
Update package.json
terreng May 17, 2022
399b511
Update package.json
terreng May 17, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ images/.DS_Store
www/docs
www/out
www/src/.vuepress/dist
dev/
dev/
dist/
14 changes: 4 additions & 10 deletions WSC.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,10 @@ WSC.DirectoryEntryHandler = handlers.DirectoryEntryHandler
WSC.BaseHandler = handlers.BaseHandler

var main_fs = new WSC.FileSystem(__dirname)
main_fs.getByPath('/directory-listing-template.html', function(file) {
file.text(function(data) {
WSC.template_data = data
})
})
main_fs.getByPath('/directory-listing-template-static.html', function(file) {
file.text(function(data) {
WSC.static_template_data = data
})
})
const fs = require('fs')
const path = require('path')
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the path and fs libraries are defined on global (see index.js)

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, thanks!

WSC.template_data = fs.readFileSync(path.resolve(__dirname, "directory-listing-template.html"), "utf8");
WSC.static_template_data = fs.readFileSync(path.resolve(__dirname, "directory-listing-template-static.html"), "utf8");

module.exports = WSC;

Expand Down
Binary file removed dist/Windows.zip
Binary file not shown.
Binary file removed dist/macOS.zip
Binary file not shown.
1 change: 0 additions & 1 deletion index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
var version = 1001000;
const {app, BrowserWindow, ipcMain, Menu, Tray, dialog, shell} = require('electron');
if (require('electron-squirrel-startup')) app.quit();
const {networkInterfaces} = require('os');

global.savingLogs = true;//prevent saving logs until log option is checked. never becomes false if logging is not enabled.
Expand Down
7,852 changes: 1,620 additions & 6,232 deletions package-lock.json

Large diffs are not rendered by default.

128 changes: 34 additions & 94 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"productName": "Simple Web Server",
"version": "1.1.0",
"main": "index.js",
"description": "A continuation of Web Server for Chrome, built with Electron.",
"description": "Create a local web server in just a few clicks with an easy to use interface. A continuation of Web Server for Chrome, built with Electron.",
"author": {
"name": "Terren Gurule",
"url": "https://github.com/terreng"
Expand All @@ -22,108 +22,48 @@
"homepage": "https://terreng.github.io/simple-web-server/",
"bugs": "https://github.com/terreng/simple-web-server/issues",
"scripts": {
"start": "electron-forge start",
"package": "electron-forge package",
"make": "electron-forge make",
"makewindowsx86": "electron-forge make --platform win32 --arch x64",
"makewindowsarm64": "electron-forge make --platform win32 --arch arm64",
"makemacosx86": "electron-forge make --platform darwin --arch x64",
"makemacosarm64": "electron-forge make --platform darwin --arch arm64",
"makemacosuniversal": "",
"makelinux": "electron-forge make --platform linux"
"start": "electron .",
"make": "electron-builder --config",
"make_macos_x64": "electron-builder --mac dmg --x64",
"make_macos_ia32": "electron-builder --mac dmg --ia32",
"make_macos_arm64": "electron-builder --mac dmg --arm64",
"make_windows_x64": "electron-builder --windows nsis --x64",
"make_windows_ia32": "electron-builder --windows nsis --ia32",
"make_windows_arm64": "electron-builder --windows nsis --arm64"
},
"build": {
"appId": "org.simplewebserver.simplewebserver",
"productName": "Simple Web Server",
"copyright": "MIT License",
"files": [
"./index.js",
"./directory-listing-template-static.html",
"./directory-listing-template.html",
"./index.html",
"./LICENSE",
"./main.js",
"./mime.js",
"./open_source_licenses.txt",
"./preload.js",
"./style.css",
"./WSC.js",
"./images/logo.png",
"./fonts/**",
"./WSC/**"
],
"mac": {
"icon": "images/icon.icns"
}
},
"devDependencies": {
"@electron-forge/cli": "^6.0.0-beta.57",
"@electron-forge/maker-appx": "^6.0.0-beta.59",
"@electron-forge/maker-deb": "6.0.0-beta.53",
"@electron-forge/maker-dmg": "6.0.0-beta.53",
"@electron-forge/maker-rpm": "6.0.0-beta.53",
"@electron-forge/maker-squirrel": "6.0.0-beta.53",
"@electron-forge/maker-zip": "6.0.0-beta.53",
"electron": "^13.6.6",
"electron-squirrel-startup": "^1.0.0",
"electron-windows-store": "^2.1.0"
"electron-builder": "^23.0.3"
},
"dependencies": {
"@electron-forge/maker-wix": "^6.0.0-beta.63",
"atob": "^2.1.2",
"http": "^0.0.1-security",
"https": "^1.0.0",
"node-blob": "0.0.2",
"node-forge": "^1.3.1"
},
"config": {
"forge": {
"packagerConfig": {
"icon": "images/icon.ico",
"ignore": [
".git/",
"dist/",
"www/",
"out/",
".github/",
".gitignore"
]
},
"make_targets": {
"win32": [
"squirrel",
"wix",
"appx"
],
"darwin": [
"zip",
"dmg"
],
"linux": [
"deb",
"rpm",
"flatpak",
"snap"
]
},
"makers": [
{
"name": "@electron-forge/maker-squirrel",
"config": {
"name": "web_server"
}
},
{
"name": "@electron-forge/maker-zip",
"platforms": [
"darwin"
]
},
{
"name": "@electron-forge/maker-dmg",
"platforms": [
"darwin"
]
},
{
"name": "@electron-forge/maker-deb",
"config": {}
},
{
"name": "@electron-forge/maker-rpm",
"config": {}
},
{
"name": "@electron-forge/maker-appx",
"config": {
"publisher": "CN=SimpleWebServer",
"expandedBaseImage": "images/icon.ico"
}
},
{
"name": "@electron-forge/maker-wix",
"config": {
"language": 1033,
"manufacturer": "Simple Web Server"
}
}
]
}
}
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.