Skip to content

Commit 6de65c3

Browse files
committed
fix Library.require assignment
1 parent d381b56 commit 6de65c3

File tree

4 files changed

+19
-8
lines changed

4 files changed

+19
-8
lines changed

src/leaflet.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export default async function leaflet(require) {
55
if (!L._style) {
66
const link = document.createElement("link");
77
link.rel = "stylesheet";
8-
link.href = ll.resolve("dist/leaflet.css");
8+
link.href = await require.resolve(ll.resolve("dist/leaflet.css"));
99
L._style = document.head.appendChild(link);
1010
}
1111
return L;

src/library.js

+12-4
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import vegalite from "./vegalite.js";
1818
import width from "./width.js";
1919
import {arquero, arrow, d3, graphviz, htl, inputs, lodash, plot, topojson} from "./dependencies.js";
2020

21-
export default Object.assign(function Library(resolver) {
21+
export default Object.defineProperties(function Library(resolver) {
2222
const require = requirer(resolver);
2323
Object.defineProperties(this, properties({
2424
FileAttachment: () => NoFileAttachments,
@@ -74,9 +74,17 @@ export default Object.assign(function Library(resolver) {
7474
Promises
7575
}));
7676
}, {
77-
get resolve() { return requireDefault.resolve; },
78-
get require() { return requireDefault; },
79-
set require(r) { setDefaultRequire(r); }
77+
resolve: {
78+
get: () => requireDefault.resolve,
79+
enumerable: true,
80+
configurable: true
81+
},
82+
require: {
83+
get: () => requireDefault,
84+
set: setDefaultRequire,
85+
enumerable: true,
86+
configurable: true
87+
}
8088
});
8189

8290
function properties(values) {

src/sqlite.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@ import {sql} from "./dependencies.js";
22
import {requireDefault} from "./require.js";
33

44
export default async function sqlite(require) {
5-
const init = await require(sql.resolve());
6-
return init({locateFile: file => sql.resolve(`dist/${file}`)});
5+
const [init, dist] = await Promise.all([
6+
require(sql.resolve()),
7+
require.resolve(sql.resolve("dist/")).then(dist => dist.replace(/\.js$/, "")) // fixed in d3-require 1.3.0
8+
]);
9+
return init({locateFile: file => `${dist}${file}`});
710
}
811

912
export class SQLiteDatabaseClient {

src/tex.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ function style(href) {
1616
export default function tex(require) {
1717
return Promise.all([
1818
require(katex.resolve()),
19-
style(katex.resolve("dist/katex.min.css"))
19+
require.resolve(katex.resolve("dist/katex.min.css")).then(style)
2020
]).then(function(values) {
2121
var katex = values[0], tex = renderer();
2222

0 commit comments

Comments
 (0)