Skip to content

Commit 67828f0

Browse files
committed
chore: use deno from node_modules
1 parent 3786d17 commit 67828f0

File tree

9 files changed

+2473
-1108
lines changed

9 files changed

+2473
-1108
lines changed

.github/workflows/ci.yml

Lines changed: 11 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,20 @@ jobs:
2121
- name: Checkout codes
2222
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2323

24-
- name: Setup deno
25-
uses: denoland/setup-deno@v1
24+
- name: Install pnpm
25+
uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
26+
27+
- name: Setup node
28+
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
2629
with:
27-
deno-version: v1.x
30+
node-version: ${{ matrix.node }}
31+
cache: pnpm
32+
33+
- name: Install dependencies
34+
run: pnpm install --frozen-lockfile
2835

2936
- name: Lint codes
30-
run: deno lint
37+
run: pnpm run lint
3138

3239
build:
3340
name: Build
@@ -45,11 +52,6 @@ jobs:
4552
- name: Install pnpm
4653
uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
4754

48-
- name: Setup deno
49-
uses: denoland/setup-deno@v1
50-
with:
51-
deno-version: v1.x
52-
5355
- name: Setup bun
5456
uses: oven-sh/setup-bun@735343b667d3e6f658f44d0eca948eb6282f2b76 # v2.0.2
5557

@@ -81,11 +83,6 @@ jobs:
8183
- name: Install pnpm
8284
uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
8385

84-
- name: Setup deno
85-
uses: denoland/setup-deno@v1
86-
with:
87-
deno-version: v1.x
88-
8986
- name: Setup bun
9087
uses: oven-sh/setup-bun@735343b667d3e6f658f44d0eca948eb6282f2b76 # v2.0.2
9188

@@ -122,11 +119,6 @@ jobs:
122119
- name: Install pnpm
123120
uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
124121

125-
- name: Setup deno
126-
uses: denoland/setup-deno@v1
127-
with:
128-
deno-version: v1.x
129-
130122
- name: Setup bun
131123
uses: oven-sh/setup-bun@735343b667d3e6f658f44d0eca948eb6282f2b76 # v2.0.2
132124

@@ -164,11 +156,6 @@ jobs:
164156
- name: Install pnpm
165157
uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
166158

167-
- name: Setup deno
168-
uses: denoland/setup-deno@v1
169-
with:
170-
deno-version: v1.x
171-
172159
- name: Setup bun
173160
uses: oven-sh/setup-bun@735343b667d3e6f658f44d0eca948eb6282f2b76 # v2.0.2
174161

.github/workflows/release.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,6 @@ jobs:
2323
- name: Install pnpm
2424
uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
2525

26-
- name: Setup deno
27-
uses: denoland/setup-deno@v1
28-
with:
29-
deno-version: v1.x
30-
3126
- name: Setup bun
3227
uses: oven-sh/setup-bun@735343b667d3e6f658f44d0eca948eb6282f2b76 # v2.0.2
3328

deno.jsonc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"include": [
1818
],
1919
*/
20-
"exclude": ["node_modules", "dist", "deno"]
20+
"exclude": ["node_modules", "dist", "deno", "playground/browser/index.js"]
2121
/*
2222
"rules": {
2323
"tags": ["recommended"],

package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@
7171
"release": "bumpp --commit \"release: v%s\" --all --push --tag",
7272
"version": "pnpx tsx scripts/bump-deno.ts",
7373
"fix": "pnpm run --stream --color \"/^(lint|format)$/\"",
74-
"lint": "deno lint",
75-
"format": "deno fmt",
74+
"lint": "pnpm exec deno lint",
75+
"format": "pnpm exec deno fmt",
7676
"build": "unbuild && pnpx tsx ./scripts/deno.ts",
7777
"test": "pnpm run test:typecheck && pnpm run test:unit",
7878
"test:unit": "NODE_OPTIONS=--experimental-vm-modules vitest run ./src",
@@ -90,10 +90,10 @@
9090
},
9191
"lint-staged": {
9292
"*.{js,ts,jsx,tsx,json,jsonc}": [
93-
"deno fmt"
93+
"pnpm exec deno fmt"
9494
],
9595
"*.{js,ts,jsx,tsx}": [
96-
"deno lint"
96+
"pnpm exec deno lint"
9797
]
9898
},
9999
"devDependencies": {
@@ -107,6 +107,7 @@
107107
"gh-changelogen": "^0.2.8",
108108
"h3": "^1.8.1",
109109
"hono": "^3.8.1",
110+
"deno": "catalog:",
110111
"jsonc-parser": "^3.2.1",
111112
"lint-staged": "^15.0.0",
112113
"miniflare": "^3.20231016.0",

playground/deno/deno.jsonc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
{
2-
"imports": { "@intlify/utils": "jsr:@intlify/utils@^0.12.0" },
2+
"imports": {
3+
"@std/assert": "jsr:@std/assert@1",
4+
"@intlify/utils": "jsr:@intlify/utils@^0.14.1"
5+
},
6+
"nodeModulesDir": true,
37
"tasks": {
48
"dev": "deno run --watch main.ts",
59
"test": "deno test --allow-read=$(which deno) --allow-run --allow-net ./deno.spec.ts"

playground/deno/deno.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { assertEquals } from 'https://deno.land/std@0.204.0/assert/mod.ts'
1+
import { assertEquals } from '@std/assert'
22

33
const sleep = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms))
44

playground/deno/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,8 @@
55
"scripts": {
66
"dev": "deno run --allow-net main.ts",
77
"test": "deno task test"
8+
},
9+
"devDependencies": {
10+
"deno": "catalog:"
811
}
912
}

0 commit comments

Comments
 (0)