chore: move native-image.ts back into common #30838
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
miniak
force-pushed
the
miniak/merge-native-image
branch
from
654c0ce
to
c4f2aeb
Compare
zcbenz
approved these changes
Sep 6, 2021
codebytere
approved these changes
Sep 6, 2021
|
Release Notes Persisted
|
Bogarde21
reviewed
Oct 12, 2022
| @@ -1,6 +1,7 @@ | |||
| // Common modules, please sort alphabetically | |||
| export const commonModuleList: ElectronInternal.ModuleEntry[] = [ | |||
| { name: 'clipboard', loader: () => require('./clipboard') }, | |||
| { name: 'nativeImage', loader: () => require('./native-image') }, | |||
| @@ -13,7 +13,7 @@ export const moduleList: ElectronInternal.ModuleEntry[] = [ | |||
| }, | |||
| { | |||
| name: 'nativeImage', | |||
| loader: () => require('@electron/internal/renderer/api/native-image') | |||
| loader: () => require('@electron/internal/common/api/native-image') | |||
| @@ -1,6 +1,7 @@ | |||
| // Common modules, please sort alphabetically | |||
| export const commonModuleList: ElectronInternal.ModuleEntry[] = [ | |||
| { name: 'clipboard', loader: () => require('./clipboard') }, | |||
| { name: 'nativeImage', loader: () => require('./native-image') }, | |||
Bogarde21
reviewed
Oct 12, 2022
| @@ -13,7 +13,7 @@ export const moduleList: ElectronInternal.ModuleEntry[] = [ | |||
| }, | |||
| { | |||
| name: 'nativeImage', | |||
| @@ -13,7 +13,7 @@ export const moduleList: ElectronInternal.ModuleEntry[] = [ | |||
| }, | |||
| { | |||
| name: 'nativeImage', | |||
| @@ -1,3 +0,0 @@ | |||
| const { nativeImage } = process._linkedBinding('electron_common_native_image'); | |||
|
|
|||
| export default nativeImage; | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of Change
It was split to separate browser and renderer implementation in #24802, which got undone in #30728 and we can merge them back into common.
Checklist
npm testpassesRelease Notes
Notes: notes