Skip to content
This repository was archived by the owner on Jul 24, 2024. It is now read-only.
Merged

Fixes #2295

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"lodash.mergewith": "^4.6.0",
"meow": "^3.7.0",
"mkdirp": "^0.5.1",
"nan": "2.9.2",
"nan": "^2.10.0",
"node-gyp": "^3.3.1",
"npmlog": "^4.0.0",
"request": "~2.79.0",
Expand Down
5 changes: 3 additions & 2 deletions src/binding.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@ int GetResult(sass_context_wrapper* ctx_w, Sass_Context* ctx, bool is_sync = fal

void MakeCallback(uv_work_t* req) {
Nan::HandleScope scope;
Nan::AsyncResource async("sass:MakeCallback");

Nan::TryCatch try_catch;
sass_context_wrapper* ctx_w = static_cast<sass_context_wrapper*>(req->data);
Expand All @@ -245,15 +246,15 @@ void MakeCallback(uv_work_t* req) {

if (status == 0 && ctx_w->success_callback) {
// if no error, do callback(null, result)
ctx_w->success_callback->Call(0, 0);
ctx_w->success_callback->Call(0, 0, &async);
}
else if (ctx_w->error_callback) {
// if error, do callback(error)
const char* err = sass_context_get_error_json(ctx);
v8::Local<v8::Value> argv[] = {
Nan::New<v8::String>(err).ToLocalChecked()
};
ctx_w->error_callback->Call(1, argv);
ctx_w->error_callback->Call(1, argv, &async);
}
if (try_catch.HasCaught()) {
Nan::FatalException(try_catch);
Expand Down
5 changes: 3 additions & 2 deletions src/callback_bridge.h
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ T CallbackBridge<T, L>::operator()(std::vector<void*> argv) {
argv_v8.push_back(Nan::New(wrapper));

return this->post_process_return_value(
this->callback->Call(argv_v8.size(), &argv_v8[0])
Nan::Call(*callback, argv_v8.size(), &argv_v8[0]).ToLocalChecked()
);
} else {
/*
Expand Down Expand Up @@ -151,6 +151,7 @@ void CallbackBridge<T, L>::dispatched_async_uv_callback(uv_async_t *req) {
* post_process_args().
*/
Nan::HandleScope scope;
Nan::AsyncResource async("sass:CallbackBridge");
Nan::TryCatch try_catch;

std::vector<v8::Local<v8::Value>> argv_v8 = bridge->pre_process_args(bridge->argv);
Expand All @@ -159,7 +160,7 @@ void CallbackBridge<T, L>::dispatched_async_uv_callback(uv_async_t *req) {
}
argv_v8.push_back(Nan::New(bridge->wrapper));

bridge->callback->Call(argv_v8.size(), &argv_v8[0]);
bridge->callback->Call(argv_v8.size(), &argv_v8[0], &async);

if (try_catch.HasCaught()) {
Nan::FatalException(try_catch);
Expand Down
2 changes: 1 addition & 1 deletion src/sass_types/color.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ namespace SassTypes
}

a = Nan::To<double>(raw_val[3]).FromJust();
// fall through vvv
NODE_SASS_FALLTHROUGH;

case 3:
if (!raw_val[0]->IsNumber() || !raw_val[1]->IsNumber() || !raw_val[2]->IsNumber()) {
Expand Down
6 changes: 6 additions & 0 deletions src/sass_types/color.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@
#include <nan.h>
#include "sass_value_wrapper.h"

#if defined(__GNUC__) && __GNUC__ >= 7
#define NODE_SASS_FALLTHROUGH __attribute__ ((fallthrough))
#else
#define NODE_SASS_FALLTHROUGH
#endif

namespace SassTypes
{
class Color : public SassValueWrapper<Color> {
Expand Down