Skip to content

Commit d5f3fd5

Browse files
authored
Merge branch 'master' into patch-1
2 parents 368ad16 + 6918431 commit d5f3fd5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+10893
-141
lines changed

.changeset/wise-seas-bathe.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"app-builder-lib": patch
3+
---
4+
5+
test: adding fixtures for lockfiles to support `--frozen-lockfile` (yarn, pnpm) and `ci` (npm)

.github/actions/pnpm/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ runs:
1515
version: ${{ inputs.version }}
1616

1717
- name: Setup node
18-
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4
18+
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
1919
with:
2020
node-version: '22'
2121
cache: 'pnpm'

.github/actions/pretest/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ runs:
2121
version: ${{ inputs.version }}
2222

2323
- name: Setup python
24-
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5
24+
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
2525
with:
2626
python-version: '3.11'
2727

2828
- name: Setup node
29-
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4
29+
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
3030
with:
3131
node-version: '22'
3232
cache: 'pnpm'

.github/workflows/deploy-netlify.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
steps:
1919
- name: Checkout code repository
20-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
20+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
2121

2222
- name: Install deps and audit
2323
uses: ./.github/actions/pnpm

.github/workflows/docker-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
]
2222
steps:
2323
- name: Checkout code repository
24-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
24+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
2525

2626
- name: Extract node major version to tag docker images
2727
run: echo "NODE_TAG=$(cut -d '.' -f 1 <<< ${{ matrix.nodeVersion }})" >> $GITHUB_ENV
@@ -34,7 +34,7 @@ jobs:
3434
docker save -o ${{ runner.temp }}/electron-builder-all-${{ env.NODE_TAG }}.tar electronuserland/builder
3535
3636
- name: Bundle all images
37-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4
37+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
3838
with:
3939
name: electron-builder-all-${{ env.NODE_TAG }}
4040
path: ${{ runner.temp }}/electron-builder-all-${{ env.NODE_TAG }}.tar

.github/workflows/pr-netlify.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
steps:
1919
- name: Checkout code repository
20-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
20+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
2121

2222
- name: Install deps and audit
2323
uses: ./.github/actions/pnpm

.github/workflows/pr-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020
steps:
2121
- name: Checkout code repository
22-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
22+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
2323
with:
2424
# This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits
2525
fetch-depth: 0

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
issues: write
1111
pull-requests: write
1212
steps:
13-
- uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9
13+
- uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9
1414
with:
1515
stale-issue-message: 'This issue is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 30 days.'
1616
stale-pr-message: 'This PR is stale because it has been open 45 days with no activity. Remove stale label or comment or this will be closed in 10 days.'

.github/workflows/test.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
force-docker-build: ${{ steps.changed-files-specific.outputs.any_changed }}
3333
steps:
3434
- name: Checkout code repository
35-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
35+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
3636
with:
3737
fetch-depth: 0
3838

@@ -77,7 +77,7 @@ jobs:
7777
- oneClickInstallerTest,assistedInstallerTest
7878
steps:
7979
- name: Checkout code repository
80-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
80+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
8181
with:
8282
fetch-depth: 2
8383

@@ -126,7 +126,7 @@ jobs:
126126
(needs.run-docker-build.result == 'success' || needs.run-docker-build.result == 'skipped')
127127
steps:
128128
- name: Checkout code repository
129-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
129+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
130130

131131
- name: Setup Tests
132132
uses: ./.github/actions/pretest
@@ -174,7 +174,7 @@ jobs:
174174
- BuildTest,oneClickInstallerTest,winPackagerTest,nsisUpdaterTest,webInstallerTest
175175
steps:
176176
- name: Checkout code repository
177-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
177+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
178178

179179
- name: Setup Tests
180180
uses: ./.github/actions/pretest
@@ -201,7 +201,7 @@ jobs:
201201
- masTest,dmgTest,filesTest,macPackagerTest,differentialUpdateTest,macArchiveTest
202202
steps:
203203
- name: Checkout code repository
204-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
204+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
205205

206206
- name: Setup Tests
207207
uses: ./.github/actions/pretest

packages/app-builder-lib/src/node-module-collector/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ async function isPnpmProjectHoisted(rootDir: string) {
1212
return lines["node-linker"] === "hoisted"
1313
}
1414

15-
async function getCollectorByPackageManager(rootDir: string) {
15+
export async function getCollectorByPackageManager(rootDir: string) {
1616
const manager: PM = await detect({ cwd: rootDir })
1717
switch (manager) {
1818
case "pnpm":

0 commit comments

Comments
 (0)