-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix dependencies based voyager build change #32
Open
ajainarayanan
wants to merge
9
commits into
vega:master
Choose a base branch
from
ajainarayanan:fix-deps-based-voyager-build-change
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
557d8d5
Modifies package.json to add dependencies not shipped as part of voya…
ajainarayanan 8f1a838
Modifies renderer and index.html to include require right modules
ajainarayanan 7b5856a
Adds minimal webpack build for renderer module to parse font-awesome-…
ajainarayanan d7c6c8b
Restores require for voyager as the same web build can still be used
ajainarayanan 4100fef
Updates node modules to latest
ajainarayanan ea23a7f
Updates voyager api to latest createVoyager api function
ajainarayanan 1b2bc29
Updates webpack config to handle native node modules (.node files fro…
ajainarayanan 06d1378
Adds yarn.lock file
ajainarayanan dafeb5f
Fixes package.json with temporary voyager and voyager-server node mod…
ajainarayanan File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -22,6 +22,6 @@ | |
</body> | ||
|
||
<script> | ||
require('./renderer.js') | ||
require('./dist/app.js') | ||
</script> | ||
</html> |
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
const path = require('path'); | ||
|
||
module.exports = { | ||
entry: { | ||
app: './renderer.js', | ||
}, | ||
output: { | ||
filename: './[name].js', | ||
path: path.join(__dirname, '/dist'), | ||
}, | ||
target: 'electron-renderer', | ||
module: { | ||
rules: [ | ||
{ | ||
test: /\.scss$/, | ||
loader: 'style-loader!css-loader!postcss-loader!sass-loader', | ||
}, | ||
{ | ||
test: /\.woff(2)?(\?v=[0-9]\.[0-9]\.[0-9])?$/, | ||
use: [ | ||
{ | ||
loader: 'url-loader', | ||
options: { | ||
limit: 10000, | ||
mimetype: 'application/font-woff', | ||
}, | ||
}, | ||
], | ||
}, | ||
{ | ||
test: /\.(ttf|eot|svg)(\?v=[0-9]\.[0-9]\.[0-9])?$/, | ||
use: 'url-loader', | ||
}, | ||
], | ||
}, | ||
}; |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ajainarayanan I though you say the normal lib build works fine -- do we really still need this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is required for
font-awesome-sass-loader
Since we markedfont-awesome-*
as external in voyager we need to add this. This is to parse font awesome font files and serve them usingurl-loader
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I removed the webpack build step to generate a library build explicitly for electron environment in the voyager PR. This however is required for using font-awesome loader in voyager.