mirror of
https://github.com/balena-io/etcher.git
synced 2025-11-14 20:59:26 +00:00
Compare commits
3 Commits
kyle/patch
...
rpiboot-re
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9ca3a9d13a | ||
|
|
fc056dba3f | ||
|
|
6a58170bc7 |
2
.github/actions/publish/action.yml
vendored
2
.github/actions/publish/action.yml
vendored
@@ -15,7 +15,7 @@ inputs:
|
|||||||
default: "accounts+apple@balena.io"
|
default: "accounts+apple@balena.io"
|
||||||
NODE_VERSION:
|
NODE_VERSION:
|
||||||
type: string
|
type: string
|
||||||
default: "14.x"
|
default: "16.x"
|
||||||
VERBOSE:
|
VERBOSE:
|
||||||
type: string
|
type: string
|
||||||
default: "true"
|
default: "true"
|
||||||
|
|||||||
2
.github/actions/test/action.yml
vendored
2
.github/actions/test/action.yml
vendored
@@ -12,7 +12,7 @@ inputs:
|
|||||||
# --- custom environment
|
# --- custom environment
|
||||||
NODE_VERSION:
|
NODE_VERSION:
|
||||||
type: string
|
type: string
|
||||||
default: "14.x"
|
default: "16.x"
|
||||||
VERBOSE:
|
VERBOSE:
|
||||||
type: string
|
type: string
|
||||||
default: "true"
|
default: "true"
|
||||||
|
|||||||
22879
package-lock.json
generated
22879
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
16
package.json
16
package.json
@@ -16,7 +16,7 @@
|
|||||||
"build": "npm run webpack",
|
"build": "npm run webpack",
|
||||||
"flowzone-preinstall-linux": "sudo apt-get install -y xvfb libudev-dev && cat < electron-builder.yml | yq e .deb.depends[] - | xargs -L1 echo | sed 's/|//g' | xargs -L1 sudo apt-get --ignore-missing install || true",
|
"flowzone-preinstall-linux": "sudo apt-get install -y xvfb libudev-dev && cat < electron-builder.yml | yq e .deb.depends[] - | xargs -L1 echo | sed 's/|//g' | xargs -L1 sudo apt-get --ignore-missing install || true",
|
||||||
"flowzone-preinstall-macos": "true",
|
"flowzone-preinstall-macos": "true",
|
||||||
"flowzone-preinstall-windows": "true",
|
"flowzone-preinstall-windows": "npx node-gyp install",
|
||||||
"flowzone-preinstall": "npm run flowzone-preinstall-linux",
|
"flowzone-preinstall": "npm run flowzone-preinstall-linux",
|
||||||
"lint-css": "prettier --write lib/**/*.css",
|
"lint-css": "prettier --write lib/**/*.css",
|
||||||
"lint-ts": "balena-lint --fix --typescript typings lib tests scripts/clean-shrinkwrap.ts webpack.config.ts",
|
"lint-ts": "balena-lint --fix --typescript typings lib tests scripts/clean-shrinkwrap.ts webpack.config.ts",
|
||||||
@@ -52,7 +52,7 @@
|
|||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@balena/lint": "5.4.2",
|
"@balena/lint": "5.4.2",
|
||||||
"@balena/sudo-prompt": "9.2.1-workaround-windows-amperstand-in-username-0849e215b947987a643fe5763902aea201255534",
|
"@balena/sudo-prompt": "9.2.1-workaround-windows-amperstand-in-username-0849e215b947987a643fe5763902aea201255534",
|
||||||
"@electron/remote": "2.0.1",
|
"@electron/remote": "^2.0.9",
|
||||||
"@fortawesome/fontawesome-free": "5.15.4",
|
"@fortawesome/fontawesome-free": "5.15.4",
|
||||||
"@sentry/electron": "^4.1.2",
|
"@sentry/electron": "^4.1.2",
|
||||||
"@svgr/webpack": "5.5.0",
|
"@svgr/webpack": "5.5.0",
|
||||||
@@ -60,8 +60,8 @@
|
|||||||
"@types/copy-webpack-plugin": "6.4.3",
|
"@types/copy-webpack-plugin": "6.4.3",
|
||||||
"@types/mime-types": "2.1.1",
|
"@types/mime-types": "2.1.1",
|
||||||
"@types/mini-css-extract-plugin": "1.4.3",
|
"@types/mini-css-extract-plugin": "1.4.3",
|
||||||
"@types/mocha": "8.2.3",
|
"@types/mocha": "^9.1.1",
|
||||||
"@types/node": "14.18.34",
|
"@types/node": "^16.18.12",
|
||||||
"@types/node-ipc": "9.2.0",
|
"@types/node-ipc": "9.2.0",
|
||||||
"@types/react": "16.14.34",
|
"@types/react": "16.14.34",
|
||||||
"@types/react-dom": "16.9.17",
|
"@types/react-dom": "16.9.17",
|
||||||
@@ -77,11 +77,11 @@
|
|||||||
"css-loader": "5.2.7",
|
"css-loader": "5.2.7",
|
||||||
"d3": "4.13.0",
|
"d3": "4.13.0",
|
||||||
"debug": "4.3.4",
|
"debug": "4.3.4",
|
||||||
"electron": "^14.2.9",
|
"electron": "^17.4.11",
|
||||||
"electron-builder": "^23.6.0",
|
"electron-builder": "^23.6.0",
|
||||||
"electron-mocha": "^11.0.2",
|
"electron-mocha": "^11.0.2",
|
||||||
"electron-notarize": "1.2.2",
|
"electron-notarize": "1.2.2",
|
||||||
"electron-rebuild": "3.2.3",
|
"electron-rebuild": "^3.2.9",
|
||||||
"electron-updater": "5.3.0",
|
"electron-updater": "5.3.0",
|
||||||
"esbuild-loader": "2.20.0",
|
"esbuild-loader": "2.20.0",
|
||||||
"etcher-sdk": "^8.3.0",
|
"etcher-sdk": "^8.3.0",
|
||||||
@@ -108,7 +108,7 @@
|
|||||||
"semver": "7.3.8",
|
"semver": "7.3.8",
|
||||||
"simple-progress-webpack-plugin": "1.1.2",
|
"simple-progress-webpack-plugin": "1.1.2",
|
||||||
"sinon": "9.2.4",
|
"sinon": "9.2.4",
|
||||||
"spectron": "^16.0.0",
|
"spectron": "^19.0.0",
|
||||||
"string-replace-loader": "3.1.0",
|
"string-replace-loader": "3.1.0",
|
||||||
"style-loader": "2.0.0",
|
"style-loader": "2.0.0",
|
||||||
"styled-components": "5.3.6",
|
"styled-components": "5.3.6",
|
||||||
@@ -125,7 +125,7 @@
|
|||||||
"webpack-dev-server": "4.11.1"
|
"webpack-dev-server": "4.11.1"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=14"
|
"node": ">=16"
|
||||||
},
|
},
|
||||||
"versionist": {
|
"versionist": {
|
||||||
"publishedAt": "2023-02-14T12:40:41.506Z"
|
"publishedAt": "2023-02-14T12:40:41.506Z"
|
||||||
|
|||||||
@@ -276,6 +276,26 @@ const commonConfig = {
|
|||||||
`,
|
`,
|
||||||
replace: "require('./build/Release/Generator.node')",
|
replace: "require('./build/Release/Generator.node')",
|
||||||
}),
|
}),
|
||||||
|
replace(/node_modules\/node-raspberrypi-usbboot\/build\/index\.js$/, {
|
||||||
|
search:
|
||||||
|
"return await readFile(Path.join(__dirname, '..', 'blobs', filename));",
|
||||||
|
replace: outdent`
|
||||||
|
const remote = require('@electron/remote');
|
||||||
|
return await readFile(
|
||||||
|
Path.join(
|
||||||
|
// With macOS universal builds, getAppPath() returns the path to an app.asar file containing an index.js file which will
|
||||||
|
// include the app-x64 or app-arm64 folder depending on the arch.
|
||||||
|
// We don't care about the app.asar file, we want the actual folder.
|
||||||
|
remote.app.getAppPath().replace(/\\.asar$/, () => process.platform === 'darwin' ? '-' + process.arch : ''),
|
||||||
|
'generated',
|
||||||
|
__dirname.replace('node_modules', 'modules'),
|
||||||
|
'..',
|
||||||
|
'blobs',
|
||||||
|
filename
|
||||||
|
)
|
||||||
|
);
|
||||||
|
`,
|
||||||
|
}),
|
||||||
// Copy native modules to generated folder
|
// Copy native modules to generated folder
|
||||||
{
|
{
|
||||||
test: /\.node$/,
|
test: /\.node$/,
|
||||||
|
|||||||
Reference in New Issue
Block a user