jeans/etcher
jeans/etcher
1
0
Fork 0
mirror of https://github.com/balena-io/etcher.git synced 2025-07-19 01:06:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3495 from balena-io/etcher-dev-server

Browse Source 
Etcher dev server
This commit is contained in:
bulldozer-balena[bot] 2021-04-29 08:45:03 +00:00 committed by GitHub
commit e9ce270dab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 3045 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/gui/app/app.ts
View File

@ -38,6 +38,7 @@ import * as exceptionReporter from './modules/exception-reporter';
import * as osDialog from './os/dialog'; import * as osDialog from './os/dialog';
import * as windowProgress from './os/window-progress'; import * as windowProgress from './os/window-progress';
import MainPage from './pages/main/MainPage'; import MainPage from './pages/main/MainPage';
import './css/main.css';
window.addEventListener( window.addEventListener(
'unhandledrejection', 'unhandledrejection',
@ -339,7 +340,7 @@ window.addEventListener('beforeunload', async (event) => {
} }
}); });
async function main() { export async function main() {
await ledsInit(); await ledsInit();
ReactDOM.render( ReactDOM.render(
React.createElement(MainPage), React.createElement(MainPage),
@ -356,5 +357,3 @@ async function main() {
}, },
); );
} }
main();

12
lib/gui/app/index.dev.html Normal file
View File

@ -0,0 +1,12 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>Etcher</title>
<link rel="stylesheet" type="text/css" href="index.css">
</head>
<body>
<main id="main"></main>
<script src="http://localhost:3030/gui.js"></script>
</body>
</html>

10
lib/gui/app/renderer.ts Normal file
View File

@ -0,0 +1,10 @@
// @ts-nocheck
import { main } from './app';
if (module.hot) {
module.hot.accept('./app', () => {
main();
});
}
main();

2984
npm-shrinkwrap.json generated
View File

File diff suppressed because it is too large Load Diff

16
package.json
View File

@ -25,7 +25,7 @@
"start": "./node_modules/.bin/electron .", "start": "./node_modules/.bin/electron .",
"postshrinkwrap": "ts-node ./scripts/clean-shrinkwrap.ts", "postshrinkwrap": "ts-node ./scripts/clean-shrinkwrap.ts",
"webpack": "webpack", "webpack": "webpack",
"watch": "webpack --watch", "watch": "webpack serve --no-optimization-minimize --config ./webpack.dev.config.ts",
"concourse-build-electron": "npm run webpack", "concourse-build-electron": "npm run webpack",
"concourse-test": "npx npm@6.14.8 test", "concourse-test": "npx npm@6.14.8 test",
"concourse-test-electron": "npx npm@6.14.8 test" "concourse-test-electron": "npx npm@6.14.8 test"
@ -66,7 +66,7 @@
"@types/mime-types": "^2.1.0", "@types/mime-types": "^2.1.0",
"@types/mini-css-extract-plugin": "^1.2.2", "@types/mini-css-extract-plugin": "^1.2.2",
"@types/mocha": "^8.0.3", "@types/mocha": "^8.0.3",
"@types/node": "^12.12.39", "@types/node": "^14.14.41",
"@types/node-ipc": "^9.1.2", "@types/node-ipc": "^9.1.2",
"@types/react-dom": "^16.8.4", "@types/react-dom": "^16.8.4",
"@types/semver": "^7.1.0", "@types/semver": "^7.1.0",
@ -110,16 +110,18 @@
"sinon": "^9.0.2", "sinon": "^9.0.2",
"spectron": "^14.0.0", "spectron": "^14.0.0",
"string-replace-loader": "^3.0.1", "string-replace-loader": "^3.0.1",
"style-loader": "^2.0.0",
"styled-components": "^5.1.0", "styled-components": "^5.1.0",
"sudo-prompt": "github:zvin/sudo-prompt#7cdede2f0da28fbcc2db48402d7d935f3a825c91", "sudo-prompt": "github:zvin/sudo-prompt#7cdede2f0da28fbcc2db48402d7d935f3a825c91",
"sys-class-rgb-led": "^3.0.0", "sys-class-rgb-led": "^3.0.0",
"ts-loader": "^8.0.12", "ts-loader": "^8.0.12",
"ts-node": "^9.0.0", "ts-node": "^9.1.1",
"tslib": "^2.0.0", "tslib": "^2.0.0",
"typescript": "^4.1.2", "typescript": "^4.2.2",
"url-loader": "^4.1.1",
"uuid": "^8.1.0", "uuid": "^8.1.0",
"webpack": "^5.11.0", "webpack": "^5.11.0",
"webpack-cli": "^4.2.0" "webpack-cli": "^4.2.0",
}, "webpack-dev-server": "^3.11.2"
"dependencies": {} }
} }

60
webpack.config.ts
View File

@ -17,7 +17,6 @@
import * as CopyPlugin from 'copy-webpack-plugin'; import * as CopyPlugin from 'copy-webpack-plugin';
import { readdirSync } from 'fs'; import { readdirSync } from 'fs';
import * as _ from 'lodash'; import * as _ from 'lodash';
import * as MiniCssExtractPlugin from 'mini-css-extract-plugin';
import * as os from 'os'; import * as os from 'os';
import outdent from 'outdent'; import outdent from 'outdent';
import * as path from 'path'; import * as path from 'path';
@ -120,7 +119,7 @@ function fetchWasm(...where: string[]) {
} catch { } catch {
} }
function appPath() { function appPath() {
return Path.isAbsolute(__dirname) ? return Path.isAbsolute(__dirname) ?
__dirname : __dirname :
Path.join( Path.join(
// With macOS universal builds, getAppPath() returns the path to an app.asar file containing an index.js file which will // With macOS universal builds, getAppPath() returns the path to an app.asar file containing an index.js file which will
@ -158,7 +157,12 @@ const commonConfig = {
rules: [ rules: [
{ {
test: /\.css$/, test: /\.css$/,
use: 'css-loader', use: ['style-loader', 'css-loader'],
},
{
test: /\.(woff|woff2|eot|ttf|otf)$/,
loader: 'file-loader',
options: { name: renameNodeModules },
}, },
{ {
test: /\.svg$/, test: /\.svg$/,
@ -348,10 +352,18 @@ const guiConfig = {
__filename: true, __filename: true,
}, },
entry: { entry: {
gui: path.join(__dirname, 'lib', 'gui', 'app', 'app.ts'), gui: path.join(__dirname, 'lib', 'gui', 'app', 'renderer.ts'),
}, },
plugins: [ plugins: [
...commonConfig.plugins, ...commonConfig.plugins,
new CopyPlugin({
patterns: [
{ from: 'lib/gui/app/index.html', to: 'index.html' },
// electron-builder doesn't bundle folders named "assets"
// See https://github.com/electron-userland/electron-builder/issues/4545
{ from: 'assets/icon.png', to: 'media/icon.png' },
],
}),
// Remove "Download the React DevTools for a better development experience" message // Remove "Download the React DevTools for a better development experience" message
new BannerPlugin({ new BannerPlugin({
banner: '__REACT_DEVTOOLS_GLOBAL_HOOK__ = { isDisabled: true };', banner: '__REACT_DEVTOOLS_GLOBAL_HOOK__ = { isDisabled: true };',
@ -390,42 +402,4 @@ const childWriterConfig = {
}, },
}; };
const cssConfig = { export default [guiConfig, etcherConfig, childWriterConfig];
mode: 'production',
optimization: {
minimize: false,
},
module: {
rules: [
{
test: /\.css$/i,
use: [MiniCssExtractPlugin.loader, 'css-loader'],
},
{
test: /\.(woff|woff2|eot|ttf|otf|svg)$/,
loader: 'file-loader',
options: { name: renameNodeModules },
},
],
},
plugins: [
new MiniCssExtractPlugin({ filename: '[name].css' }),
new CopyPlugin({
patterns: [
{ from: 'lib/gui/app/index.html', to: 'index.html' },
// electron-builder doesn't bundle folders named "assets"
// See https://github.com/electron-userland/electron-builder/issues/4545
{ from: 'assets/icon.png', to: 'media/icon.png' },
],
}),
],
entry: {
index: path.join(__dirname, 'lib', 'gui', 'app', 'css', 'main.css'),
},
output: {
publicPath: '',
path: path.join(__dirname, 'generated'),
},
};
module.exports = [cssConfig, guiConfig, etcherConfig, childWriterConfig];

22
webpack.dev.config.ts Normal file
View File

@ -0,0 +1,22 @@
import configs from './webpack.config';
import { WebpackOptionsNormalized } from 'webpack';
import * as fs from 'fs';
const [
guiConfig,
etcherConfig,
childWriterConfig,
] = (configs as unknown) as WebpackOptionsNormalized[];
configs.forEach((config) => {
config.mode = 'development';
});
guiConfig.devServer = {
hot: true,
port: 3030,
};
fs.copyFileSync('./lib/gui/app/index.dev.html', './generated/index.html');
export default [guiConfig, etcherConfig, childWriterConfig];