Skip to content

Commit 1d8349d

Browse files
committed
feat(node): 22.9.0, switching to electron nightly
1 parent 37541a6 commit 1d8349d

File tree

11 files changed

+243
-118
lines changed

11 files changed

+243
-118
lines changed

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Install Node.js
2828
uses: actions/setup-node@v4
2929
with:
30-
node-version: 20.18.1
30+
node-version: 22.9.0
3131
cache: 'pnpm'
3232

3333
- name: Check node $PATH version
@@ -90,7 +90,7 @@ jobs:
9090
- name: Install Node.js
9191
uses: actions/setup-node@v4
9292
with:
93-
node-version: 20.18.1
93+
node-version: 22.9.0
9494
cache: 'pnpm'
9595

9696
- name: Build Kit
@@ -162,7 +162,7 @@ jobs:
162162
- name: Install Node.js
163163
uses: actions/setup-node@v4
164164
with:
165-
node-version: 20.18.1
165+
node-version: 22.9.0
166166
cache: 'pnpm'
167167

168168

.npmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
registry=https://registry.npmjs.org
22
install-links=false
33
save-exact=true
4-
use-node-version=20.18.1
4+
use-node-version=22.9.0

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@
114114
"lowdb": "7.0.1",
115115
"marked": "4.3.0",
116116
"minimist": "1.2.8",
117+
"open": "10.1.0",
117118
"p-retry": "6.2.1",
118119
"pnpm": "10.0.0",
119120
"project-name-generator": "2.1.9",
@@ -192,7 +193,7 @@
192193
]
193194
},
194195
"volta": {
195-
"node": "20.18.1"
196+
"node": "22.9.0"
196197
},
197198
"config": {
198199
"commitizen": {

pnpm-lock.yaml

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

src/cli/new-from-protocol.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,6 @@ let name = await arg(
4343
let response = await get(arg?.url)
4444
let content = await response.data
4545

46-
await dev({
47-
content,
48-
name,
49-
template: arg?.template,
50-
url: arg?.url,
51-
})
52-
5346
let preview = await highlightJavaScript(content)
5447

5548
if (process?.env?.KIT_TRUST_SCRIPTS !== "true") {

src/editor/types/kit-editor.d.ts

Lines changed: 89 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import type { MarkedFunction } from "../../types/globals.ts"
2+
13
declare module "@johnlindquist/kit" {
24
import type { ChildProcess } from "node:child_process"
35
import type {
@@ -13051,26 +13053,19 @@ declare module "@johnlindquist/kit" {
1305113053
var term: Terminal
1305213054
var showLogWindow: ShowLogWindow
1305313055
}
13054-
export interface Md {
13055-
(markdown: string, containerClasses?: string): string
13056-
}
13056+
export type Md = (markdown: string, containerClasses?: string) => string
1305713057

1305813058
type ReadFileOptions = Parameters<typeof readFile>[1]
13059-
export interface EnsureReadFile {
13060-
(
13059+
export type EnsureReadFile = (
1306113060
path: string,
1306213061
defaultContent?: string,
13063-
options?: ReadFileOptions
13064-
): Promise<string>
13065-
}
13062+
options?: ReadFileOptions) => Promise<string>
1306613063

13067-
export interface EnsureReadJson {
13064+
export type EnsureReadJson =
1306813065
<T>(
1306913066
path: string,
1307013067
defaultContent: T,
13071-
options?: Parameters<typeof readJson>[1]
13072-
): Promise<T>
13073-
}
13068+
options?: Parameters<typeof readJson>[1]) => Promise<T>
1307413069

1307513070
export interface GlobalsApi {
1307613071
cwd: typeof process.cwd
@@ -13123,35 +13118,35 @@ declare module "@johnlindquist/kit" {
1312313118
writeJsonSync: typeof import("./fs-extra").writeJsonSync
1312413119
move: typeof import("./fs-extra").move
1312513120
moveSync: typeof import("./fs-extra").moveSync
13126-
readFile: typeof import("fs/promises").readFile
13127-
readFileSync: typeof import("fs").readFileSync
13128-
writeFile: typeof import("fs/promises").writeFile
13129-
writeFileSync: typeof import("fs").writeFileSync
13130-
appendFile: typeof import("fs/promises").appendFile
13131-
appendFileSync: typeof import("fs").appendFileSync
13132-
readdir: typeof import("fs/promises").readdir
13133-
readdirSync: typeof import("fs").readdirSync
13134-
copyFile: typeof import("fs/promises").copyFile
13135-
copyFileSync: typeof import("fs").copyFileSync
13136-
13137-
stat: typeof import("fs/promises").stat
13138-
lstat: typeof import("fs/promises").lstat
13139-
13140-
rmdir: typeof import("fs/promises").rmdir
13141-
unlink: typeof import("fs/promises").unlink
13142-
symlink: typeof import("fs/promises").symlink
13143-
readlink: typeof import("fs/promises").readlink
13144-
realpath: typeof import("fs/promises").realpath
13145-
access: typeof import("fs/promises").access
13146-
rename: typeof import("fs/promises").rename
13147-
13148-
chown: typeof import("fs/promises").chown
13149-
lchown: typeof import("fs/promises").lchown
13150-
utimes: typeof import("fs/promises").utimes
13151-
lutimes: typeof import("fs/promises").lutimes
13152-
13153-
createReadStream: typeof import("fs").createReadStream
13154-
createWriteStream: typeof import("fs").createWriteStream
13121+
readFile: typeof import("node:fs/promises").readFile
13122+
readFileSync: typeof import("node:fs").readFileSync
13123+
writeFile: typeof import("node:fs/promises").writeFile
13124+
writeFileSync: typeof import("node:fs").writeFileSync
13125+
appendFile: typeof import("node:fs/promises").appendFile
13126+
appendFileSync: typeof import("node:fs").appendFileSync
13127+
readdir: typeof import("node:fs/promises").readdir
13128+
readdirSync: typeof import("node:fs").readdirSync
13129+
copyFile: typeof import("node:fs/promises").copyFile
13130+
copyFileSync: typeof import("node:fs").copyFileSync
13131+
13132+
stat: typeof import("node:fs/promises").stat
13133+
lstat: typeof import("node:fs/promises").lstat
13134+
13135+
rmdir: typeof import("node:fs/promises").rmdir
13136+
unlink: typeof import("node:fs/promises").unlink
13137+
symlink: typeof import("node:fs/promises").symlink
13138+
readlink: typeof import("node:fs/promises").readlink
13139+
realpath: typeof import("node:fs/promises").realpath
13140+
access: typeof import("node:fs/promises").access
13141+
rename: typeof import("node:fs/promises").rename
13142+
13143+
chown: typeof import("node:fs/promises").chown
13144+
lchown: typeof import("node:fs/promises").lchown
13145+
utimes: typeof import("node:fs/promises").utimes
13146+
lutimes: typeof import("node:fs/promises").lutimes
13147+
13148+
createReadStream: typeof import("node:fs").createReadStream
13149+
createWriteStream: typeof import("node:fs").createWriteStream
1315513150
Writable: typeof import("stream").Writable
1315613151
Readable: typeof import("stream").Readable
1315713152
Duplex: typeof import("stream").Duplex
@@ -13231,44 +13226,44 @@ declare module "@johnlindquist/kit" {
1323113226
var move: typeof import("./fs-extra").move
1323213227
var moveSync: typeof import("./fs-extra").moveSync
1323313228
//fs/promises
13234-
var readFile: typeof import("fs/promises").readFile
13235-
var readFileSync: typeof import("fs").readFileSync
13236-
var writeFile: typeof import("fs/promises").writeFile
13237-
var writeFileSync: typeof import("fs").writeFileSync
13238-
var appendFile: typeof import("fs/promises").appendFile
13239-
var appendFileSync: typeof import("fs").appendFileSync
13240-
var readdir: typeof import("fs/promises").readdir
13241-
var readdirSync: typeof import("fs").readdirSync
13242-
var copyFile: typeof import("fs/promises").copyFile
13243-
var copyFileSync: typeof import("fs").copyFileSync
13244-
13245-
var stat: typeof import("fs/promises").stat
13246-
var lstat: typeof import("fs/promises").lstat
13247-
13248-
var rmdir: typeof import("fs/promises").rmdir
13249-
var unlink: typeof import("fs/promises").unlink
13250-
var symlink: typeof import("fs/promises").symlink
13251-
var readlink: typeof import("fs/promises").readlink
13252-
var realpath: typeof import("fs/promises").realpath
13253-
var access: typeof import("fs/promises").access
13254-
13255-
var chown: typeof import("fs/promises").chown
13256-
var lchown: typeof import("fs/promises").lchown
13257-
var utimes: typeof import("fs/promises").utimes
13258-
var lutimes: typeof import("fs/promises").lutimes
13259-
13260-
var rename: typeof import("fs/promises").rename
13229+
var readFile: typeof import("node:fs/promises").readFile
13230+
var readFileSync: typeof import("node:fs").readFileSync
13231+
var writeFile: typeof import("node:fs/promises").writeFile
13232+
var writeFileSync: typeof import("node:fs").writeFileSync
13233+
var appendFile: typeof import("node:fs/promises").appendFile
13234+
var appendFileSync: typeof import("node:fs").appendFileSync
13235+
var readdir: typeof import("node:fs/promises").readdir
13236+
var readdirSync: typeof import("node:fs").readdirSync
13237+
var copyFile: typeof import("node:fs/promises").copyFile
13238+
var copyFileSync: typeof import("node:fs").copyFileSync
13239+
13240+
var stat: typeof import("node:fs/promises").stat
13241+
var lstat: typeof import("node:fs/promises").lstat
13242+
13243+
var rmdir: typeof import("node:fs/promises").rmdir
13244+
var unlink: typeof import("node:fs/promises").unlink
13245+
var symlink: typeof import("node:fs/promises").symlink
13246+
var readlink: typeof import("node:fs/promises").readlink
13247+
var realpath: typeof import("node:fs/promises").realpath
13248+
var access: typeof import("node:fs/promises").access
13249+
13250+
var chown: typeof import("node:fs/promises").chown
13251+
var lchown: typeof import("node:fs/promises").lchown
13252+
var utimes: typeof import("node:fs/promises").utimes
13253+
var lutimes: typeof import("node:fs/promises").lutimes
13254+
13255+
var rename: typeof import("node:fs/promises").rename
1326113256

1326213257
//fs
13263-
var createReadStream: typeof import("fs").createReadStream
13264-
var createWriteStream: typeof import("fs").createWriteStream
13258+
var createReadStream: typeof import("node:fs").createReadStream
13259+
var createWriteStream: typeof import("node:fs").createWriteStream
1326513260

1326613261
//handlebars
1326713262
var compile: typeof import("./handlebars").compile
1326813263

1326913264
//marked
1327013265
var md: Md
13271-
var marked: typeof import("./marked").marked
13266+
var marked: MarkedFunction
1327213267
//uuid
1327313268
var uuid: typeof import("crypto").randomUUID
1327413269

@@ -13333,31 +13328,31 @@ declare module "@johnlindquist/kit" {
1333313328
export var writeJson: typeof import("./fs-extra").writeJson
1333413329
export var move: typeof import("./fs-extra").move
1333513330
//fs/promises
13336-
export var readFile: typeof import("fs/promises").readFile
13337-
export var writeFile: typeof import("fs/promises").writeFile
13338-
export var appendFile: typeof import("fs/promises").appendFile
13339-
export var readdir: typeof import("fs/promises").readdir
13340-
export var copyFile: typeof import("fs/promises").copyFile
13341-
13342-
export var stat: typeof import("fs/promises").stat
13343-
export var lstat: typeof import("fs/promises").lstat
13344-
13345-
export var rmdir: typeof import("fs/promises").rmdir
13346-
export var unlink: typeof import("fs/promises").unlink
13347-
export var symlink: typeof import("fs/promises").symlink
13348-
export var readlink: typeof import("fs/promises").readlink
13349-
export var realpath: typeof import("fs/promises").realpath
13350-
export var access: typeof import("fs/promises").access
13351-
13352-
export var chown: typeof import("fs/promises").chown
13353-
export var lchown: typeof import("fs/promises").lchown
13354-
export var utimes: typeof import("fs/promises").utimes
13355-
export var lutimes: typeof import("fs/promises").lutimes
13356-
export var rename: typeof import("fs/promises").rename
13331+
export var readFile: typeof import("node:fs/promises").readFile
13332+
export var writeFile: typeof import("node:fs/promises").writeFile
13333+
export var appendFile: typeof import("node:fs/promises").appendFile
13334+
export var readdir: typeof import("node:fs/promises").readdir
13335+
export var copyFile: typeof import("node:fs/promises").copyFile
13336+
13337+
export var stat: typeof import("node:fs/promises").stat
13338+
export var lstat: typeof import("node:fs/promises").lstat
13339+
13340+
export var rmdir: typeof import("node:fs/promises").rmdir
13341+
export var unlink: typeof import("node:fs/promises").unlink
13342+
export var symlink: typeof import("node:fs/promises").symlink
13343+
export var readlink: typeof import("node:fs/promises").readlink
13344+
export var realpath: typeof import("node:fs/promises").realpath
13345+
export var access: typeof import("node:fs/promises").access
13346+
13347+
export var chown: typeof import("node:fs/promises").chown
13348+
export var lchown: typeof import("node:fs/promises").lchown
13349+
export var utimes: typeof import("node:fs/promises").utimes
13350+
export var lutimes: typeof import("node:fs/promises").lutimes
13351+
export var rename: typeof import("node:fs/promises").rename
1335713352

1335813353
//fs
13359-
export var createReadStream: typeof import("fs").createReadStream
13360-
export var createWriteStream: typeof import("fs").createWriteStream
13354+
export var createReadStream: typeof import("node:fs").createReadStream
13355+
export var createWriteStream: typeof import("node:fs").createWriteStream
1336113356
//handlebars
1336213357
export var compile: typeof import("./handlebars").compile
1336313358

src/globals/marked.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { marked as _marked } from "marked"
2+
import type { MarkedFunction } from "../types/globals.ts"
23

3-
export let marked = (global.marked = _marked)
4+
export let marked = (global.marked = _marked) as MarkedFunction
45

56
export type Md = (markdown: string, containerClasses?: string) => string
67
export let md: Md = (global.md = (markdown: string, containerClasses = "p-5 prose dark:prose-dark") => {

src/setup/link-kenv-to-kit.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,15 @@ await cli("install", `"${kitPath()}"`)
3838

3939
// ensure kenvPath('package.json') has a "type": "module"
4040

41+
42+
4143
let defaultPackageJson = {
4244
type: "module",
4345
engines: {
44-
node: "20.18.1",
46+
node: "22.9.0",
4547
},
4648
devDependencies: {
47-
"@johnlindquist/kit": "file:../.kit",
49+
"@johnlindquist/kit": `link:${(process.env.KIT || home(".kit"))?.replace(/\\/g, '/')}`,
4850
"@typescript/lib-dom":
4951
"npm:@johnlindquist/no-dom@^1.0.2",
5052
},

src/setup/setup-pnpm.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ try {
6363
)
6464
try {
6565
await exec(
66-
"pnpm config set use-node-version 20.18.1 --location project",
66+
"pnpm config set use-node-version 22.9.0 --location project",
6767
{
6868
cwd: kenvPath(),
6969
}

0 commit comments

Comments
 (0)