mirror of
https://github.com/scratchfoundation/scratch-desktop.git
synced 2024-12-22 21:52:31 -05:00
fix: Make sure that index.html can be found in paths with hashtag (#20)
This commit is contained in:
parent
0f0ec413af
commit
427ff959db
1 changed files with 9 additions and 1 deletions
|
@ -1,6 +1,7 @@
|
||||||
'use strict'
|
'use strict'
|
||||||
|
|
||||||
import { app, BrowserWindow } from 'electron'
|
import { app, BrowserWindow } from 'electron'
|
||||||
|
import { path } from 'path'
|
||||||
|
|
||||||
const isDevelopment = process.env.NODE_ENV !== 'production'
|
const isDevelopment = process.env.NODE_ENV !== 'production'
|
||||||
|
|
||||||
|
@ -12,12 +13,19 @@ function createMainWindow() {
|
||||||
// Construct new BrowserWindow
|
// Construct new BrowserWindow
|
||||||
const window = new BrowserWindow()
|
const window = new BrowserWindow()
|
||||||
|
|
||||||
|
// Path to index file in production environment
|
||||||
|
const productionIndexPath = url.format({
|
||||||
|
pathname: path.join(__dirname, 'index.html'),
|
||||||
|
protocol: 'file',
|
||||||
|
slashes: true
|
||||||
|
})
|
||||||
|
|
||||||
// Set url for `win`
|
// Set url for `win`
|
||||||
// points to `webpack-dev-server` in development
|
// points to `webpack-dev-server` in development
|
||||||
// points to `index.html` in production
|
// points to `index.html` in production
|
||||||
const url = isDevelopment
|
const url = isDevelopment
|
||||||
? `http://localhost:${process.env.ELECTRON_WEBPACK_WDS_PORT}`
|
? `http://localhost:${process.env.ELECTRON_WEBPACK_WDS_PORT}`
|
||||||
: `file://${__dirname}/index.html`
|
: productionIndexPath
|
||||||
|
|
||||||
if (isDevelopment) {
|
if (isDevelopment) {
|
||||||
window.webContents.openDevTools()
|
window.webContents.openDevTools()
|
||||||
|
|
Loading…
Reference in a new issue