Skip to content

Commit d27af65

Browse files
GordonSmithGordonSmith
authored
Merge pull request #4436 from hpcc-systems/dependabot/npm_and_yarn/tmp-0.2.4
[npm]: Bump tmp from 0.2.3 to 0.2.4
2 parents 0953f88 + f5bc64f commit d27af65

30 files changed

Lines changed: 951 additions & 87 deletions

‎package-lock.json‎

Lines changed: 393 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/markdown-it-plugins/package.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,10 @@
5454
"dependencies": {
5555
"@hpcc-js/observablehq-compiler": "^3.3.9",
5656
"@observablehq/framework": "1.13.3",
57-
"@observablehq/runtime": "5.9.9",
57+
"@observablehq/parser": "6.1.0",
58+
"@observablehq/inspector": "5.0.1",
59+
"@observablehq/stdlib": "5.8.8",
60+
"@observablehq/runtime": "6.0.0",
5861
"@types/markdown-it": "14.1.2"
5962
},
6063
"peerDependencies": {

‎packages/observablehq-compiler/.vscode/launch.json‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,20 @@
4343
"!**/node_modules/**"
4444
]
4545
},
46+
{
47+
"name": "index-notebook-kit.html",
48+
"request": "launch",
49+
"type": "msedge",
50+
"url": "http://localhost:5514/index-notebook-kit.html",
51+
"runtimeArgs": [
52+
"--disable-web-security"
53+
],
54+
"webRoot": "${workspaceFolder}",
55+
"outFiles": [
56+
"${workspaceFolder}/**/*.js",
57+
"!**/node_modules/**"
58+
]
59+
},
4660
{
4761
"name": "index-preview.html",
4862
"request": "launch",

‎packages/observablehq-compiler/README.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,9 @@ The interpreter is 100% compatible with:
8080
It also supports fetching notebooks directly from the ObservableHQ repository.
8181

8282
```js
83-
import { Library, Runtime, Inspector } from "@observablehq/runtime";
83+
import { Inspector } from "@observablehq/inspector";
84+
import { Library } from "@observablehq/stdlib";
85+
import { Runtime } from "@observablehq/runtime";
8486
import { download, compile } from "@hpcc-js/observablehq-compiler";
8587

8688
const placeholder = document.getElementById("placeholder");

‎packages/observablehq-compiler/esbuild.js‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎packages/observablehq-compiler/index-notebook-kit.html‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<!DOCTYPE html>
2+
<html>
3+
4+
<head>
5+
<title>Home</title>
6+
<style>
7+
body {
8+
font-family: Arial, sans-serif;
9+
margin: 0;
10+
padding: 0;
11+
background-color: #f0f0f0;
12+
}
13+
14+
h1 {
15+
text-align: center;
16+
margin-top: 50px;
17+
}
18+
19+
#placeholder {
20+
width: 100%;
21+
height: 500px;
22+
background-color: #fff;
23+
margin-top: 20px;
24+
}
25+
</style>
26+
</head>
27+
28+
<body>
29+
<h1>ESM Quick Test</h1>
30+
<div id="placeholder"></div>
31+
<script type="module">
32+
33+
import { test } from "./tests/index-notebook-kit.ts";
34+
test();
35+
36+
</script>
37+
</body>
38+
39+
</html>

‎packages/observablehq-compiler/index-preview.html‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,14 @@
2626
<script type="importmap">
2727
{
2828
"imports": {
29-
"@observablehq/runtime": "https://cdn.jsdelivr.net/npm/@observablehq/runtime@5.9.9/dist/runtime.js",
29+
"@observablehq/stdlib": "https://cdn.jsdelivr.net/npm/@observablehq/stdlib@5.8.8/src/index.js",
30+
"@observablehq/inspector": "https://cdn.jsdelivr.net/npm/@observablehq/inspector@5.0.1/src/index.js",
31+
"@observablehq/runtime": "https://cdn.jsdelivr.net/npm/@observablehq/runtime@6.0.0/src/index.js",
32+
"isoformat": "https://cdn.jsdelivr.net/npm/isoformat@0.2.1/src/index.js",
33+
"d3-dsv": "https://cdn.jsdelivr.net/npm/d3-dsv@3.0.1/src/index.js",
34+
"d3-require": "https://cdn.jsdelivr.net/npm/d3-require@1.3.0/src/index.mjs",
35+
"d3-array": "https://cdn.jsdelivr.net/npm/d3-array@3.2.4/src/index.js",
36+
"internmap": "https://cdn.jsdelivr.net/npm/internmap@2.0.3/src/index.js",
3037

3138
"@hpcc-js/observablehq-compiler": "../observablehq-compiler/dist/index.js"
3239
}
@@ -38,7 +45,9 @@
3845
<h1>ESM Quick Test</h1>
3946
<div id="placeholder"></div>
4047
<script type="module">
41-
import { Library, Runtime, Inspector } from "@observablehq/runtime";
48+
import { Inspector } from "@observablehq/inspector";
49+
import { Library } from "@observablehq/stdlib";
50+
import { Runtime } from "@observablehq/runtime";
4251
import { omd2notebook, compile } from "@hpcc-js/observablehq-compiler";
4352

4453
const md = `\

‎packages/observablehq-compiler/index.html‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@
2929
<h1>ESM Quick Test</h1>
3030
<div id="placeholder"></div>
3131
<script type="module">
32-
import { Library, Runtime, Inspector } from "@observablehq/runtime";
32+
import { Inspector } from "@observablehq/inspector";
33+
import { Library } from "@observablehq/stdlib";
34+
import { Runtime } from "@observablehq/runtime";
3335
import { omd2notebook, compile } from "./src/index.ts";
3436

3537
const md = `\

‎packages/observablehq-compiler/package.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,10 @@
4848
"devDependencies": {
4949
"@hpcc-js/esbuild-plugins": "^1.4.9",
5050
"@observablehq/parser": "6.1.0",
51-
"@observablehq/runtime": "5.9.9"
51+
"@observablehq/inspector": "5.0.1",
52+
"@observablehq/stdlib": "5.8.8",
53+
"@observablehq/notebook-kit": "1.0.1"
54+
5255
},
5356
"repository": {
5457
"type": "git",

‎packages/observablehq-compiler/src/index.ts‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
export type { ohq } from "./observable-shim.ts";
1+
export type { ohq } from "./ojs/observable-shim.ts";
22

3-
export * from "./compiler.ts";
4-
export { ojs2notebook, omd2notebook, download } from "./util.ts";
5-
export * from "./writer.ts";
3+
export * from "./ojs/compiler.ts";
4+
export { ojs2notebook, omd2notebook } from "./ojs/util.ts";
5+
export { download } from "./util/comms.ts";
6+
export * from "./ojs/writer.ts";
67

78
import "../src/index.css";
9+
10+
export * from "./ohqnk/index.ts";

0 commit comments

Comments
 (0)