Skip to content

Commit

Permalink
Merge branch 'main' into pnpmpnpmpnpmpnpm
Browse files Browse the repository at this point in the history
  • Loading branch information
erickzhao committed Feb 3, 2025
2 parents d5a43a2 + b8812ec commit 64ac631
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 27 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/add-to-project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
creds: ${{ secrets.ECOSYSTEM_ISSUE_TRIAGE_GH_APP_CREDS }}
org: electron
- name: Add to Project
uses: dsanders11/project-actions/add-item@438b25e007c2f4efec324497fadc6402e7cc61a6 # v1.4.0
uses: dsanders11/project-actions/add-item@9c80cd31f58599941c64f74636bea95ba5d46090 # v1.5.1
with:
field: Opened
field-value: ${{ github.event.pull_request.created_at || github.event.issue.created_at }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
run: echo "sha=$(git rev-parse --short=7 HEAD)" >> $GITHUB_OUTPUT

- name: Use Node.js LTS
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
with:
node-version: 20.x
cache: yarn
Expand Down
21 changes: 21 additions & 0 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Close issues that have been blocked for two weeks

on:
schedule:
- cron: '0 0 * * *'

permissions: {}

jobs:
stale:
runs-on: ubuntu-latest
permissions:
issues: write
pull-requests: write
steps:
- uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
only-labels: 'blocked/needs-info,blocked/needs-repro'
labels-to-remove-when-unstale: 'blocked/needs-info,blocked/needs-repro'
days-before-pr-stale: 9001 # good luck to whoever leaves their PR up for 25 years
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,4 @@ packages/plugin/fuses/spec/fixture/app
reports
packages/**/typedoc.json
.eslintcache
.vscode/settings.json
17 changes: 0 additions & 17 deletions .vscode/settings.json

This file was deleted.

5 changes: 1 addition & 4 deletions packages/api/core/spec/slow/api.slow.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -290,10 +290,7 @@ describe.each([{ pm: 'npm' }, { pm: 'yarn' }, { pm: 'pnpm' }])(`init (with $pm)`
await fs.promises.rm(path.resolve(dir, 'out'), { recursive: true, force: true });
});

// FIXME(erickzhao): This test hangs on the electron-rebuild step
// with Electron 19. It was tested to work on Electron 18.
// see https://github.com/electron/forge/pull/2869
describe.skip('with prebuilt native module deps installed', () => {
describe('with prebuilt native module deps installed', () => {
beforeAll(async () => {
await installDeps(dir, ['ref-napi']);
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class ViteTypeScriptTemplate extends BaseTemplate {

// TODO: Compatible with any path entry.
// Vite uses index.html under the root path as the entry point.
await fs.move(filePath('index.html'), path.join(directory, 'index.html'));
await fs.move(filePath('index.html'), path.join(directory, 'index.html'), { overwrite: options.force });
await this.updateFileByLine(path.join(directory, 'index.html'), (line) => {
if (line.includes('link rel="stylesheet"')) return '';
if (line.includes('</body>')) return ' <script type="module" src="/src/renderer.ts"></script>\n </body>';
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10216,9 +10216,9 @@ no-case@^3.0.4:
tslib "^2.0.3"

node-abi@^3.45.0:
version "3.68.0"
resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.68.0.tgz#8f37fb02ecf4f43ebe694090dcb52e0c4cc4ba25"
integrity sha512-7vbj10trelExNjFSBm5kTvZXXa7pZyKWx9RCKIyqe6I9Ev3IzGpQoqBP3a+cOdxY+pWj6VkP28n/2wWysBHD/A==
version "3.74.0"
resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.74.0.tgz#5bfb4424264eaeb91432d2adb9da23c63a301ed0"
integrity sha512-c5XK0MjkGBrQPGYG24GBADZud0NCbznxNx0ZkS+ebUTrmV1qTDxPxSL8zEAPURXSbLRWVexxmP4986BziahL5w==
dependencies:
semver "^7.3.5"

Expand Down

0 comments on commit 64ac631

Please sign in to comment.