fix: Handle an electron.d.ts file in a custom build #33979

felixrieseberg · 2022-04-29T15:29:34Z

Description of Change

Right now, if you use a custom build or a mirror during the installation of Electron, you will always get the electron.d.ts file that was part of the npm package - and not the one that's part of your custom build or mirror.

With this change, during installation, we check if the downloaded zip file contained an electron.d.ts file. If so, we move it one level up.

Checklist

PR description included and stakeholders cc'd
npm test passes
tests are changed or added
relevant documentation is changed or added
PR release notes describe the change in a way relevant to app developers, and are capitalized, punctuated, and past tense.

Release Notes

Notes: Fixed: If a custom Electron build contains an electron.d.ts file, it is now being used.

felixrieseberg · 2022-04-29T23:14:55Z

The broken Windows build seems to be a fluke!

MarshallOfSound · 2022-05-02T07:13:23Z

@felixrieseberg Can you re-auth with Circle to kick off the CI builds, you may have to push an empty commit too

codebytere

Approved w/ small typo fix!

npm/install.js

jkleinsc · 2022-05-09T15:22:51Z

@felixrieseberg can you re-authenticate with CircleCI and then push an empty commit to trigger CircleCI testing?

jkleinsc

Lint failures need to be addressed.

ckerr · 2022-09-16T01:45:34Z

@jkleinsc are you good with these lint changes?

release-clerk · 2022-09-26T18:39:29Z

Release Notes Persisted

Fixed: If a custom Electron build contains an electron.d.ts file, it is now being used.

trop · 2022-09-26T18:39:56Z

I was unable to backport this PR to "19-x-y" cleanly;
you will need to perform this backport manually.

* Handle an electron.d.ts file in a custom build * Fix linter issues Co-authored-by: Felix Rieseberg <felixr@stripe.com>

trop · 2022-09-26T18:40:11Z

I have automatically backported this PR to "21-x-y", please check out #35822

trop · 2022-09-26T18:40:14Z

I have automatically backported this PR to "20-x-y", please check out #35823

fix: Handle an electron.d.ts file in a custom build (#33979) * Handle an electron.d.ts file in a custom build * Fix linter issues Co-authored-by: Felix Rieseberg <felixr@stripe.com> Co-authored-by: Felix Rieseberg <felix@felixrieseberg.com> Co-authored-by: Felix Rieseberg <felixr@stripe.com>

hassanmahdi58 · 2022-10-19T20:30:59Z

electron.d.ts

* Fix dangling promise introduced in #33979 * fix reject in callback * simplify code Co-authored-by: Black-Hole <158blackhole@gmail.com> Co-authored-by: Black-Hole <158blackhole@gmail.com>

Co-authored-by: hyrious <hyrious@outlook.com>

* Fix dangling promise introduced in #33979 Co-authored-by: hyrious <hyrious@outlook.com> * fix reject in callback Co-authored-by: hyrious <hyrious@outlook.com> * simplify code Co-authored-by: Black-Hole <158blackhole@gmail.com> Co-authored-by: hyrious <hyrious@outlook.com> Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: hyrious <hyrious@outlook.com>

* Handle an electron.d.ts file in a custom build * Fix linter issues Co-authored-by: Felix Rieseberg <felixr@stripe.com>

* Fix dangling promise introduced in electron#33979 * fix reject in callback * simplify code Co-authored-by: Black-Hole <158blackhole@gmail.com> Co-authored-by: Black-Hole <158blackhole@gmail.com>

felixrieseberg requested a review from a team as a code owner April 29, 2022 15:29

electron-cation bot added the new-pr 🌱 PR opened in the last 24 hours label Apr 29, 2022

felixrieseberg added semver/patch backwards-compatible bug fixes target/18-x-y labels Apr 29, 2022

electron-cation bot removed the new-pr 🌱 PR opened in the last 24 hours label Apr 30, 2022

codebytere approved these changes May 4, 2022

View reviewed changes

npm/install.js Outdated Show resolved Hide resolved

felixrieseberg commented May 6, 2022

View reviewed changes

npm/install.js Outdated Show resolved Hide resolved

Handle an electron.d.ts file in a custom build

4224f01

codebytere force-pushed the felix-install-dts branch from 778d6f8 to 4224f01 Compare May 23, 2022 13:07

codebytere requested a review from jkleinsc May 23, 2022 13:08

jkleinsc added the target/20-x-y label May 25, 2022

jkleinsc requested changes Jun 14, 2022

View reviewed changes

felixrieseberg and others added 2 commits September 2, 2022 08:09

Merge branch 'main' into felix-install-dts

d05393c

Fix linter issues

3a34f48

codebytere requested a review from jkleinsc September 5, 2022 08:30

felixrieseberg added 2 commits September 9, 2022 08:04

Merge branch 'main' into felix-install-dts

1e460f8

Merge branch 'main' into felix-install-dts

ff70c69

miniak added target/21-x-y PR should also be added to the "21-x-y" branch. and removed target/18-x-y labels Sep 23, 2022

jkleinsc approved these changes Sep 26, 2022

View reviewed changes

jkleinsc merged commit 74d59af into electron:main Sep 26, 2022

trop bot removed the target/19-x-y label Sep 26, 2022

trop bot pushed a commit that referenced this pull request Sep 26, 2022

fix: Handle an electron.d.ts file in a custom build (#33979)

1231b9a

* Handle an electron.d.ts file in a custom build * Fix linter issues Co-authored-by: Felix Rieseberg <felixr@stripe.com>

trop bot pushed a commit that referenced this pull request Sep 26, 2022

fix: Handle an electron.d.ts file in a custom build (#33979)

84cb9b5

* Handle an electron.d.ts file in a custom build * Fix linter issues Co-authored-by: Felix Rieseberg <felixr@stripe.com>

trop bot mentioned this pull request Sep 26, 2022

fix: Handle an electron.d.ts file in a custom build #35822

Merged

trop bot added the needs-manual-bp/19-x-y label Sep 26, 2022

trop bot mentioned this pull request Sep 26, 2022

fix: Handle an electron.d.ts file in a custom build #35823

Merged

trop bot added the in-flight/21-x-y label Sep 26, 2022

trop bot added in-flight/20-x-y merged/21-x-y PR was merged to the "21-x-y" branch. and removed target/21-x-y PR should also be added to the "21-x-y" branch. target/20-x-y labels Sep 26, 2022

trop bot added the merged/20-x-y label Sep 26, 2022

trop bot removed the in-flight/20-x-y label Sep 26, 2022

hyrious mentioned this pull request Nov 17, 2022

chore: fix dangling promise in npm install #36379

Merged

5 tasks

trop bot added a commit that referenced this pull request Nov 18, 2022

Fix dangling promise introduced in #33979

776bf56

Co-authored-by: hyrious <hyrious@outlook.com>

trop bot added a commit that referenced this pull request Nov 18, 2022

Fix dangling promise introduced in #33979

bb04f22

Co-authored-by: hyrious <hyrious@outlook.com>

trop bot added a commit that referenced this pull request Nov 18, 2022

Fix dangling promise introduced in #33979

980f233

Co-authored-by: hyrious <hyrious@outlook.com>

commit-lint bot mentioned this pull request Jan 25, 2023

[pull] main from electron:main Blaquez-home/electron#3

Open

miniak removed the needs-manual-bp/19-x-y label Feb 15, 2023

felixrieseberg deleted the felix-install-dts branch May 4, 2023 18:38

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Handle an electron.d.ts file in a custom build #33979

fix: Handle an electron.d.ts file in a custom build #33979

felixrieseberg commented Apr 29, 2022 •

edited

felixrieseberg commented Apr 29, 2022

MarshallOfSound commented May 2, 2022

codebytere left a comment

jkleinsc commented May 9, 2022

jkleinsc left a comment

ckerr commented Sep 16, 2022

release-clerk bot commented Sep 26, 2022

trop bot commented Sep 26, 2022

trop bot commented Sep 26, 2022

trop bot commented Sep 26, 2022

hassanmahdi58 commented Oct 19, 2022

fix: Handle an electron.d.ts file in a custom build #33979

fix: Handle an electron.d.ts file in a custom build #33979

Conversation

felixrieseberg commented Apr 29, 2022 • edited

Description of Change

Checklist

Release Notes

felixrieseberg commented Apr 29, 2022

MarshallOfSound commented May 2, 2022

codebytere left a comment

Choose a reason for hiding this comment

jkleinsc commented May 9, 2022

jkleinsc left a comment

Choose a reason for hiding this comment

ckerr commented Sep 16, 2022

release-clerk bot commented Sep 26, 2022

trop bot commented Sep 26, 2022

trop bot commented Sep 26, 2022

trop bot commented Sep 26, 2022

hassanmahdi58 commented Oct 19, 2022

felixrieseberg commented Apr 29, 2022 •

edited