diff --git a/.changeset/purple-impalas-prove.md b/.changeset/purple-impalas-prove.md
new file mode 100644
index 0000000000..0951b05ecf
--- /dev/null
+++ b/.changeset/purple-impalas-prove.md
@@ -0,0 +1,5 @@
+---
+"electron-updater": patch
+---
+
+fix: moving typed-emitter from devDependency to dependencies
diff --git a/.circleci/config.yml b/.circleci/config.yml
index e959cb4725..39296ad08f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2
jobs:
build:
docker:
- - image: circleci/node:14.17@sha256:b1c0b133fc872314dee5b24e34084693f0747850aad6ac0181b70061e198375f
+ - image: cimg/node:14.19
steps:
- checkout
- restore_cache:
@@ -13,7 +13,7 @@ jobs:
keys:
- v-11.0.0-electron
- run:
- command: npm i --prefix=$HOME/.local -g pnpm@6.25.1
+ command: npm i --prefix=$HOME/.local -g pnpm@7.1.6
- run:
command: pnpm install --frozen-lockfile
- run:
@@ -37,4 +37,4 @@ workflows:
filters:
branches:
ignore:
- - docs
\ No newline at end of file
+ - docs
diff --git a/.github/actions/pnpm/action.yml b/.github/actions/pnpm/action.yml
index f9cc745bc1..55abd1c13b 100644
--- a/.github/actions/pnpm/action.yml
+++ b/.github/actions/pnpm/action.yml
@@ -4,21 +4,23 @@ inputs:
version: # id of input
description: 'The pnpm version to use'
required: false
- default: 6.25.1
+ default: 7.1.6
runs:
using: 'composite'
steps:
- - uses: pnpm/action-setup@v2
+ - name: Setup pnpm
+ uses: pnpm/action-setup@v2.2.2
with:
version: ${{ inputs.version }}
- - uses: actions/setup-node@v3
+ - name: Setup node
+ uses: actions/setup-node@v3
with:
node-version: '14'
cache: 'pnpm'
- - name: install dependencies
+ - name: Install dependencies
run: pnpm install --frozen-lockfile
shell: bash
diff --git a/.github/actions/pretest/action.yml b/.github/actions/pretest/action.yml
index c97796d29e..eac53ef3cd 100644
--- a/.github/actions/pretest/action.yml
+++ b/.github/actions/pretest/action.yml
@@ -7,20 +7,26 @@ inputs:
cache-path:
description: 'The path to the electron cache'
required: true
+ version:
+ description: 'The pnpm version to use'
+ required: false
+ default: 7.1.6
runs:
using: 'composite'
steps:
- - uses: pnpm/action-setup@v2
+ - name: Setup pnpm
+ uses: pnpm/action-setup@v2.2.2
with:
- version: 6.25.1
+ version: ${{ inputs.version }}
- - uses: actions/setup-node@v3
+ - name: Setup node
+ uses: actions/setup-node@v3
with:
node-version: '14'
cache: 'pnpm'
- - name: install dependencies
+ - name: Install dependencies
run: pnpm install --frozen-lockfile
shell: bash
diff --git a/docker/build.sh b/docker/build.sh
index 49a8cec4b4..e3a0d82ccf 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -7,7 +7,7 @@ DATE=$(date +%m.%y)
docker build -t electronuserland/builder:base -t "electronuserland/builder:base-$DATE" docker/base
# Node 14
-docker build --build-arg NODE_VERSION=14.19.1 -t electronuserland/builder:14 -t "electronuserland/builder:14-$DATE" -t electronuserland/builder:latest docker/node
+docker build --build-arg NODE_VERSION=14.19.3 -t electronuserland/builder:14 -t "electronuserland/builder:14-$DATE" -t electronuserland/builder:latest docker/node
docker build --build-arg IMAGE_VERSION=14 -t electronuserland/builder:14-wine -t "electronuserland/builder:14-wine-$DATE" -t electronuserland/builder:wine docker/wine
docker build --build-arg IMAGE_VERSION=14-wine -t electronuserland/builder:14-wine-mono -t "electronuserland/builder:14-wine-mono-$DATE" -t electronuserland/builder:wine-mono docker/wine-mono
diff --git a/docker/node/Dockerfile b/docker/node/Dockerfile
index 645ff7fdfa..a6008470da 100644
--- a/docker/node/Dockerfile
+++ b/docker/node/Dockerfile
@@ -1,10 +1,10 @@
FROM electronuserland/builder:base
-ARG NODE_VERSION 14.17.0
+ARG NODE_VERSION 14.19.3
# this package is used for snapcraft and we should not clear apt list - to avoid apt-get update during snap build
RUN curl -L https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz | tar xz -C /usr/local --strip-components=1 && \
unlink /usr/local/CHANGELOG.md && unlink /usr/local/LICENSE && unlink /usr/local/README.md && \
# https://github.com/npm/npm/issues/4531
npm config set unsafe-perm true
-RUN npm i -g pnpm@6.25.1
+RUN npm i -g pnpm@7.1.6
diff --git a/packages/app-builder-lib/src/targets/MsiTarget.ts b/packages/app-builder-lib/src/targets/MsiTarget.ts
index 8cd25e9a20..d6524a81cd 100644
--- a/packages/app-builder-lib/src/targets/MsiTarget.ts
+++ b/packages/app-builder-lib/src/targets/MsiTarget.ts
@@ -224,7 +224,9 @@ export default class MsiTarget extends Target {
result += `>\n`
const shortcutName = commonOptions.shortcutName
if (isCreateDesktopShortcut) {
- result += `${fileSpace} \n`
+ result += `${fileSpace} \n`
}
const hasMenuCategory = commonOptions.menuCategory != null
@@ -233,7 +235,9 @@ export default class MsiTarget extends Target {
if (hasMenuCategory) {
dirs.push(``)
}
- result += `${fileSpace}