Skip to content

Commit

Permalink
fix build regression
Browse files Browse the repository at this point in the history
  • Loading branch information
ungoldman committed Dec 19, 2017
1 parent 0e5c3fe commit 7442cc5
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jspm_packages
.node_repl_history

# Our stuff
renderer/dist/*
renderer/**/bundle.js

!.keep

Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -126,12 +126,12 @@
},
"scripts": {
"build": "run-s clean build:*",
"build:assets": "browserify --no-bundle-external --debug renderer/player/index.js -o renderer/dist/bundle.js",
"build:assets": "browserify --no-bundle-external --debug renderer/player/index.js -o renderer/player/bundle.js",
"build:electron": "build --dir",
"clean": "rimraf dist renderer/dist && mkdirp dist renderer/dist",
"clean": "rimraf dist renderer/**/bundle.js && mkdirp dist",
"clear": "electron scripts/clear.js",
"pkg": "run-s clean pkg:*",
"pkg:assets": "browserify --no-bundle-external -g unassertify -p common-shakeify -p bundle-collapser/plugin --debug renderer/player/index.js -o renderer/dist/bundle.js",
"pkg:assets": "browserify --no-bundle-external -g unassertify -p common-shakeify -p bundle-collapser/plugin --debug renderer/player/index.js -o renderer/player/bundle.js",
"pkg:electron": "build",
"prod": "ELECTRON_IS_DEV=0 DEV_SERVER=1 npm start",
"start": "run-s watch",
Expand Down
1 change: 0 additions & 1 deletion renderer/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,3 @@ The two renderer process in Hyperamp are the Player and Audio windows.
- `audio` - Background audio process. Exposes interface for HTML audio element over IPC.
- `player` - GUI (playlist, player controls)
- `shared` - resources shared between processes
- `dist` - browserify bundles (ignored by git)
4 changes: 2 additions & 2 deletions renderer/player/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
<main id="app"></main>
<script>
var isDev = require('electron-is-dev')
if (!isDev) window.raven = require('../lib/sentry.js')
if (!isDev) window.raven = require('../../lib/sentry.js')
if (isDev || process.env.DEV_SERVER) {
var bundle = document.createElement('script')
bundle.src = 'http://localhost:9966/bundle.js'
document.body.appendChild(bundle)
} else {
window.localStorage.DISABLE_NANOTIMING = true
require('./dist/bundle.js')
require('./bundle.js')
}
</script>
</body>
Expand Down

0 comments on commit 7442cc5

Please sign in to comment.