Skip to content

Commit

Permalink
kuroshiro-patched 1.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@retorquere
retorquere committed Aug 13, 2018
1 parent f51756f commit a245535
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 74 deletions.
6 changes: 3 additions & 3 deletions package.json
View file
Expand Up @@ -48,7 +48,7 @@
"barcoder": "^2.0.1",
"better-queue": "^3.8.10",
"better-queue-memory": "^1.0.2",
"biblatex-csl-converter": "^1.3.34",
"biblatex-csl-converter": "^1.4.7",
"citeproc": "^2.1.210",
"edtf": "^2.3.2",
"edtfy": "0.0.8",
Expand All @@ -65,7 +65,7 @@
"json-stringify-safe": "^5.0.1",
"json5": "^1.0.1",
"kuromoji": "^0.1.2",
"kuroshiro": "1.0.0",
"kuroshiro": "1.1.0",
"kuroshiro-analyzer-kuromoji": "^1.1.0",
"lokijs": "^1.5.5",
"node-eta": "^0.9.0",
Expand All @@ -79,7 +79,7 @@
"tslint": "5.11.0",
"webpack-cli": "^3.1.0",
"xregexp": "^4.2.0",
"zotero-plugin": "0.0.44"
"zotero-plugin": "0.0.48"
},
"devDependencies": {
"@rgrove/parse-xml": "^1.1.1",
Expand Down
20 changes: 10 additions & 10 deletions setup/kuroshiro.patch
View file
@@ -1,20 +1,20 @@
--- node_modules/kuroshiro/src/core.js 2018-08-12 14:15:38.000000000 +0200
+++ node_modules/kuroshiro/src/coreSync.js 2018-08-12 16:31:16.000000000 +0200
@@ -60,9 +60,9 @@
* @param {string} [options.mode='normal'] Convert mode ['normal'|'spaced'|'okurigana'|'furigana']
* @param {string} [options.delimiter_start='('] Delimiter(Start)
* @param {string} [options.delimiter_end=')'] Delimiter(End)
--- node_modules/kuroshiro/src/core.js 2018-08-13 12:57:57.000000000 +0200
+++ node_modules/kuroshiro/src/core-sync.js 2018-08-13 13:04:46.000000000 +0200
@@ -64,9 +64,9 @@
* @param {string} [options.romajiSystem="hepburn"] Romanization System ["nippon"|"passport"|"hepburn"]
* @param {string} [options.delimiter_start="("] Delimiter(Start)
* @param {string} [options.delimiter_end=")"] Delimiter(End)
- * @returns {Promise} Promise object represents the result of conversion
+ * @returns {Promise} result of conversion
+ * @returns {string} result of conversion
*/
- async convert(str, options) {
+ convert(str, options) {
options = options || {};
options.to = options.to || "hiragana";
options.mode = options.mode || "normal";
@@ -71,7 +71,7 @@
options.delimiter_end = options.delimiter_end || ")";
str = str || "";
@@ -88,7 +88,7 @@
throw new Error("Invalid Romanization System.");
}

- const tokens = await this._analyzer.parse(str);
+ const tokens = this._analyzer.parse(str);
Expand Down
95 changes: 34 additions & 61 deletions yarn.lock
View file
Expand Up @@ -2,7 +2,7 @@
# yarn lockfile v1


"@octokit/rest@^15.9.4":
"@octokit/rest@^15.9.5":
version "15.9.5"
resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-15.9.5.tgz#e356d202bd0b517e381f705ad77d98ccb84e0c65"
dependencies:
Expand Down Expand Up @@ -69,7 +69,7 @@
version "3.0.3"
resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"

"@types/node@*", "@types/node@^10.5.2", "@types/node@^10.5.8":
"@types/node@*", "@types/node@^10.5.8":
version "10.5.8"
resolved "https://registry.yarnpkg.com/@types/node/-/node-10.5.8.tgz#6f14ccecad1d19332f063a6a764f8907801fece0"

Expand All @@ -90,7 +90,7 @@
dependencies:
source-map "^0.6.1"

"@types/webpack@^4.4.7", "@types/webpack@^4.4.9":
"@types/webpack@^4.4.9":
version "4.4.9"
resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.4.9.tgz#814721fb4cfaebe553ffdf2ae2c504494ec6613b"
dependencies:
Expand Down Expand Up @@ -330,14 +330,14 @@ ansi-escapes@^3.0.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"

ansi-regex@*, ansi-regex@^3.0.0, ansi-regex@~3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"

ansi-regex@^2.0.0:
version "2.1.1"
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"

ansi-regex@^3.0.0, ansi-regex@~3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"

ansi-styles@^2.2.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
Expand Down Expand Up @@ -612,9 +612,9 @@ better-queue@^3.8.10:
node-eta "^0.9.0"
uuid "^3.0.0"

biblatex-csl-converter@^1.3.34:
version "1.3.34"
resolved "https://registry.yarnpkg.com/biblatex-csl-converter/-/biblatex-csl-converter-1.3.34.tgz#e1b240a531cea33a764fb2c9216bc98e8cdbfca3"
biblatex-csl-converter@^1.4.7:
version "1.4.7"
resolved "https://registry.yarnpkg.com/biblatex-csl-converter/-/biblatex-csl-converter-1.4.7.tgz#969aed76c96cbb2d21399b620a4de50c465a40e6"

big.js@^3.1.3:
version "3.2.0"
Expand Down Expand Up @@ -1378,7 +1378,7 @@ debug@^2.1.2, debug@^2.2.0, debug@^2.3.3:
dependencies:
ms "2.0.0"

debuglog@*, debuglog@^1.0.1:
debuglog@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"

Expand Down Expand Up @@ -2315,7 +2315,7 @@ import-local@^1.0.0:
pkg-dir "^2.0.0"
resolve-cwd "^2.0.0"

imurmurhash@*, imurmurhash@^0.1.4:
imurmurhash@^0.1.4:
version "0.1.4"
resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"

Expand Down Expand Up @@ -2769,9 +2769,11 @@ kuroshiro-analyzer-kuromoji@^1.1.0:
dependencies:
kuromoji "^0.1.1"

kuroshiro@1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/kuroshiro/-/kuroshiro-1.0.0.tgz#a7d93e4baf99516a7e47d8e6f1b66ba5c55550b9"
kuroshiro@1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/kuroshiro/-/kuroshiro-1.1.0.tgz#6b3f7affb5b63c5c7af7911e196b697aa4968a3a"
dependencies:
babel-runtime "^6.26.0"

latest-version@^3.0.0:
version "3.1.0"
Expand Down Expand Up @@ -2869,39 +2871,17 @@ lockfile@^1.0.4, lockfile@~1.0.2:
dependencies:
signal-exit "^3.0.2"

lodash._baseindexof@*:
version "3.1.0"
resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c"

lodash._baseuniq@~4.6.0:
version "4.6.0"
resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8"
dependencies:
lodash._createset "~4.0.0"
lodash._root "~3.0.0"

lodash._bindcallback@*:
version "3.0.1"
resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"

lodash._cacheindexof@*:
version "3.0.2"
resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92"

lodash._createcache@*:
version "3.1.2"
resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093"
dependencies:
lodash._getnative "^3.0.0"

lodash._createset@~4.0.0:
version "4.0.3"
resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26"

lodash._getnative@*, lodash._getnative@^3.0.0:
version "3.9.1"
resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"

lodash._root@~3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
Expand All @@ -2914,10 +2894,6 @@ lodash.debounce@^4.0.8:
version "4.0.8"
resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"

lodash.restparam@*:
version "3.6.1"
resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"

lodash.union@~4.6.0:
version "4.6.0"
resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88"
Expand Down Expand Up @@ -4565,7 +4541,7 @@ readable-stream@~2.1.5:
string_decoder "~0.10.x"
util-deprecate "~1.0.1"

readdir-scoped-modules@*, readdir-scoped-modules@^1.0.0:
readdir-scoped-modules@^1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747"
dependencies:
Expand Down Expand Up @@ -5400,7 +5376,7 @@ ts-loader@^4.4.2:
micromatch "^3.1.4"
semver "^5.0.1"

ts-node@^7.0.0, ts-node@^7.0.1:
ts-node@^7.0.1:
version "7.0.1"
resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-7.0.1.tgz#9562dc2d1e6d248d24bc55f773e3f614337d9baf"
dependencies:
Expand Down Expand Up @@ -5492,10 +5468,6 @@ typescript@2.7.2:
version "2.7.2"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.7.2.tgz#2d615a1ef4aee4f574425cdff7026edf81919836"

typescript@^2.9.2:
version "2.9.2"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.2.tgz#1cbf61d05d6b96269244eb6a3bce4bd914e0f00c"

typescript@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.0.1.tgz#43738f29585d3a87575520a4b93ab6026ef11fdb"
Expand Down Expand Up @@ -5541,9 +5513,9 @@ umask@^1.1.0, umask@~1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/umask/-/umask-1.1.0.tgz#f29cebf01df517912bb58ff9c4e50fde8e33320d"

"underscore@git://github.com/jashkenas/underscore":
underscore@jashkenas/underscore:
version "1.9.1"
resolved "git://github.com/jashkenas/underscore#d5fe0fd4060f13b40608cb9d92eda6d857e8752c"
resolved "https://codeload.github.com/jashkenas/underscore/tar.gz/d5fe0fd4060f13b40608cb9d92eda6d857e8752c"

underscore@~1.4.4:
version "1.4.4"
Expand Down Expand Up @@ -5677,7 +5649,7 @@ v8-compile-cache@^2.0.0:
version "2.0.2"
resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.2.tgz#a428b28bb26790734c4fc8bc9fa106fccebf6a6c"

validate-npm-package-license@*, validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.3:
validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.3:
version "3.0.4"
resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
dependencies:
Expand Down Expand Up @@ -5751,7 +5723,7 @@ webpack-sources@^1.0.1, webpack-sources@^1.1.0:
source-list-map "^2.0.0"
source-map "~0.6.1"

webpack@^4.16.1, webpack@^4.16.5:
webpack@^4.16.5:
version "4.16.5"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.16.5.tgz#29fb39462823d7eb8aefcab8b45f7f241db0d092"
dependencies:
Expand Down Expand Up @@ -5985,16 +5957,17 @@ zlibjs@^0.3.1:
version "0.3.1"
resolved "https://registry.yarnpkg.com/zlibjs/-/zlibjs-0.3.1.tgz#50197edb28a1c42ca659cc8b4e6a9ddd6d444554"

zotero-plugin@0.0.44:
version "0.0.44"
resolved "https://registry.yarnpkg.com/zotero-plugin/-/zotero-plugin-0.0.44.tgz#cee8b7f475a9e2393d3fe689f6c4245ad22ba378"
zotero-plugin@0.0.48:
version "0.0.48"
resolved "https://registry.yarnpkg.com/zotero-plugin/-/zotero-plugin-0.0.48.tgz#ff1fb83611c8af1288f0924cc243c9dff3160b78"
dependencies:
"@octokit/rest" "^15.9.4"
"@octokit/rest" "^15.9.5"
"@rgrove/parse-xml" "^1.1.1"
"@types/node" "^10.5.2"
"@types/webpack" "^4.4.7"
"@types/node" "^10.5.8"
"@types/webpack" "^4.4.9"
archiver "^2.1.1"
aws-s3-form "^0.3.5"
current-git-branch "^1.0.1"
dotenv "^6.0.0"
ejs "^2.6.1"
find-up "^3.0.0"
Expand All @@ -6008,17 +5981,17 @@ zotero-plugin@0.0.44:
pegjs "^0.10.0"
properties-reader "^0.0.16"
pug "^2.0.3"
request "^2.87.0"
request "^2.88.0"
request-promise "^4.2.2"
rimraf "^2.6.2"
shelljs "^0.8.2"
string-to-arraybuffer "^1.0.0"
ts-loader "^4.4.2"
ts-node "^7.0.0"
ts-node "^7.0.1"
tslint "^5.11.0"
typescript "^2.9.2"
typescript "^3.0.1"
uri-templates "^0.2.0"
webpack "^4.16.1"
webpack "^4.16.5"
wrapper-webpack-plugin "^2.0.0"
xml-parser "^1.2.1"
xmldom "^0.1.27"
Expand Down

0 comments on commit a245535

Please sign in to comment.