Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/0xfe/vexflow
Browse files Browse the repository at this point in the history
  • Loading branch information
AaronDavidNewman committed Mar 10, 2021
2 parents 71e89f6 + 5eb9275 commit 3aacb8e
Show file tree
Hide file tree
Showing 156 changed files with 8,282 additions and 6,864 deletions.
15 changes: 15 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"root": true,
"parser": "babel-eslint",
"parserOptions": {
"ecmaVersion": 6,
"sourceType": "module"
},
"env": { "browser": true },
"plugins": ["prettier"],
"extends": ["eslint:recommended", "prettier"],
"rules": {
"no-console": 1, // Means warning
"prettier/prettier": 2 // Means error
}
}
149 changes: 0 additions & 149 deletions .eslintrc.json

This file was deleted.

7 changes: 7 additions & 0 deletions .prettierrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
module.exports = {
trailingComma: 'es5',
tabWidth: 2,
semi: true,
singleQuote: true,
printWidth: 120,
};
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,7 @@
},
"editor.tabSize": 2,
"eslint.format.enable": true,
"javascript.format.enable": false,
"editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode",
}
28 changes: 13 additions & 15 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* global module, __dirname, process, require */
const path = require('path');

module.exports = (grunt) => {
Expand All @@ -21,12 +22,7 @@ module.exports = (grunt) => {

// Take all test files in 'tests/' and build TARGET_TESTS
const TARGET_TESTS = path.join(BUILD_DIR, 'vexflow-tests.js');
const TEST_SOURCES = [
'tests/vexflow_test_helpers.js',
'tests/mocks.js',
'tests/*_tests.js',
'tests/run.js',
];
const TEST_SOURCES = ['tests/vexflow_test_helpers.js', 'tests/mocks.js', 'tests/*_tests.js', 'tests/run.js'];

function webpackConfig(target, preset, mode) {
return {
Expand All @@ -39,19 +35,21 @@ module.exports = (grunt) => {
libraryTarget: 'umd',
libraryExport: 'default',
},
devtool: (process.env.VEX_GENMAP || mode === 'production') ? 'source-map' : false,
devtool: process.env.VEX_GENMAP || mode === 'production' ? 'source-map' : false,
module: {
rules: [
{
test: /\.js?$/,
exclude: /(node_modules|bower_components)/,
use: [{
loader: 'babel-loader',
options: {
presets: [preset],
plugins: ['@babel/plugin-transform-object-assign'],
use: [
{
loader: 'babel-loader',
options: {
presets: [preset],
plugins: ['@babel/plugin-transform-object-assign'],
},
},
}],
],
},
],
},
Expand Down Expand Up @@ -85,6 +83,7 @@ module.exports = (grunt) => {
},
eslint: {
target: SOURCES.concat('./tests'),
options: { fix: true },
},
qunit: {
files: ['tests/flow.html'],
Expand Down Expand Up @@ -179,6 +178,5 @@ module.exports = (grunt) => {
});

// Increment package version generate releases
grunt.registerTask('publish', 'Generate releases.',
['bump', 'stage', 'gitcommit:releases', 'release', 'alldone']);
grunt.registerTask('publish', 'Generate releases.', ['bump', 'stage', 'gitcommit:releases', 'release', 'alldone']);
};
Loading

0 comments on commit 3aacb8e

Please sign in to comment.