Skip to content

Commit 6f5f9ec

Browse files
authored
Load observablehq stdlib using jsdelivr ESM (#3237)
1 parent 727f5c2 commit 6f5f9ec

File tree

7 files changed

+23
-22
lines changed

7 files changed

+23
-22
lines changed

frontend/common/SetupCellEnvironment.js

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
// import Library from "https://unpkg.com/@observablehq/[email protected]/src/library.js?module"
1+
// @ts-ignore
2+
import { Library } from "https://cdn.jsdelivr.net/npm/@observablehq/[email protected]/+esm"
23

3-
export let make_library = () => {
4+
export const make_library = () => {
45
// @ts-ignore
5-
let library = new window.observablehq.Library()
6+
const library = new Library()
67
return {
78
DOM: library.DOM,
89
Files: library.Files,
@@ -27,11 +28,11 @@ const observablehq_for_myself = make_library()
2728
export const observablehq_for_cells = make_library()
2829
export { observablehq_for_myself as default }
2930

30-
export let DOM = observablehq_for_myself.DOM
31-
export let Files = observablehq_for_myself.Files
32-
export let Generators = observablehq_for_myself.Generators
33-
export let Promises = observablehq_for_myself.Promises
34-
export let now = observablehq_for_myself.now
35-
export let svg = observablehq_for_myself.svg
36-
export let html = observablehq_for_myself.html
37-
export let require = observablehq_for_myself.require
31+
export const DOM = observablehq_for_myself.DOM
32+
export const Files = observablehq_for_myself.Files
33+
export const Generators = observablehq_for_myself.Generators
34+
export const Promises = observablehq_for_myself.Promises
35+
export const now = observablehq_for_myself.now
36+
export const svg = observablehq_for_myself.svg
37+
export const html = observablehq_for_myself.html
38+
export const require = observablehq_for_myself.require

frontend/editor.html

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,7 @@
2323
)
2424
</script>
2525

26-
<script src="https://cdn.jsdelivr.net/npm/[email protected]/lodash.min.js" defer></script>
27-
<script src="https://cdn.jsdelivr.net/npm/@observablehq/[email protected]/dist/stdlib.js" defer></script>
2826
<script src="https://cdn.jsdelivr.net/npm/[email protected]/js/iframeResizer.min.js" defer></script>
29-
<script src="https://cdn.jsdelivr.net/npm/[email protected]/ansi_up.min.js" defer></script>
3027

3128
<link rel="pluto-external-source" id="vmsg-wasm" href="https://unpkg.com/[email protected]/vmsg.wasm">
3229
<link rel="pluto-external-source" id="arrow_up_circle_icon" href="https://cdn.jsdelivr.net/gh/ionic-team/[email protected]/src/svg/arrow-up-circle-outline.svg">

frontend/imports/AnsiUp.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
// @ts-ignore
2-
export default AnsiUp = window.AnsiUp
2+
import AnsiUpPackage from "https://cdn.jsdelivr.net/npm/[email protected]/+esm"
3+
// needs .default a second time, weird
4+
const AnsiUp = AnsiUpPackage.default
5+
export default AnsiUp

frontend/imports/lodash.d.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1-
import _ from "lodash-es"
1+
import * as _ from "lodash-es"
22
export default _
3+
4+
// Note: run `npm install` if you want to get types in your editor

frontend/imports/lodash.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
// @ts-ignore
2-
export default window._
2+
import _ from "https://cdn.jsdelivr.net/npm/[email protected]/+esm"
3+
export default _
4+
5+
// Note: run `npm install` if you want to get types in your editor

frontend/index.html

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@
2121
<link rel="pluto-logo-big" href="./img/logo.svg" />
2222
<link rel="pluto-logo-small" href="./img/favicon_unsaturated.svg" />
2323

24-
<script src="https://cdn.jsdelivr.net/npm/[email protected]/lodash.min.js" defer></script>
25-
<script src="https://cdn.jsdelivr.net/npm/@observablehq/[email protected]/dist/stdlib.js" defer></script>
26-
27-
2824
<link rel="stylesheet" href="welcome.css">
2925
<link rel="stylesheet" href="index.css">
3026

frontend/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"devDependencies": {
3-
"@types/lodash": "^4.14.182",
43
"@types/lodash-es": "^4.17.6"
54
}
65
}

0 commit comments

Comments
 (0)