diff --git a/deno_dist/index.ts b/deno_dist/index.ts index 31e90f51..99650688 100644 --- a/deno_dist/index.ts +++ b/deno_dist/index.ts @@ -1,7 +1,7 @@ -import type { Context, MiddlewareHandler } from 'https://raw.githubusercontent.com/honojs/hono/v2.6.1/deno_dist/mod.ts' +import type { Context, MiddlewareHandler } from 'https://deno.land/x/hono/mod.ts' import Toucan from 'https://cdn.skypack.dev/toucan-js@2.6.1' -declare module 'https://raw.githubusercontent.com/honojs/hono/v2.6.1/deno_dist/mod.ts' { +declare module 'https://deno.land/x/hono/mod.ts' { interface ContextVariableMap { sentry: Toucan } diff --git a/deno_test/deps.ts b/deno_test/deps.ts index 2c9471af..12c276dd 100644 --- a/deno_test/deps.ts +++ b/deno_test/deps.ts @@ -1,2 +1,2 @@ export { assert, assertEquals } from 'https://deno.land/std@0.148.0/testing/asserts.ts' -export { Hono } from 'https://raw.githubusercontent.com/honojs/hono/v2.6.1/deno_dist/mod.ts' +export { Hono } from 'https://deno.land/x/hono@v2.6.1/mod.ts' diff --git a/package.json b/package.json index 0ccdf9bd..ec5d3528 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "@types/jest": "^28.1.4", "@typescript-eslint/eslint-plugin": "^5.32.0", "@typescript-eslint/parser": "^5.32.0", - "denoify": "^0.11.1", + "denoify": "^1.4.5", "eslint": "^8.21.0", "eslint-config-prettier": "^8.5.0", "eslint-define-config": "^1.6.0", @@ -61,4 +61,4 @@ "ts-jest": "^28.0.5", "typescript": "^4.7.4" } -} +} \ No newline at end of file diff --git a/src/replacer.ts b/src/replacer.ts index 113c5288..a75f8cf5 100644 --- a/src/replacer.ts +++ b/src/replacer.ts @@ -1,9 +1,26 @@ // @denoify-ignore -import { makeThisModuleAnExecutableReplacer } from 'denoify' +import { makeThisModuleAnExecutableReplacer, ParsedImportExportStatement } from 'denoify' makeThisModuleAnExecutableReplacer(async ({ parsedImportExportStatement, version }) => { if (parsedImportExportStatement.parsedArgument.nodeModuleName === 'toucan-js') { - return `import Toucan from 'https://cdn.skypack.dev/toucan-js@${version}'` + return ParsedImportExportStatement.stringify({ + ...parsedImportExportStatement, + parsedArgument: { + type: 'URL', + url: `https://cdn.skypack.dev/toucan-js@${version}`, + }, + }) } + + if (parsedImportExportStatement.parsedArgument.nodeModuleName === 'hono') { + return ParsedImportExportStatement.stringify({ + ...parsedImportExportStatement, + parsedArgument: { + type: 'URL', + url: `https://deno.land/x/hono/mod.ts`, + }, + }) + } + return undefined }) diff --git a/yarn.lock b/yarn.lock index d9129e68..36273d1a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1832,7 +1832,7 @@ core-util-is@^1.0.2: resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== -cosmiconfig@^7.0.0: +cosmiconfig@^7.0.0, cosmiconfig@^7.0.1: version "7.1.0" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.1.0.tgz#1443b9afa596b670082ea46cbd8f6a62b84635f6" integrity sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA== @@ -1967,23 +1967,26 @@ del@^6.0.0: rimraf "^3.0.2" slash "^3.0.0" -denoify@^0.11.1: - version "0.11.7" - resolved "https://registry.yarnpkg.com/denoify/-/denoify-0.11.7.tgz#58d1fa69cb954d06ab98a2de07f1a08ab8a1a73c" - integrity sha512-2JvQysrBci6Fq0abR+PZl1vGb5spXuXnU3INf/4sflkwk3yRdGi233hd0tBk9fDjNrA2iz8xVemyOv6Hdcvt+g== +denoify@^1.4.5: + version "1.4.5" + resolved "https://registry.yarnpkg.com/denoify/-/denoify-1.4.5.tgz#6c4a0682b051b2d3dc8cca1d7e29611139ca4bd9" + integrity sha512-hk75EoJgI8kCizSAQ8wT7Vmopg67k9+rsos/ScYSFmEk/wMSSgi8xlQMkf99dvNDFck07BgnlywIBLpbs8oU5w== dependencies: "@octokit/rest" "^18.0.0" "@types/comment-json" "^1.1.1" commander "^4.1.1" comment-json "^3.0.2" - evt "^2.3.1" + cosmiconfig "^7.0.1" + evt "^2.4.13" get-github-default-branch-name "^0.0.4" gitignore-parser "0.0.2" glob "^7.1.6" - node-fetch "^2.6.0" + minimal-polyfills "^2.2.2" + node-fetch "^2.6.7" + parse-dont-validate "^4.0.1" path-depth "^1.0.0" - scripting-tools "^0.19.13" - tsafe "^0.10.1" + scripting-tools "^0.19.14" + tsafe "^1.4.1" url-join "^4.0.1" deprecation@^2.0.0, deprecation@^2.3.1: @@ -2398,7 +2401,7 @@ esutils@^2.0.2: resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== -evt@^2.3.1: +evt@^2.4.13: version "2.4.13" resolved "https://registry.yarnpkg.com/evt/-/evt-2.4.13.tgz#5ef873159ce62e099d58801a3e4b8e0f5b648017" integrity sha512-haTVOsmjzk+28zpzvVwan9Zw2rLQF2izgi7BKjAPRzZAfcv+8scL0TpM8MzvGNKFYHiy+Bq3r6FYIIUPl9kt3A== @@ -4202,7 +4205,7 @@ new-github-release-url@^1.0.0: dependencies: type-fest "^0.4.1" -node-fetch@^2.6.0, node-fetch@^2.6.7: +node-fetch@^2.6.7: version "2.6.7" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad" integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ== @@ -4586,6 +4589,11 @@ parent-module@^1.0.0: dependencies: callsites "^3.0.0" +parse-dont-validate@^4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/parse-dont-validate/-/parse-dont-validate-4.0.2.tgz#4611b40f1e41814f74e71ce49d278a9893d2f7e3" + integrity sha512-e8KvTcCGfIuE7do7m/3DgFbOQ1ddU5y6CioUfD3CLMSHGm0reBAqpl1kfTxT676eaFrWij/k9hhLDJb6XH7J4A== + parse-json@^5.0.0, parse-json@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" @@ -4935,7 +4943,7 @@ scoped-regex@^2.0.0: resolved "https://registry.yarnpkg.com/scoped-regex/-/scoped-regex-2.1.0.tgz#7b9be845d81fd9d21d1ec97c61a0b7cf86d2015f" integrity sha512-g3WxHrqSWCZHGHlSrF51VXFdjImhwvH8ZO/pryFH56Qi0cDsZfylQa/t0jCzVQFNbNvM00HfHjkDPEuarKDSWQ== -scripting-tools@^0.19.12, scripting-tools@^0.19.13: +scripting-tools@^0.19.12, scripting-tools@^0.19.14: version "0.19.14" resolved "https://registry.yarnpkg.com/scripting-tools/-/scripting-tools-0.19.14.tgz#d46cdea3dcf042b103b1712103b007e72c4901d5" integrity sha512-KGRES70dEmcaCdpx3R88bLWmfA4mQ/EGikCQy0FGTZwx3y9F5yYkzEhwp02+ZTgpvF25JcNOhDBbOqL6z92kwg== @@ -5402,11 +5410,6 @@ ts-jest@^28.0.5: semver "7.x" yargs-parser "^21.0.1" -tsafe@^0.10.1: - version "0.10.1" - resolved "https://registry.yarnpkg.com/tsafe/-/tsafe-0.10.1.tgz#8f100b901e4467c43c0484f56a063f4276683ce0" - integrity sha512-S+LrpSjoH5Pah201KS0MxtJn88HVtKf4ZxUoQuW/Hnl4IK6ALu9Qwjed7RbohDeHn+iMuug4c5Mk/z1Cq2G3nw== - tsafe@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/tsafe/-/tsafe-1.4.1.tgz#59cdad8ac41babf88e56dcd1a683ae2fb145d059"