diff options
| author | nsfisis <nsfisis@gmail.com> | 2025-03-28 23:52:50 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2025-03-28 23:54:31 +0900 |
| commit | f65ec15aaf8fc46685c39d721cab82f64baead8c (patch) | |
| tree | a1b64e7db236698976c6436a1b0cd84cd47f53e4 | |
| parent | a5e9d98602084e1e7a98d2bf78699fd157ea2c78 (diff) | |
| download | nsfisis.dev-f65ec15aaf8fc46685c39d721cab82f64baead8c.tar.gz nsfisis.dev-f65ec15aaf8fc46685c39d721cab82f64baead8c.tar.zst nsfisis.dev-f65ec15aaf8fc46685c39d721cab82f64baead8c.zip | |
refactor(blog/nuldoc): migrate Deno standard library to JSR
| -rw-r--r-- | vhosts/blog/deno.jsonc | 11 | ||||
| -rw-r--r-- | vhosts/blog/deno.lock | 106 | ||||
| -rw-r--r-- | vhosts/blog/nuldoc-src/commands/build.ts | 5 | ||||
| -rw-r--r-- | vhosts/blog/nuldoc-src/commands/new.ts | 8 | ||||
| -rw-r--r-- | vhosts/blog/nuldoc-src/commands/serve.ts | 5 | ||||
| -rw-r--r-- | vhosts/blog/nuldoc-src/components/StaticScript.tsx | 2 | ||||
| -rw-r--r-- | vhosts/blog/nuldoc-src/components/StaticStylesheet.tsx | 2 | ||||
| -rw-r--r-- | vhosts/blog/nuldoc-src/config.ts | 4 | ||||
| -rw-r--r-- | vhosts/blog/nuldoc-src/generators/post.ts | 2 | ||||
| -rw-r--r-- | vhosts/blog/nuldoc-src/generators/slide.ts | 2 | ||||
| -rw-r--r-- | vhosts/blog/nuldoc-src/ndoc/document.ts | 2 | ||||
| -rw-r--r-- | vhosts/blog/nuldoc-src/ndoc/parse.ts | 2 | ||||
| -rw-r--r-- | vhosts/blog/nuldoc-src/slide/parse.ts | 2 | ||||
| -rw-r--r-- | vhosts/blog/nuldoc-src/xml_test.ts | 2 |
14 files changed, 132 insertions, 23 deletions
diff --git a/vhosts/blog/deno.jsonc b/vhosts/blog/deno.jsonc index ace62a67..e0df1d1b 100644 --- a/vhosts/blog/deno.jsonc +++ b/vhosts/blog/deno.jsonc @@ -1,11 +1,16 @@ { "imports": { - "myjsx/jsx-runtime": "./nuldoc-src/jsx/jsx-runtime.ts", - "myjsx-types/jsx-runtime": "./nuldoc-src/jsx/types.d.ts", + "@std/assert": "jsr:@std/assert@^1.0.12", + "@std/cli": "jsr:@std/cli@^1.0.15", + "@std/fs": "jsr:@std/fs@^1.0.15", + "@std/http": "jsr:@std/http@^1.0.13", + "@std/path": "jsr:@std/path@^1.0.8", + "@std/toml": "jsr:@std/toml@^1.0.3", "checksum/": "https://deno.land/x/checksum@1.4.0/", "highlight.js": "npm:highlight.js@11.11.1", - "std/": "https://deno.land/std@0.224.0/", "zod/": "https://deno.land/x/zod@v3.24.2/", + "myjsx/jsx-runtime": "./nuldoc-src/jsx/jsx-runtime.ts", + "myjsx-types/jsx-runtime": "./nuldoc-src/jsx/types.d.ts", }, "compilerOptions": { "jsx": "react-jsx", diff --git a/vhosts/blog/deno.lock b/vhosts/blog/deno.lock index 4310e205..f5840e3d 100644 --- a/vhosts/blog/deno.lock +++ b/vhosts/blog/deno.lock @@ -1,17 +1,113 @@ { "version": "4", "specifiers": { + "jsr:@std/cli@^1.0.12": "1.0.15", + "jsr:@std/cli@^1.0.15": "1.0.15", + "jsr:@std/collections@^1.0.10": "1.0.10", + "jsr:@std/encoding@^1.0.7": "1.0.8", + "jsr:@std/fmt@^1.0.5": "1.0.6", + "jsr:@std/fs@^1.0.15": "1.0.15", + "jsr:@std/html@^1.0.3": "1.0.3", + "jsr:@std/http@^1.0.13": "1.0.13", + "jsr:@std/media-types@^1.1.0": "1.1.0", + "jsr:@std/net@^1.0.4": "1.0.4", + "jsr:@std/path@^1.0.8": "1.0.8", + "jsr:@std/streams@^1.0.9": "1.0.9", + "jsr:@std/toml@^1.0.3": "1.0.3", "npm:highlight.js@11.11.1": "11.11.1" }, + "jsr": { + "@std/cli@1.0.13": { + "integrity": "5db2d95ab2dca3bca9fb6ad3c19908c314e93d6391c8b026725e4892d4615a69" + }, + "@std/cli@1.0.15": { + "integrity": "e79ba3272ec710ca44d8342a7688e6288b0b88802703f3264184b52893d5e93f" + }, + "@std/collections@1.0.10": { + "integrity": "903af106a3d92970d74e20f7ebff77d9658af9bef4403f1dc42a7801c0575899" + }, + "@std/encoding@1.0.8": { + "integrity": "a6c8f3f933ab1bed66244f435d1dc0fd23a888e07195532122ddc3d5f8f0e6b4" + }, + "@std/fmt@1.0.6": { + "integrity": "a2c56a69a2369876ddb3ad6a500bb6501b5bad47bb3ea16bfb0c18974d2661fc" + }, + "@std/fs@1.0.15": { + "integrity": "c083fb479889d6440d768e498195c3fc499d426fbf9a6592f98f53884d1d3f41", + "dependencies": [ + "jsr:@std/path" + ] + }, + "@std/html@1.0.3": { + "integrity": "7a0ac35e050431fb49d44e61c8b8aac1ebd55937e0dc9ec6409aa4bab39a7988" + }, + "@std/http@1.0.13": { + "integrity": "d29618b982f7ae44380111f7e5b43da59b15db64101198bb5f77100d44eb1e1e", + "dependencies": [ + "jsr:@std/cli@^1.0.12", + "jsr:@std/encoding", + "jsr:@std/fmt", + "jsr:@std/html", + "jsr:@std/media-types", + "jsr:@std/net", + "jsr:@std/path", + "jsr:@std/streams" + ] + }, + "@std/media-types@1.1.0": { + "integrity": "c9d093f0c05c3512932b330e3cc1fe1d627b301db33a4c2c2185c02471d6eaa4" + }, + "@std/net@1.0.4": { + "integrity": "2f403b455ebbccf83d8a027d29c5a9e3a2452fea39bb2da7f2c04af09c8bc852" + }, + "@std/path@1.0.8": { + "integrity": "548fa456bb6a04d3c1a1e7477986b6cffbce95102d0bb447c67c4ee70e0364be" + }, + "@std/streams@1.0.9": { + "integrity": "a9d26b1988cdd7aa7b1f4b51e1c36c1557f3f252880fa6cc5b9f37078b1a5035" + }, + "@std/toml@1.0.3": { + "integrity": "dd5c039860a312779ec19980be000d977ce8f56fadaa073d8f33632f21540ffb", + "dependencies": [ + "jsr:@std/collections" + ] + } + }, "npm": { "highlight.js@11.11.1": { "integrity": "sha512-Xwwo44whKBVCYoliBQwaPvtd/2tYFkRQtXDWj1nackaV2JPXx3L0+Jvd8/qCJ2p+ML0/XVkJ2q+Mr+UVdpJK5w==" } }, "remote": { + "https://deno.land/std@0.224.0/assert/_constants.ts": "a271e8ef5a573f1df8e822a6eb9d09df064ad66a4390f21b3e31f820a38e0975", "https://deno.land/std@0.224.0/assert/assert.ts": "09d30564c09de846855b7b071e62b5974b001bb72a4b797958fe0660e7849834", + "https://deno.land/std@0.224.0/assert/assert_almost_equals.ts": "9e416114322012c9a21fa68e187637ce2d7df25bcbdbfd957cd639e65d3cf293", + "https://deno.land/std@0.224.0/assert/assert_array_includes.ts": "14c5094471bc8e4a7895fc6aa5a184300d8a1879606574cb1cd715ef36a4a3c7", + "https://deno.land/std@0.224.0/assert/assert_equals.ts": "3bbca947d85b9d374a108687b1a8ba3785a7850436b5a8930d81f34a32cb8c74", "https://deno.land/std@0.224.0/assert/assert_exists.ts": "43420cf7f956748ae6ed1230646567b3593cb7a36c5a5327269279c870c5ddfd", + "https://deno.land/std@0.224.0/assert/assert_false.ts": "3e9be8e33275db00d952e9acb0cd29481a44fa0a4af6d37239ff58d79e8edeff", + "https://deno.land/std@0.224.0/assert/assert_greater.ts": "5e57b201fd51b64ced36c828e3dfd773412c1a6120c1a5a99066c9b261974e46", + "https://deno.land/std@0.224.0/assert/assert_greater_or_equal.ts": "9870030f997a08361b6f63400273c2fb1856f5db86c0c3852aab2a002e425c5b", + "https://deno.land/std@0.224.0/assert/assert_instance_of.ts": "e22343c1fdcacfaea8f37784ad782683ec1cf599ae9b1b618954e9c22f376f2c", + "https://deno.land/std@0.224.0/assert/assert_is_error.ts": "f856b3bc978a7aa6a601f3fec6603491ab6255118afa6baa84b04426dd3cc491", + "https://deno.land/std@0.224.0/assert/assert_less.ts": "60b61e13a1982865a72726a5fa86c24fad7eb27c3c08b13883fb68882b307f68", + "https://deno.land/std@0.224.0/assert/assert_less_or_equal.ts": "d2c84e17faba4afe085e6c9123a63395accf4f9e00150db899c46e67420e0ec3", + "https://deno.land/std@0.224.0/assert/assert_match.ts": "ace1710dd3b2811c391946954234b5da910c5665aed817943d086d4d4871a8b7", + "https://deno.land/std@0.224.0/assert/assert_not_equals.ts": "78d45dd46133d76ce624b2c6c09392f6110f0df9b73f911d20208a68dee2ef29", + "https://deno.land/std@0.224.0/assert/assert_not_instance_of.ts": "3434a669b4d20cdcc5359779301a0588f941ffdc2ad68803c31eabdb4890cf7a", + "https://deno.land/std@0.224.0/assert/assert_not_match.ts": "df30417240aa2d35b1ea44df7e541991348a063d9ee823430e0b58079a72242a", + "https://deno.land/std@0.224.0/assert/assert_not_strict_equals.ts": "37f73880bd672709373d6dc2c5f148691119bed161f3020fff3548a0496f71b8", + "https://deno.land/std@0.224.0/assert/assert_object_match.ts": "411450fd194fdaabc0089ae68f916b545a49d7b7e6d0026e84a54c9e7eed2693", + "https://deno.land/std@0.224.0/assert/assert_rejects.ts": "4bee1d6d565a5b623146a14668da8f9eb1f026a4f338bbf92b37e43e0aa53c31", + "https://deno.land/std@0.224.0/assert/assert_strict_equals.ts": "b4f45f0fd2e54d9029171876bd0b42dd9ed0efd8f853ab92a3f50127acfa54f5", + "https://deno.land/std@0.224.0/assert/assert_string_includes.ts": "496b9ecad84deab72c8718735373feb6cdaa071eb91a98206f6f3cb4285e71b8", + "https://deno.land/std@0.224.0/assert/assert_throws.ts": "c6508b2879d465898dab2798009299867e67c570d7d34c90a2d235e4553906eb", "https://deno.land/std@0.224.0/assert/assertion_error.ts": "ba8752bd27ebc51f723702fac2f54d3e94447598f54264a6653d6413738a8917", + "https://deno.land/std@0.224.0/assert/equal.ts": "bddf07bb5fc718e10bb72d5dc2c36c1ce5a8bdd3b647069b6319e07af181ac47", + "https://deno.land/std@0.224.0/assert/fail.ts": "0eba674ffb47dff083f02ced76d5130460bff1a9a68c6514ebe0cdea4abadb68", + "https://deno.land/std@0.224.0/assert/mod.ts": "48b8cb8a619ea0b7958ad7ee9376500fe902284bb36f0e32c598c3dc34cbd6f3", + "https://deno.land/std@0.224.0/assert/unimplemented.ts": "8c55a5793e9147b4f1ef68cd66496b7d5ba7a9e7ca30c6da070c1a58da723d73", + "https://deno.land/std@0.224.0/assert/unreachable.ts": "5ae3dbf63ef988615b93eb08d395dda771c96546565f9e521ed86f6510c29e19", "https://deno.land/std@0.224.0/async/delay.ts": "f90dd685b97c2f142b8069082993e437b1602b8e2561134827eeb7c12b95c499", "https://deno.land/std@0.224.0/cli/parse_args.ts": "5250832fb7c544d9111e8a41ad272c016f5a53f975ef84d5a9fe5fcb70566ece", "https://deno.land/std@0.224.0/collections/_utils.ts": "b2ec8ada31b5a72ebb1d99774b849b4c09fe4b3a38d07794bd010bd218a16e0b", @@ -53,6 +149,9 @@ "https://deno.land/std@0.224.0/http/status.ts": "ed61b4882af2514a81aefd3245e8df4c47b9a8e54929a903577643d2d1ebf514", "https://deno.land/std@0.224.0/http/unstable_signed_cookie.ts": "2a5bfbdf6b4aa35ef1464300fe1ba4eb89eb79f535c9cb28401d55fbb7038479", "https://deno.land/std@0.224.0/http/user_agent.ts": "05f8849c7e27b898793bfc70204f0c72b6be9bee7accbe98e18a1c413bd4ace3", + "https://deno.land/std@0.224.0/internal/diff.ts": "6234a4b493ebe65dc67a18a0eb97ef683626a1166a1906232ce186ae9f65f4e6", + "https://deno.land/std@0.224.0/internal/format.ts": "0a98ee226fd3d43450245b1844b47003419d34d210fa989900861c79820d21c2", + "https://deno.land/std@0.224.0/internal/mod.ts": "534125398c8e7426183e12dc255bb635d94e06d0f93c60a297723abe69d3b22e", "https://deno.land/std@0.224.0/media_types/_db.ts": "19563a2491cd81b53b9c1c6ffd1a9145c355042d4a854c52f6e1424f73ff3923", "https://deno.land/std@0.224.0/media_types/_util.ts": "e0b8da0c7d8ad2015cf27ac16ddf0809ac984b2f3ec79f7fa4206659d4f10deb", "https://deno.land/std@0.224.0/media_types/content_type.ts": "ed3f2e1f243b418ad3f441edc95fd92efbadb0f9bde36219c7564c67f9639513", @@ -139,6 +238,7 @@ "https://deno.land/std@0.224.0/path/windows/to_file_url.ts": "40e560ee4854fe5a3d4d12976cef2f4e8914125c81b11f1108e127934ced502e", "https://deno.land/std@0.224.0/path/windows/to_namespaced_path.ts": "4ffa4fb6fae321448d5fe810b3ca741d84df4d7897e61ee29be961a6aac89a4c", "https://deno.land/std@0.224.0/streams/byte_slice_stream.ts": "5bbdcadb118390affa9b3d0a0f73ef8e83754f59bb89df349add669dd9369713", + "https://deno.land/std@0.224.0/testing/asserts.ts": "d0cdbabadc49cc4247a50732ee0df1403fdcd0f95360294ad448ae8c240f3f5c", "https://deno.land/std@0.224.0/toml/_parser.ts": "187560eb4465977808b18c68299e1f5a6e4631c0a181d868c8f24722cf9146d1", "https://deno.land/std@0.224.0/toml/mod.ts": "a457ea7877a6d5e7f3d6985c43da4d2ecd7461038d5c4c7a0089737e90a7ee90", "https://deno.land/std@0.224.0/toml/parse.ts": "2f0729a8f62c7e508af8dfada0386a4bc2c0d664ef4d26090df03cf495dcb25a", @@ -178,6 +278,12 @@ }, "workspace": { "dependencies": [ + "jsr:@std/assert@^1.0.12", + "jsr:@std/cli@^1.0.15", + "jsr:@std/fs@^1.0.15", + "jsr:@std/http@^1.0.13", + "jsr:@std/path@^1.0.8", + "jsr:@std/toml@^1.0.3", "npm:highlight.js@11.11.1" ] } diff --git a/vhosts/blog/nuldoc-src/commands/build.ts b/vhosts/blog/nuldoc-src/commands/build.ts index 2bfb9e02..4702fd0a 100644 --- a/vhosts/blog/nuldoc-src/commands/build.ts +++ b/vhosts/blog/nuldoc-src/commands/build.ts @@ -1,6 +1,5 @@ -import { dirname, join, joinGlobs } from "std/path/mod.ts"; -import { ensureDir } from "std/fs/mod.ts"; -import { expandGlob } from "std/fs/expand_glob.ts"; +import { dirname, join, joinGlobs } from "@std/path"; +import { ensureDir, expandGlob } from "@std/fs"; import { generateFeedPageFromEntries } from "../generators/atom.ts"; import { Config, getTagLabel } from "../config.ts"; import { parseNulDocFile } from "../ndoc/parse.ts"; diff --git a/vhosts/blog/nuldoc-src/commands/new.ts b/vhosts/blog/nuldoc-src/commands/new.ts index 13735f0b..e694ce20 100644 --- a/vhosts/blog/nuldoc-src/commands/new.ts +++ b/vhosts/blog/nuldoc-src/commands/new.ts @@ -1,10 +1,10 @@ -import { dirname, join } from "std/path/mod.ts"; -import { ensureDir } from "std/fs/mod.ts"; -import { parse } from "std/flags/mod.ts"; +import { dirname, join } from "@std/path"; +import { ensureDir } from "@std/fs"; +import { parseArgs } from "@std/cli"; import { Config } from "../config.ts"; export async function runNewCommand(config: Config) { - const parsedArgs = parse(Deno.args, { + const parsedArgs = parseArgs(Deno.args, { string: ["date"], }); diff --git a/vhosts/blog/nuldoc-src/commands/serve.ts b/vhosts/blog/nuldoc-src/commands/serve.ts index cc8d5d5b..a78dda5d 100644 --- a/vhosts/blog/nuldoc-src/commands/serve.ts +++ b/vhosts/blog/nuldoc-src/commands/serve.ts @@ -1,6 +1,5 @@ -import { serveDir } from "std/http/file_server.ts"; -import { STATUS_CODE, STATUS_TEXT } from "std/http/mod.ts"; -import { join } from "std/path/mod.ts"; +import { serveDir, STATUS_CODE, STATUS_TEXT } from "@std/http"; +import { join } from "@std/path"; import { Config } from "../config.ts"; import { runBuildCommand } from "./build.ts"; diff --git a/vhosts/blog/nuldoc-src/components/StaticScript.tsx b/vhosts/blog/nuldoc-src/components/StaticScript.tsx index eb26ada7..e3b103cc 100644 --- a/vhosts/blog/nuldoc-src/components/StaticScript.tsx +++ b/vhosts/blog/nuldoc-src/components/StaticScript.tsx @@ -1,4 +1,4 @@ -import { join } from "std/path/mod.ts"; +import { join } from "@std/path"; import { Config } from "../config.ts"; import { calculateFileHash } from "./utils.ts"; diff --git a/vhosts/blog/nuldoc-src/components/StaticStylesheet.tsx b/vhosts/blog/nuldoc-src/components/StaticStylesheet.tsx index 5c2c2a0f..52b695e5 100644 --- a/vhosts/blog/nuldoc-src/components/StaticStylesheet.tsx +++ b/vhosts/blog/nuldoc-src/components/StaticStylesheet.tsx @@ -1,4 +1,4 @@ -import { join } from "std/path/mod.ts"; +import { join } from "@std/path"; import { Config } from "../config.ts"; import { calculateFileHash } from "./utils.ts"; diff --git a/vhosts/blog/nuldoc-src/config.ts b/vhosts/blog/nuldoc-src/config.ts index 21a620a7..5a07896f 100644 --- a/vhosts/blog/nuldoc-src/config.ts +++ b/vhosts/blog/nuldoc-src/config.ts @@ -1,5 +1,5 @@ -import { join } from "std/path/mod.ts"; -import { parse as parseToml } from "std/toml/mod.ts"; +import { join } from "@std/path"; +import { parse as parseToml } from "@std/toml"; import { z } from "zod/mod.ts"; const ConfigSchema = z.object({ diff --git a/vhosts/blog/nuldoc-src/generators/post.ts b/vhosts/blog/nuldoc-src/generators/post.ts index f90ab193..ae96c573 100644 --- a/vhosts/blog/nuldoc-src/generators/post.ts +++ b/vhosts/blog/nuldoc-src/generators/post.ts @@ -1,4 +1,4 @@ -import { join } from "std/path/mod.ts"; +import { join } from "@std/path"; import { renderToDOM } from "../jsx/render.ts"; import PostPage from "../pages/PostPage.tsx"; import { Config } from "../config.ts"; diff --git a/vhosts/blog/nuldoc-src/generators/slide.ts b/vhosts/blog/nuldoc-src/generators/slide.ts index ab68d332..cd28879f 100644 --- a/vhosts/blog/nuldoc-src/generators/slide.ts +++ b/vhosts/blog/nuldoc-src/generators/slide.ts @@ -1,4 +1,4 @@ -import { join } from "std/path/mod.ts"; +import { join } from "@std/path"; import { renderToDOM } from "../jsx/render.ts"; import SlidePage from "../pages/SlidePage.tsx"; import { Config } from "../config.ts"; diff --git a/vhosts/blog/nuldoc-src/ndoc/document.ts b/vhosts/blog/nuldoc-src/ndoc/document.ts index 26c00784..dfb6d03b 100644 --- a/vhosts/blog/nuldoc-src/ndoc/document.ts +++ b/vhosts/blog/nuldoc-src/ndoc/document.ts @@ -1,4 +1,4 @@ -import { join } from "std/path/mod.ts"; +import { join } from "@std/path"; import { Config } from "../config.ts"; import { NuldocError } from "../errors.ts"; import { Revision, stringToDate } from "../revision.ts"; diff --git a/vhosts/blog/nuldoc-src/ndoc/parse.ts b/vhosts/blog/nuldoc-src/ndoc/parse.ts index 1ffa7413..10b3309b 100644 --- a/vhosts/blog/nuldoc-src/ndoc/parse.ts +++ b/vhosts/blog/nuldoc-src/ndoc/parse.ts @@ -1,4 +1,4 @@ -import { parse as parseToml } from "std/toml/mod.ts"; +import { parse as parseToml } from "@std/toml"; import { Config } from "../config.ts"; import { parseXmlString } from "../xml.ts"; import { diff --git a/vhosts/blog/nuldoc-src/slide/parse.ts b/vhosts/blog/nuldoc-src/slide/parse.ts index 170b7484..c5a89675 100644 --- a/vhosts/blog/nuldoc-src/slide/parse.ts +++ b/vhosts/blog/nuldoc-src/slide/parse.ts @@ -1,4 +1,4 @@ -import { parse as parseToml } from "std/toml/mod.ts"; +import { parse as parseToml } from "@std/toml"; import { createNewSlideFromMetadata, Slide, diff --git a/vhosts/blog/nuldoc-src/xml_test.ts b/vhosts/blog/nuldoc-src/xml_test.ts index 28e15970..c423800e 100644 --- a/vhosts/blog/nuldoc-src/xml_test.ts +++ b/vhosts/blog/nuldoc-src/xml_test.ts @@ -1,4 +1,4 @@ -import { assertEquals } from "std/testing/asserts.ts"; +import { assertEquals } from "@std/assert"; import { parseXmlString } from "./xml.ts"; Deno.test("Parse XML", () => { |
