Skip to content
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

Update a bunch of stuff to get latest magenta building #24

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions .babelrc

This file was deleted.

2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"typescript.tsdk": "node_modules/typescript/lib"
}
}
51 changes: 21 additions & 30 deletions configs/webpack/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,23 +45,14 @@ module.exports = {
test: /\.tsx?$/,
use: [
{ loader: 'cache-loader' },
{
loader: 'thread-loader',
options: {
// there should be 1 cpu for the fork-ts-checker-webpack-plugin
workers: require('os').cpus().length - 1,
poolTimeout: Infinity, // set this to Infinity in watch mode - see https://github.com/webpack-contrib/thread-loader
},
},
{
loader: 'babel-loader',
options: {
cacheDirectory: true,
babelrc: false,
presets: ['@babel/preset-env', '@babel/preset-react'],
plugins: ['react-hot-loader/babel'],
},
},
// {
// loader: 'thread-loader',
// options: {
// // there should be 1 cpu for the fork-ts-checker-webpack-plugin
// workers: require('os').cpus().length - 1,
// poolTimeout: Infinity, // set this to Infinity in watch mode - see https://github.com/webpack-contrib/thread-loader
// },
// },
{
loader: 'ts-loader',
options: {
Expand Down Expand Up @@ -89,21 +80,21 @@ module.exports = {
],
},
plugins: [
new ForkTsCheckerWebpackPlugin({
checkSyntacticErrors: true,
tsconfig: resolve(__dirname, '../../tsconfig.json'),
exclude: '',
}),
// new ForkTsCheckerWebpackPlugin({
// checkSyntacticErrors: true,
// tsconfig: resolve(__dirname, '../../tsconfig.json'),
// exclude: '',
// }),
new Dotenv(),
new HtmlWebpackPlugin({ inject: true, template: 'index.html.ejs' }),
new AutoDllPlugin({
inject: true, // will inject the DLL bundles to index.html
filename: dllFilename,
entry: {
vendor: vendorDependencies,
},
context: resolve(__dirname, '../../src'),
}),
// new AutoDllPlugin({
// inject: true, // will inject the DLL bundles to index.html
// filename: dllFilename,
// entry: {
// vendor: vendorDependencies,
// },
// context: resolve(__dirname, '../../src'),
// }),
],
performance: {
hints: false,
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"webpack-merge": "^4.2.1"
},
"dependencies": {
"@magenta/music": "1.9.0",
"@magenta/music": "1.23.0",
"@material-ui/core": "^4.0.0",
"@material-ui/icons": "^4.0.0",
"@material-ui/lab": "^4.0.0-alpha.13",
Expand Down
2 changes: 1 addition & 1 deletion src/core/player.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class Player {

private player = new mm.SoundFontPlayer(
SOUNDFONT_URL,
Tone.master,
Tone.Destination,
undefined,
undefined,
this.playerCallbackObject
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"sourceMap": true,
"noImplicitAny": false,
"module": "commonjs",
"target": "es5",
"target": "ES6",
"jsx": "react",
"lib": ["es5", "es6", "dom"],
"experimentalDecorators": true,
Expand Down
Loading