Skip to content

Commit

Permalink
fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Fil committed Oct 18, 2024
1 parent 963aeb8 commit 7c96c68
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 22 deletions.
2 changes: 1 addition & 1 deletion src/javascript/transpile.ts
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ export async function transpileModule(
mime.getType(name) ?? undefined
)},"path":${annotatePath(relativePath(servePath, resolveFile(name)))},"lastModified":${JSON.stringify(
info.mtimeMs
)},"size":${JSON.stringify(info.size)}`
)},"size":${JSON.stringify(info.size)}}`
: JSON.stringify(p)
}, import.meta.url`
);
Expand Down
2 changes: 1 addition & 1 deletion test/output/build/data-loaders/_import/test.86a60bc6.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import {FileAttachment} from "../_observablehq/stdlib.00000003.js"/* observablehq-file */;

export const test = FileAttachment({"name":"../test.txt","mimeType":"text/plain","path":"../_file/test.f2ca1bb6.txt"/* observablehq-file */,"lastModified":/* ts */1706742000000,"size":5, import.meta.url).text();
export const test = FileAttachment({"name":"../test.txt","mimeType":"text/plain","path":"../_file/test.f2ca1bb6.txt"/* observablehq-file */,"lastModified":/* ts */1706742000000,"size":5}, import.meta.url).text();
2 changes: 1 addition & 1 deletion test/output/build/embed/_import/chart.2ce91e05.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {FileAttachment} from "../_observablehq/stdlib.00000003.js"/* observableh
import * as Plot from "../_npm/@observablehq/[email protected]/cd372fb8.js"/* observablehq-file */;

export async function Chart() {
const gistemp = await FileAttachment({"name":"../lib/gistemp.csv","mimeType":"text/csv","path":"../_file/lib/gistemp.1cf298b1.csv"/* observablehq-file */,"lastModified":/* ts */1706742000000,"size":97, import.meta.url).csv({typed: true});
const gistemp = await FileAttachment({"name":"../lib/gistemp.csv","mimeType":"text/csv","path":"../_file/lib/gistemp.1cf298b1.csv"/* observablehq-file */,"lastModified":/* ts */1706742000000,"size":97}, import.meta.url).csv({typed: true});
return Plot.plot({
y: {grid: true},
color: {scheme: "burd"},
Expand Down
4 changes: 2 additions & 2 deletions test/output/build/fetches/_import/foo/foo.666599bc.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions test/output/build/fetches/_import/top.c85e149a.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion test/output/build/imports/_import/bar/bar.13bb8056.js

This file was deleted.

2 changes: 1 addition & 1 deletion test/output/build/imports/_import/bar/bar.4460ccc2.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export {bar} from "./baz.2add1dd0.js";
export {bar} from "./baz.2add1dd0.js"/* observablehq-file */;
6 changes: 1 addition & 5 deletions test/output/build/imports/_import/bar/baz.2add1dd0.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
<<<<<<< HEAD:test/output/build/imports/_import/bar/baz.cdbfb28b.js
import {foo} from "../foo/foo.5963bf78.js"/* observablehq-file */;
=======
import {foo} from "../foo/foo.bcd720b2.js";
>>>>>>> main:test/output/build/imports/_import/bar/baz.2add1dd0.js
import {foo} from "../foo/foo.bcd720b2.js"/* observablehq-file */;

export const bar = "bar";
export const foobar = foo + "bar";
10 changes: 2 additions & 8 deletions test/output/build/imports/_import/foo/foo.bcd720b2.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
<<<<<<< HEAD:test/output/build/imports/_import/foo/foo.5963bf78.js
import "../../_npm/[email protected]/cd372fb8.js"/* observablehq-file */;
import {bar} from "../bar/bar.13bb8056.js"/* observablehq-file */;
import "../../_npm/@example/[email protected]/1dd108c5.js"/* observablehq-file */;
import {bar} from "../bar/bar.4460ccc2.js"/* observablehq-file */;
export {top} from "../top.160847a6.js"/* observablehq-file */;
=======
import "../../_npm/[email protected]/cd372fb8.js";
import "../../_npm/@example/[email protected]/1dd108c5.js";
import {bar} from "../bar/bar.4460ccc2.js";
export {top} from "../top.160847a6.js";
>>>>>>> main:test/output/build/imports/_import/foo/foo.bcd720b2.js

export const foo = "foo";
export const foobar = "foo" + bar;

0 comments on commit 7c96c68

Please sign in to comment.