Skip to content

Commit 76bb9cd

Browse files
cscheidcscheid
committed
chore - more deno 2 import map changes
1 parent 462b0c7 commit 76bb9cd

File tree

4 files changed

+9
-92
lines changed

4 files changed

+9
-92
lines changed

‎src/core/devconfig.ts‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ export interface DevConfig {
2424
esbuild: string;
2525
typst: string;
2626
script: string;
27-
importMap: string; // import map for most imports, which we need on dev version
28-
bundleImportMap: string; // import map for dynamic imports which we need on bundled versions
27+
importMap: string;
2928
}
3029

3130
export function createDevConfig(
@@ -53,11 +52,6 @@ export function createDevConfig(
5352
join(srcDir, "import_map.json"),
5453
),
5554
),
56-
bundleImportMap: md5HashSync(
57-
Deno.readTextFileSync(
58-
join(srcDir, "resources/vendor/import_map.json"),
59-
),
60-
),
6155
};
6256
}
6357

@@ -117,8 +111,7 @@ export function devConfigsEqual(a: DevConfig, b: DevConfig) {
117111
a.esbuild == b.esbuild &&
118112
a.typst === b.typst &&
119113
a.script == b.script &&
120-
a.importMap === b.importMap &&
121-
a.bundleImportMap === b.bundleImportMap;
114+
a.importMap === b.importMap;
122115
}
123116

124117
export async function reconfigureQuarto(
@@ -183,8 +176,7 @@ function reconfigureReason(
183176
} else if (installed.script !== source.script) {
184177
return "update Quarto wrapper script";
185178
} else if (
186-
installed.importMap !== source.importMap ||
187-
installed.bundleImportMap !== source.importMap
179+
installed.importMap !== source.importMap
188180
) {
189181
return "update dev import map";
190182
}

‎src/core/puppeteer.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { isMac, isWindows } from "../deno_ral/platform.ts";
1515
// deno-lint-ignore no-explicit-any
1616
let puppeteerImport: any = undefined;
1717
// deno-lint-ignore prefer-const
18-
let puppeteerUrl = "puppeteer/mod.ts";
18+
let puppeteerUrl = "puppeteer";
1919
export async function getPuppeteer() {
2020
if (puppeteerImport !== undefined) {
2121
return puppeteerImport;

‎src/import_map.json‎

Lines changed: 3 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@
5353
"fontoxpath": "https://cdn.skypack.dev/[email protected]",
5454
"scss-parser": "https://cdn.skypack.dev/[email protected]",
5555

56+
"puppeteer": "https://deno.land/x/[email protected]/mod.ts",
57+
5658
"https://deno.land/[email protected]/console/unicode_width.ts": "https://deno.land/[email protected]/console/unicode_width.ts",
5759
"https://deno.land/[email protected]/": "https://deno.land/[email protected]/",
5860
"https://deno.land/[email protected]/": "https://deno.land/[email protected]/",
@@ -62,84 +64,6 @@
6264
"https://deno.land/[email protected]/": "https://deno.land/[email protected]/",
6365

6466
"https://deno.land/[email protected]/fs/exists.ts": "https://deno.land/[email protected]/fs/exists.ts",
65-
"https://deno.land/[email protected]/fs/ensure_dir.ts": "https://deno.land/[email protected]/fs/ensure_dir.ts",
66-
67-
"https://deno.land/[email protected]/hash/": "./resources/vendor/deno-land/std@0-91-0/hash/",
68-
"https://deno.land/x/[email protected]/": "./resources/vendor/deno-land/x/cache@0-2-12/",
69-
"https://dev.jspm.io/": "./resources/vendor/dev-jspm-io/",
70-
"https://dev.jspm.io/[email protected]": "./resources/vendor/dev-jspm-io/[email protected]",
71-
"puppeteer/": "./resources/vendor/deno-land/x/puppeteer@9-0-2/"
72-
},
73-
"scopes": {
74-
"./resources/vendor/dev-jspm-io/": {
75-
"/npm:@jspm/[email protected]/nodelibs/buffer.js": "./resources/vendor/dev-jspm-io/npm_@jspm/core@1-1-1/nodelibs/buffer.js",
76-
"/npm:@jspm/[email protected]/nodelibs/chunk-0c2d1322.js": "./resources/vendor/dev-jspm-io/npm_@jspm/core@1-1-1/nodelibs/chunk-0c2d1322.js",
77-
"/npm:@jspm/[email protected]/nodelibs/chunk-6e68c801.js": "./resources/vendor/dev-jspm-io/npm_@jspm/core@1-1-1/nodelibs/chunk-6e68c801.js",
78-
"/npm:@jspm/[email protected]/nodelibs/chunk-cffba9d4.js": "./resources/vendor/dev-jspm-io/npm_@jspm/core@1-1-1/nodelibs/chunk-cffba9d4.js",
79-
"/npm:@jspm/[email protected]/nodelibs/chunk-dac557ba.js": "./resources/vendor/dev-jspm-io/npm_@jspm/core@1-1-1/nodelibs/chunk-dac557ba.js",
80-
"/npm:@jspm/[email protected]/nodelibs/events.js": "./resources/vendor/dev-jspm-io/npm_@jspm/core@1-1-1/nodelibs/events.js",
81-
"/npm:@jspm/[email protected]/nodelibs/stream.js": "./resources/vendor/dev-jspm-io/npm_@jspm/core@1-1-1/nodelibs/stream.js",
82-
"/npm:@jspm/[email protected]/nodelibs/util.js": "./resources/vendor/dev-jspm-io/npm_@jspm/core@1-1-1/nodelibs/util.js",
83-
"/npm:@jspm/core@1/nodelibs/buffer.js": "./resources/vendor/dev-jspm-io/npm_@jspm/core@1/nodelibs/buffer.js",
84-
"/npm:@jspm/core@1/nodelibs/stream.js": "./resources/vendor/dev-jspm-io/npm_@jspm/core@1/nodelibs/stream.js",
85-
"/npm:[email protected]/lib/browser.dew.js": "./resources/vendor/dev-jspm-io/npm_immediate@3-0-6/lib/browser.dew.js",
86-
"/npm:[email protected]?dew": "./resources/vendor/dev-jspm-io/[email protected]",
87-
"/npm:[email protected]/lib/base64.dew.js": "./resources/vendor/dev-jspm-io/npm_jszip@3-5-0/lib/base64.dew.js",
88-
"/npm:[email protected]/lib/compressedObject.dew.js": "./resources/vendor/dev-jspm-io/npm_jszip@3-5-0/lib/compressedObject.dew.js",
89-
"/npm:[email protected]/lib/compressions.dew.js": "./resources/vendor/dev-jspm-io/npm_jszip@3-5-0/lib/compressions.dew.js",
90-
"/npm:[email protected]/lib/crc32.dew.js": "./resources/vendor/dev-jspm-io/npm_jszip@3-5-0/lib/crc32.dew.js",
91-
"/npm:[email protected]/lib/defaults.dew.js": "./resources/vendor/dev-jspm-io/npm_jszip@3-5-0/lib/defaults.dew.js",
92-
"/npm:[email protected]/lib/external.dew.js": "./resources/vendor/dev-jspm-io/npm_jszip@3-5-0/lib/external.dew.js",
93-
"/npm:[email protected]/lib/flate.dew.js": "./resources/vendor/dev-jspm-io/npm_jszip@3-5-0/lib/flate.dew.js",
94-
"/npm:[email protected]/lib/generate/ZipFileWorker.dew.js": "./resources/vendor/dev-jspm-io/npm_jszip@3-5-0/lib/generate/ZipFileWorker.dew.js",
95-
"/npm:[email protected]/lib/generate/index.dew.js": "./resources/vendor/dev-jspm-io/npm_jszip@3-5-0/lib/generate/index.dew.js",
96-
"/npm:[email protected]/lib/index.dew.js": "./resources/vendor/dev-jspm-io/npm_jszip@3-5-0/lib/index.dew.js",
97-
"/npm:[email protected]/lib/load.dew.js": "./resources/vendor/dev-jspm-io/npm_jszip@3-5-0/lib/load.dew.js",
98-
"/npm:[email protected]/lib/nodejs/NodejsStreamInputAdapter.dew.js": "./resources/vendor/dev-jspm-io/npm_jszip@3-5-0/lib/nodejs/NodejsStreamInputAdapter.dew.js",
99-
"/npm:[email protected]/lib/nodejs/NodejsStreamOutputAdapter.dew.js": "./resources/vendor/dev-jspm-io/npm_jszip@3-5-0/lib/nodejs/NodejsStreamOutputAdapter.dew.js",
100-
"/npm:[email protected]/lib/nodejsUtils.dew.js": "./resources/vendor/dev-jspm-io/npm_jszip@3-5-0/lib/nodejsUtils.dew.js",
101-
"/npm:[email protected]/lib/object.dew.js": "./resources/vendor/dev-jspm-io/npm_jszip@3-5-0/lib/object.dew.js",
102-
"/npm:[email protected]/lib/readable-stream-browser.dew.js": "./resources/vendor/dev-jspm-io/npm_jszip@3-5-0/lib/readable-stream-browser.dew.js",
103-
"/npm:[email protected]/lib/reader/ArrayReader.dew.js": "./resources/vendor/dev-jspm-io/npm_jszip@3-5-0/lib/reader/ArrayReader.dew.js",
104-
"/npm:[email protected]/lib/reader/DataReader.dew.js": "./resources/vendor/dev-jspm-io/npm_jszip@3-5-0/lib/reader/DataReader.dew.js",
105-
"/npm:[email protected]/lib/reader/NodeBufferReader.dew.js": "./resources/vendor/dev-jspm-io/npm_jszip@3-5-0/lib/reader/NodeBufferReader.dew.js",
106-
"/npm:[email protected]/lib/reader/StringReader.dew.js": "./resources/vendor/dev-jspm-io/npm_jszip@3-5-0/lib/reader/StringReader.dew.js",
107-
"/npm:[email protected]/lib/reader/Uint8ArrayReader.dew.js": "./resources/vendor/dev-jspm-io/npm_jszip@3-5-0/lib/reader/Uint8ArrayReader.dew.js",
108-
"/npm:[email protected]/lib/reader/readerFor.dew.js": "./resources/vendor/dev-jspm-io/npm_jszip@3-5-0/lib/reader/readerFor.dew.js",
109-
"/npm:[email protected]/lib/signature.dew.js": "./resources/vendor/dev-jspm-io/npm_jszip@3-5-0/lib/signature.dew.js",
110-
"/npm:[email protected]/lib/stream/ConvertWorker.dew.js": "./resources/vendor/dev-jspm-io/npm_jszip@3-5-0/lib/stream/ConvertWorker.dew.js",
111-
"/npm:[email protected]/lib/stream/Crc32Probe.dew.js": "./resources/vendor/dev-jspm-io/npm_jszip@3-5-0/lib/stream/Crc32Probe.dew.js",
112-
"/npm:[email protected]/lib/stream/DataLengthProbe.dew.js": "./resources/vendor/dev-jspm-io/npm_jszip@3-5-0/lib/stream/DataLengthProbe.dew.js",
113-
"/npm:[email protected]/lib/stream/DataWorker.dew.js": "./resources/vendor/dev-jspm-io/npm_jszip@3-5-0/lib/stream/DataWorker.dew.js",
114-
"/npm:[email protected]/lib/stream/GenericWorker.dew.js": "./resources/vendor/dev-jspm-io/npm_jszip@3-5-0/lib/stream/GenericWorker.dew.js",
115-
"/npm:[email protected]/lib/stream/StreamHelper.dew.js": "./resources/vendor/dev-jspm-io/npm_jszip@3-5-0/lib/stream/StreamHelper.dew.js",
116-
"/npm:[email protected]/lib/support.dew.js": "./resources/vendor/dev-jspm-io/npm_jszip@3-5-0/lib/support.dew.js",
117-
"/npm:[email protected]/lib/utf8.dew.js": "./resources/vendor/dev-jspm-io/npm_jszip@3-5-0/lib/utf8.dew.js",
118-
"/npm:[email protected]/lib/utils.dew.js": "./resources/vendor/dev-jspm-io/npm_jszip@3-5-0/lib/utils.dew.js",
119-
"/npm:[email protected]/lib/zipEntries.dew.js": "./resources/vendor/dev-jspm-io/npm_jszip@3-5-0/lib/zipEntries.dew.js",
120-
"/npm:[email protected]/lib/zipEntry.dew.js": "./resources/vendor/dev-jspm-io/npm_jszip@3-5-0/lib/zipEntry.dew.js",
121-
"/npm:[email protected]/lib/zipObject.dew.js": "./resources/vendor/dev-jspm-io/npm_jszip@3-5-0/lib/zipObject.dew.js",
122-
"/npm:[email protected]/lib/browser.dew.js": "./resources/vendor/dev-jspm-io/npm_lie@3-3-0/lib/browser.dew.js",
123-
"/npm:[email protected]?dew": "./resources/vendor/dev-jspm-io/[email protected]",
124-
"/npm:[email protected]/index.dew.js": "./resources/vendor/dev-jspm-io/npm_pako@1-0-11/index.dew.js",
125-
"/npm:[email protected]/lib/deflate.dew.js": "./resources/vendor/dev-jspm-io/npm_pako@1-0-11/lib/deflate.dew.js",
126-
"/npm:[email protected]/lib/inflate.dew.js": "./resources/vendor/dev-jspm-io/npm_pako@1-0-11/lib/inflate.dew.js",
127-
"/npm:[email protected]/lib/utils/common.dew.js": "./resources/vendor/dev-jspm-io/npm_pako@1-0-11/lib/utils/common.dew.js",
128-
"/npm:[email protected]/lib/utils/strings.dew.js": "./resources/vendor/dev-jspm-io/npm_pako@1-0-11/lib/utils/strings.dew.js",
129-
"/npm:[email protected]/lib/zlib/adler32.dew.js": "./resources/vendor/dev-jspm-io/npm_pako@1-0-11/lib/zlib/adler32.dew.js",
130-
"/npm:[email protected]/lib/zlib/constants.dew.js": "./resources/vendor/dev-jspm-io/npm_pako@1-0-11/lib/zlib/constants.dew.js",
131-
"/npm:[email protected]/lib/zlib/crc32.dew.js": "./resources/vendor/dev-jspm-io/npm_pako@1-0-11/lib/zlib/crc32.dew.js",
132-
"/npm:[email protected]/lib/zlib/deflate.dew.js": "./resources/vendor/dev-jspm-io/npm_pako@1-0-11/lib/zlib/deflate.dew.js",
133-
"/npm:[email protected]/lib/zlib/gzheader.dew.js": "./resources/vendor/dev-jspm-io/npm_pako@1-0-11/lib/zlib/gzheader.dew.js",
134-
"/npm:[email protected]/lib/zlib/inffast.dew.js": "./resources/vendor/dev-jspm-io/npm_pako@1-0-11/lib/zlib/inffast.dew.js",
135-
"/npm:[email protected]/lib/zlib/inflate.dew.js": "./resources/vendor/dev-jspm-io/npm_pako@1-0-11/lib/zlib/inflate.dew.js",
136-
"/npm:[email protected]/lib/zlib/inftrees.dew.js": "./resources/vendor/dev-jspm-io/npm_pako@1-0-11/lib/zlib/inftrees.dew.js",
137-
"/npm:[email protected]/lib/zlib/messages.dew.js": "./resources/vendor/dev-jspm-io/npm_pako@1-0-11/lib/zlib/messages.dew.js",
138-
"/npm:[email protected]/lib/zlib/trees.dew.js": "./resources/vendor/dev-jspm-io/npm_pako@1-0-11/lib/zlib/trees.dew.js",
139-
"/npm:[email protected]/lib/zlib/zstream.dew.js": "./resources/vendor/dev-jspm-io/npm_pako@1-0-11/lib/zlib/zstream.dew.js",
140-
"/npm:[email protected]?dew": "./resources/vendor/dev-jspm-io/[email protected]",
141-
"/npm:[email protected]/index.dew.js": "./resources/vendor/dev-jspm-io/npm_set-immediate-shim@1-0-1/index.dew.js",
142-
"/npm:[email protected]?dew": "./resources/vendor/dev-jspm-io/[email protected]"
143-
}
67+
"https://deno.land/[email protected]/fs/ensure_dir.ts": "https://deno.land/[email protected]/fs/ensure_dir.ts"
14468
}
14569
}

‎src/vendor_deps.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ This is only used by vendor.sh and should not be imported by any other code.
1010
// for puppeteer
1111
import { dirname, join, SEP } from "https://deno.land/[email protected]/path/mod.ts";
1212
import puppeteer from "https://deno.land/x/[email protected]/mod.ts";
13-
import * as _base64 from "https://deno.land/[email protected]/encoding/base64.ts";
13+
import _jszip from "https://dev.jspm.io/[email protected]";
14+
// import * as _base64 from "https://deno.land/[email protected]/encoding/base64.ts";
1415

1516
// I don't quite understand why the import map is not resolving this one
1617
import * as _base64_2 from "https://deno.land/[email protected]/encoding/base64.ts";

0 commit comments

Comments
 (0)