From 613ff91dd2d9a5ee0e86be8a3682beecc4e94887 Mon Sep 17 00:00:00 2001 From: Hal Gentz Date: Thu, 24 Oct 2019 06:17:40 -0600 Subject: [PATCH 1/6] Fix for v8 in node 12. Signed-off-by: Hal Gentz --- package-lock.json | 2 +- src/main.cc | 22 ++++++++++++++++------ src/worker.cc | 12 +++++++++--- 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3bd3e17..5b3ab17 100644 --- a/package-lock.json +++ b/package-lock.json @@ -202,7 +202,7 @@ "integrity": "sha1-uDx1fIAOaOHW78GjoaE/85/23NI=", "dev": true, "requires": { - "jasmine-node": "git+https://github.com/kevinsawicki/jasmine-node.git#81af4f953a2b7dfb5bde8331c05362a4b464c5ef", + "jasmine-node": "jasmine-node@git+https://github.com/kevinsawicki/jasmine-node.git#81af4f953a2b7dfb5bde8331c05362a4b464c5ef", "underscore-plus": "1.x", "walkdir": "0.0.7" } diff --git a/src/main.cc b/src/main.cc index 0318ac5..b834148 100644 --- a/src/main.cc +++ b/src/main.cc @@ -134,9 +134,15 @@ class Spellchecker : public Nan::ObjectWrap { uint32_t start = iter->start, end = iter->end; Local misspelled_range = Nan::New(); - misspelled_range->Set(Nan::New("start").ToLocalChecked(), Nan::New(start)); - misspelled_range->Set(Nan::New("end").ToLocalChecked(), Nan::New(end)); - result->Set(index, misspelled_range); + { + Isolate* isolate = misspelled_range->GetIsolate(); + Local context = isolate->GetCurrentContext(); + misspelled_range->Set(context, Nan::New("start").ToLocalChecked(), Nan::New(start)).Check(); + misspelled_range->Set(context, Nan::New("end").ToLocalChecked(), Nan::New(end)).Check(); + } + Isolate* isolate = result->GetIsolate(); + Local context = isolate->GetCurrentContext(); + result->Set(context, index, misspelled_range).Check(); } } @@ -220,7 +226,9 @@ class Spellchecker : public Nan::ObjectWrap { Local result = Nan::New(dictionaries.size()); for (size_t i = 0; i < dictionaries.size(); ++i) { const std::string& dict = dictionaries[i]; - result->Set(i, Nan::New(dict.data(), dict.size()).ToLocalChecked()); + Isolate* isolate = result->GetIsolate(); + Local context = isolate->GetCurrentContext(); + result->Set(context, i, Nan::New(dict.data(), dict.size()).ToLocalChecked()).Check(); } info.GetReturnValue().Set(result); @@ -246,7 +254,9 @@ class Spellchecker : public Nan::ObjectWrap { const std::string& word = corrections[i]; Nan::MaybeLocal val = Nan::New(word.data(), word.size()); - result->Set(i, val.ToLocalChecked()); + Isolate* isolate = result->GetIsolate(); + Local context = isolate->GetCurrentContext(); + result->Set(context, i, val.ToLocalChecked()).Check(); } info.GetReturnValue().Set(result); @@ -286,7 +296,7 @@ class Spellchecker : public Nan::ObjectWrap { Isolate* isolate = exports->GetIsolate(); Local context = isolate->GetCurrentContext(); - exports->Set(Nan::New("Spellchecker").ToLocalChecked(), tpl->GetFunction(context).ToLocalChecked()); + exports->Set(context, Nan::New("Spellchecker").ToLocalChecked(), tpl->GetFunction(context).ToLocalChecked()).Check(); } }; diff --git a/src/worker.cc b/src/worker.cc index fbae5ec..0314e91 100644 --- a/src/worker.cc +++ b/src/worker.cc @@ -35,9 +35,15 @@ void CheckSpellingWorker::HandleOKCallback() { uint32_t start = iter->start, end = iter->end; Local misspelled_range = Nan::New(); - misspelled_range->Set(Nan::New("start").ToLocalChecked(), Nan::New(start)); - misspelled_range->Set(Nan::New("end").ToLocalChecked(), Nan::New(end)); - result->Set(index, misspelled_range); + { + Isolate* isolate = misspelled_range->GetIsolate(); + Local context = isolate->GetCurrentContext(); + misspelled_range->Set(context, Nan::New("start").ToLocalChecked(), Nan::New(start)).Check(); + misspelled_range->Set(context, Nan::New("end").ToLocalChecked(), Nan::New(end)).Check(); + } + Isolate* isolate = result->GetIsolate(); + Local context = isolate->GetCurrentContext(); + result->Set(context, index, misspelled_range).Check(); } Local argv[] = { Nan::Null(), result }; From d696b7c47afc21d5fbbcf1516ac92bcdfee021b1 Mon Sep 17 00:00:00 2001 From: Ben Demboski Date: Thu, 19 Dec 2019 11:21:57 -0800 Subject: [PATCH 2/6] Build for older and newer version of v8 --- package-lock.json | 2 +- src/main.cc | 19 +++++++++++++++++++ src/spellchecker.h | 4 ++++ src/worker.cc | 6 ++++++ 4 files changed, 30 insertions(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 5b3ab17..3bd3e17 100644 --- a/package-lock.json +++ b/package-lock.json @@ -202,7 +202,7 @@ "integrity": "sha1-uDx1fIAOaOHW78GjoaE/85/23NI=", "dev": true, "requires": { - "jasmine-node": "jasmine-node@git+https://github.com/kevinsawicki/jasmine-node.git#81af4f953a2b7dfb5bde8331c05362a4b464c5ef", + "jasmine-node": "git+https://github.com/kevinsawicki/jasmine-node.git#81af4f953a2b7dfb5bde8331c05362a4b464c5ef", "underscore-plus": "1.x", "walkdir": "0.0.7" } diff --git a/src/main.cc b/src/main.cc index b834148..2ac121c 100644 --- a/src/main.cc +++ b/src/main.cc @@ -134,6 +134,8 @@ class Spellchecker : public Nan::ObjectWrap { uint32_t start = iter->start, end = iter->end; Local misspelled_range = Nan::New(); + +#ifdef V8_USE_MAYBE { Isolate* isolate = misspelled_range->GetIsolate(); Local context = isolate->GetCurrentContext(); @@ -143,6 +145,11 @@ class Spellchecker : public Nan::ObjectWrap { Isolate* isolate = result->GetIsolate(); Local context = isolate->GetCurrentContext(); result->Set(context, index, misspelled_range).Check(); +#else + misspelled_range->Set(Nan::New("start").ToLocalChecked(), Nan::New(start)); + misspelled_range->Set(Nan::New("end").ToLocalChecked(), Nan::New(end)); + result->Set(index, misspelled_range); +#endif } } @@ -226,9 +233,13 @@ class Spellchecker : public Nan::ObjectWrap { Local result = Nan::New(dictionaries.size()); for (size_t i = 0; i < dictionaries.size(); ++i) { const std::string& dict = dictionaries[i]; +#ifdef V8_USE_MAYBE Isolate* isolate = result->GetIsolate(); Local context = isolate->GetCurrentContext(); result->Set(context, i, Nan::New(dict.data(), dict.size()).ToLocalChecked()).Check(); +#else + result->Set(i, Nan::New(dict.data(), dict.size()).ToLocalChecked()); +#endif } info.GetReturnValue().Set(result); @@ -254,9 +265,13 @@ class Spellchecker : public Nan::ObjectWrap { const std::string& word = corrections[i]; Nan::MaybeLocal val = Nan::New(word.data(), word.size()); +#ifdef V8_USE_MAYBE Isolate* isolate = result->GetIsolate(); Local context = isolate->GetCurrentContext(); result->Set(context, i, val.ToLocalChecked()).Check(); +#else + result->Set(i, val.ToLocalChecked()); +#endif } info.GetReturnValue().Set(result); @@ -296,7 +311,11 @@ class Spellchecker : public Nan::ObjectWrap { Isolate* isolate = exports->GetIsolate(); Local context = isolate->GetCurrentContext(); +#ifdef V8_USE_MAYBE exports->Set(context, Nan::New("Spellchecker").ToLocalChecked(), tpl->GetFunction(context).ToLocalChecked()).Check(); +#else + exports->Set(Nan::New("Spellchecker").ToLocalChecked(), tpl->GetFunction(context).ToLocalChecked()); +#endif } }; diff --git a/src/spellchecker.h b/src/spellchecker.h index d1d9b68..a26b681 100644 --- a/src/spellchecker.h +++ b/src/spellchecker.h @@ -6,6 +6,10 @@ #include #include +#if V8_MAJOR_VERSION > 6 && V8_MINOR_VERSION > 2 +#define V8_USE_MAYBE +#endif + namespace spellchecker { const int USE_SYSTEM_DEFAULTS = 0; diff --git a/src/worker.cc b/src/worker.cc index 0314e91..ed4e2e7 100644 --- a/src/worker.cc +++ b/src/worker.cc @@ -35,6 +35,7 @@ void CheckSpellingWorker::HandleOKCallback() { uint32_t start = iter->start, end = iter->end; Local misspelled_range = Nan::New(); +#ifdef V8_USE_MAYBE { Isolate* isolate = misspelled_range->GetIsolate(); Local context = isolate->GetCurrentContext(); @@ -44,6 +45,11 @@ void CheckSpellingWorker::HandleOKCallback() { Isolate* isolate = result->GetIsolate(); Local context = isolate->GetCurrentContext(); result->Set(context, index, misspelled_range).Check(); +#else + misspelled_range->Set(Nan::New("start").ToLocalChecked(), Nan::New(start)); + misspelled_range->Set(Nan::New("end").ToLocalChecked(), Nan::New(end)); + result->Set(index, misspelled_range); +#endif } Local argv[] = { Nan::Null(), result }; From 39fdca5e104db4d7f18f607d87d73f0081d832cd Mon Sep 17 00:00:00 2001 From: Freya Gentz Date: Thu, 19 Dec 2019 19:47:02 -0700 Subject: [PATCH 3/6] Squashed commit of the following: commit 0c83612a8d11558f481c28e6e4a6e15374df93af Merge: 2c0d135 5cbdece Author: Freya Gentz Date: Thu Dec 19 18:04:18 2019 -0700 Merge pull request #4 from goddessfreya/Add-Github-actions Add Github actions commit 5cbdece2e5838e6cdd7bd907e8601e756583ed59 Author: Freya Gentz Date: Thu Dec 19 18:01:01 2019 -0700 Delete appveyor.yml commit 4ddcbd373fb254575d7de07101760ed6f60ea643 Author: Freya Gentz Date: Thu Dec 19 18:00:49 2019 -0700 Delete .travis.yml commit c6f6c633ebeec77521f839309aba438c03003f60 Author: Freya Gentz Date: Thu Dec 19 17:57:45 2019 -0700 Update nodejs.yml commit 84bccbd0f2dfd3ae7c182b98ec2c438f2001e410 Author: Freya Gentz Date: Thu Dec 19 17:55:23 2019 -0700 Update nodejs.yml commit f6720eace4df0319148611f6ad6ac460ffcad3fb Author: Freya Gentz Date: Thu Dec 19 17:50:59 2019 -0700 Update nodejs.yml commit 514a3f977a58cb8767fcda3a5ee85cc2e6deeecf Author: Freya Gentz Date: Thu Dec 19 17:31:31 2019 -0700 Add Github actions Signed-off-by: Freya Gentz --- .github/workflows/nodejs.yml | 31 +++++++++++++++++++++++++++++++ .travis.yml | 35 ----------------------------------- appveyor.yml | 18 ------------------ src/worker.cc | 3 ++- 4 files changed, 33 insertions(+), 54 deletions(-) create mode 100644 .github/workflows/nodejs.yml delete mode 100644 .travis.yml delete mode 100644 appveyor.yml diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml new file mode 100644 index 0000000..40d6d4e --- /dev/null +++ b/.github/workflows/nodejs.yml @@ -0,0 +1,31 @@ +name: Node CI + +on: [push] + +jobs: + build: + strategy: + fail-fast: false + matrix: + node-version: [8.x, 10.x, 12.x] + platform: + - { os: windows-latest, hunspell: true } + - { os: windows-latest } + - { os: macos-latest, hunspell: true } + - { os: macos-latest } + - { os: ubuntu-latest } + + runs-on: ${{ matrix.platform.os }} + + steps: + - uses: actions/checkout@v1 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v1 + with: + node-version: ${{ matrix.node-version }} + - name: npm install, build, and test + run: | + npm install + npm test + env: + SPELLCHECKER_PREFER_HUNSPELL: ${{ matrix.platform.hunspell }} diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 0ea25f3..0000000 --- a/.travis.yml +++ /dev/null @@ -1,35 +0,0 @@ -notifications: - email: - on_success: never - on_failure: change - -os: - - linux - - osx - -install: - - rm -rf ~/.nvm - - git clone https://github.com/creationix/nvm.git ~/.nvm - - source ~/.nvm/nvm.sh - - nvm install $NODE_VERSION - - node --version - - npm install - -script: npm test - -sudo: false - -git: - depth: 10 - -branches: - only: - - master - -env: - global: - - CC=clang CXX=clang++ npm_config_clang=1 - matrix: - - NODE_VERSION=8.9.3 - - NODE_VERSION=10 - - NODE_VERSION=12 diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 6eb4f22..0000000 --- a/appveyor.yml +++ /dev/null @@ -1,18 +0,0 @@ -environment: - matrix: - - nodejs_version: '10' - - nodejs_version: '10' - SPELLCHECKER_PREFER_HUNSPELL: true - - nodejs_version: '8' - -install: - - ps: Install-Product node $env:nodejs_version - - npm --msvs_version=2015 install - -test_script: - - node --version - - npm --version - - ps: Write-Host $env:SPELLCHECKER_PREFER_HUNSPELL - - npm test - -build: off diff --git a/src/worker.cc b/src/worker.cc index ed4e2e7..e54bf02 100644 --- a/src/worker.cc +++ b/src/worker.cc @@ -53,5 +53,6 @@ void CheckSpellingWorker::HandleOKCallback() { } Local argv[] = { Nan::Null(), result }; - callback->Call(2, argv); + Nan::AsyncResource resource("CheckSpellingWorker::HandleOKCallback"); + callback->Call(2, argv, &resource); } From 3d27d36540428e5c886b9813254082fc9ce54b35 Mon Sep 17 00:00:00 2001 From: Freya Gentz Date: Thu, 19 Dec 2019 19:50:20 -0700 Subject: [PATCH 4/6] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 84b670882e5e172aca1d79e663d4b920cdd2b1ee Merge: fef5593 1a0243e Author: Freya Gentz Date: Thu Dec 19 19:43:16 2019 -0700 Merge pull request #6 from goddessfreya/goddessfreya-patch-1 Add clang testing commit 1a0243ebe310145bebdf6561cb9fd26eb3446dfd Author: Freya Gentz Date: Thu Dec 19 19:37:34 2019 -0700 Update nodejs.yml commit 18e838fe97c743169703bae7c90ba7fabca45750 Author: Freya Gentz Date: Thu Dec 19 19:35:27 2019 -0700 Delete package-lock.json commit d17cf278b7ecb80e3da5f40a3a974acb41c6e40a Author: Freya Gentz Date: Thu Dec 19 19:22:57 2019 -0700 Update nodejs.yml commit 81c5ae60d3d97b74610ff7f181e6bbc56f35f0f7 Author: Freya Gentz Date: Thu Dec 19 19:12:42 2019 -0700 Update nodejs.yml commit 2db0f183ee31eeff55b4aedffa672a57e30a72b6 Author: Freya Gentz Date: Thu Dec 19 18:56:33 2019 -0700 Update nodejs.yml commit 855c3c1beae3b5f1fc15819d2f17794a5ddb287c Author: Freya Gentz Date: Thu Dec 19 18:49:38 2019 -0700 Update nodejs.yml commit f80be0af2535e32303d4fd0db947ff6bacfd4da3 Author: Freya Gentz Date: Thu Dec 19 18:38:49 2019 -0700 Update nodejs.yml commit 3c52d662d8d51639a96affa400cac7ea9734cc47 Author: Freya Gentz Date: Thu Dec 19 18:35:04 2019 -0700 Update nodejs.yml commit 5fe3493dd2533dd7e02f119873f8e18bef5b3281 Author: Freya Gentz Date: Thu Dec 19 18:34:31 2019 -0700 Update nodejs.yml commit 8c4177100cbaf5aa8a74b3641eaef2b8b41f6094 Author: Freya Gentz Date: Thu Dec 19 18:34:05 2019 -0700 Update nodejs.yml commit 5bd03fe647c682bd5c52677f2c358853084cb7fc Author: Freya Gentz Date: Thu Dec 19 18:33:49 2019 -0700 Update nodejs.yml commit aab4c50d9a11a4fdcce0140af0c3a7eeff1edb22 Author: Freya Gentz Date: Thu Dec 19 18:33:35 2019 -0700 Update nodejs.yml commit 0e6f86f121e81d3b4fa8578f4070334b440bf419 Author: Freya Gentz Date: Thu Dec 19 18:30:31 2019 -0700 Update nodejs.yml commit fef559397e041bc746bb61a6cc4520e44f103235 Merge: 0c83612 e99e477 Author: Freya Gentz Date: Thu Dec 19 18:16:48 2019 -0700 Merge pull request #5 from abetomo/fix_deprecated_callback Fix deprecated callback commit 0c83612a8d11558f481c28e6e4a6e15374df93af Merge: 2c0d135 5cbdece Author: Freya Gentz Date: Thu Dec 19 18:04:18 2019 -0700 Merge pull request #4 from goddessfreya/Add-Github-actions Add Github actions commit 5cbdece2e5838e6cdd7bd907e8601e756583ed59 Author: Freya Gentz Date: Thu Dec 19 18:01:01 2019 -0700 Delete appveyor.yml commit 4ddcbd373fb254575d7de07101760ed6f60ea643 Author: Freya Gentz Date: Thu Dec 19 18:00:49 2019 -0700 Delete .travis.yml commit c6f6c633ebeec77521f839309aba438c03003f60 Author: Freya Gentz Date: Thu Dec 19 17:57:45 2019 -0700 Update nodejs.yml commit 84bccbd0f2dfd3ae7c182b98ec2c438f2001e410 Author: Freya Gentz Date: Thu Dec 19 17:55:23 2019 -0700 Update nodejs.yml commit f6720eace4df0319148611f6ad6ac460ffcad3fb Author: Freya Gentz Date: Thu Dec 19 17:50:59 2019 -0700 Update nodejs.yml commit 514a3f977a58cb8767fcda3a5ee85cc2e6deeecf Author: Freya Gentz Date: Thu Dec 19 17:31:31 2019 -0700 Add Github actions commit e99e47733ea0426862ce63900c247811021325a1 Author: abetomo Date: Thu Jul 5 10:25:35 2018 +0900 Fix deprecated callback The following warning. ``` ../src/worker.cc: In member function ‘virtual void CheckSpellingWorker::HandleOKCallback()’: ../src/worker.cc:44:25: warning: ‘v8::Local Nan::Callback::Call(int, v8::Local*) const’ is deprecated [-Wdeprecated-declarations] callback->Call(2, argv); ``` Signed-off-by: Freya Gentz --- .github/workflows/nodejs.yml | 19 +- package-lock.json | 365 ----------------------------------- 2 files changed, 13 insertions(+), 371 deletions(-) delete mode 100644 package-lock.json diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 40d6d4e..1091ab1 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -9,23 +9,30 @@ jobs: matrix: node-version: [8.x, 10.x, 12.x] platform: - - { os: windows-latest, hunspell: true } + - { os: windows-latest, force-hunspell: true } - { os: windows-latest } - - { os: macos-latest, hunspell: true } + - { os: macos-latest, force-hunspell: true } - { os: macos-latest } - - { os: ubuntu-latest } + - { os: ubuntu-latest, use-clang: true } runs-on: ${{ matrix.platform.os }} - + env: + SPELLCHECKER_PREFER_HUNSPELL: ${{ matrix.platform.hunspell }} + steps: - uses: actions/checkout@v1 - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v1 with: node-version: ${{ matrix.node-version }} + - name: npm install, build, and test (clang) + if: matrix.platform.use-clang == true + run: | + export CC="$(which clang)" + export CPP="$(which clang++)" + npm install + npm test - name: npm install, build, and test run: | npm install npm test - env: - SPELLCHECKER_PREFER_HUNSPELL: ${{ matrix.platform.hunspell }} diff --git a/package-lock.json b/package-lock.json deleted file mode 100644 index 3bd3e17..0000000 --- a/package-lock.json +++ /dev/null @@ -1,365 +0,0 @@ -{ - "name": "spellchecker", - "version": "3.7.0", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "amdefine": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", - "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", - "dev": true - }, - "any-promise": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", - "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=" - }, - "async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", - "dev": true - }, - "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "coffee-script": { - "version": "1.12.7", - "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz", - "integrity": "sha512-fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw==", - "dev": true - }, - "coffeestack": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/coffeestack/-/coffeestack-1.1.2.tgz", - "integrity": "sha1-NSePO+uc5vXQraH7bgh4UrZXzpg=", - "dev": true, - "requires": { - "coffee-script": "~1.8.0", - "fs-plus": "^2.5.0", - "source-map": "~0.1.43" - }, - "dependencies": { - "coffee-script": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.8.0.tgz", - "integrity": "sha1-nJ8dK0pSoADe0Vtll5FwNkgmPB0=", - "dev": true, - "requires": { - "mkdirp": "~0.3.5" - } - } - } - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true - }, - "fileset": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/fileset/-/fileset-0.1.8.tgz", - "integrity": "sha1-UGuRqTluqn4y+0KoQHfHoMc2t0E=", - "dev": true, - "requires": { - "glob": "3.x", - "minimatch": "0.x" - }, - "dependencies": { - "glob": { - "version": "3.2.11", - "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz", - "integrity": "sha1-Spc/Y1uRkPcV0QmH1cAP0oFevj0=", - "dev": true, - "requires": { - "inherits": "2", - "minimatch": "0.3" - }, - "dependencies": { - "minimatch": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz", - "integrity": "sha1-J12O2qxPG7MyZHIInnlJyDlGmd0=", - "dev": true, - "requires": { - "lru-cache": "2", - "sigmund": "~1.0.0" - } - } - } - }, - "minimatch": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.4.0.tgz", - "integrity": "sha1-vSx9Bg0sjI/Xzefx8u0tWycP2xs=", - "dev": true, - "requires": { - "lru-cache": "2", - "sigmund": "~1.0.0" - } - } - } - }, - "fs-plus": { - "version": "2.10.1", - "resolved": "https://registry.npmjs.org/fs-plus/-/fs-plus-2.10.1.tgz", - "integrity": "sha1-MgR4HXhAYR5jZOe2+wWMljJ8WqU=", - "dev": true, - "requires": { - "async": "^1.5.2", - "mkdirp": "^0.5.1", - "rimraf": "^2.5.2", - "underscore-plus": "1.x" - }, - "dependencies": { - "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "dev": true, - "requires": { - "minimist": "0.0.8" - } - } - } - }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true - }, - "gaze": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.3.4.tgz", - "integrity": "sha1-X5S92gr+U7xxCWm81vKCVI1gwnk=", - "dev": true, - "requires": { - "fileset": "~0.1.5", - "minimatch": "~0.2.9" - }, - "dependencies": { - "minimatch": { - "version": "0.2.14", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz", - "integrity": "sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=", - "dev": true, - "requires": { - "lru-cache": "2", - "sigmund": "~1.0.0" - } - } - } - }, - "glob": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", - "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dev": true, - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true - }, - "jasmine-focused": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/jasmine-focused/-/jasmine-focused-1.0.7.tgz", - "integrity": "sha1-uDx1fIAOaOHW78GjoaE/85/23NI=", - "dev": true, - "requires": { - "jasmine-node": "git+https://github.com/kevinsawicki/jasmine-node.git#81af4f953a2b7dfb5bde8331c05362a4b464c5ef", - "underscore-plus": "1.x", - "walkdir": "0.0.7" - } - }, - "jasmine-node": { - "version": "git+https://github.com/kevinsawicki/jasmine-node.git#81af4f953a2b7dfb5bde8331c05362a4b464c5ef", - "from": "jasmine-node@git+https://github.com/kevinsawicki/jasmine-node.git#81af4f953a2b7dfb5bde8331c05362a4b464c5ef", - "dev": true, - "requires": { - "coffee-script": ">=1.0.1", - "coffeestack": ">=1 <2", - "gaze": "~0.3.2", - "jasmine-reporters": ">=0.2.0", - "mkdirp": "~0.3.5", - "requirejs": ">=0.27.1", - "underscore": ">= 1.3.1", - "walkdir": ">= 0.0.1" - } - }, - "jasmine-reporters": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/jasmine-reporters/-/jasmine-reporters-2.3.2.tgz", - "integrity": "sha512-u/7AT9SkuZsUfFBLLzbErohTGNsEUCKaQbsVYnLFW1gEuL2DzmBL4n8v90uZsqIqlWvWUgian8J6yOt5Fyk/+A==", - "dev": true, - "requires": { - "mkdirp": "^0.5.1", - "xmldom": "^0.1.22" - }, - "dependencies": { - "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "dev": true, - "requires": { - "minimist": "0.0.8" - } - } - } - }, - "lru-cache": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz", - "integrity": "sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=", - "dev": true - }, - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true - }, - "mkdirp": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz", - "integrity": "sha1-3j5fiWHIjHh+4TaN+EmsRBPsqNc=", - "dev": true - }, - "nan": { - "version": "2.14.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz", - "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==" - }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, - "requires": { - "wrappy": "1" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "dev": true - }, - "requirejs": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/requirejs/-/requirejs-2.3.6.tgz", - "integrity": "sha512-ipEzlWQe6RK3jkzikgCupiTbTvm4S0/CAU5GlgptkN5SO6F3u0UD0K18wy6ErDqiCyP4J4YYe1HuAShvsxePLg==", - "dev": true - }, - "rimraf": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", - "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", - "dev": true, - "requires": { - "glob": "^7.1.3" - } - }, - "sigmund": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz", - "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=", - "dev": true - }, - "source-map": { - "version": "0.1.43", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", - "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", - "dev": true, - "requires": { - "amdefine": ">=0.0.4" - } - }, - "underscore": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz", - "integrity": "sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==", - "dev": true - }, - "underscore-plus": { - "version": "1.6.8", - "resolved": "https://registry.npmjs.org/underscore-plus/-/underscore-plus-1.6.8.tgz", - "integrity": "sha512-88PrCeMKeAAC1L4xjSiiZ3Fg6kZOYrLpLGVPPeqKq/662DfQe/KTSKdSR/Q/tucKNnfW2MNAUGSCkDf8HmXC5Q==", - "dev": true, - "requires": { - "underscore": "~1.8.3" - }, - "dependencies": { - "underscore": { - "version": "1.8.3", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz", - "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=", - "dev": true - } - } - }, - "walkdir": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/walkdir/-/walkdir-0.0.7.tgz", - "integrity": "sha1-BNoCcKh6d4VAFzzb8KLbSZqNnik=", - "dev": true - }, - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true - }, - "xmldom": { - "version": "0.1.27", - "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz", - "integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk=", - "dev": true - } - } -} From 98e43770abd1c92618815a1c816409a8a2f55d66 Mon Sep 17 00:00:00 2001 From: Freya Gentz Date: Thu, 19 Dec 2019 19:52:57 -0700 Subject: [PATCH 5/6] Provide default value for spellchecker_use_hunspell (#7) and add "freebsd" case. Co-authored-by: Alexander Krotov --- binding.gyp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/binding.gyp b/binding.gyp index bfb0fa4..3c76df4 100644 --- a/binding.gyp +++ b/binding.gyp @@ -1,15 +1,12 @@ { 'variables': { 'conditions': [ - ['OS=="mac"', { - 'spellchecker_use_hunspell%': 'true', - }], - ['OS=="linux"', { - 'spellchecker_use_hunspell': 'true', - }], - ['OS=="win"', { - 'spellchecker_use_hunspell': 'true', - }], + ['OS=="mac"', { 'spellchecker_use_hunspell%': 'true' }, + 'OS=="linux"', { 'spellchecker_use_hunspell': 'true'}, + 'OS=="win"', { 'spellchecker_use_hunspell': 'true' }, + 'OS=="freebsd"', { 'spellchecker_use_hunspell': 'true' }, + { 'spellchecker_use_hunspell': 'false' } + ], ], }, 'target_defaults': { From 37cebc43ccbfce27dac51f64ec45f72d9aa80b8f Mon Sep 17 00:00:00 2001 From: Freya Gentz Date: Fri, 27 Dec 2019 00:13:08 -0700 Subject: [PATCH 6/6] Fix macro define. Signed-off-by: Freya Gentz --- src/spellchecker.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/spellchecker.h b/src/spellchecker.h index a26b681..0c3e2ad 100644 --- a/src/spellchecker.h +++ b/src/spellchecker.h @@ -6,7 +6,7 @@ #include #include -#if V8_MAJOR_VERSION > 6 && V8_MINOR_VERSION > 2 +#if (V8_MAJOR_VERSION == 7 && V8_MINOR_VERSION > 2) || V8_MAJOR_VERSION > 7 #define V8_USE_MAYBE #endif