diff --git a/.resinci.json b/.resinci.json
index 881d51be..3623c90c 100644
--- a/.resinci.json
+++ b/.resinci.json
@@ -1,6 +1,6 @@
{
"electron": {
- "npm_version": "6.7.0",
+ "npm_version": "6.14.5",
"dependencies": {
"linux": [
"libudev-dev",
@@ -18,32 +18,13 @@
"productName": "balenaEtcher",
"nodeGypRebuild": true,
"afterPack": "./afterPack.js",
+ "asar": false,
"files": [
- "build/Release/elevator.node",
"generated",
- "lib/shared/catalina-sudo/sudo-askpass.osascript.js",
- "lib/gui/app/index.html",
- "lib/gui/css/*.css",
- "lib/gui/css/fonts/*.woff2",
- "lib/gui/assets/*.svg",
- "assets/icon.png",
- "!node_modules/**/**",
- "node_modules/**/*.js",
- "node_modules/**/*.json",
- "node_modules/**/*.node",
- "node_modules/**/*.dll",
- "node_modules/node-raspberrypi-usbboot/blobs/**",
- "node_modules/flexboxgrid/dist/flexboxgrid.css",
- "node_modules/roboto-fontface/fonts/roboto/Roboto-Thin.woff",
- "node_modules/roboto-fontface/fonts/roboto/Roboto-Light.woff",
- "node_modules/roboto-fontface/fonts/roboto/Roboto-Regular.woff",
- "node_modules/roboto-fontface/fonts/roboto/Roboto-Medium.woff",
- "node_modules/roboto-fontface/fonts/roboto/Roboto-Bold.woff",
- "node_modules/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.woff2"
+ "lib/shared/catalina-sudo/sudo-askpass.osascript.js"
],
"afterSign": "./afterSignHook.js",
"mac": {
- "asar": false,
"category": "public.app-category.developer-tools",
"hardenedRuntime": true,
"entitlements": "entitlements.mac.plist",
diff --git a/Makefile b/Makefile
index 929d3dc1..12bc50da 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
# ---------------------------------------------------------------------
RESIN_SCRIPTS ?= ./scripts/resin
-export NPM_VERSION ?= 6.7.0
+export NPM_VERSION ?= 6.14.5
S3_BUCKET = artifacts.ci.balena-cloud.com
# This directory will be completely deleted by the `clean` rule
@@ -144,10 +144,6 @@ webpack:
.PHONY: $(TARGETS)
-sass:
- npm rebuild node-sass
- node-sass lib/gui/app/scss/main.scss > lib/gui/css/main.css
-
lint-ts:
balena-lint --fix --typescript typings lib tests scripts/clean-shrinkwrap.ts webpack.config.ts
@@ -190,7 +186,6 @@ info:
@echo "Target arch : $(TARGET_ARCH)"
sanity-checks:
- ./scripts/ci/ensure-staged-sass.sh
./scripts/ci/ensure-all-file-extensions-in-gitattributes.sh
clean:
diff --git a/electron-builder.yml b/electron-builder.yml
index 957e8aff..9c93153f 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -5,30 +5,11 @@ npmRebuild: true
nodeGypRebuild: true
publish: null
afterPack: "./afterPack.js"
+asar: false
files:
- - build/Release/elevator.node
- generated
- lib/shared/catalina-sudo/sudo-askpass.osascript.js
- - lib/gui/app/index.html
- - lib/gui/css/*.css
- - lib/gui/css/fonts/*.woff2
- - lib/gui/assets/*.svg
- - assets/icon.png
- - "!node_modules/**/**"
- - "node_modules/**/*.js"
- - "node_modules/**/*.json"
- - "node_modules/**/*.node"
- - "node_modules/**/*.dll"
- - node_modules/node-raspberrypi-usbboot/blobs/**
- - node_modules/flexboxgrid/dist/flexboxgrid.css
- - node_modules/roboto-fontface/fonts/roboto/Roboto-Thin.woff
- - node_modules/roboto-fontface/fonts/roboto/Roboto-Light.woff
- - node_modules/roboto-fontface/fonts/roboto/Roboto-Regular.woff
- - node_modules/roboto-fontface/fonts/roboto/Roboto-Medium.woff
- - node_modules/roboto-fontface/fonts/roboto/Roboto-Bold.woff
- - node_modules/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.woff2
mac:
- asar: false
icon: assets/icon.icns
category: public.app-category.developer-tools
hardenedRuntime: true
diff --git a/lib/gui/app/components/drive-selector/DriveSelectorModal.tsx b/lib/gui/app/components/drive-selector/DriveSelectorModal.tsx
index 44d7800a..598fdf3a 100644
--- a/lib/gui/app/components/drive-selector/DriveSelectorModal.tsx
+++ b/lib/gui/app/components/drive-selector/DriveSelectorModal.tsx
@@ -171,7 +171,7 @@ export function DriveSelectorModal({ close }: { close: () => void }) {
diff --git a/lib/gui/app/components/finish/finish.tsx b/lib/gui/app/components/finish/finish.tsx
index f1d02487..c950e572 100644
--- a/lib/gui/app/components/finish/finish.tsx
+++ b/lib/gui/app/components/finish/finish.tsx
@@ -78,7 +78,7 @@ function FinishPage({ goToMain }: { goToMain: () => void }) {
}
>