-
+
Forge
diff --git a/default_app/index.ts b/default_app/index.ts
new file mode 100644
index 000000000000..6b3fdd084f0b
--- /dev/null
+++ b/default_app/index.ts
@@ -0,0 +1,30 @@
+async function getOcticonSvg (name: string) {
+ try {
+ const response = await fetch(`octicon/${name}.svg`)
+ const div = document.createElement('div')
+ div.innerHTML = await response.text()
+ return div
+ } catch {
+ return null
+ }
+}
+
+async function loadSVG (element: HTMLSpanElement) {
+ for (const cssClass of element.classList) {
+ if (cssClass.startsWith('octicon-')) {
+ const icon = await getOcticonSvg(cssClass.substr(8))
+ if (icon) {
+ for (const elemClass of element.classList) {
+ icon.classList.add(elemClass)
+ }
+ element.before(icon)
+ element.remove()
+ break
+ }
+ }
+ }
+}
+
+for (const element of document.querySelectorAll
('.octicon')) {
+ loadSVG(element)
+}
diff --git a/default_app/main.ts b/default_app/main.ts
index 3f7fef3ef92e..a25ba6d5579c 100644
--- a/default_app/main.ts
+++ b/default_app/main.ts
@@ -129,9 +129,14 @@ function showErrorMessage (message: string) {
process.exit(1)
}
-async function loadApplicationByUrl (appUrl: string) {
- const { load } = await import('./default_app')
- load(appUrl)
+async function loadApplicationByURL (appUrl: string) {
+ const { loadURL } = await import('./default_app')
+ loadURL(appUrl)
+}
+
+async function loadApplicationByFile (appPath: string) {
+ const { loadFile } = await import('./default_app')
+ loadFile(appPath)
}
function startRepl () {
@@ -156,13 +161,9 @@ if (option.file && !option.webdriver) {
const protocol = url.parse(file).protocol
const extension = path.extname(file)
if (protocol === 'http:' || protocol === 'https:' || protocol === 'file:' || protocol === 'chrome:') {
- loadApplicationByUrl(file)
+ loadApplicationByURL(file)
} else if (extension === '.html' || extension === '.htm') {
- loadApplicationByUrl(url.format({
- protocol: 'file:',
- slashes: true,
- pathname: path.resolve(file)
- }))
+ loadApplicationByFile(path.resolve(file))
} else {
loadApplicationPackage(file)
}
@@ -196,10 +197,5 @@ Options:
console.log(welcomeMessage)
}
- const indexPath = path.join(__dirname, '/index.html')
- loadApplicationByUrl(url.format({
- protocol: 'file:',
- slashes: true,
- pathname: indexPath
- }))
+ loadApplicationByFile('index.html')
}
diff --git a/default_app/preload.ts b/default_app/preload.ts
new file mode 100644
index 000000000000..3424ad45bb5e
--- /dev/null
+++ b/default_app/preload.ts
@@ -0,0 +1,20 @@
+import { ipcRenderer } from 'electron'
+
+function initialize () {
+ const electronPath = ipcRenderer.sendSync('bootstrap')
+
+ function replaceText (selector: string, text: string) {
+ const element = document.querySelector(selector)
+ if (element) {
+ element.innerText = text
+ }
+ }
+
+ replaceText('.electron-version', `Electron v${process.versions.electron}`)
+ replaceText('.chrome-version', `Chromium v${process.versions.chrome}`)
+ replaceText('.node-version', `Node v${process.versions.node}`)
+ replaceText('.v8-version', `v8 v${process.versions.v8}`)
+ replaceText('.command-example', `${electronPath} path-to-app`)
+}
+
+document.addEventListener('DOMContentLoaded', initialize)
diff --git a/default_app/renderer.ts b/default_app/renderer.ts
deleted file mode 100644
index 498cf70f97f4..000000000000
--- a/default_app/renderer.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { remote, shell } from 'electron'
-import * as fs from 'fs'
-import * as path from 'path'
-import * as URL from 'url'
-
-function initialize () {
- // Find the shortest path to the electron binary
- const absoluteElectronPath = remote.process.execPath
- const relativeElectronPath = path.relative(process.cwd(), absoluteElectronPath)
- const electronPath = absoluteElectronPath.length < relativeElectronPath.length
- ? absoluteElectronPath
- : relativeElectronPath
-
- for (const link of document.querySelectorAll('a[href]')) {
- // safely add `?utm_source=default_app
- const parsedUrl = URL.parse(link.getAttribute('href')!, true)
- parsedUrl.query = { ...parsedUrl.query, utm_source: 'default_app' }
- const url = URL.format(parsedUrl)
-
- const openLinkExternally = (e: Event) => {
- e.preventDefault()
- shell.openExternalSync(url)
- }
-
- link.addEventListener('click', openLinkExternally)
- link.addEventListener('auxclick', openLinkExternally)
- }
-
- document.querySelector('.electron-version')!.innerText = `Electron v${process.versions.electron}`
- document.querySelector('.chrome-version')!.innerText = `Chromium v${process.versions.chrome}`
- document.querySelector('.node-version')!.innerText = `Node v${process.versions.node}`
- document.querySelector('.v8-version')!.innerText = `v8 v${process.versions.v8}`
- document.querySelector('.command-example')!.innerText = `${electronPath} path-to-app`
-
- function getOcticonSvg (name: string) {
- const octiconPath = path.resolve(__dirname, 'octicon', `${name}.svg`)
- if (fs.existsSync(octiconPath)) {
- const content = fs.readFileSync(octiconPath, 'utf8')
- const div = document.createElement('div')
- div.innerHTML = content
- return div
- }
- return null
- }
-
- function loadSVG (element: HTMLSpanElement) {
- for (const cssClass of element.classList) {
- if (cssClass.startsWith('octicon-')) {
- const icon = getOcticonSvg(cssClass.substr(8))
- if (icon) {
- for (const elemClass of element.classList) {
- icon.classList.add(elemClass)
- }
- element.before(icon)
- element.remove()
- break
- }
- }
- }
- }
-
- for (const element of document.querySelectorAll('.octicon')) {
- loadSVG(element)
- }
-}
-
-window.addEventListener('load', initialize)
diff --git a/filenames.gni b/filenames.gni
index 965b36ea77b2..b3fa1e8a3fea 100644
--- a/filenames.gni
+++ b/filenames.gni
@@ -94,8 +94,9 @@ filenames = {
default_app_ts_sources = [
"default_app/default_app.ts",
+ "default_app/index.ts",
"default_app/main.ts",
- "default_app/renderer.ts",
+ "default_app/preload.ts",
]
default_app_static_sources = [
diff --git a/lib/sandboxed_renderer/init.js b/lib/sandboxed_renderer/init.js
index 77e17e9df399..f1e26139d29e 100644
--- a/lib/sandboxed_renderer/init.js
+++ b/lib/sandboxed_renderer/init.js
@@ -158,7 +158,7 @@ const errorUtils = require('@electron/internal/common/error-utils')
// since browserify won't try to include `electron` in the bundle, falling back
// to the `preloadRequire` function above.
function runPreloadScript (preloadSrc) {
- const preloadWrapperSrc = `(function(require, process, Buffer, global, setImmediate, clearImmediate) {
+ const preloadWrapperSrc = `(function(require, process, Buffer, global, setImmediate, clearImmediate, exports) {
${preloadSrc}
})`
@@ -166,7 +166,7 @@ function runPreloadScript (preloadSrc) {
const preloadFn = binding.createPreloadScript(preloadWrapperSrc)
const { setImmediate, clearImmediate } = require('timers')
- preloadFn(preloadRequire, preloadProcess, Buffer, global, setImmediate, clearImmediate)
+ preloadFn(preloadRequire, preloadProcess, Buffer, global, setImmediate, clearImmediate, {})
}
for (const { preloadPath, preloadSrc, preloadError } of preloadScripts) {