Skip to content

Commit

Permalink
remove handlebars, update chord mark and build
Browse files Browse the repository at this point in the history
  • Loading branch information
no-chris committed Oct 24, 2022
1 parent 1374493 commit c9492ad
Show file tree
Hide file tree
Showing 21 changed files with 32 additions and 122 deletions.
1 change: 0 additions & 1 deletion jest.config.base.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ module.exports = {

transform: {
'\\.js$': 'babel-jest',
'\\.hbs$': 'jest-handlebars',
'\\.txt': 'jest-text-transformer',
'\\.svg': 'jest-text-transformer',
},
Expand Down
2 changes: 0 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,9 @@
"eslint-plugin-react-hooks": "^4.2.0",
"file-loader": "^6.2.0",
"generate-changelog": "^1.8.0",
"handlebars-loader": "^1.7.1",
"html-webpack-inline-source-plugin": "0.0.10",
"html-webpack-plugin": "^5.4.0",
"jest": "^29.2.1",
"jest-handlebars": "^1.0.1",
"jest-localstorage-mock": "^2.4.14",
"lerna": "^6.0.1",
"long": "^5.1.0",
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

This file was deleted.

2 changes: 1 addition & 1 deletion packages/chord-chart-studio/build/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());

gtag('config', 'G-EGKBT2J600');</script><link rel="icon" href="app/favicon.png"><script defer="defer" src="app/vendors.9eb5f33d21b01935d155.js"></script><script defer="defer" src="app/main.9eb5f33d21b01935d155.js"></script><link href="app/css/main.9eb5f33d21b01935d155.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.png"><script defer="defer" src="app/vendors.6c2b09763d09b4b4339a.js"></script><script defer="defer" src="app/main.6c2b09763d09b4b4339a.js"></script><link href="app/css/main.6c2b09763d09b4b4339a.css" rel="stylesheet"></head><body><div id="app" class="theme-dark"></div></body></html>

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

This file was deleted.

This file was deleted.

7 changes: 3 additions & 4 deletions packages/chord-chart-studio/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,16 @@
"react-test-renderer": "^18.2.0"
},
"dependencies": {
"chord-mark": "^0.11.0",
"chord-mark-converters": "^0.11.0",
"chord-mark-themes": "^0.11.0",
"chord-mark": "^0.12.0",
"chord-mark-converters": "^0.12.0",
"chord-mark-themes": "^0.12.0",
"chord-symbol": "^3.0.0",
"chord-symbol-ultimateguitar": "3.0.0",
"combine-section-reducers": "^1.0.6",
"core-js": "^3.20.2",
"dompurify": "^2.2.9",
"file-saver": "^2.0.5",
"filesize": "^10.0.5",
"handlebars": "^4.7.7",
"lodash": "^4.17.21",
"normalize.css": "^8.0.1",
"prop-types": "^15.8.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/chord-chart-studio/src/core/getVersions.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export default () => ({'chord-chart-studio':'v0.13.0','chord-symbol':'3.0.0','chord-mark':'v0.11.0'});
export default () => ({'chord-chart-studio':'v0.13.0','chord-symbol':'3.0.0','chord-mark':'v0.12.0'});
1 change: 0 additions & 1 deletion packages/chord-chart-studio/todo.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

## Build & tooling

- remove handlebars (but depends on CM...)
- host React on CDN

- have a clear entry point for each feature module
Expand Down
4 changes: 0 additions & 4 deletions packages/chord-chart-studio/webpack.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,6 @@ const config = {
exclude: /node_modules/,
loader: 'babel-loader',
},
{
test: /\.hbs$/,
loader: 'handlebars-loader',
},
{
test: /\.scss|sass|css$/,
use: [MiniCssExtractPlugin.loader, 'css-loader', 'sass-loader'],
Expand Down
65 changes: 14 additions & 51 deletions packages/chord-chart-studio/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -285,27 +285,27 @@ chalk@^4.0.0, chalk@^4.1.0:
ansi-styles "^4.1.0"
supports-color "^7.1.0"

chord-mark-converters@^0.11.0:
version "0.11.0"
resolved "https://registry.yarnpkg.com/chord-mark-converters/-/chord-mark-converters-0.11.0.tgz#fc8d7b67c282044db08242cadffc7b80645c2ee4"
integrity sha512-KhLcz+dDJyHRTfcQGtY/KnOuV6E4o+Z/l0YC+orOZaf8N/VrEi5OxMxMOmQURIwQYCn6LFEuMnbL2IQoUlaZIw==
chord-mark-converters@^0.12.0:
version "0.12.0"
resolved "https://registry.yarnpkg.com/chord-mark-converters/-/chord-mark-converters-0.12.0.tgz#ec23f24a34766e261039ec07b277fe9779975a21"
integrity sha512-d25pwL+huSlfXtaDkFSMvzW7qFzq2ob5dcGKg75CuImbeiqYbmoYf8XQFhkJfbNmCEQRCTTxx2ti9eKlrnJgRg==
dependencies:
chord-mark "^0.11.0"
chord-mark "^0.12.0"
chord-symbol "3.0.0"
chord-symbol-ultimateguitar "3.0.0"
dompurify "^2.3.4"

chord-mark-themes@^0.11.0:
version "0.11.0"
resolved "https://registry.yarnpkg.com/chord-mark-themes/-/chord-mark-themes-0.11.0.tgz#192c90068b0225b20d7cbdba44aa0a2cf36dd206"
integrity sha512-Oe0BBUXT7PcZ5WGIC7U0WUJH0mWXZW6C0AvN9dfeTiiEt49QKntTInx/lnus/hdoyImgnzt5jC9XxwPDzV4EGg==
chord-mark-themes@^0.12.0:
version "0.12.0"
resolved "https://registry.yarnpkg.com/chord-mark-themes/-/chord-mark-themes-0.12.0.tgz#b67951a3f0a62727e78df7fda08cc6dc09f3c821"
integrity sha512-3kmzSt9Bxq5S+NRTptjVhUK1JJ1C04isKD4TCQAWfXXP/71vmhk/5anZx6/pi1z+fupd9IXpgcXMgnwWMytUkA==
dependencies:
chord-mark "^0.11.0"
chord-mark "^0.12.0"

chord-mark@^0.11.0:
version "0.11.0"
resolved "https://registry.yarnpkg.com/chord-mark/-/chord-mark-0.11.0.tgz#f21cb9824a638ec2712ced076d99e971329994a4"
integrity sha512-eoewZZdG5yJpiNK+JAQiBbVLAmg9VuqLUye1FmhD9DU//Pbpj+Hel4wLgOE2aF7/fhYT0YhfPQ+Jhc0cZ1M8mA==
chord-mark@^0.12.0:
version "0.12.0"
resolved "https://registry.yarnpkg.com/chord-mark/-/chord-mark-0.12.0.tgz#499ac3965aee93b4128a97b7b31c5a86b0924457"
integrity sha512-LsZ/elw1yLsiPaF32rIayFvKXuMbsfzRXBCMNfwKLsXK8mM3mupdCUFxFUTzYho23U35VKDXFp7sNvhzI/IuCw==
dependencies:
chord-symbol "3.0.0"
dompurify "^2.3.4"
Expand Down Expand Up @@ -560,18 +560,6 @@ graceful-fs@^4.2.9:
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==

handlebars@^4.7.7:
version "4.7.7"
resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1"
integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==
dependencies:
minimist "^1.2.5"
neo-async "^2.6.0"
source-map "^0.6.1"
wordwrap "^1.0.0"
optionalDependencies:
uglify-js "^3.1.4"

has-bigints@^1.0.1, has-bigints@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa"
Expand Down Expand Up @@ -853,16 +841,6 @@ min-indent@^1.0.0:
resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==

minimist@^1.2.5:
version "1.2.7"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==

neo-async@^2.6.0:
version "2.6.2"
resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==

normalize.css@^8.0.1:
version "8.0.1"
resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-8.0.1.tgz#9b98a208738b9cc2634caacbc42d131c97487bf3"
Expand Down Expand Up @@ -1151,11 +1129,6 @@ slash@^3.0.0:
resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==

source-map@^0.6.1:
version "0.6.1"
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==

stack-utils@^2.0.3:
version "2.0.5"
resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.5.tgz#d25265fca995154659dbbfba3b49254778d2fdd5"
Expand Down Expand Up @@ -1209,11 +1182,6 @@ to-regex-range@^5.0.1:
dependencies:
is-number "^7.0.0"

uglify-js@^3.1.4:
version "3.17.4"
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c"
integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==

unbox-primitive@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e"
Expand Down Expand Up @@ -1278,8 +1246,3 @@ which-typed-array@^1.1.2:
for-each "^0.3.3"
has-tostringtag "^1.0.0"
is-typed-array "^1.1.9"

wordwrap@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==
2 changes: 1 addition & 1 deletion packages/documentation/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"scripts": {
"docusaurus": "docusaurus",
"start": "docusaurus start --poll",
"build": "docusaurus build",
"build": "docusaurus build && cp -rf ../chord-chart-studio/build/* build/app",
"swizzle": "docusaurus swizzle",
"deploy": "docusaurus deploy",
"clear": "docusaurus clear",
Expand Down
48 changes: 2 additions & 46 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3130,7 +3130,7 @@ assign-symbols@^1.0.0:
resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
integrity sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==

async@^3.2.2, async@^3.2.3:
async@^3.2.3:
version "3.2.4"
resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c"
integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==
Expand Down Expand Up @@ -3293,11 +3293,6 @@ before-after-hook@^2.2.0:
resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.2.3.tgz#c51e809c81a4e354084422b9b26bad88249c517c"
integrity sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==

big.js@^3.1.3:
version "3.2.0"
resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
integrity sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==

big.js@^5.2.2:
version "5.2.2"
resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
Expand Down Expand Up @@ -4585,11 +4580,6 @@ emoji-regex@^8.0.0:
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==

emojis-list@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
integrity sha512-knHEZMgs8BB+MInokmNTg/OyPlAddghe1YBgNwJBc5zsJi/uyIcXoSDsL/W9ymOsBoBGdPIHXYJ9+qKFwRwDng==

emojis-list@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
Expand Down Expand Up @@ -5141,11 +5131,6 @@ fastest-levenshtein@^1.0.12:
resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5"
integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==

fastparse@^1.0.0:
version "1.1.2"
resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.2.tgz#91728c5a5942eced8531283c79441ee4122c35a9"
integrity sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==

fastq@^1.6.0:
version "1.13.0"
resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c"
Expand Down Expand Up @@ -5663,16 +5648,6 @@ handle-thing@^2.0.0:
resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e"
integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==

handlebars-loader@^1.7.1:
version "1.7.2"
resolved "https://registry.yarnpkg.com/handlebars-loader/-/handlebars-loader-1.7.2.tgz#1694cc7cb3de1d16bec718af257eed853e4af84d"
integrity sha512-rEzru8REzqeJlbotJD+gPQ8AHyxcAjeXbGqGmrz3+sbjecI0ungieONwMR27Htr+AoKI5W36oPLwcwGrPzO8gw==
dependencies:
async "^3.2.2"
fastparse "^1.0.0"
loader-utils "1.0.x"
object-assign "^4.1.0"

handlebars@^4.7.7:
version "4.7.7"
resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1"
Expand Down Expand Up @@ -6638,11 +6613,6 @@ jest-get-type@^29.2.0:
resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.2.0.tgz#726646f927ef61d583a3b3adb1ab13f3a5036408"
integrity sha512-uXNJlg8hKFEnDgFsrCjznB+sTxdkuqiCL6zMgA75qEbAJjJYTs9XPrvDctrEig2GDow22T/LvHgO57iJhXB/UA==

jest-handlebars@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/jest-handlebars/-/jest-handlebars-1.0.1.tgz#391a3d8a6d13a1bc150a9d6786e426b57965c95f"
integrity sha512-R0L6F7bgkQjaGhDtkeC6UGlZ91pZtmMx1USIrx5OyY+DG5FlPjdDJOirOQwnZjMkApdpRq1uzo2P2O4nl3dbfQ==

jest-haste-map@^29.2.1:
version "29.2.1"
resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.2.1.tgz#f803fec57f8075e6c55fb5cd551f99a72471c699"
Expand Down Expand Up @@ -7003,11 +6973,6 @@ json-stringify-safe@^5.0.1:
resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==

json5@^0.5.0:
version "0.5.1"
resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
integrity sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw==

json5@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
Expand Down Expand Up @@ -7197,15 +7162,6 @@ loader-runner@^4.2.0:
resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1"
integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==

loader-utils@1.0.x:
version "1.0.4"
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.0.4.tgz#13f56197f1523a305891248b4c7244540848426c"
integrity sha512-TMS4PQ0+m0xyRGBunvDQIdhWJY6JOYeEPpHZEW0EmDhqKrQUj04xiMT3jsdVS17pUg0JzX1mJI3QiV8lXjoEng==
dependencies:
big.js "^3.1.3"
emojis-list "^2.0.0"
json5 "^0.5.0"

loader-utils@^2.0.0:
version "2.0.3"
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.3.tgz#d4b15b8504c63d1fc3f2ade52d41bc8459d6ede1"
Expand Down Expand Up @@ -7972,7 +7928,7 @@ nx@15.0.1, "nx@>=14.8.6 < 16":
yargs "^17.4.0"
yargs-parser "21.0.1"

object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
object-assign@^4.0.1, object-assign@^4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
Expand Down

0 comments on commit c9492ad

Please sign in to comment.