no-chris · no-chris · Jan 3, 2022 · Dec 28, 2021 · Dec 28, 2021 · Dec 28, 2021
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/babel.config.js b/babel.config.js
@@ -0,0 +1,16 @@
+/* eslint-env node */
+const presets = [
+	[
+		'@babel/preset-env',
+		{
+			targets: {
+				browsers: 'defaults',
+			},
+			corejs: '3.0',
+			useBuiltIns: 'usage',
+		},
+	],
+	'@babel/preset-react',
+];
+
+module.exports = { presets };
diff --git a/jest.config.base.js b/jest.config.base.js
@@ -0,0 +1,31 @@
+/* eslint-env node */
+module.exports = {
+	testEnvironment: 'jsdom',
+	rootDir: __dirname,
+
+	collectCoverage: true,
+	collectCoverageFrom: ['<rootDir>/packages/chord-charts-studio/src/**/*.js'],
+	coverageDirectory: '<rootDir>/coverage',
+	coverageReporters: ['json', 'lcov', 'text', 'clover'],
+	coverageThreshold: {
+		global: {
+			branches: 99,
+			functions: 99,
+			lines: 99,
+			statements: 99,
+		},
+	},
+
+	transform: {
+		'\\.js$': 'babel-jest',
+		'\\.hbs$': 'jest-handlebars',
+		'\\.txt': 'jest-raw-loader',
+	},
+	// whitelisting local modules in the node_modules folder
+	transformIgnorePatterns: ['<rootDir>.*(node_modules)(?!.*chord-mark.*).*$'],
+
+	moduleNameMapper: {
+		'\\.(css|scss)$': '<rootDir>/tests/styleMock.js',
+		'\\.(png)$': '<rootDir>/tests/assetMock.js',
+	},
+};
diff --git a/jest.config.js b/jest.config.js
@@ -0,0 +1,7 @@
+/* eslint-env node */
+const baseConfig = require('./jest.config.base');
+
+module.exports = {
+	...baseConfig,
+	projects: ['<rootDir>/packages/*/jest.config.js'],
+};
diff --git a/packages/chord-charts-studio/SLOC b/packages/chord-charts-studio/SLOC
@@ -2,53 +2,53 @@ Source code:
 
 ---------- Result ------------
 
-            Physical :  6330
-              Source :  5236
+            Physical :  6183
+              Source :  5117
              Comment :  128
  Single-line comment :  60
        Block comment :  68
                Mixed :  6
  Empty block comment :  0
-               Empty :  972
+               Empty :  944
                To Do :  0
 
-Number of files read :  145
+Number of files read :  142
 
 ----------------------------
 
 Tests:
 
 ---------- Result ------------
 
-            Physical :  7403
-              Source :  6102
+            Physical :  7167
+              Source :  5889
              Comment :  65
  Single-line comment :  58
        Block comment :  7
                Mixed :  8
  Empty block comment :  0
-               Empty :  1244
+               Empty :  1221
                To Do :  0
 
-Number of files read :  71
+Number of files read :  65
 
 ----------------------------
 
 Total:
 
 ---------- Result ------------
 
-            Physical :  13733
-              Source :  11338
+            Physical :  13350
+              Source :  11006
              Comment :  193
  Single-line comment :  118
        Block comment :  75
                Mixed :  14
  Empty block comment :  0
-               Empty :  2216
+               Empty :  2165
                To Do :  0
 
-Number of files read :  216
+Number of files read :  207
 
 ----------------------------
 
diff --git a/...o/build/css/main.8021d68be529720cfa48.css → ...o/build/css/main.eda2da7c7e10c33e1838.css b/...o/build/css/main.8021d68be529720cfa48.css → ...o/build/css/main.eda2da7c7e10c33e1838.css
diff --git a/...ild/css/main.8021d68be529720cfa48.css.map → ...ild/css/main.eda2da7c7e10c33e1838.css.map b/...ild/css/main.8021d68be529720cfa48.css.map → ...ild/css/main.eda2da7c7e10c33e1838.css.map
diff --git a/packages/chord-charts-studio/build/index.html b/packages/chord-charts-studio/build/index.html
@@ -2,4 +2,4 @@
         function gtag(){dataLayer.push(arguments);}
         gtag('js', new Date());
 
-        gtag('config', 'G-EGKBT2J600');</script><link rel="icon" href="app/favicon.ico"><script defer="defer" src="app/vendors.8021d68be529720cfa48.js"></script><script defer="defer" src="app/main.8021d68be529720cfa48.js"></script><link href="app/css/main.8021d68be529720cfa48.css" rel="stylesheet"></head><body><div id="app" class="theme-dark"></div></body></html>
+        gtag('config', 'G-EGKBT2J600');</script><link rel="icon" href="app/favicon.ico"><script defer="defer" src="app/vendors.eda2da7c7e10c33e1838.js"></script><script defer="defer" src="app/main.eda2da7c7e10c33e1838.js"></script><link href="app/css/main.eda2da7c7e10c33e1838.css" rel="stylesheet"></head><body><div id="app" class="theme-dark"></div></body></html>
diff --git a/packages/chord-charts-studio/build/main.8021d68be529720cfa48.js b/packages/chord-charts-studio/build/main.8021d68be529720cfa48.js
diff --git a/packages/chord-charts-studio/build/main.8021d68be529720cfa48.js.map b/packages/chord-charts-studio/build/main.8021d68be529720cfa48.js.map
diff --git a/packages/chord-charts-studio/build/main.eda2da7c7e10c33e1838.js b/packages/chord-charts-studio/build/main.eda2da7c7e10c33e1838.js
diff --git a/packages/chord-charts-studio/build/main.eda2da7c7e10c33e1838.js.map b/packages/chord-charts-studio/build/main.eda2da7c7e10c33e1838.js.map
diff --git a/packages/chord-charts-studio/build/vendors.8021d68be529720cfa48.js b/packages/chord-charts-studio/build/vendors.8021d68be529720cfa48.js
diff --git a/packages/chord-charts-studio/build/vendors.8021d68be529720cfa48.js.map b/packages/chord-charts-studio/build/vendors.8021d68be529720cfa48.js.map
diff --git a/packages/chord-charts-studio/build/vendors.eda2da7c7e10c33e1838.js b/packages/chord-charts-studio/build/vendors.eda2da7c7e10c33e1838.js
diff --git a/...ndors.8021d68be529720cfa48.js.LICENSE.txt → ...ndors.eda2da7c7e10c33e1838.js.LICENSE.txt b/...ndors.8021d68be529720cfa48.js.LICENSE.txt → ...ndors.eda2da7c7e10c33e1838.js.LICENSE.txt
@@ -74,30 +74,3 @@ and limitations under the License.
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-
-/**!
-
- @license
- handlebars v4.7.7
-
-Copyright (C) 2011-2019 by Yehuda Katz
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-*/
diff --git a/packages/chord-charts-studio/build/vendors.eda2da7c7e10c33e1838.js.map b/packages/chord-charts-studio/build/vendors.eda2da7c7e10c33e1838.js.map
diff --git a/packages/chord-charts-studio/jest.config.js b/packages/chord-charts-studio/jest.config.js
@@ -1,34 +1,17 @@
 /* eslint-env node */
+const baseConfig = require('../../jest.config.base');
+const packageJson = require('./package');
+
 module.exports = {
-	testEnvironment: 'jsdom',
+	...baseConfig,
+	name: packageJson.name,
+	displayName: packageJson.name,
 
-	collectCoverage: true,
-	collectCoverageFrom: ['src/**/*.js', '!src/main.js', '!**/node_modules/**'],
-	coverageDirectory: '<rootDir>/coverage',
+	rootDir: '../..',
 	coveragePathIgnorePatterns: [
-		'node_modules',
-		'src/core/createGetVersions.js',
+		'packages/chord-charts-studio/src/main.js',
+		'packages/chord-charts-studio/src/core/createGetVersions.js',
 	],
-	coverageReporters: ['json', 'lcov', 'text', 'clover'],
-	coverageThreshold: {
-		global: {
-			branches: 99,
-			functions: 99,
-			lines: 99,
-			statements: 99,
-		},
-	},
-
-	transform: {
-		'\\.js$': 'babel-jest',
-		'\\.hbs$': 'jest-handlebars',
-		'\\.txt': 'jest-raw-loader',
-	},
 
 	setupFiles: ['jest-localstorage-mock'],
-
-	moduleNameMapper: {
-		'\\.(css|scss)$': '<rootDir>/scss/__mocks__/styleMock.js',
-		'\\.(png)$': '<rootDir>/assets/__mocks__/assetMock.js',
-	},
 };
diff --git a/packages/chord-charts-studio/package.json b/packages/chord-charts-studio/package.json
@@ -23,10 +23,9 @@
 		"@testing-library/user-event": "^13.5.0"
 	},
 	"dependencies": {
-		"chord-mark": "^0.9.0",
-		"chord-mark-2-chordpro": "^0.9.0",
+		"chord-mark": "^0.10.0-beta.6",
+		"chord-mark-converters": "^0.10.0-beta.8",
 		"chord-mark-themes": "^0.9.1",
-		"chordsheetjs": "^5.1.2",
 		"combine-section-reducers": "^1.0.6",
 		"core-js": "^3.20.0",
 		"dompurify": "^2.2.9",

diff --git a/packages/chord-charts-studio/src/core/converters/chordSheetJs2ChordMark.js b/packages/chord-charts-studio/src/core/converters/chordSheetJs2ChordMark.js
diff --git a/packages/chord-charts-studio/src/core/converters/ultimateGuitar2ChordMark.js b/packages/chord-charts-studio/src/core/converters/ultimateGuitar2ChordMark.js
diff --git a/packages/chord-charts-studio/src/core/getVersions.js b/packages/chord-charts-studio/src/core/getVersions.js