Skip to content

Commit 8d0a612

Browse files
authored
refactor: remove code for non-native extensions shim (electron#23340)
1 parent 3e54863 commit 8d0a612

File tree

13 files changed

+5
-1175
lines changed

13 files changed

+5
-1175
lines changed

BUILD.gn

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -139,15 +139,6 @@ webpack_build("electron_isolated_renderer_bundle") {
139139
out_file = "$target_gen_dir/js2c/isolated_bundle.js"
140140
}
141141

142-
webpack_build("electron_content_script_bundle") {
143-
deps = [ ":build_electron_definitions" ]
144-
145-
inputs = auto_filenames.content_script_bundle_deps
146-
147-
config_file = "//electron/build/webpack/webpack.config.content_script.js"
148-
out_file = "$target_gen_dir/js2c/content_script_bundle.js"
149-
}
150-
151142
copy("electron_js2c_copy") {
152143
sources = [
153144
"lib/common/asar.js",
@@ -159,7 +150,6 @@ copy("electron_js2c_copy") {
159150
action("electron_js2c") {
160151
deps = [
161152
":electron_browser_bundle",
162-
":electron_content_script_bundle",
163153
":electron_isolated_renderer_bundle",
164154
":electron_js2c_copy",
165155
":electron_renderer_bundle",
@@ -169,7 +159,6 @@ action("electron_js2c") {
169159

170160
webpack_sources = [
171161
"$target_gen_dir/js2c/browser_init.js",
172-
"$target_gen_dir/js2c/content_script_bundle.js",
173162
"$target_gen_dir/js2c/isolated_bundle.js",
174163
"$target_gen_dir/js2c/renderer_init.js",
175164
"$target_gen_dir/js2c/sandbox_bundle.js",

build/webpack/webpack.config.content_script.js

Lines changed: 0 additions & 4 deletions
This file was deleted.

filenames.auto.gni

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -153,12 +153,6 @@ auto_filenames = {
153153
"lib/renderer/api/ipc-renderer.ts",
154154
"lib/renderer/api/remote.js",
155155
"lib/renderer/api/web-frame.ts",
156-
"lib/renderer/chrome-api.ts",
157-
"lib/renderer/content-scripts-injector.ts",
158-
"lib/renderer/extensions/event.ts",
159-
"lib/renderer/extensions/i18n.ts",
160-
"lib/renderer/extensions/storage.ts",
161-
"lib/renderer/extensions/web-navigation.ts",
162156
"lib/renderer/inspector.ts",
163157
"lib/renderer/ipc-renderer-internal-utils.ts",
164158
"lib/renderer/ipc-renderer-internal.ts",
@@ -190,24 +184,6 @@ auto_filenames = {
190184
"tsconfig.json",
191185
]
192186

193-
content_script_bundle_deps = [
194-
"lib/common/electron-binding-setup.ts",
195-
"lib/common/webpack-globals-provider.ts",
196-
"lib/content_script/init.js",
197-
"lib/renderer/api/context-bridge.ts",
198-
"lib/renderer/chrome-api.ts",
199-
"lib/renderer/extensions/event.ts",
200-
"lib/renderer/extensions/i18n.ts",
201-
"lib/renderer/extensions/storage.ts",
202-
"lib/renderer/extensions/web-navigation.ts",
203-
"lib/renderer/ipc-renderer-internal-utils.ts",
204-
"lib/renderer/ipc-renderer-internal.ts",
205-
"lib/renderer/window-setup.ts",
206-
"package.json",
207-
"tsconfig.electron.json",
208-
"tsconfig.json",
209-
]
210-
211187
browser_bundle_deps = [
212188
"lib/browser/api/app.ts",
213189
"lib/browser/api/auto-updater.js",
@@ -247,7 +223,6 @@ auto_filenames = {
247223
"lib/browser/api/web-contents-view.js",
248224
"lib/browser/api/web-contents.js",
249225
"lib/browser/chrome-extension-shim.js",
250-
"lib/browser/chrome-extension.js",
251226
"lib/browser/crash-reporter-init.js",
252227
"lib/browser/default-menu.ts",
253228
"lib/browser/desktop-capturer.ts",
@@ -308,12 +283,6 @@ auto_filenames = {
308283
"lib/renderer/api/module-list.ts",
309284
"lib/renderer/api/remote.js",
310285
"lib/renderer/api/web-frame.ts",
311-
"lib/renderer/chrome-api.ts",
312-
"lib/renderer/content-scripts-injector.ts",
313-
"lib/renderer/extensions/event.ts",
314-
"lib/renderer/extensions/i18n.ts",
315-
"lib/renderer/extensions/storage.ts",
316-
"lib/renderer/extensions/web-navigation.ts",
317286
"lib/renderer/init.ts",
318287
"lib/renderer/inspector.ts",
319288
"lib/renderer/ipc-renderer-internal-utils.ts",

lib/browser/chrome-extension-shim.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
// BrowserWindow-based extensions stuff to the new native-backed extensions
55
// API.
66

7-
if (!process.electronBinding('features').isExtensionsEnabled()) {
8-
throw new Error('Attempted to load JS chrome-extension shim without //extensions support enabled');
9-
}
10-
117
const { app, session, BrowserWindow, deprecate } = require('electron');
128

139
app.whenReady().then(function () {

0 commit comments

Comments
 (0)