Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
with:
node-version-file: '.nvmrc'
- name: Install dependencies
run: yarn --frozen-lockfile
run: yarn --immutable
- name: Build API documentation
run: yarn build:docs
- name: Azure login
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
node-version-file: .nvmrc
cache: 'yarn'
- name: Install
run: yarn install --frozen-lockfile
run: yarn install --immutable
- uses: continuousauth/action@4e8a2573eeb706f6d7300d6a9f3ca6322740b72d # v1.0.5
timeout-minutes: 60
with:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,10 @@ jobs:
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
with:
node-version: '${{ matrix.node-version }}'
cache: 'yarn'
- name: Setup CI Environment
run: test/ci/before_install.sh
- name: Install
run: yarn install --frozen-lockfile
run: yarn install --immutable
- name: Build
run: yarn build
- name: Electron Cache
Expand Down
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,12 @@ typedoc
npm-debug.log
dist/
.eslintcache

# yarn v4
.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
942 changes: 942 additions & 0 deletions .yarn/releases/yarn-4.10.2.cjs

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
enableScripts: false

nodeLinker: node-modules

# 1 week
npmMinimalAgeGate: 10080

npmPreapprovedPackages:
- "@electron/*"

yarnPath: .yarn/releases/yarn-4.10.2.cjs
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
"junk": "^4.0.1",
"parse-author": "^2.0.0",
"plist": "^3.1.0",
"prettier": "^3.6.2",
"resedit": "^2.0.3",
"resolve": "^1.22.10",
"semver": "^7.7.2",
Expand All @@ -70,6 +69,7 @@
"husky": "^9.1.7",
"lint-staged": "^16.1.5",
"lodash": "^4.17.21",
"prettier": "^3.6.2",
"tsx": "^4.20.4",
"typedoc": "~0.25.4",
"typescript": "^5.9.2",
Expand Down Expand Up @@ -108,5 +108,6 @@
"prettier --write",
"eslint --fix"
]
}
},
"packageManager": "[email protected]"
}
3 changes: 2 additions & 1 deletion test/fixtures/asar-prebuilt/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"description": "A prebuilt asar app",
"main": "main.js",
"devDependencies": {
"electron": "27.0.0"
"electron": "27.0.0",
"@electron/this-will-never-exist": "1.0.0"
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion test/fixtures/basic/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"ncp": "^2.0.0",
"run-waterfall": "^1.1.1",
"electron": "27.0.0",
"ffi-napi": "4.0.3"
"ffi-napi": "4.0.3",
"@electron/this-will-never-exist": "1.0.0"
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion test/fixtures/electron-in-dependencies/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"productName": "MainJS",
"description": "Removing electron from dependencies",
"dependencies": {
"electron": "27.0.0"
"electron": "27.0.0",
"@electron/this-will-never-exist": "1.0.0"
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion test/fixtures/infer-electron-nightly/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"main": "main.js",
"productName": "MainJS",
"devDependencies": {
"electron-nightly": "5.0.0-nightly.20190107"
"electron-nightly": "5.0.0-nightly.20190107",
"@electron/this-will-never-exist": "1.0.0"
}
}
3 changes: 2 additions & 1 deletion test/fixtures/infer-missing-electron-version/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"name": "Missing electron version",
"version": "0.0.1",
"dependencies": {
"run-series": "^1.1.1"
"run-series": "^1.1.1",
"@electron/this-will-never-exist": "1.0.0"
}
}
3 changes: 2 additions & 1 deletion test/fixtures/infer-missing-name/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"dependencies": {
"electron": "6.0.0",
"run-series": "^1.1.1"
"run-series": "^1.1.1",
"@electron/this-will-never-exist": "1.0.0"
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion test/fixtures/infer-missing-version-only/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"main": "main.js",
"productName": "MainJS",
"devDependencies": {
"electron": "27.0.0"
"electron": "27.0.0",
"@electron/this-will-never-exist": "1.0.0"
}
}
3 changes: 2 additions & 1 deletion test/fixtures/infer-win32metadata/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"author": "Foo Bar <[email protected]>",
"description": "Some description",
"devDependencies": {
"electron": "1.4.15"
"electron": "1.4.15",
"@electron/this-will-never-exist": "1.0.0"
}
}
2 changes: 1 addition & 1 deletion test/packager.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1347,7 +1347,7 @@ describe('packager', () => {
expect(infoPlist.ElectronAsarIntegrity).toEqual({
'Resources/app.asar': {
algorithm: 'SHA256',
hash: 'f4a18a4219d839f07a75a4e93d18f410b020d339c4fe8b5b25a9b380515ef71c',
hash: 'e60d812babe8808d3a68572e4d55cc1a2bbde470d9926eafa6b7ea7f86a59767',
},
});
});
Expand Down
Loading