Skip to content

Commit 5e0631c

Browse files
authored
Merge pull request #387 from tfo-dot/main
Fix deno types and broken dependencies
2 parents b37bf5d + 4a60155 commit 5e0631c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+418
-458
lines changed

.eslintrc.js renamed to .eslintrc.cjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ module.exports = {
1414
'@typescript-eslint/restrict-template-expressions': 'off',
1515
'@typescript-eslint/no-non-null-assertion': 'off'
1616
}
17-
}
17+
}

.github/workflows/deno.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
strategy:
2222
matrix:
23-
deno: ['v1.x', 'canary']
23+
deno: ['v2.x', 'canary']
2424

2525
steps:
2626
- name: Setup repo
@@ -31,6 +31,9 @@ jobs:
3131
with:
3232
deno-version: ${{ matrix.deno }} # tests across multiple Deno versions
3333

34+
- name: Deno Install
35+
run: deno install
36+
3437
- name: Check
3538
run: deno run --allow-read mod.ts
3639

deno.json

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
{
22
"tasks": {
3-
"fmt": "npx prettier --write src/ test/ mod.ts deploy.ts deps.ts",
4-
"lint": "npx eslint src/ test/ mod.ts deploy.ts deps.ts",
3+
"fmt": "deno run -A npm:prettier --write src/ test/ mod.ts deploy.ts deps.ts",
4+
"lint": "deno run -A npm:eslint src/ test/ mod.ts deploy.ts deps.ts",
55
"check": "deno run -A --check mod.ts",
6-
"build-npm": "deno run -A --no-check ./scripts/build_npm.ts"
76
},
87
"name": "@harmony/harmony",
9-
"version": "2.9.1",
8+
"version": "2.9.2",
109
"exports": "./mod.ts",
1110
"publish": {
1211
"include": [
@@ -19,5 +18,12 @@
1918
"tsconfig.json",
2019
"deno.json"
2120
]
21+
},
22+
"compilerOptions": {
23+
"lib": [
24+
"deno.ns",
25+
"deno.window",
26+
"esnext"
27+
]
2228
}
2329
}

deno.lock

Lines changed: 64 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

deploy.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { Interaction } from './src/structures/interactions.ts'
2-
import {
1+
import type { Interaction } from './src/structures/interactions.ts'
2+
import type {
33
ApplicationCommandsManager,
44
InteractionsClient,
55
ApplicationCommandHandler,
@@ -10,7 +10,7 @@ import {
1010
InteractionResponseType,
1111
InteractionType
1212
} from './src/types/interactions.ts'
13-
import { ApplicationCommandType } from './src/types/applicationCommand.ts'
13+
import type { ApplicationCommandType } from './src/types/applicationCommand.ts'
1414

1515
export interface DeploySlashInitOptions {
1616
env?: boolean

deps.ts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
export { EventEmitter } from 'jsr:@denosaurs/[email protected]'
2-
export { decompress_with as unzlib } from 'npm:@evan/[email protected]/target/zlib/node.mjs'
3-
export { walk } from 'jsr:@std/[email protected]/walk'
2+
export { walk } from 'jsr:@std/[email protected]/walk'
43
export { join } from 'node:path'
5-
export { Mixin } from 'npm:ts-mixer@6.0.0'
6-
export { verify as edverify } from 'npm:@evan/wasm@0.0.95/target/ed25519/node.mjs'
7-
export { decodeHex } from 'jsr:@std/encoding@0.217/hex'
8-
export { encodeBase64 } from 'jsr:@std/encoding@0.217/base64'
9-
export { readAll } from 'jsr:@std/[email protected]/read_all'
4+
export { decodeHex } from 'jsr:@std/encoding@1.0.10/hex'
5+
export { encodeBase64 } from 'jsr:@std/encoding@1.0.10/base64'
6+
export { readAll } from 'jsr:@std/io@0.225.2'
7+
export type { Reader } from 'jsr:@std/io@0.225.2'
8+
export * as Redis from 'npm:[email protected]'

npm_example/.gitignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

npm_example/package.json

Lines changed: 0 additions & 14 deletions
This file was deleted.

npm_example/src/index.ts

Lines changed: 0 additions & 20 deletions
This file was deleted.

npm_example/tsconfig.json

Lines changed: 0 additions & 101 deletions
This file was deleted.

0 commit comments

Comments
 (0)