From 5caad02fbf200877f6a599bddf8c0f5aafd076ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Abel=20P=C3=A9rez?= Date: Mon, 5 Jun 2023 05:39:19 -0400 Subject: [PATCH 1/4] Bugfix abelpz 1577 1580 (#1584) * fix wrong merge * updated scripture-resources-rcl * updated scripture resources rcl --- package.json | 2 +- public/build_number | 2 +- .../branch-merger/hooks/useBranchMerger.js | 2 +- yarn.lock | 73 +++++++++++++++++-- 4 files changed, 70 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index b63006e4..46d7e883 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "react-icons": "^4.8.0", "react-select": "^4.1.0", "react-waypoint": "^10.1.0", - "scripture-resources-rcl": "5.3.8", + "scripture-resources-rcl": "^5.5.1", "tc-ui-toolkit": "^5.3.3", "use-deep-compare": "^1.1.0", "use-deep-compare-effect": "^1.3.1", diff --git a/public/build_number b/public/build_number index 0a7c44d0..b0a7be86 100644 --- a/public/build_number +++ b/public/build_number @@ -1 +1 @@ -257-de3d3b0 \ No newline at end of file +260-45d04f9 diff --git a/src/components/branch-merger/hooks/useBranchMerger.js b/src/components/branch-merger/hooks/useBranchMerger.js index 9d856509..41102264 100644 --- a/src/components/branch-merger/hooks/useBranchMerger.js +++ b/src/components/branch-merger/hooks/useBranchMerger.js @@ -38,7 +38,7 @@ export default function useBranchMerger({ server, owner, repo, userBranch, token const params = useMemo(() => ({ server, owner, repo, userBranch, tokenid }), [server, owner, repo, userBranch, tokenid]) const setStatus = useCallback((setter, newStatus) => setter( prevStatus => { - if (Object.keys(prevStatus).some(key => prevStatus[key] !== newStatus[key])) return {...prevStatus, ...newStatus}; + if (Object.keys(newStatus).some(key => prevStatus[key] !== newStatus[key])) return {...defaultStatus, ...newStatus}; return prevStatus; }), []) diff --git a/yarn.lock b/yarn.lock index afc22605..1aab65f9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1315,6 +1315,14 @@ core-js-pure "^3.25.1" regenerator-runtime "^0.13.11" +"@babel/runtime-corejs3@^7.16.5": + version "7.22.3" + resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.22.3.tgz#a684fb6b2eb987d9eb4ee7f1bba832473a29f0f1" + integrity sha512-6bdmknScYKmt8I9VjsJuKKGr+TwUb555FTf6tT1P/ANlCjTHCiYLhiQ4X/O7J731w5NOqu8c1aYHEVuOwPz7jA== + dependencies: + core-js-pure "^3.30.2" + regenerator-runtime "^0.13.11" + "@babel/runtime@7.3.1": version "7.3.1" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.3.1.tgz#574b03e8e8a9898eaf4a872a92ea20b7846f6f2a" @@ -5232,6 +5240,11 @@ core-js-pure@^3.25.1: resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.30.0.tgz#41b6c42e5f363bd53d79999bd35093b17e42e1bf" integrity sha512-+2KbMFGeBU0ln/csoPqTe0i/yfHbrd2EUhNMObsGtXMKS/RTtlkYyi+/3twLcevbgNR0yM/r0Psa3TEoQRpFMQ== +core-js-pure@^3.30.2: + version "3.30.2" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.30.2.tgz#005a82551f4af3250dcfb46ed360fad32ced114e" + integrity sha512-p/npFUJXXBkCCTIlEGBdghofn00jWG6ZOtdoIXSJmAu2QBvN0IqpZXWweOytcwE6cfx8ZvVUy1vw8zxhe4Y2vg== + core-js@^1.0.0: version "1.2.7" resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636" @@ -7838,7 +7851,7 @@ fs-extra@6.0.1: jsonfile "^4.0.0" universalify "^0.1.0" -fs-extra@7.0.1, fs-extra@^7.0.0: +fs-extra@7.0.1, fs-extra@^7.0.0, fs-extra@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw== @@ -12863,7 +12876,7 @@ path-exists@^4.0.0: resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== -path-extra@^4.2.1: +path-extra@^4.2.1, path-extra@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/path-extra/-/path-extra-4.3.0.tgz#480cae968c698f779c4db939442fb2b871e89385" integrity sha512-ZzYeovxrO9rxKHJ27kFjF8oKnN4U7y463Y4WH7PC3wH5GzEPVdX32Z2ayy3lwMIM2iGKkq6XuufeSRblgHNnhQ== @@ -15413,10 +15426,10 @@ schema-utils@^3.0.0: ajv "^6.12.5" ajv-keywords "^3.5.2" -scripture-resources-rcl@5.3.8: - version "5.3.8" - resolved "https://registry.yarnpkg.com/scripture-resources-rcl/-/scripture-resources-rcl-5.3.8.tgz#148cb021522d95542f6f56f343a2039fc692a569" - integrity sha512-6z/vzjaYfctch5d21riFosw9URPu47/buALUMihcMTmWuUmPne6phcCxLQik0ZJIYrVmzKlJqMjvA2nNK2EhUQ== +scripture-resources-rcl@^5.5.1: + version "5.5.1" + resolved "https://registry.yarnpkg.com/scripture-resources-rcl/-/scripture-resources-rcl-5.5.1.tgz#d203ae2ac592fe20e5c453d50811c7bdf0866a34" + integrity sha512-RmPM+3LfZbi8fEMA6WjZJldqnncmI3me49FuQcnTCDj0WzXyLZYDJsKNXLfF/5M5hVElEcc3EVCb3U9D1l/PcQ== dependencies: bible-reference-range "^1.0.1" deep-freeze "^0.0.1" @@ -15431,6 +15444,7 @@ scripture-resources-rcl@5.3.8: tc-ui-toolkit "^5.3.3" use-deep-compare-effect "^1.3.1" usfm-js "3.4.0" + uw-quote-helpers "^1.0.0" word-aligner "^1.0.0" xregexp "^4.1.1" @@ -16169,6 +16183,13 @@ string-punctuation-tokenizer@2.1.2: dependencies: xregexp "^4.1.1" +string-punctuation-tokenizer@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/string-punctuation-tokenizer/-/string-punctuation-tokenizer-2.2.0.tgz#058465f994e29bfb93eaf4a9a2503d3ab6a50a18" + integrity sha512-QOTErphviG7wtzhM6A0tVZugwPtfHFNySboO0SEkruFwW/d2HHalSHWri4230HG/F6egvJx76kZdtYY359+rrA== + dependencies: + xregexp "^4.1.1" + string-width@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" @@ -16850,6 +16871,24 @@ tsutils@^3.21.0, tsutils@^3.7.0: dependencies: tslib "^1.8.1" +tsv-groupdata-parser@1.1.0-beta.4: + version "1.1.0-beta.4" + resolved "https://registry.yarnpkg.com/tsv-groupdata-parser/-/tsv-groupdata-parser-1.1.0-beta.4.tgz#4f3df012262b85d2109f44e088bd797738fe14cc" + integrity sha512-nHALVtH9Nss+XrqMPHpaWkhE01sqs/VPf5O/LBOHW69lxqH0ZMMdZIA1gASmU4R8WPiCIXpIN4pgQo2PaaOnJQ== + dependencies: + bible-reference-range "^1.0.1" + fs-extra "^7.0.1" + ospath "^1.2.2" + path-extra "^4.3.0" + semver "^6.1.1" + tsvtojson "^1.0.1" + uw-tsv-parser "1.0.3" + +tsvtojson@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/tsvtojson/-/tsvtojson-1.0.1.tgz#b2cc04812e2b8f5e6ad4d537b99d8c24b0109bd3" + integrity sha512-tcmQHJvwroh4EqkDoUan1UsYo0S5lTLjVc865zYxZ+hwfkDBr0Ljnqr4CywNqgsoS8313zoZ938uHyQEdBHY6A== + tty-browserify@0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6" @@ -17403,11 +17442,26 @@ uw-languages-rcl@1.0.0: regenerator-runtime "^0.13.7" use-deep-compare-effect "^1.3.1" +uw-quote-helpers@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/uw-quote-helpers/-/uw-quote-helpers-1.0.0.tgz#cc684523c7686ac45d63cdc9d4348db6641f25d5" + integrity sha512-VT6fh6w+oEjb/YBczNahmZ7dnC7rM4wbRifcOsNQWnlntunDnCNrS8AhbWFEt7X+jn/NmLYXYqsUPeKd+R8NBQ== + dependencies: + bible-reference-range "^1.1.0" + string-punctuation-tokenizer "^2.2.0" + tsv-groupdata-parser "1.1.0-beta.4" + xregexp "^5.1.1" + uw-tsv-parser@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/uw-tsv-parser/-/uw-tsv-parser-1.0.2.tgz#461ebb01a4902eb77df86b9d4b6dd84d40ab539b" integrity sha512-O4w7xK6z0A79GP52RliS5bRY1RzllebmT6RfcuZGx1e2aKSLvV5ajCNJtyn7vs6KhJgOX11LBdv+GEH1QP7kgQ== +uw-tsv-parser@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/uw-tsv-parser/-/uw-tsv-parser-1.0.3.tgz#5009a3710d985e1d86a08bbb58a736a9be0c55d5" + integrity sha512-BqDEayQWdGGsINZlYMzn1+4dAyVtG9zEmNnIv51H/7DquEODEO8hOI1mpNpLlNqGCcXySgTSj2nGhiODefZ4VA== + v8-compile-cache@^2.0.3, v8-compile-cache@^2.1.1: version "2.3.0" resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" @@ -18169,6 +18223,13 @@ xregexp@^4.1.1: dependencies: "@babel/runtime-corejs3" "^7.12.1" +xregexp@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-5.1.1.tgz#6d3fe18819e3143aaf52f9284d34f49a59583ebb" + integrity sha512-fKXeVorD+CzWvFs7VBuKTYIW63YD1e1osxwQ8caZ6o1jg6pDAbABDG54LCIq0j5cy7PjRvGIq6sef9DYPXpncg== + dependencies: + "@babel/runtime-corejs3" "^7.16.5" + xtend@^4.0.0, xtend@^4.0.1, xtend@^4.0.2, xtend@~4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" From 617a90e082e63c7b50d9f8ad0d76a5dbfeae68b5 Mon Sep 17 00:00:00 2001 From: jincypjose Date: Fri, 9 Jun 2023 23:26:40 +0530 Subject: [PATCH 2/4] updated version for issue 1579 --- package.json | 4 ++-- public/build_number | 2 +- yarn.lock | 29 +++++++++++------------------ 3 files changed, 14 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index 46d7e883..6132873b 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "@material-ui/styles": "^4.11.3", "axios": "^0.21.0", "bible-reference-range": "^1.1.0", - "datatable-translatable": "^1.0.24", + "datatable-translatable": "^1.2.1", "dcs-branch-merger": "^1.3.0", "deep-freeze": "^0.0.1", "gitea-react-toolkit": "2.2.4", @@ -48,7 +48,7 @@ "react-icons": "^4.8.0", "react-select": "^4.1.0", "react-waypoint": "^10.1.0", - "scripture-resources-rcl": "^5.5.1", + "scripture-resources-rcl": "^5.5.2", "tc-ui-toolkit": "^5.3.3", "use-deep-compare": "^1.1.0", "use-deep-compare-effect": "^1.3.1", diff --git a/public/build_number b/public/build_number index b0a7be86..996b23f4 100644 --- a/public/build_number +++ b/public/build_number @@ -1 +1 @@ -260-45d04f9 +261-5caad02 diff --git a/yarn.lock b/yarn.lock index 1aab65f9..a1cd0d18 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5727,10 +5727,10 @@ data-urls@^1.0.0, data-urls@^1.1.0: whatwg-mimetype "^2.2.0" whatwg-url "^7.0.0" -datatable-translatable@^1.0.24: - version "1.0.24" - resolved "https://registry.yarnpkg.com/datatable-translatable/-/datatable-translatable-1.0.24.tgz#ed73e23d9b490d001d99386ee9b4f5de06c6b494" - integrity sha512-8V3Bg5fqIlTSXTG5BQT8N3gKJBcgCymwGYXKsJbiRKjonsznDKIdzQV7lSREM42/2HMBGO6Q472MS4gmGvjL5A== +datatable-translatable@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/datatable-translatable/-/datatable-translatable-1.2.1.tgz#665c81f912542e710259a0e96803cee34f7d351d" + integrity sha512-WVA90z9sNVXcSjWR15Mdoo7quy/m4+wjaB2Zec+rZozcSJy9dWr4rJs6lCrPh7NjHknpRJ4Tx49atzGlvyZ/GA== dependencies: deep-freeze "^0.0.1" extensible-rcl "^1.1.0" @@ -15426,12 +15426,12 @@ schema-utils@^3.0.0: ajv "^6.12.5" ajv-keywords "^3.5.2" -scripture-resources-rcl@^5.5.1: - version "5.5.1" - resolved "https://registry.yarnpkg.com/scripture-resources-rcl/-/scripture-resources-rcl-5.5.1.tgz#d203ae2ac592fe20e5c453d50811c7bdf0866a34" - integrity sha512-RmPM+3LfZbi8fEMA6WjZJldqnncmI3me49FuQcnTCDj0WzXyLZYDJsKNXLfF/5M5hVElEcc3EVCb3U9D1l/PcQ== +scripture-resources-rcl@^5.5.2: + version "5.5.2" + resolved "https://registry.yarnpkg.com/scripture-resources-rcl/-/scripture-resources-rcl-5.5.2.tgz#1add70aab52694a4bbb114f9bfe6b89a43a09b02" + integrity sha512-2Yz0HcUACJrRZqAEAQvzJd27FJZn5vff3BEXeZWp+GMOOAZuRi1oFmXOHHWmgs79P8aALpB8IZpx+7X6sW+9hw== dependencies: - bible-reference-range "^1.0.1" + bible-reference-range "^1.1.0" deep-freeze "^0.0.1" gitea-react-toolkit "2.2.1" js-yaml-parser "^1.0.0" @@ -15443,7 +15443,7 @@ scripture-resources-rcl@^5.5.1: string-punctuation-tokenizer "2.1.2" tc-ui-toolkit "^5.3.3" use-deep-compare-effect "^1.3.1" - usfm-js "3.4.0" + usfm-js "^3.4.2" uw-quote-helpers "^1.0.0" word-aligner "^1.0.0" xregexp "^4.1.1" @@ -17308,13 +17308,6 @@ usfm-grammar@^2.2.0: ohm-js "^15.5.0" yargs "^17.0.1" -usfm-js@3.4.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/usfm-js/-/usfm-js-3.4.0.tgz#d3a00634b7219163b2bf41dc9dd83d976ec7ef26" - integrity sha512-8pCtMxzb/E3/4PPLLpf9KK10vza1I1/4tZJaDhJ+ycTGfg5JfT6GmDTxYFd6Nw81sbS0CVoyyG89a5ff6yHCzA== - dependencies: - lodash.clonedeep "^4.5.0" - usfm-js@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/usfm-js/-/usfm-js-2.1.0.tgz#2d5b200d491d87a9c443728436f8ef07fb0c8730" @@ -17322,7 +17315,7 @@ usfm-js@^2.1.0: dependencies: lodash.clonedeep "^4.5.0" -usfm-js@^3.3.1: +usfm-js@^3.3.1, usfm-js@^3.4.2: version "3.4.2" resolved "https://registry.yarnpkg.com/usfm-js/-/usfm-js-3.4.2.tgz#a4232cffe38c9f521246b007a4045648cbcf419a" integrity sha512-i5nGxGwFhkOWd7xgfVWQ6GTkCpksfy5AUIwNJcwanTn3ua5J1nwl3pjApCDA6x1B++8ICkcQMUt0FB/bkKdE2g== From cfd8930c4ab9e895269415e75985f3c7f1aece35 Mon Sep 17 00:00:00 2001 From: jincypjose Date: Fri, 9 Jun 2023 23:33:48 +0530 Subject: [PATCH 3/4] increased the version number --- package.json | 2 +- public/build_number | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 6132873b..ab162d61 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "tc-create-app", "homepage": "https://create.translationcore.com/", - "version": "1.12", + "version": "1.13", "license": "MIT", "private": false, "bugs": { diff --git a/public/build_number b/public/build_number index 996b23f4..cbebb327 100644 --- a/public/build_number +++ b/public/build_number @@ -1 +1 @@ -261-5caad02 +262-617a90e From 107d30ea38e9b092e3c3f43c6fff4141e92aabbb Mon Sep 17 00:00:00 2001 From: Abel Perez Date: Mon, 12 Jun 2023 12:03:09 -0400 Subject: [PATCH 4/4] updated uw-languages-rcl --- package.json | 2 +- public/build_number | 2 +- yarn.lock | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index ab162d61..49e55196 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "use-deep-compare-effect": "^1.3.1", "usfm-js": "^2.1.0", "uw-content-validation": "3.1.2", - "uw-languages-rcl": "1.0.0", + "uw-languages-rcl": "1.0.2", "uw-tsv-parser": "1.0.2", "word-aligner": "^1.0.0" }, diff --git a/public/build_number b/public/build_number index cbebb327..cce10e30 100644 --- a/public/build_number +++ b/public/build_number @@ -1 +1 @@ -262-617a90e +263-b3675b2 diff --git a/yarn.lock b/yarn.lock index a1cd0d18..9de36ecd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -17423,10 +17423,10 @@ uw-content-validation@3.1.2: usfm-js "^3.3.1" yaml "^1.10.2" -uw-languages-rcl@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/uw-languages-rcl/-/uw-languages-rcl-1.0.0.tgz#3a9b93b4e81cc2a2cfc8297f7e070b21172eec05" - integrity sha512-FEbfZaTgc+cLejDct74dpKfKMfcmBoz3ODY0YzYEK5jzAUhF+PhA+xnHh66WGof6STA2H0SMKHNj9N9KG+Hflg== +uw-languages-rcl@1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/uw-languages-rcl/-/uw-languages-rcl-1.0.2.tgz#ee13af81afa5a3c4e94b90882a29a5aa1e0f7844" + integrity sha512-DaQ1V0VQHPfRpRvrSI52YywMPR7T8BQiYEEdSdwJ+D5kRrqGrKhFQPnxNDaRWYny8uz3q87QHjUiOk208kiuHg== dependencies: "@babel/runtime-corejs3" "^7.14.7" core-js "^3.15.2"