Skip to content

Commit

Permalink
Merge branch 'main' of github.com:gjsify/ts-for-gir
Browse files Browse the repository at this point in the history
  • Loading branch information
JumpLink committed Sep 20, 2024
2 parents fa0a7cb + 8480ec5 commit 8116b59
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 25 deletions.
2 changes: 1 addition & 1 deletion examples/adw-1-hello/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"license": "MIT",
"devDependencies": {
"typescript": "^5.5.4",
"vite": "^5.4.2"
"vite": "^5.4.6"
},
"dependencies": {
"@girs/adw-1": "workspace:^",
Expand Down
2 changes: 1 addition & 1 deletion examples/gtk-4-template-vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"license": "MIT",
"devDependencies": {
"typescript": "^5.5.4",
"vite": "^5.4.2"
"vite": "^5.4.6"
},
"dependencies": {
"@girs/gdk-4.0": "workspace:^",
Expand Down
12 changes: 6 additions & 6 deletions packages/generator-typescript/templates/gjs/system.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export const programArgs: string[]
* @param o Any Object
* @returns A hexadecimal string (e.g. `0xb4f170f0`)
*/
export function addressOf(o: any): string
export function addressOf(o: object): string

/**
* Return the memory address of any GObject as a string.
Expand Down Expand Up @@ -141,26 +141,26 @@ export function dumpHeap(path?: string): void
* }
* }
* ```
*
*
*/
export function dumpMemoryInfo(path?: string): void

/**
* This works the same as C's exit() function; exits the program, passing a
* certain error code to the shell. The shell expects the error code to be zero if
* there was no error, or non-zero (any value you please) to indicate an error.
*
*
* This value is used by other tools such as `make`; if `make` calls a program that
* returns a non-zero error code, then `make` aborts the build.
* @param code An exit code
*/
export function exit(code: number): void
export function exit(code: number): never

/**
* The System module provides common low-level facilities such as access to
* process arguments and exit(), as well as a number of useful functions and
* properties for debugging.
*
*
* Note that the majority of the functions and properties in this module should not
* be used in normal operation of a GJS application.
*/
Expand All @@ -184,4 +184,4 @@ export default System

<%_ if(!package){ -%>
}
<% } -%>
<% } -%>
41 changes: 24 additions & 17 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -12065,7 +12065,7 @@ __metadata:
"@girs/glib-2.0": "workspace:^"
"@girs/gtk-4.0": "workspace:^"
typescript: "npm:^5.5.4"
vite: "npm:^5.4.2"
vite: "npm:^5.4.6"
languageName: unknown
linkType: soft

Expand Down Expand Up @@ -12355,7 +12355,7 @@ __metadata:
"@girs/gobject-2.0": "workspace:^"
"@girs/gtk-4.0": "workspace:^"
typescript: "npm:^5.5.4"
vite: "npm:^5.4.2"
vite: "npm:^5.4.6"
languageName: unknown
linkType: soft

Expand Down Expand Up @@ -16028,6 +16028,13 @@ __metadata:
languageName: node
linkType: hard

"picocolors@npm:^1.1.0":
version: 1.1.0
resolution: "picocolors@npm:1.1.0"
checksum: 10/a2ad60d94d185c30f2a140b19c512547713fb89b920d32cc6cf658fa786d63a37ba7b8451872c3d9fc34883971fb6e5878e07a20b60506e0bb2554dce9169ccb
languageName: node
linkType: hard

"picomatch@npm:^2.0.4, picomatch@npm:^2.2.1, picomatch@npm:^2.3.1":
version: 2.3.1
resolution: "picomatch@npm:2.3.1"
Expand All @@ -16051,14 +16058,14 @@ __metadata:
languageName: node
linkType: hard

"postcss@npm:^8.4.41":
version: 8.4.41
resolution: "postcss@npm:8.4.41"
"postcss@npm:^8.4.43":
version: 8.4.47
resolution: "postcss@npm:8.4.47"
dependencies:
nanoid: "npm:^3.3.7"
picocolors: "npm:^1.0.1"
source-map-js: "npm:^1.2.0"
checksum: 10/6e6176c2407eff60493ca60a706c6b7def20a722c3adda94ea1ece38345eb99964191336fd62b62652279cec6938e79e0b1e1d477142c8d3516e7a725a74ee37
picocolors: "npm:^1.1.0"
source-map-js: "npm:^1.2.1"
checksum: 10/f2b50ba9b6fcb795232b6bb20de7cdc538c0025989a8ed9c4438d1960196ba3b7eaff41fdb1a5c701b3504651ea87aeb685577707f0ae4d6ce6f3eae5df79a81
languageName: node
linkType: hard

Expand Down Expand Up @@ -16622,10 +16629,10 @@ __metadata:
languageName: node
linkType: hard

"source-map-js@npm:^1.2.0":
version: 1.2.0
resolution: "source-map-js@npm:1.2.0"
checksum: 10/74f331cfd2d121c50790c8dd6d3c9de6be21926de80583b23b37029b0f37aefc3e019fa91f9a10a5e120c08135297e1ecf312d561459c45908cb1e0e365f49e5
"source-map-js@npm:^1.2.1":
version: 1.2.1
resolution: "source-map-js@npm:1.2.1"
checksum: 10/ff9d8c8bf096d534a5b7707e0382ef827b4dd360a577d3f34d2b9f48e12c9d230b5747974ee7c607f0df65113732711bb701fe9ece3c7edbd43cb2294d707df3
languageName: node
linkType: hard

Expand Down Expand Up @@ -17166,13 +17173,13 @@ __metadata:
languageName: node
linkType: hard

"vite@npm:^5.4.2":
version: 5.4.2
resolution: "vite@npm:5.4.2"
"vite@npm:^5.4.6":
version: 5.4.6
resolution: "vite@npm:5.4.6"
dependencies:
esbuild: "npm:^0.21.3"
fsevents: "npm:~2.3.3"
postcss: "npm:^8.4.41"
postcss: "npm:^8.4.43"
rollup: "npm:^4.20.0"
peerDependencies:
"@types/node": ^18.0.0 || >=20.0.0
Expand Down Expand Up @@ -17205,7 +17212,7 @@ __metadata:
optional: true
bin:
vite: bin/vite.js
checksum: 10/c449f9295060fa88c9b5cc1bd17c2de198deae596b7da1250db9662fb15e7b21e0dbe9a40a9106fb7438b1231494b169457e809ecbb65e732648d87dd284ab23
checksum: 10/8489fa55c48675fc12b64bf7af58b5e2f8a11b2aebc63cb177861bd53dc196d7c496d6918f5a8c48828f51b6fe498166a1a2350334bbfaae10d015a0c71f1c77
languageName: node
linkType: hard

Expand Down

0 comments on commit 8116b59

Please sign in to comment.