Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/dev/deps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ export { parse } from "https://deno.land/std@0.193.0/flags/mod.ts";
export { gte } from "https://deno.land/std@0.193.0/semver/mod.ts";
export { existsSync } from "https://deno.land/std@0.193.0/fs/mod.ts";
export * as semver from "https://deno.land/std@0.195.0/semver/mod.ts";
export * as JSONC from "https://deno.land/std@0.195.0/jsonc/mod.ts";

// ts-morph
export { Node, Project } from "https://deno.land/x/ts_morph@17.0.1/mod.ts";
14 changes: 12 additions & 2 deletions tests/cli_test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -356,14 +356,24 @@ Deno.test("fresh-update", async function fn(t) {
);
});

const comment = "// This is a test comment";
const regex = /("preact": "https:\/\/esm.sh\/preact@[\d.]+",\n)/;
const originalName = `${tmpDirName}/deno.json`;
const updatedName = `${originalName}c`;
await t.step("execute update command deno.jsonc support", async () => {
try {
Deno.renameSync(`${tmpDirName}/deno.json`, `${tmpDirName}/deno.jsonc`);
Deno.renameSync(originalName, updatedName);
let denoJsonText = await Deno.readTextFile(updatedName);
denoJsonText = denoJsonText.replace(regex, `$1${comment}\n`);
await Deno.writeTextFile(updatedName, denoJsonText);
await updateAndVerify(
/The manifest has been generated for \d+ routes and \d+ islands./,
);
} finally {
Deno.renameSync(`${tmpDirName}/deno.jsonc`, `${tmpDirName}/deno.json`);
let denoJsonText = await Deno.readTextFile(updatedName);
denoJsonText = denoJsonText.replace(new RegExp(`\n${comment}\n`), "\n");
await Deno.writeTextFile(updatedName, denoJsonText);
Deno.renameSync(updatedName, originalName);
}
});

Expand Down
12 changes: 11 additions & 1 deletion update.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import {
dirname,
existsSync,
extname,
join,
JSONC,
Node,
parse,
Project,
Expand Down Expand Up @@ -49,7 +51,15 @@ if (!DENO_JSON_PATH) {
);
}
let denoJsonText = await Deno.readTextFile(DENO_JSON_PATH);
let denoJson = JSON.parse(denoJsonText);
const ext = extname(DENO_JSON_PATH);
let denoJson;
if (ext === ".json") {
denoJson = JSON.parse(denoJsonText);
} else if (ext === ".jsonc") {
denoJson = JSONC.parse(denoJsonText);
} else {
throw new Error(`Unsupported file extension: ${ext}`);
}
if (denoJson.importMap) {
const IMPORT_MAP_PATH = join(resolvedDirectory, denoJson.importMap);
const importMapText = await Deno.readTextFile(IMPORT_MAP_PATH);
Expand Down