Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(database): now nativeBinding supports addon object #974

Merged
merged 8 commits into from
Sep 2, 2023
Merged

feat(database): now nativeBinding supports addon object #974

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8f7441d
Added `webpack` support
destyk Mar 28, 2023
886a913
changed from `webpack_require` to `non_webpack_require`
destyk Apr 12, 2023
abcb068
Update database.js
mceachen Apr 19, 2023
175e7e3
Merge branch 'WiseLibs:master' into master
destyk Jun 19, 2023
a3582b2
feat(database): now `nativeBinding` supports addon object
destyk Jun 19, 2023
4b22aa6
style(package): line break removed
destyk Jun 19, 2023
2141c26
Merge branch 'WiseLibs:master' into master
destyk Aug 11, 2023
a8a6f19
Merge branch 'WiseLibs:master' into master
destyk Aug 31, 2023
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
9 changes: 8 additions & 1 deletion lib/database.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,15 @@ function Database(filenameGiven, options) {
if (nativeBindingPath == null) {
addon = DEFAULT_ADDON || (DEFAULT_ADDON = require('bindings')('better_sqlite3.node'));
} else {
addon = require(path.resolve(nativeBindingPath).replace(/(\.node)?$/, '.node'));
// If webpack is used to build the application, we must use `__non_webpack_require__`.
const requireFunc =
typeof __webpack_require__ === 'function'
? __non_webpack_require__
: require;

addon = requireFunc(path.resolve(nativeBindingPath).replace(/(\.node)?$/, '.node'));
}

if (!addon.isInitialized) {
addon.setErrorConstructor(SqliteError);
addon.isInitialized = true;
Expand Down