mirror of
https://github.com/balena-io/etcher.git
synced 2025-04-21 13:57:17 +00:00
Compare commits
No commits in common. "master" and "v1.19.18" have entirely different histories.
9
.github/actions/publish/action.yml
vendored
9
.github/actions/publish/action.yml
vendored
@ -53,13 +53,6 @@ runs:
|
||||
shell: bash
|
||||
run: sudo apt-get install -y --no-install-recommends fakeroot dpkg rpm
|
||||
|
||||
# rpmbuild will strip binaries by default, which breaks the sidecar.
|
||||
# Use a macro to override the "strip" to bypass stripping.
|
||||
- name: Configure rpmbuild to not strip executables
|
||||
if: runner.os == 'Linux'
|
||||
shell: bash
|
||||
run: echo '%__strip /usr/bin/true' > ~/.rpmmacros
|
||||
|
||||
- name: Install host dependencies
|
||||
if: runner.os == 'macOS'
|
||||
# FIXME: Python 3.12 dropped distutils that node-gyp depends upon.
|
||||
@ -138,7 +131,7 @@ runs:
|
||||
PLATFORM=Windows
|
||||
SHA256SUM_BIN=sha256sum
|
||||
|
||||
# Install DigiCert Signing Manager Tools
|
||||
# Install DigiCert Signing Manager Tools
|
||||
curl --silent --retry 3 --fail https://one.digicert.com/signingmanager/api-ui/v1/releases/smtools-windows-x64.msi/download \
|
||||
-H "x-api-key:$SM_API_KEY" \
|
||||
-o smtools-windows-x64.msi
|
||||
|
||||
6
.github/actions/test/action.yml
vendored
6
.github/actions/test/action.yml
vendored
@ -55,12 +55,6 @@ runs:
|
||||
# fi
|
||||
|
||||
npm ci
|
||||
|
||||
# as the shrinkwrap might have been done on mac/linux, this is ensure the package is there for windows
|
||||
if [[ "$RUNNER_OS" == "Windows" ]]; then
|
||||
npm i -D winusb-driver-generator
|
||||
fi
|
||||
|
||||
npm run lint
|
||||
npm run package
|
||||
npm run wdio # test stage, note that it requires the package to be done first
|
||||
|
||||
19
.github/workflows/flowzone.yml
vendored
19
.github/workflows/flowzone.yml
vendored
@ -18,24 +18,7 @@ jobs:
|
||||
(github.event.pull_request.head.repo.full_name != github.repository && github.event_name == 'pull_request_target')
|
||||
secrets: inherit
|
||||
with:
|
||||
custom_test_matrix: >
|
||||
{
|
||||
"os": [
|
||||
["ubuntu-22.04"],
|
||||
["windows-2019"],
|
||||
["macos-13"],
|
||||
["macos-latest-xlarge"]
|
||||
]
|
||||
}
|
||||
custom_publish_matrix: >
|
||||
{
|
||||
"os": [
|
||||
["ubuntu-22.04"],
|
||||
["windows-2019"],
|
||||
["macos-13"],
|
||||
["macos-latest-xlarge"]
|
||||
]
|
||||
}
|
||||
custom_runs_on: '[["ubuntu-20.04"],["windows-2019"],["macos-12"],["macos-latest-xlarge"]]'
|
||||
restrict_custom_actions: false
|
||||
github_prerelease: true
|
||||
cloudflare_website: "etcher"
|
||||
|
||||
@ -1,125 +1,3 @@
|
||||
- commits:
|
||||
- subject: Add informational notice about how to disable analytics collection
|
||||
hash: aac092fd4df8750024c082b25dcbd0ae6ee618fd
|
||||
body: ""
|
||||
footer:
|
||||
Change-type: minor
|
||||
change-type: minor
|
||||
author: myarmolinsky
|
||||
nested: []
|
||||
version: 2.1.0
|
||||
title: ""
|
||||
date: 2025-02-27T16:16:57.036Z
|
||||
- commits:
|
||||
- subject: "major: build on ubuntu 22 and macos 13"
|
||||
hash: 039a022353d1980ef9ddd19166515c531e48aba4
|
||||
body: ""
|
||||
footer: {}
|
||||
author: Edwin Joassart
|
||||
nested: []
|
||||
version: 2.0.0
|
||||
title: ""
|
||||
date: 2025-02-20T14:27:01.338Z
|
||||
- commits:
|
||||
- subject: "patch: bump etcher-sdk to 9.1.2"
|
||||
hash: c726b51dca3383c76f4bf824fd5d594ac3069180
|
||||
body: ""
|
||||
footer: {}
|
||||
author: Edwin Joassart
|
||||
nested: []
|
||||
version: 1.19.25
|
||||
title: ""
|
||||
date: 2024-10-10T10:03:29.519Z
|
||||
- commits:
|
||||
- subject: "patch: etcher-util is corrupted in RPM package"
|
||||
hash: e43ee788ec5ec49e105ff804206919bb10a59ea7
|
||||
body: |
|
||||
rpmbuild strips executables by default when generating an rpm packge.
|
||||
This was causing the JavaScript code bundled in the etcher-util file
|
||||
to be removed, causing "Pkg: Error reading from file." whenever
|
||||
etcher-util was called.
|
||||
|
||||
This in turn caused balena-etcher to generate the error message
|
||||
`Error: (0, h.requestMetadata) is not a function` when attempting
|
||||
to write an SD card.
|
||||
|
||||
This fixes the issue for RPM builds by replacing the `strip` command
|
||||
with `true` so that rpmbuild no longer strips the executables and
|
||||
the embeded code stays intact.
|
||||
|
||||
See: https://github.com/balena-io/etcher/issues/4150
|
||||
footer:
|
||||
Signed-off-by: Richard Glidden <richard@glidden.org>
|
||||
signed-off-by: Richard Glidden <richard@glidden.org>
|
||||
author: Richard Glidden
|
||||
nested: []
|
||||
version: 1.19.24
|
||||
title: ""
|
||||
date: 2024-10-09T14:22:56.623Z
|
||||
- commits:
|
||||
- subject: "patch: remove gconf2 libgconf-2-4 deps"
|
||||
hash: 2ed779ef371db367e4e413c9d0d08fcd738edb5b
|
||||
body: "Closes #4096"
|
||||
footer: {}
|
||||
author: Marc-Aurèle Brothier
|
||||
nested: []
|
||||
version: 1.19.23
|
||||
title: ""
|
||||
date: 2024-10-09T13:52:54.936Z
|
||||
- commits:
|
||||
- subject: Replace deprecated Flowzone inputs
|
||||
hash: 52d396aa7ea9ae1ef6d68151f582f04f57191b14
|
||||
body: ""
|
||||
footer:
|
||||
Change-type: patch
|
||||
change-type: patch
|
||||
author: Kyle Harding
|
||||
nested: []
|
||||
version: 1.19.22
|
||||
title: ""
|
||||
date: 2024-07-18T18:12:56.368Z
|
||||
- commits:
|
||||
- subject: "patch: fix missing windows dependency"
|
||||
hash: 8dad81ae34b8d71f3d4f7151ee60717e6207ccd8
|
||||
body: ""
|
||||
footer: {}
|
||||
author: Edwin Joassart
|
||||
nested: []
|
||||
- subject: "patch: fix missing windows dependency"
|
||||
hash: d28719daf249f2994acdf94b4bb7ea937ffcab9b
|
||||
body: ""
|
||||
footer: {}
|
||||
author: Edwin Joassart
|
||||
nested: []
|
||||
- subject: "patch: fix missing windows dependency"
|
||||
hash: 98db4df0dc147e5fec9180c50f4e21acf1fd0a58
|
||||
body: ""
|
||||
footer: {}
|
||||
author: Edwin Joassart
|
||||
nested: []
|
||||
version: 1.19.21
|
||||
title: ""
|
||||
date: 2024-05-30T15:00:35.706Z
|
||||
- commits:
|
||||
- subject: "patch: fix missing windows dependency"
|
||||
hash: c4d3f8db8769418925a9909ac700edc5f425a068
|
||||
body: ""
|
||||
footer: {}
|
||||
author: Edwin Joassart
|
||||
nested: []
|
||||
version: 1.19.20
|
||||
title: ""
|
||||
date: 2024-05-30T10:17:29.075Z
|
||||
- commits:
|
||||
- subject: "patch: add sentry debug flag"
|
||||
hash: 8223130e8dfce180481550d77f022064255601e4
|
||||
body: ""
|
||||
footer: {}
|
||||
author: Edwin Joassart
|
||||
nested: []
|
||||
version: 1.19.19
|
||||
title: ""
|
||||
date: 2024-05-28T12:09:51.167Z
|
||||
- commits:
|
||||
- subject: "patch: fix Sentry DSN for main process"
|
||||
hash: 4ffda6e208a6e2f109f652d39e1248bec23a2ddf
|
||||
@ -1276,10 +1154,13 @@
|
||||
nested: []
|
||||
- subject: "Patch: run linux build on ubuntu-20.04"
|
||||
hash: adcd8e0325bc891460b3e51aa5403f8675189f13
|
||||
body: |-
|
||||
as [`18.04` has been removed](https://github.blog/changelog/2022-08-09-github-actions-the-ubuntu-18-04-actions-runner-image-is-being-deprecated-and-will-be-removed-by-12-1-22/)
|
||||
body: >-
|
||||
as [`18.04` has been
|
||||
removed](https://github.blog/changelog/2022-08-09-github-actions-the-ubuntu-18-04-actions-runner-image-is-being-deprecated-and-will-be-removed-by-12-1-22/)
|
||||
|
||||
We cannot use `latest` as the glibc version will cause issue with older ubuntu version.
|
||||
|
||||
We cannot use `latest` as the glibc version will cause issue with older
|
||||
ubuntu version.
|
||||
footer: {}
|
||||
author: Edwin Joassart
|
||||
nested: []
|
||||
@ -12024,19 +11905,40 @@
|
||||
changelog-entry: Don't include user paths in Mixpanel usage reports
|
||||
link: https://github.com/resin-io-modules/etcher-image-stream/blob/master/CHANGELOG.md
|
||||
subject: Fix uncaught exception if no file was selected from a dialog
|
||||
body: |-
|
||||
body: >-
|
||||
The following error is thrown if the open file dialog is cancelled
|
||||
|
||||
without any selection:
|
||||
|
||||
Unhandled rejection TypeError: Cannot read property '0' of undefined
|
||||
at Number.indexedGetter (/home/parallels/Projects/etcher/node_modules/bluebird/js/release/call_get.js:106:15)
|
||||
at Number.tryCatcher (/home/parallels/Projects/etcher/node_modules/bluebird/js/release/util.js:16:23)
|
||||
at Promise._settlePromiseFromHandler (/home/parallels/Projects/etcher/node_modules/bluebird/js/release/promise.js:503:31)
|
||||
at Promise._settlePromise (/home/parallels/Projects/etcher/node_modules/bluebird/js/release/promise.js:560:18)
|
||||
at Promise._settlePromise0 (/home/parallels/Projects/etcher/node_modules/bluebird/js/release/promise.js:605:10)
|
||||
at Promise._settlePromises (/home/parallels/Projects/etcher/node_modules/bluebird/js/release/promise.js:684:18)
|
||||
at Async._drainQueue (/home/parallels/Projects/etcher/node_modules/bluebird/js/release/async.js:126:16)
|
||||
at Async._drainQueues (/home/parallels/Projects/etcher/node_modules/bluebird/js/release/async.js:136:10)
|
||||
at Immediate.Async.drainQueues [as _onImmediate] (/home/parallels/Projects/etcher/node_modules/bluebird/js/release/async.js:16:14)
|
||||
|
||||
at Number.indexedGetter
|
||||
(/home/parallels/Projects/etcher/node_modules/bluebird/js/release/call_get.js:106:15)
|
||||
|
||||
at Number.tryCatcher
|
||||
(/home/parallels/Projects/etcher/node_modules/bluebird/js/release/util.js:16:23)
|
||||
|
||||
at Promise._settlePromiseFromHandler
|
||||
(/home/parallels/Projects/etcher/node_modules/bluebird/js/release/promise.js:503:31)
|
||||
|
||||
at Promise._settlePromise
|
||||
(/home/parallels/Projects/etcher/node_modules/bluebird/js/release/promise.js:560:18)
|
||||
|
||||
at Promise._settlePromise0
|
||||
(/home/parallels/Projects/etcher/node_modules/bluebird/js/release/promise.js:605:10)
|
||||
|
||||
at Promise._settlePromises
|
||||
(/home/parallels/Projects/etcher/node_modules/bluebird/js/release/promise.js:684:18)
|
||||
|
||||
at Async._drainQueue
|
||||
(/home/parallels/Projects/etcher/node_modules/bluebird/js/release/async.js:126:16)
|
||||
|
||||
at Async._drainQueues
|
||||
(/home/parallels/Projects/etcher/node_modules/bluebird/js/release/async.js:136:10)
|
||||
|
||||
at Immediate.Async.drainQueues [as _onImmediate]
|
||||
(/home/parallels/Projects/etcher/node_modules/bluebird/js/release/async.js:16:14)
|
||||
|
||||
at processImmediate [as _immediateCallback] (timers.js:383:17)
|
||||
- hash: 6bd086f1c5c6654a47125cf2d46788655cae2553
|
||||
author: Juan Cruz Viotti
|
||||
@ -12633,14 +12535,21 @@
|
||||
changelog-entry: Use info icon instead of "SHOW FULL FILE NAME" in first step.
|
||||
fixes: https://github.com/resin-io/etcher/issues/458
|
||||
subject: Make use of AppImage desktop integration script
|
||||
body: |-
|
||||
body: >-
|
||||
This is useful to prompt the user to install the `.desktop` file.
|
||||
|
||||
The `Description` key in `Etcher.desktop` was changed to `Comment` since
|
||||
|
||||
`desktop-file-validate` complained with:
|
||||
|
||||
Etcher.desktop: error: file contains key "Description" in group "Desktop
|
||||
|
||||
Entry", but keys extending the format should start with "X-"
|
||||
|
||||
After checking the desktop file format specification, the correct key
|
||||
|
||||
should be "Comment"
|
||||
|
||||
(https://specifications.freedesktop.org/desktop-entry-spec/latest/ar01s05.html).
|
||||
- hash: c3e360e61933ef0044c005b5e92c879ff9a47c49
|
||||
author: Juan Cruz Viotti
|
||||
@ -12853,12 +12762,17 @@
|
||||
changelog-entry: Fix flashing never starting after elevation in GNU/Linux.
|
||||
fixes: https://github.com/resin-io/etcher/issues/665
|
||||
subject: Make all angular modules export the name of the module
|
||||
body: |-
|
||||
body: >-
|
||||
This makes them very nicely require-able, for example:
|
||||
|
||||
angular.module('MyModule', [
|
||||
|
||||
require('my-dependency');
|
||||
|
||||
]);
|
||||
From https://medium.com/@kentcdodds/how-to-distribute-your-angularjs-module-e04d4dd58ddc#.yqg2zo8im
|
||||
|
||||
From
|
||||
https://medium.com/@kentcdodds/how-to-distribute-your-angularjs-module-e04d4dd58ddc#.yqg2zo8im
|
||||
- hash: b8f63af3f81bca3abd055303bc91ab35eb126655
|
||||
author: Juan Cruz Viotti
|
||||
footers:
|
||||
|
||||
47
CHANGELOG.md
47
CHANGELOG.md
@ -3,53 +3,6 @@
|
||||
All notable changes to this project will be documented in this file.
|
||||
This project adheres to [Semantic Versioning](http://semver.org/).
|
||||
|
||||
# v2.1.0
|
||||
## (2025-02-27)
|
||||
|
||||
* Add informational notice about how to disable analytics collection [myarmolinsky]
|
||||
|
||||
# v2.0.0
|
||||
## (2025-02-20)
|
||||
|
||||
* major: build on ubuntu 22 and macos 13 [Edwin Joassart]
|
||||
|
||||
# v1.19.25
|
||||
## (2024-10-10)
|
||||
|
||||
* patch: bump etcher-sdk to 9.1.2 [Edwin Joassart]
|
||||
|
||||
# v1.19.24
|
||||
## (2024-10-09)
|
||||
|
||||
* patch: etcher-util is corrupted in RPM package [Richard Glidden]
|
||||
|
||||
# v1.19.23
|
||||
## (2024-10-09)
|
||||
|
||||
* patch: remove gconf2 libgconf-2-4 deps [Marc-Aurèle Brothier]
|
||||
|
||||
# v1.19.22
|
||||
## (2024-07-18)
|
||||
|
||||
* Replace deprecated Flowzone inputs [Kyle Harding]
|
||||
|
||||
# v1.19.21
|
||||
## (2024-05-30)
|
||||
|
||||
* patch: fix missing windows dependency [Edwin Joassart]
|
||||
* patch: fix missing windows dependency [Edwin Joassart]
|
||||
* patch: fix missing windows dependency [Edwin Joassart]
|
||||
|
||||
# v1.19.20
|
||||
## (2024-05-30)
|
||||
|
||||
* patch: fix missing windows dependency [Edwin Joassart]
|
||||
|
||||
# v1.19.19
|
||||
## (2024-05-28)
|
||||
|
||||
* patch: add sentry debug flag [Edwin Joassart]
|
||||
|
||||
# v1.19.18
|
||||
## (2024-05-22)
|
||||
|
||||
|
||||
@ -122,6 +122,7 @@ run Etcher on a GNU/Linux system.
|
||||
- xrender
|
||||
- xtst
|
||||
- xscrnsaver
|
||||
- gconf-2.0
|
||||
- gmodule-2.0
|
||||
- nss
|
||||
|
||||
|
||||
@ -308,7 +308,6 @@ const FlowSelector = styled(
|
||||
|
||||
interface SourceSelectorProps {
|
||||
flashing: boolean;
|
||||
hideAnalyticsAlert: () => void;
|
||||
}
|
||||
|
||||
interface SourceSelectorState {
|
||||
@ -360,20 +359,6 @@ export class SourceSelector extends React.Component<
|
||||
ipcRenderer.removeListener('select-image', this.onSelectImage);
|
||||
}
|
||||
|
||||
public componentDidUpdate(
|
||||
_prevProps: Readonly<SourceSelectorProps>,
|
||||
prevState: Readonly<SourceSelectorState>,
|
||||
) {
|
||||
if (
|
||||
(!prevState.showDriveSelector && this.state.showDriveSelector) ||
|
||||
(!prevState.showURLSelector && this.state.showURLSelector) ||
|
||||
(!prevState.showImageDetails && this.state.showImageDetails) ||
|
||||
(!prevState.imageSelectorOpen && this.state.imageSelectorOpen)
|
||||
) {
|
||||
this.props.hideAnalyticsAlert();
|
||||
}
|
||||
}
|
||||
|
||||
private async onSelectImage(_event: IpcRendererEvent, imagePath: string) {
|
||||
this.setState({ imageLoading: true });
|
||||
await this.selectSource(
|
||||
@ -397,7 +382,6 @@ export class SourceSelector extends React.Component<
|
||||
});
|
||||
|
||||
selectionState.deselectImage();
|
||||
this.props.hideAnalyticsAlert();
|
||||
}
|
||||
|
||||
private selectSource(
|
||||
|
||||
@ -100,14 +100,12 @@ interface TargetSelectorProps {
|
||||
disabled: boolean;
|
||||
hasDrive: boolean;
|
||||
flashing: boolean;
|
||||
hideAnalyticsAlert: () => void;
|
||||
}
|
||||
|
||||
export const TargetSelector = ({
|
||||
disabled,
|
||||
hasDrive,
|
||||
flashing,
|
||||
hideAnalyticsAlert,
|
||||
}: TargetSelectorProps) => {
|
||||
// TODO: inject these from redux-connector
|
||||
const [{ driveListLabel, targets }, setStateSlice] = React.useState(
|
||||
@ -139,7 +137,6 @@ export const TargetSelector = ({
|
||||
tooltip={driveListLabel}
|
||||
openDriveSelector={() => {
|
||||
setShowTargetSelectorModal(true);
|
||||
hideAnalyticsAlert();
|
||||
}}
|
||||
reselectDrive={() => {
|
||||
analytics.logEvent('Reselect drive');
|
||||
|
||||
@ -122,11 +122,7 @@ let analyticsClient: Client;
|
||||
export const initAnalytics = once(() => {
|
||||
const dsn =
|
||||
settings.getSync('analyticsSentryToken') || process.env.SENTRY_TOKEN;
|
||||
SentryRenderer.init({
|
||||
dsn,
|
||||
beforeSend: anonymizeSentryData,
|
||||
debug: process.env.ETCHER_SENTRY_DEBUG === 'true',
|
||||
});
|
||||
SentryRenderer.init({ dsn, beforeSend: anonymizeSentryData });
|
||||
|
||||
const projectName =
|
||||
settings.getSync('analyticsAmplitudeToken') || process.env.AMPLITUDE_TOKEN;
|
||||
|
||||
@ -15,13 +15,12 @@
|
||||
*/
|
||||
|
||||
import CogSvg from '@fortawesome/fontawesome-free/svgs/solid/gear.svg';
|
||||
import CloseSvg from '@fortawesome/fontawesome-free/svgs/solid/x.svg';
|
||||
import QuestionCircleSvg from '@fortawesome/fontawesome-free/svgs/solid/circle-question.svg';
|
||||
|
||||
import * as path from 'path';
|
||||
import prettyBytes from 'pretty-bytes';
|
||||
import * as React from 'react';
|
||||
import { Alert, Flex, Link } from 'rendition';
|
||||
import { Flex } from 'rendition';
|
||||
import styled from 'styled-components';
|
||||
|
||||
import FinishPage from '../../components/finish/finish';
|
||||
@ -36,7 +35,6 @@ import { observe } from '../../models/store';
|
||||
import { open as openExternal } from '../../os/open-external/services/open-external';
|
||||
import {
|
||||
IconButton as BaseIcon,
|
||||
IconButton,
|
||||
ThemedProvider,
|
||||
} from '../../styled-components';
|
||||
|
||||
@ -48,7 +46,6 @@ import { FlashStep } from './Flash';
|
||||
|
||||
import EtcherSvg from '../../../assets/etcher.svg';
|
||||
import { SafeWebview } from '../../components/safe-webview/safe-webview';
|
||||
import { theme } from '../../theme';
|
||||
|
||||
const Icon = styled(BaseIcon)`
|
||||
margin-right: 20px;
|
||||
@ -100,8 +97,6 @@ const StepBorder = styled.div<{
|
||||
margin-left: ${(props) => (props.right ? '-120px' : undefined)};
|
||||
`;
|
||||
|
||||
const ANALYTICS_ALERT_VISIBILITY_KEY = 'analytics_alert_visible';
|
||||
|
||||
interface MainPageStateFromStore {
|
||||
isFlashing: boolean;
|
||||
hasImage: boolean;
|
||||
@ -118,7 +113,6 @@ interface MainPageState {
|
||||
isWebviewShowing: boolean;
|
||||
hideSettings: boolean;
|
||||
featuredProjectURL?: string;
|
||||
analyticsAlertIsVisible: boolean;
|
||||
}
|
||||
|
||||
export class MainPage extends React.Component<
|
||||
@ -131,8 +125,6 @@ export class MainPage extends React.Component<
|
||||
current: 'main',
|
||||
isWebviewShowing: false,
|
||||
hideSettings: true,
|
||||
analyticsAlertIsVisible:
|
||||
localStorage.getItem(ANALYTICS_ALERT_VISIBILITY_KEY) !== 'false',
|
||||
...this.stateHelper(),
|
||||
};
|
||||
}
|
||||
@ -161,13 +153,6 @@ export class MainPage extends React.Component<
|
||||
return url.toString();
|
||||
}
|
||||
|
||||
private hideAnalyticsAlert = () => {
|
||||
if (this.state.analyticsAlertIsVisible) {
|
||||
localStorage.setItem(ANALYTICS_ALERT_VISIBILITY_KEY, 'false');
|
||||
this.setState({ analyticsAlertIsVisible: false });
|
||||
}
|
||||
};
|
||||
|
||||
public async componentDidMount() {
|
||||
observe(() => {
|
||||
this.setState(this.stateHelper());
|
||||
@ -175,17 +160,6 @@ export class MainPage extends React.Component<
|
||||
this.setState({ featuredProjectURL: await this.getFeaturedProjectURL() });
|
||||
}
|
||||
|
||||
public componentDidUpdate(
|
||||
_prevProps: object,
|
||||
prevState: Readonly<MainPageState & MainPageStateFromStore>,
|
||||
) {
|
||||
if (this.state.analyticsAlertIsVisible) {
|
||||
if (prevState.hideSettings !== this.state.hideSettings) {
|
||||
this.setState({ analyticsAlertIsVisible: false });
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private renderMain() {
|
||||
const state = flashState.getFlashState();
|
||||
const shouldDriveStepBeDisabled = !this.state.hasImage;
|
||||
@ -195,127 +169,86 @@ export class MainPage extends React.Component<
|
||||
!this.state.isFlashing || !this.state.isWebviewShowing;
|
||||
return (
|
||||
<Flex
|
||||
m={`110px ${this.state.isWebviewShowing ? 35 : 55}px 18px ${this.state.isWebviewShowing ? 35 : 55}px`}
|
||||
flexDirection="column"
|
||||
m={`110px ${this.state.isWebviewShowing ? 35 : 55}px`}
|
||||
justifyContent="space-between"
|
||||
>
|
||||
<Flex
|
||||
justifyContent="space-between"
|
||||
mb={this.state.analyticsAlertIsVisible ? '0px' : '92px'}
|
||||
>
|
||||
{notFlashingOrSplitView && (
|
||||
<>
|
||||
<SourceSelector
|
||||
flashing={this.state.isFlashing}
|
||||
hideAnalyticsAlert={this.hideAnalyticsAlert}
|
||||
/>
|
||||
<Flex>
|
||||
<StepBorder disabled={shouldDriveStepBeDisabled} left />
|
||||
</Flex>
|
||||
<TargetSelector
|
||||
disabled={shouldDriveStepBeDisabled}
|
||||
hasDrive={this.state.hasDrive}
|
||||
flashing={this.state.isFlashing}
|
||||
hideAnalyticsAlert={this.hideAnalyticsAlert}
|
||||
/>
|
||||
<Flex>
|
||||
<StepBorder disabled={shouldFlashStepBeDisabled} right />
|
||||
</Flex>
|
||||
</>
|
||||
)}
|
||||
|
||||
{this.state.isFlashing && this.state.isWebviewShowing && (
|
||||
<Flex
|
||||
style={{
|
||||
position: 'absolute',
|
||||
top: 0,
|
||||
left: 0,
|
||||
width: '36.2vw',
|
||||
height: '100vh',
|
||||
zIndex: 1,
|
||||
boxShadow: '0 2px 15px 0 rgba(0, 0, 0, 0.2)',
|
||||
}}
|
||||
>
|
||||
<ReducedFlashingInfos
|
||||
imageLogo={this.state.imageLogo}
|
||||
imageName={this.state.imageName}
|
||||
imageSize={
|
||||
typeof this.state.imageSize === 'number'
|
||||
? prettyBytes(this.state.imageSize)
|
||||
: ''
|
||||
}
|
||||
driveTitle={this.state.driveTitle}
|
||||
driveLabel={this.state.driveLabel}
|
||||
style={{
|
||||
position: 'absolute',
|
||||
color: '#fff',
|
||||
left: 35,
|
||||
top: 72,
|
||||
}}
|
||||
/>
|
||||
{notFlashingOrSplitView && (
|
||||
<>
|
||||
<SourceSelector flashing={this.state.isFlashing} />
|
||||
<Flex>
|
||||
<StepBorder disabled={shouldDriveStepBeDisabled} left />
|
||||
</Flex>
|
||||
)}
|
||||
{this.state.isFlashing && this.state.featuredProjectURL && (
|
||||
<SafeWebview
|
||||
src={this.state.featuredProjectURL}
|
||||
onWebviewShow={(isWebviewShowing: boolean) => {
|
||||
this.setState({ isWebviewShowing });
|
||||
}}
|
||||
<TargetSelector
|
||||
disabled={shouldDriveStepBeDisabled}
|
||||
hasDrive={this.state.hasDrive}
|
||||
flashing={this.state.isFlashing}
|
||||
/>
|
||||
<Flex>
|
||||
<StepBorder disabled={shouldFlashStepBeDisabled} right />
|
||||
</Flex>
|
||||
</>
|
||||
)}
|
||||
|
||||
{this.state.isFlashing && this.state.isWebviewShowing && (
|
||||
<Flex
|
||||
style={{
|
||||
position: 'absolute',
|
||||
top: 0,
|
||||
left: 0,
|
||||
width: '36.2vw',
|
||||
height: '100vh',
|
||||
zIndex: 1,
|
||||
boxShadow: '0 2px 15px 0 rgba(0, 0, 0, 0.2)',
|
||||
}}
|
||||
>
|
||||
<ReducedFlashingInfos
|
||||
imageLogo={this.state.imageLogo}
|
||||
imageName={this.state.imageName}
|
||||
imageSize={
|
||||
typeof this.state.imageSize === 'number'
|
||||
? prettyBytes(this.state.imageSize)
|
||||
: ''
|
||||
}
|
||||
driveTitle={this.state.driveTitle}
|
||||
driveLabel={this.state.driveLabel}
|
||||
style={{
|
||||
position: 'absolute',
|
||||
right: 0,
|
||||
bottom: 0,
|
||||
width: '63.8vw',
|
||||
height: '100vh',
|
||||
color: '#fff',
|
||||
left: 35,
|
||||
top: 72,
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
|
||||
<FlashStep
|
||||
width={this.state.isWebviewShowing ? '220px' : '200px'}
|
||||
goToSuccess={() => this.setState({ current: 'success' })}
|
||||
shouldFlashStepBeDisabled={shouldFlashStepBeDisabled}
|
||||
isFlashing={this.state.isFlashing}
|
||||
step={state.type}
|
||||
percentage={state.percentage}
|
||||
position={state.position}
|
||||
failed={state.failed}
|
||||
speed={state.speed}
|
||||
eta={state.eta}
|
||||
style={{ zIndex: 1 }}
|
||||
/>
|
||||
</Flex>
|
||||
{this.state.analyticsAlertIsVisible && (
|
||||
<Alert mt="18px" style={{ boxShadow: 'none', fontSize: '12px' }}>
|
||||
<Flex alignItems="center" justifyContent="space-between">
|
||||
<Flex flexDirection="column">
|
||||
<div>
|
||||
Etcher collects a limited amount of anonymous data to help us
|
||||
improve user experience. You can opt out in the{' '}
|
||||
<Link onClick={() => this.setState({ hideSettings: false })}>
|
||||
settings
|
||||
</Link>
|
||||
.
|
||||
</div>
|
||||
<div>
|
||||
For more information about how we use this data, see our{' '}
|
||||
<Link
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
openExternal('https://www.balena.io/privacy-policy');
|
||||
}}
|
||||
>
|
||||
privacy policy
|
||||
</Link>
|
||||
.
|
||||
</div>
|
||||
</Flex>
|
||||
{/* TODO: can we use onDismiss instead? */}
|
||||
<IconButton onClick={this.hideAnalyticsAlert}>
|
||||
<CloseSvg height="0.75rem" fill={theme.colors.text.main} />
|
||||
</IconButton>
|
||||
</Flex>
|
||||
</Alert>
|
||||
</Flex>
|
||||
)}
|
||||
{this.state.isFlashing && this.state.featuredProjectURL && (
|
||||
<SafeWebview
|
||||
src={this.state.featuredProjectURL}
|
||||
onWebviewShow={(isWebviewShowing: boolean) => {
|
||||
this.setState({ isWebviewShowing });
|
||||
}}
|
||||
style={{
|
||||
position: 'absolute',
|
||||
right: 0,
|
||||
bottom: 0,
|
||||
width: '63.8vw',
|
||||
height: '100vh',
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
|
||||
<FlashStep
|
||||
width={this.state.isWebviewShowing ? '220px' : '200px'}
|
||||
goToSuccess={() => this.setState({ current: 'success' })}
|
||||
shouldFlashStepBeDisabled={shouldFlashStepBeDisabled}
|
||||
isFlashing={this.state.isFlashing}
|
||||
step={state.type}
|
||||
percentage={state.percentage}
|
||||
position={state.position}
|
||||
failed={state.failed}
|
||||
speed={state.speed}
|
||||
eta={state.eta}
|
||||
style={{ zIndex: 1 }}
|
||||
/>
|
||||
</Flex>
|
||||
);
|
||||
}
|
||||
|
||||
@ -121,7 +121,6 @@ const initSentryMain = once(() => {
|
||||
SentryMain.init({
|
||||
dsn,
|
||||
beforeSend: anonymizeSentryData,
|
||||
debug: process.env.ETCHER_SENTRY_DEBUG === 'true',
|
||||
});
|
||||
console.log(SentryMain.getCurrentScope());
|
||||
});
|
||||
|
||||
29
npm-shrinkwrap.json
generated
29
npm-shrinkwrap.json
generated
@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "balena-etcher",
|
||||
"version": "2.1.0",
|
||||
"version": "1.19.18",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "balena-etcher",
|
||||
"version": "2.1.0",
|
||||
"version": "1.19.18",
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"@electron/remote": "^2.1.2",
|
||||
@ -19,7 +19,7 @@
|
||||
"drivelist": "^12.0.2",
|
||||
"electron-squirrel-startup": "^1.0.0",
|
||||
"electron-updater": "6.1.8",
|
||||
"etcher-sdk": "9.1.2",
|
||||
"etcher-sdk": "9.0.11",
|
||||
"i18next": "23.11.2",
|
||||
"immutable": "3.8.2",
|
||||
"lodash": "4.17.21",
|
||||
@ -88,8 +88,7 @@
|
||||
},
|
||||
"optionalDependencies": {
|
||||
"bufferutil": "^4.0.8",
|
||||
"utf-8-validate": "^5.0.10",
|
||||
"winusb-driver-generator": "2.1.2"
|
||||
"utf-8-validate": "^5.0.10"
|
||||
}
|
||||
},
|
||||
"node_modules/@aashutoshrathi/word-wrap": {
|
||||
@ -12955,10 +12954,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/etcher-sdk": {
|
||||
"version": "9.1.2",
|
||||
"resolved": "https://registry.npmjs.org/etcher-sdk/-/etcher-sdk-9.1.2.tgz",
|
||||
"integrity": "sha512-mFH8Q2CsqmPkWGjq7MX+WkN5ndGVBmtelYNjlB9E5nj3qXnNBBNbu3YR7P9s/Ft9HN73sKg5mP72xu/U0klG5Q==",
|
||||
"license": "Apache-2.0",
|
||||
"version": "9.0.11",
|
||||
"resolved": "https://registry.npmjs.org/etcher-sdk/-/etcher-sdk-9.0.11.tgz",
|
||||
"integrity": "sha512-pWE+gqciw8V/NUnu/ywDLOUZZFdayx7ZJdZd5KVqIkm3pgEfAlpPgvmMNDnP9+b6/UW2wPaLy6NS8EiaDqK7tQ==",
|
||||
"dependencies": {
|
||||
"@balena/node-beaglebone-usbboot": "^3.0.0",
|
||||
"@balena/udif": "^1.1.2",
|
||||
@ -12979,7 +12977,7 @@
|
||||
"lzma-native": "^8.0.6",
|
||||
"minimatch": "^9.0.3",
|
||||
"mountutils": "^1.3.20",
|
||||
"node-raspberrypi-usbboot": "1.1.0",
|
||||
"node-raspberrypi-usbboot": "1.0.7",
|
||||
"outdent": "^0.8.0",
|
||||
"partitioninfo": "^6.0.2",
|
||||
"rwmutex": "^1.0.0",
|
||||
@ -12991,7 +12989,7 @@
|
||||
"zip-part-stream": "^2.0.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=18 <22"
|
||||
"node": ">=18"
|
||||
},
|
||||
"optionalDependencies": {
|
||||
"winusb-driver-generator": "^2.0.0"
|
||||
@ -20408,13 +20406,12 @@
|
||||
}
|
||||
},
|
||||
"node_modules/node-raspberrypi-usbboot": {
|
||||
"version": "1.1.0",
|
||||
"resolved": "https://registry.npmjs.org/node-raspberrypi-usbboot/-/node-raspberrypi-usbboot-1.1.0.tgz",
|
||||
"integrity": "sha512-X5+S+YO/jHcNosb+532shuSQAkaFrt9y0B+JiimTsH62gO+OenwBqWEEoVxrxr/fOtze30zPMe/66u/gA9WzhA==",
|
||||
"license": "Apache-2.0",
|
||||
"version": "1.0.7",
|
||||
"resolved": "https://registry.npmjs.org/node-raspberrypi-usbboot/-/node-raspberrypi-usbboot-1.0.7.tgz",
|
||||
"integrity": "sha512-ebL2xC7GQSrbrbAdaj2P6rWCViDoh0ewsgu3gHrtOCNeioCZ6ESirUob1iXT/0DCCMqUDPZA0VV3+euCPRruJw==",
|
||||
"dependencies": {
|
||||
"debug": "^4.3.4",
|
||||
"usb": "^2.12.1"
|
||||
"usb": "^2.5.2"
|
||||
}
|
||||
},
|
||||
"node_modules/node-releases": {
|
||||
|
||||
12
package.json
12
package.json
@ -3,7 +3,7 @@
|
||||
"private": true,
|
||||
"displayName": "balenaEtcher",
|
||||
"productName": "balenaEtcher",
|
||||
"version": "2.1.0",
|
||||
"version": "1.19.18",
|
||||
"packageType": "local",
|
||||
"main": ".webpack/main",
|
||||
"description": "Flash OS images to SD cards and USB drives, safely and easily.",
|
||||
@ -40,7 +40,7 @@
|
||||
"drivelist": "^12.0.2",
|
||||
"electron-squirrel-startup": "^1.0.0",
|
||||
"electron-updater": "6.1.8",
|
||||
"etcher-sdk": "9.1.2",
|
||||
"etcher-sdk": "9.0.11",
|
||||
"i18next": "23.11.2",
|
||||
"immutable": "3.8.2",
|
||||
"lodash": "4.17.21",
|
||||
@ -106,6 +106,8 @@
|
||||
},
|
||||
"hostDependencies": {
|
||||
"debian": [
|
||||
"gconf-service",
|
||||
"gconf2",
|
||||
"libasound2",
|
||||
"libatk1.0-0",
|
||||
"libc6",
|
||||
@ -117,6 +119,7 @@
|
||||
"libfreetype6",
|
||||
"libgbm1",
|
||||
"libgcc1",
|
||||
"libgconf-2-4",
|
||||
"libgdk-pixbuf2.0-0",
|
||||
"libglib2.0-0",
|
||||
"libgtk-3-0",
|
||||
@ -144,11 +147,10 @@
|
||||
"node": ">=20 <21"
|
||||
},
|
||||
"versionist": {
|
||||
"publishedAt": "2025-02-27T16:16:57.534Z"
|
||||
"publishedAt": "2024-05-22T13:28:04.201Z"
|
||||
},
|
||||
"optionalDependencies": {
|
||||
"bufferutil": "^4.0.8",
|
||||
"utf-8-validate": "^5.0.10",
|
||||
"winusb-driver-generator": "2.1.2"
|
||||
"utf-8-validate": "^5.0.10"
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user