From 4df45dfb4c5677a368470592351e3605f06d9d4f Mon Sep 17 00:00:00 2001 From: Pascal Garber Date: Fri, 1 Mar 2024 22:51:14 +0100 Subject: [PATCH] chore: Port examples to ESM NPM packages from yarn workspace --- examples/gjs/adw-1-hello/package.json | 2 +- examples/gjs/gio-2-cat-packages/.gitignore | 18 - examples/gjs/gio-2-cat-packages/esbuild.js | 15 - examples/gjs/gio-2-cat-packages/main.ts | 34 -- examples/gjs/gio-2-cat-packages/package.json | 29 - examples/gjs/gio-2-cat-packages/tsconfig.json | 18 - .../gio-2-cat-packages/tsconfig.types.json | 6 - .../gio-2-cat-promisify/.ts-for-girrc.json | 6 - examples/gjs/gio-2-cat-promisify/esbuild.js | 15 - examples/gjs/gio-2-cat-promisify/main.ts | 26 - examples/gjs/gio-2-cat-promisify/package.json | 28 - .../gjs/gio-2-cat-promisify/tsconfig.json | 19 - .../gio-2-cat-promisify/tsconfig.types.json | 6 - .../gio-2-cat-types-only/.ts-for-girrc.json | 4 - examples/gjs/gio-2-cat-types-only/esbuild.js | 14 - examples/gjs/gio-2-cat-types-only/main.ts | 38 -- .../gjs/gio-2-cat-types-only/package.json | 28 - .../gjs/gio-2-cat-types-only/tsconfig.json | 18 - .../gio-2-cat-types-only/tsconfig.types.json | 6 - examples/gjs/gio-2-cat/main.ts | 8 +- examples/gjs/gio-2-cat/package.json | 10 +- examples/gjs/gio-2-dbus/package.json | 9 +- examples/gjs/gio-2-dbus/tsconfig.json | 2 +- examples/gjs/gio-2-list-model/package.json | 6 +- examples/gjs/gio-2-list-model/tsconfig.json | 3 +- .../gjs/glib-2-spawn-command/package.json | 6 +- .../gjs/glib-2-spawn-command/tsconfig.json | 2 +- examples/gjs/glib-2-variant/package.json | 6 +- examples/gjs/glib-2-variant/tsconfig.json | 3 +- examples/gjs/gtk-3-browser/main.ts | 5 + examples/gjs/gtk-3-browser/package.json | 12 +- examples/gjs/gtk-3-browser/tsconfig.json | 2 +- examples/gjs/gtk-3-builder/main.ts | 4 +- examples/gjs/gtk-3-builder/package.json | 9 +- examples/gjs/gtk-3-builder/tsconfig.json | 2 +- examples/gjs/gtk-3-calc/main.ts | 3 + examples/gjs/gtk-3-calc/package.json | 9 +- examples/gjs/gtk-3-calc/tsconfig.json | 3 +- examples/gjs/gtk-3-editor/main.ts | 6 +- examples/gjs/gtk-3-editor/package.json | 12 +- examples/gjs/gtk-3-gettext/main.ts | 4 + examples/gjs/gtk-3-gettext/package.json | 10 +- examples/gjs/gtk-3-gettext/tsconfig.json | 3 +- examples/gjs/gtk-3-hello-2/main.ts | 3 +- examples/gjs/gtk-3-hello-2/package.json | 10 +- examples/gjs/gtk-3-hello-2/tsconfig.json | 3 +- examples/gjs/gtk-3-hello/main.ts | 4 +- examples/gjs/gtk-3-hello/package.json | 10 +- examples/gjs/gtk-3-template/main.ts | 3 + examples/gjs/gtk-3-template/package.json | 10 +- examples/gjs/gtk-3-template/tsconfig.json | 3 +- examples/gjs/gtk-3-webkit/main.ts | 4 +- examples/gjs/gtk-3-webkit/package.json | 10 +- examples/gjs/gtk-3-webkit/tsconfig.json | 3 +- examples/gjs/gtk-4-application/main.ts | 6 + examples/gjs/gtk-4-application/package.json | 10 +- examples/gjs/gtk-4-application/tsconfig.json | 3 +- examples/gjs/gtk-4-custom-widget/package.json | 5 +- .../gjs/gtk-4-custom-widget/tsconfig.json | 3 +- examples/gjs/gtk-4-list-store/main.ts | 2 +- examples/gjs/gtk-4-list-store/package.json | 6 +- examples/gjs/gtk-4-list-store/tsconfig.json | 3 +- examples/gjs/gtk-4-template/package.json | 9 +- examples/gjs/gtk-4-template/tsconfig.json | 3 +- examples/gjs/run-async/package.json | 5 +- examples/gjs/soup-3-http/package.json | 9 +- examples/gjs/soup-3-http/tsconfig.json | 3 +- examples/gjs/soup-3-websocket/client.ts | 2 +- examples/gjs/soup-3-websocket/package.json | 9 +- examples/gjs/soup-3-websocket/tsconfig.json | 3 +- examples/gjs/timers/package.json | 9 +- examples/gjs/timers/tsconfig.json | 2 +- package.json | 2 +- yarn.lock | 546 +++++++++--------- 74 files changed, 429 insertions(+), 743 deletions(-) delete mode 100644 examples/gjs/gio-2-cat-packages/.gitignore delete mode 100644 examples/gjs/gio-2-cat-packages/esbuild.js delete mode 100644 examples/gjs/gio-2-cat-packages/main.ts delete mode 100644 examples/gjs/gio-2-cat-packages/package.json delete mode 100644 examples/gjs/gio-2-cat-packages/tsconfig.json delete mode 100644 examples/gjs/gio-2-cat-packages/tsconfig.types.json delete mode 100644 examples/gjs/gio-2-cat-promisify/.ts-for-girrc.json delete mode 100644 examples/gjs/gio-2-cat-promisify/esbuild.js delete mode 100644 examples/gjs/gio-2-cat-promisify/main.ts delete mode 100644 examples/gjs/gio-2-cat-promisify/package.json delete mode 100644 examples/gjs/gio-2-cat-promisify/tsconfig.json delete mode 100644 examples/gjs/gio-2-cat-promisify/tsconfig.types.json delete mode 100644 examples/gjs/gio-2-cat-types-only/.ts-for-girrc.json delete mode 100644 examples/gjs/gio-2-cat-types-only/esbuild.js delete mode 100644 examples/gjs/gio-2-cat-types-only/main.ts delete mode 100644 examples/gjs/gio-2-cat-types-only/package.json delete mode 100644 examples/gjs/gio-2-cat-types-only/tsconfig.json delete mode 100644 examples/gjs/gio-2-cat-types-only/tsconfig.types.json diff --git a/examples/gjs/adw-1-hello/package.json b/examples/gjs/adw-1-hello/package.json index b229fa596..f17b55818 100644 --- a/examples/gjs/adw-1-hello/package.json +++ b/examples/gjs/adw-1-hello/package.json @@ -1,5 +1,5 @@ { - "name": "ts-for-gir-adw-1-hello-example", + "name": "@ts-for-gir-example/adw-1-hello-example", "version": "4.0.0", "description": "Simple GJS Typescript hello-world example using Libadwaita", "main": "index.js", diff --git a/examples/gjs/gio-2-cat-packages/.gitignore b/examples/gjs/gio-2-cat-packages/.gitignore deleted file mode 100644 index 1345bf22e..000000000 --- a/examples/gjs/gio-2-cat-packages/.gitignore +++ /dev/null @@ -1,18 +0,0 @@ -# Yarn https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored -.pnp.* -.yarn/* -!.yarn/patches -!.yarn/plugins -!.yarn/releases -!.yarn/sdks -!.yarn/versions - -!@types/ -@types/gio-2.0/* -!@types/gio-2.0/package.json -@types/gjs/* -!@types/gjs/package.json -@types/glib-2.0/* -!@types/glib-2.0/package.json -@types/gobject-2.0/* -!@types/gobject-2.0/package.json \ No newline at end of file diff --git a/examples/gjs/gio-2-cat-packages/esbuild.js b/examples/gjs/gio-2-cat-packages/esbuild.js deleted file mode 100644 index 5d596dfe6..000000000 --- a/examples/gjs/gio-2-cat-packages/esbuild.js +++ /dev/null @@ -1,15 +0,0 @@ -import { build } from "esbuild"; - -await build({ - entryPoints: ['main.ts'], - outdir: 'dist', - bundle: true, - // target: "firefox60", // Since GJS 1.53.90 - // target: "firefox68", // Since GJS 1.63.90 - // target: "firefox78", // Since GJS 1.65.90 - target: "firefox91", // Since GJS 1.71.1 - // target: firefox102 // Since GJS 1.73.2 - format: 'esm', - // platform: 'node', - external: ['gi://*', 'resource://*', 'gettext', 'system', 'cairo'], -}) \ No newline at end of file diff --git a/examples/gjs/gio-2-cat-packages/main.ts b/examples/gjs/gio-2-cat-packages/main.ts deleted file mode 100644 index 9c96734a9..000000000 --- a/examples/gjs/gio-2-cat-packages/main.ts +++ /dev/null @@ -1,34 +0,0 @@ -// SPDX-License-Identifier: MIT OR LGPL-2.0-or-later -// SPDX-FileCopyrightText: 2009 Red Hat, Inc. -// Based on https://gitlab.gnome.org/GNOME/gjs/-/blob/master/examples/gio-cat.js - -/* - * Make sure you have a non english locale installed, for example fr_FR and run - * LANGUAGE=fr_FR gjs gettext.js - * the label should show a translation of 'Print help' - */ - -import '@girs/gjs'; -import '@girs/gjs/ambient'; -import '@girs/gjs/dom'; -import '@girs/gio-2.0'; - -import Gio from "gi://Gio?version=2.0"; - -const textDecoder = new TextDecoder() - -Gio._promisify(Gio.File.prototype, 'load_contents_async', 'load_contents_finish'); - -async function cat(filename: string) { - const file = Gio.file_new_for_path(filename); - - const [contents] = await file.load_contents_async(null); - - print(textDecoder.decode(contents)); -} - -if (ARGV.length !== 1) - printerr('Usage: gio-cat.js filename'); -else { - await cat(ARGV[0]); -} \ No newline at end of file diff --git a/examples/gjs/gio-2-cat-packages/package.json b/examples/gjs/gio-2-cat-packages/package.json deleted file mode 100644 index 156df9d7e..000000000 --- a/examples/gjs/gio-2-cat-packages/package.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "name": "ts-for-gir-gio-2-cat-promisify-packages", - "version": "4.0.0", - "description": "Simple GJS Gtk 3 example app that shows how you can translate strings with gettext", - "main": "index.js", - "type": "module", - "private": true, - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1", - "build:app": "yarn node esbuild.js", - "build": "yarn build:app", - "start:app": "gjs -m dist/main.js main.ts", - "debug:app": "GTK_DEBUG=interactive yarn start:app", - "start": "yarn clear && yarn build && yarn start:app", - "validate": "yarn validate:app", - "validate:app": "tsc --noEmit", - "clear": "rm -rf dist @types" - }, - "author": "Pascal Garber ", - "license": "MIT", - "devDependencies": { - "esbuild": "^0.20.1", - "typescript": "^5.2.2" - }, - "dependencies": { - "@girs/gio-2.0": "workspace:^", - "@girs/gjs": "workspace:^" - } -} diff --git a/examples/gjs/gio-2-cat-packages/tsconfig.json b/examples/gjs/gio-2-cat-packages/tsconfig.json deleted file mode 100644 index 802d624f0..000000000 --- a/examples/gjs/gio-2-cat-packages/tsconfig.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "compilerOptions": { - "lib": ["ESNext"], - "types": [], - "target": "ESNext", - "module": "ESNext", - "moduleResolution": "bundler", - "strict": true, - "noImplicitAny": true, - "strictNullChecks": true, - "noImplicitThis": true, - "alwaysStrict": true, - }, - "include": ["@girs/gjs", "@girs/gjs/dom", "@girs/gjs/ambient"], - "files": [ - "main.ts", - ] -} diff --git a/examples/gjs/gio-2-cat-packages/tsconfig.types.json b/examples/gjs/gio-2-cat-packages/tsconfig.types.json deleted file mode 100644 index 9f910a243..000000000 --- a/examples/gjs/gio-2-cat-packages/tsconfig.types.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "noEmit": true - } -} diff --git a/examples/gjs/gio-2-cat-promisify/.ts-for-girrc.json b/examples/gjs/gio-2-cat-promisify/.ts-for-girrc.json deleted file mode 100644 index 7a0ab6695..000000000 --- a/examples/gjs/gio-2-cat-promisify/.ts-for-girrc.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "modules": ["Gio-2.0"], - "noNamespace": false, - "outdir": "./@types", - "promisify": true -} \ No newline at end of file diff --git a/examples/gjs/gio-2-cat-promisify/esbuild.js b/examples/gjs/gio-2-cat-promisify/esbuild.js deleted file mode 100644 index 5d596dfe6..000000000 --- a/examples/gjs/gio-2-cat-promisify/esbuild.js +++ /dev/null @@ -1,15 +0,0 @@ -import { build } from "esbuild"; - -await build({ - entryPoints: ['main.ts'], - outdir: 'dist', - bundle: true, - // target: "firefox60", // Since GJS 1.53.90 - // target: "firefox68", // Since GJS 1.63.90 - // target: "firefox78", // Since GJS 1.65.90 - target: "firefox91", // Since GJS 1.71.1 - // target: firefox102 // Since GJS 1.73.2 - format: 'esm', - // platform: 'node', - external: ['gi://*', 'resource://*', 'gettext', 'system', 'cairo'], -}) \ No newline at end of file diff --git a/examples/gjs/gio-2-cat-promisify/main.ts b/examples/gjs/gio-2-cat-promisify/main.ts deleted file mode 100644 index 0ea17133e..000000000 --- a/examples/gjs/gio-2-cat-promisify/main.ts +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-License-Identifier: MIT OR LGPL-2.0-or-later -// SPDX-FileCopyrightText: 2009 Red Hat, Inc. -// Based on https://gitlab.gnome.org/GNOME/gjs/-/blob/master/examples/gio-cat.js - -/* - * Make sure you have a non english locale installed, for example fr_FR and run - * LANGUAGE=fr_FR gjs gettext.js - * the label should show a translation of 'Print help' - */ - -import Gio from "gi://Gio?version=2.0"; -const textDecoder = new TextDecoder(); - -Gio._promisify(Gio.File.prototype, 'load_contents_async', 'load_contents_finish'); - -async function cat(filename: string) { - const file = Gio.file_new_for_path(filename); - - const [contents] = await file.load_contents_async(null); - print(textDecoder.decode(contents)); -} - -if (ARGV.length !== 1) - printerr('Usage: gio-cat.js filename'); -else - await cat(ARGV[0]); diff --git a/examples/gjs/gio-2-cat-promisify/package.json b/examples/gjs/gio-2-cat-promisify/package.json deleted file mode 100644 index cb2d48a9d..000000000 --- a/examples/gjs/gio-2-cat-promisify/package.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "name": "ts-for-gir-gio-2-cat-promisify-example", - "version": "4.0.0", - "description": "Simple GJS Gtk 3 example app that shows how you can translate strings with gettext", - "main": "index.js", - "type": "module", - "private": true, - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1", - "build:types": "yarn ts-for-gir generate --configName=.ts-for-girrc.json", - "build:app": "yarn node esbuild.js", - "build": "yarn build:types && yarn build:app", - "start:app": "gjs -m dist/main.js main.ts", - "debug:app": "GTK_DEBUG=interactive yarn start:app", - "start": "yarn build && yarn start:app", - "validate": "yarn validate:types && yarn validate:app", - "validate:types": "tsc --project tsconfig.types.json", - "validate:app": "tsc --noEmit", - "clear": "rm -rf dist @types" - }, - "author": "Pascal Garber ", - "license": "MIT", - "devDependencies": { - "@ts-for-gir/cli": "workspace:^", - "esbuild": "^0.20.1", - "typescript": "^5.2.2" - } -} diff --git a/examples/gjs/gio-2-cat-promisify/tsconfig.json b/examples/gjs/gio-2-cat-promisify/tsconfig.json deleted file mode 100644 index b438edd2e..000000000 --- a/examples/gjs/gio-2-cat-promisify/tsconfig.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "extends": "./tsconfig.alias.json", - "compilerOptions": { - "lib": ["ESNext"], - "types": [], - "target": "ESNext", - "module": "ESNext", - "moduleResolution": "bundler", - "strict": true, - "noImplicitAny": true, - "strictNullChecks": true, - "noImplicitThis": true, - "alwaysStrict": true, - }, - "include": ["@types/gjs.d.ts", "@types/dom.d.ts"], - "files": [ - "main.ts", - ] -} diff --git a/examples/gjs/gio-2-cat-promisify/tsconfig.types.json b/examples/gjs/gio-2-cat-promisify/tsconfig.types.json deleted file mode 100644 index 9f910a243..000000000 --- a/examples/gjs/gio-2-cat-promisify/tsconfig.types.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "noEmit": true - } -} diff --git a/examples/gjs/gio-2-cat-types-only/.ts-for-girrc.json b/examples/gjs/gio-2-cat-types-only/.ts-for-girrc.json deleted file mode 100644 index a109f0017..000000000 --- a/examples/gjs/gio-2-cat-types-only/.ts-for-girrc.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "modules": ["Gio-2.0"], - "outdir": "./@types" -} \ No newline at end of file diff --git a/examples/gjs/gio-2-cat-types-only/esbuild.js b/examples/gjs/gio-2-cat-types-only/esbuild.js deleted file mode 100644 index 03cb394b5..000000000 --- a/examples/gjs/gio-2-cat-types-only/esbuild.js +++ /dev/null @@ -1,14 +0,0 @@ -import { build } from "esbuild"; - -await build({ - entryPoints: ['main.ts'], - outdir: 'dist', - bundle: true, - // target: "firefox60", // Since GJS 1.53.90 - // target: "firefox68", // Since GJS 1.63.90 - target: "firefox78", // Since GJS 1.65.90 - // target: "firefox91", // Since GJS 1.71.1 - format: 'esm', - // platform: 'node', - external: ['gi://*', 'resource://*', 'gettext', 'system', 'cairo'], -}) \ No newline at end of file diff --git a/examples/gjs/gio-2-cat-types-only/main.ts b/examples/gjs/gio-2-cat-types-only/main.ts deleted file mode 100644 index 5f037780a..000000000 --- a/examples/gjs/gio-2-cat-types-only/main.ts +++ /dev/null @@ -1,38 +0,0 @@ -// SPDX-License-Identifier: MIT OR LGPL-2.0-or-later -// SPDX-FileCopyrightText: 2009 Red Hat, Inc. -// Based on https://gitlab.gnome.org/GNOME/gjs/-/blob/master/examples/gio-cat.js - -/* - * Make sure you have a non english locale installed, for example fr_FR and run - * LANGUAGE=fr_FR gjs gettext.js - * the label should show a translation of 'Print help' - */ - -const textDecoder = new TextDecoder(); -const Gio = imports.gi.Gio; -const GLib = imports.gi.GLib; - -const loop = GLib.MainLoop.new(null, false); - -function cat(filename: string) { - const file = Gio.file_new_for_path(filename); - file.load_contents_async(null, (obj, res) => { - let contents: Uint8Array; - try { - contents = obj.load_contents_finish(res)[1]; - } catch (e) { - logError(e); - loop.quit(); - return; - } - print(textDecoder.decode(contents)); - loop.quit(); - }); - - loop.run(); -} - -if (ARGV.length !== 1) - printerr('Usage: gio-cat.js filename'); -else - cat(ARGV[0]); diff --git a/examples/gjs/gio-2-cat-types-only/package.json b/examples/gjs/gio-2-cat-types-only/package.json deleted file mode 100644 index 5ebcf3408..000000000 --- a/examples/gjs/gio-2-cat-types-only/package.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "name": "ts-for-gir-gio-2-cat-types-only-example", - "version": "4.0.0", - "description": "Simple GJS Gtk 3 example app that shows how you can translate strings with gettext", - "main": "index.js", - "type": "module", - "private": true, - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1", - "build:types": "yarn ts-for-gir generate --configName=.ts-for-girrc.json", - "build:app": "yarn node esbuild.js", - "build": "yarn build:types && yarn build:app", - "start:app": "gjs -m dist/main.js main.ts", - "debug:app": "GTK_DEBUG=interactive yarn start:app", - "start": "yarn build && yarn start:app", - "validate": "yarn validate:types && yarn validate:app", - "validate:types": "tsc --project tsconfig.types.json", - "validate:app": "tsc --noEmit", - "clear": "rm -rf dist @types" - }, - "author": "Pascal Garber ", - "license": "MIT", - "devDependencies": { - "@ts-for-gir/cli": "workspace:^", - "esbuild": "^0.20.1", - "typescript": "^5.2.2" - } -} diff --git a/examples/gjs/gio-2-cat-types-only/tsconfig.json b/examples/gjs/gio-2-cat-types-only/tsconfig.json deleted file mode 100644 index 387ef5260..000000000 --- a/examples/gjs/gio-2-cat-types-only/tsconfig.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "compilerOptions": { - "lib": ["ESNext"], - "types": [], - "target": "ESNext", - "module": "ESNext", - "moduleResolution": "bundler", - "strict": true, - "noImplicitAny": true, - "strictNullChecks": true, - "noImplicitThis": true, - "alwaysStrict": true, - }, - "include": ["@types/gjs.d.ts", "@types/dom.d.ts", "@types/gio-2.0.d.ts", "@types/glib-2.0.d.ts"], - "files": [ - "main.ts", - ] -} diff --git a/examples/gjs/gio-2-cat-types-only/tsconfig.types.json b/examples/gjs/gio-2-cat-types-only/tsconfig.types.json deleted file mode 100644 index 9f910a243..000000000 --- a/examples/gjs/gio-2-cat-types-only/tsconfig.types.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "noEmit": true - } -} diff --git a/examples/gjs/gio-2-cat/main.ts b/examples/gjs/gio-2-cat/main.ts index 0ae82f9ab..66c77b220 100644 --- a/examples/gjs/gio-2-cat/main.ts +++ b/examples/gjs/gio-2-cat/main.ts @@ -8,10 +8,10 @@ * the label should show a translation of 'Print help' */ -import './@types/gjs/gjs'; -import './@types/gjs/dom'; -import GLib from './@types/glib-2.0/glib-2.0'; -import Gio from './@types/gio-2.0/gio-2.0'; +import '@girs/gjs'; +import '@girs/dom'; +import GLib from '@girs/glib-2.0'; +import Gio from '@girs/gio-2.0'; const loop = GLib.MainLoop.new(null, false); const textDecoder = new TextDecoder() diff --git a/examples/gjs/gio-2-cat/package.json b/examples/gjs/gio-2-cat/package.json index 9ae64ca9f..06ac3fe2f 100644 --- a/examples/gjs/gio-2-cat/package.json +++ b/examples/gjs/gio-2-cat/package.json @@ -1,5 +1,5 @@ { - "name": "ts-for-gir-gio-2-cat-example", + "name": "@ts-for-gir-example/gio-2-cat-example", "version": "4.0.0", "description": "Simple GJS Gtk 3 example app that shows how you can translate strings with gettext", "main": "index.js", @@ -7,9 +7,8 @@ "private": true, "scripts": { "test": "echo \"Error: no test specified\" && exit 1", - "build:types": "yarn ts-for-gir generate Gio-2.0", "build:app": "yarn node esbuild.js", - "build": "yarn build:types && yarn build:app", + "build": "yarn build:app", "start:app": "gjs -m dist/main.js main.ts", "debug:app": "GTK_DEBUG=interactive yarn start:app", "start": "yarn build && yarn start:app", @@ -21,8 +20,11 @@ "author": "Pascal Garber ", "license": "MIT", "devDependencies": { - "@ts-for-gir/cli": "workspace:^", "esbuild": "^0.20.1", "typescript": "^5.2.2" + }, + "dependencies": { + "@girs/gio-2.0": "workspace:^", + "@girs/glib-2.0": "workspace:^" } } diff --git a/examples/gjs/gio-2-dbus/package.json b/examples/gjs/gio-2-dbus/package.json index 9c6bfd018..f7d6a9bd1 100644 --- a/examples/gjs/gio-2-dbus/package.json +++ b/examples/gjs/gio-2-dbus/package.json @@ -1,5 +1,5 @@ { - "name": "ts-for-gir-gio-2-dbus-example", + "name": "@ts-for-gir-example/gio-2-dbus-example", "version": "4.0.0", "description": "GJS example showing how to build a DBus server/client", "main": "index.js", @@ -7,9 +7,8 @@ "private": true, "scripts": { "test": "echo \"Error: no test specified\" && exit 1", - "build:types": "yarn ts-for-gir generate Gio-2.0", "build:app": "yarn node esbuild.js", - "build": "yarn build:types && yarn build:app", + "build": "yarn build:app", "start": "yarn build && yarn start:server", "start:server": "gjs -m dist/dbus-server.js", "start:client": "gjs -m dist/dbus-client.js", @@ -24,8 +23,10 @@ "author": "Pascal Garber ", "license": "MIT", "devDependencies": { - "@ts-for-gir/cli": "workspace:^", "esbuild": "^0.20.1", "typescript": "^5.2.2" + }, + "dependencies": { + "@girs/gjs": "workspace:^" } } diff --git a/examples/gjs/gio-2-dbus/tsconfig.json b/examples/gjs/gio-2-dbus/tsconfig.json index e5ec1e792..1d9c397f5 100644 --- a/examples/gjs/gio-2-dbus/tsconfig.json +++ b/examples/gjs/gio-2-dbus/tsconfig.json @@ -11,7 +11,7 @@ "noImplicitThis": true, "alwaysStrict": true, }, - "include": ["@types/gjs.d.ts"], + "include": ["@girs/gjs"], "files": [ "dbus-client.ts", "dbus-server.ts", diff --git a/examples/gjs/gio-2-list-model/package.json b/examples/gjs/gio-2-list-model/package.json index 4a19f15e3..7a165849b 100644 --- a/examples/gjs/gio-2-list-model/package.json +++ b/examples/gjs/gio-2-list-model/package.json @@ -1,5 +1,5 @@ { - "name": "ts-for-gir-gio-2-list-model-example", + "name": "@ts-for-gir-example/gio-2-list-model-example", "version": "4.0.0", "description": "An example of implementing the GListModel interface in GJS", "main": "index.js", @@ -7,9 +7,8 @@ "private": true, "scripts": { "test": "echo \"Error: no test specified\" && exit 1", - "build:types": "yarn ts-for-gir generate Gtk-4.0", "build:app": "yarn node esbuild.js", - "build": "yarn build:types && yarn build:app", + "build": "yarn build:app", "start:app": "gjs -m dist/main.js", "debug:app": "GTK_DEBUG=interactive gjs -m dist/main.js", "start": "yarn build && yarn start:app", @@ -20,7 +19,6 @@ "author": "Pascal Garber ", "license": "MIT", "devDependencies": { - "@ts-for-gir/cli": "workspace:^", "esbuild": "^0.20.1", "typescript": "^5.2.2" } diff --git a/examples/gjs/gio-2-list-model/tsconfig.json b/examples/gjs/gio-2-list-model/tsconfig.json index f7adebcb5..37a61a26f 100644 --- a/examples/gjs/gio-2-list-model/tsconfig.json +++ b/examples/gjs/gio-2-list-model/tsconfig.json @@ -1,5 +1,4 @@ { - "extends": "./tsconfig.alias.json", "compilerOptions": { "lib": ["ESNext"], "types": [], @@ -12,7 +11,7 @@ "noImplicitThis": true, "alwaysStrict": true, }, - "include": ["@types/gjs.d.ts"], + "include": ["@girs/gjs"], "files": [ "main.ts", ] diff --git a/examples/gjs/glib-2-spawn-command/package.json b/examples/gjs/glib-2-spawn-command/package.json index fb1763a89..ef0701616 100644 --- a/examples/gjs/glib-2-spawn-command/package.json +++ b/examples/gjs/glib-2-spawn-command/package.json @@ -1,5 +1,5 @@ { - "name": "ts-for-gir-glib-2-spawn-command-example", + "name": "@ts-for-gir-example/glib-2-spawn-command-example", "version": "4.0.0", "description": "", "module": "dist/main.js", @@ -8,9 +8,8 @@ "start": "yarn build && yarn start:gjs", "start:gjs": "gjs dist/main.js", "watch": "yarn build:app --watch", - "build": "yarn build:types && yarn build:app", + "build": "yarn build:app", "build:app": "yarn clear:ts && webpack --env production", - "build:types": "yarn ts-for-gir generate GLib-2.0 --noNamespace", "clear:types": "rm -rf ./@types", "clear:ts": "rm -rf ./dist", "clear": "yarn clear:ts && yarn clear:types", @@ -22,7 +21,6 @@ "author": "", "license": "Apache-2.0", "devDependencies": { - "@ts-for-gir/cli": "workspace:^", "fork-ts-checker-webpack-plugin": "^9.0.2", "ts-loader": "^9.5.1", "typescript": "^5.2.2", diff --git a/examples/gjs/glib-2-spawn-command/tsconfig.json b/examples/gjs/glib-2-spawn-command/tsconfig.json index fa3e8ae25..8f513cd41 100644 --- a/examples/gjs/glib-2-spawn-command/tsconfig.json +++ b/examples/gjs/glib-2-spawn-command/tsconfig.json @@ -11,7 +11,7 @@ "noImplicitThis": true, "alwaysStrict": true, }, - "include": ["@types/gjs.d.ts", "@types/dom.d.ts", "@types/ambient.d.ts"], + "include": ["@girs/gjs", "@girs/gjs/dom", "@girs/gjs/ambient"], "files": [ "main.ts" ] diff --git a/examples/gjs/glib-2-variant/package.json b/examples/gjs/glib-2-variant/package.json index b9d69dc61..7c4a4b0b0 100644 --- a/examples/gjs/glib-2-variant/package.json +++ b/examples/gjs/glib-2-variant/package.json @@ -1,5 +1,5 @@ { - "name": "ts-for-gir-glib-2-variant-example", + "name": "@ts-for-gir-example/glib-2-variant-example", "version": "4.0.0", "description": "ts-for-gir GVariant example based on https://gjs.guide/guides/glib/gvariant.html", "main": "index.js", @@ -7,9 +7,8 @@ "private": true, "scripts": { "test": "echo \"Error: no test specified\" && exit 1", - "build:types": "yarn ts-for-gir generate GLib-2.0 Gio-2.0", "build:app": "yarn node esbuild.js", - "build": "yarn build:types && yarn build:app", + "build": "yarn build:app", "start:app": "gjs -m dist/index.js", "debug:app": "GTK_DEBUG=interactive yarn start:app", "start": "yarn build && yarn start:app", @@ -21,7 +20,6 @@ "author": "Pascal Garber ", "license": "MIT", "devDependencies": { - "@ts-for-gir/cli": "workspace:^", "esbuild": "^0.20.1", "typescript": "^5.2.2" } diff --git a/examples/gjs/glib-2-variant/tsconfig.json b/examples/gjs/glib-2-variant/tsconfig.json index 55908286a..ec6a15ebf 100644 --- a/examples/gjs/glib-2-variant/tsconfig.json +++ b/examples/gjs/glib-2-variant/tsconfig.json @@ -1,5 +1,4 @@ { - "extends": "./tsconfig.alias.json", "compilerOptions": { "lib": ["ESNext"], "types": [], @@ -12,7 +11,7 @@ "noImplicitThis": true, "alwaysStrict": true, }, - "include": ["@types/gjs.d.ts"], + "include": ["@girs/gjs"], "files": [ "index.ts" ] diff --git a/examples/gjs/gtk-3-browser/main.ts b/examples/gjs/gtk-3-browser/main.ts index 5bbf14ca9..4e004428f 100644 --- a/examples/gjs/gtk-3-browser/main.ts +++ b/examples/gjs/gtk-3-browser/main.ts @@ -1,3 +1,8 @@ +import "@girs/gjs" +import "@girs/pango-1.0/ambient" +import "@girs/gtk-3.0/ambient" +import "@girs/webkit2-4.0/ambient" + import Gtk from 'gi://Gtk?version=3.0'; import Pango from 'gi://Pango?version=1.0' import WebKit2 from 'gi://WebKit2?version=4.0' diff --git a/examples/gjs/gtk-3-browser/package.json b/examples/gjs/gtk-3-browser/package.json index 4faa8ed68..96abde13f 100644 --- a/examples/gjs/gtk-3-browser/package.json +++ b/examples/gjs/gtk-3-browser/package.json @@ -1,5 +1,5 @@ { - "name": "ts-for-gir-gtk-3-browser-example", + "name": "@ts-for-gir-example/gtk-3-browser-example", "version": "4.0.0", "description": "", "module": "dist/main.js", @@ -9,9 +9,8 @@ "start": "yarn build && yarn start:app", "start:app": "gjs -m dist/main.js", "watch": "yarn build:app --watch", - "build": "yarn build:types && yarn build:app", + "build": "yarn build:app", "build:app": "yarn clear:ts && webpack --config webpack.config.cjs --env production", - "build:types": "yarn ts-for-gir generate Gtk-3.0 Pango-1.0 WebKit2-4.0", "clear:types": "rm -rf ./@types", "clear:ts": "rm -rf ./dist", "clear": "yarn clear:ts && yarn clear:types", @@ -23,11 +22,16 @@ "author": "", "license": "Apache-2.0", "devDependencies": { - "@ts-for-gir/cli": "workspace:^", "fork-ts-checker-webpack-plugin": "^9.0.2", "ts-loader": "^9.5.1", "typescript": "^5.2.2", "webpack": "^5.90.3", "webpack-cli": "^5.1.4" + }, + "dependencies": { + "@girs/gjs": "workspace:^", + "@girs/gtk-3.0": "workspace:^", + "@girs/pango-1.0": "workspace:^", + "@girs/webkit2-4.0": "workspace:^" } } diff --git a/examples/gjs/gtk-3-browser/tsconfig.json b/examples/gjs/gtk-3-browser/tsconfig.json index b0ea0baa9..c490cdc69 100644 --- a/examples/gjs/gtk-3-browser/tsconfig.json +++ b/examples/gjs/gtk-3-browser/tsconfig.json @@ -11,7 +11,7 @@ "noImplicitThis": true, "alwaysStrict": true, }, - "include": ["@types/ambient.d.ts", "@types/pango-1.0-ambient.d.ts", "@types/gtk-3.0-ambient.d.ts", "@types/webkit2-4.0-ambient.d.ts"], + "files": [ "main.ts" ] diff --git a/examples/gjs/gtk-3-builder/main.ts b/examples/gjs/gtk-3-builder/main.ts index dfe505582..3fbd128f8 100644 --- a/examples/gjs/gtk-3-builder/main.ts +++ b/examples/gjs/gtk-3-builder/main.ts @@ -1,6 +1,6 @@ -import './@types/gjs.js' +import '@girs/gjs' import gladeFile from './builderExample.glade' -import * as Gtk from './@types/gtk-3.0' +import * as Gtk from '@girs/gtk-3.0' Gtk.init(null) diff --git a/examples/gjs/gtk-3-builder/package.json b/examples/gjs/gtk-3-builder/package.json index 12020e353..9c16eb520 100644 --- a/examples/gjs/gtk-3-builder/package.json +++ b/examples/gjs/gtk-3-builder/package.json @@ -1,5 +1,5 @@ { - "name": "ts-for-gir-gtk-3-builder-example", + "name": "@ts-for-gir-example/gtk-3-builder-example", "version": "4.0.0", "description": "", "main": "main.ts", @@ -8,9 +8,8 @@ "start": "yarn build && yarn start:app", "start:app": "gjs dist/main.js", "watch": "yarn build:app --watch", - "build": "yarn build:types && yarn build:app", + "build": "yarn build:app", "build:app": "yarn clear:ts && webpack --env production", - "build:types": "yarn ts-for-gir generate Gtk-3.0 --noNamespace", "clear:types": "rm -rf ./@types", "clear:ts": "rm -rf ./dist", "clear": "yarn clear:ts && yarn clear:types", @@ -22,12 +21,14 @@ "author": "", "license": "Apache-2.0", "devDependencies": { - "@ts-for-gir/cli": "workspace:^", "fork-ts-checker-webpack-plugin": "^9.0.2", "raw-loader": "^4.0.2", "ts-loader": "^9.5.1", "typescript": "^5.2.2", "webpack": "^5.90.3", "webpack-cli": "^5.1.4" + }, + "dependencies": { + "@girs/gtk-3.0": "workspace:^" } } diff --git a/examples/gjs/gtk-3-builder/tsconfig.json b/examples/gjs/gtk-3-builder/tsconfig.json index b8ecd1ea3..fc8393f6f 100644 --- a/examples/gjs/gtk-3-builder/tsconfig.json +++ b/examples/gjs/gtk-3-builder/tsconfig.json @@ -11,7 +11,7 @@ "noImplicitThis": true, "alwaysStrict": true, }, - "include": ["global.d.ts", "@types/gjs.d.ts", "@types/ambient.d.ts"], + "include": ["global.d.ts", "@girs/gjs", "@girs/gjs/ambient"], "files": [ "main.ts" ] diff --git a/examples/gjs/gtk-3-calc/main.ts b/examples/gjs/gtk-3-calc/main.ts index 5879b37a4..122ef7ef4 100644 --- a/examples/gjs/gtk-3-calc/main.ts +++ b/examples/gjs/gtk-3-calc/main.ts @@ -3,6 +3,9 @@ // SPDX-FileCopyrightText: 2008 Robert Carr // Based on https://gitlab.gnome.org/GNOME/gjs/-/blob/master/examples/calc.js +import "@girs/gjs" +import "@girs/gtk-3.0/ambient" + import Gtk from 'gi://Gtk?version=3.0'; Gtk.init(null); diff --git a/examples/gjs/gtk-3-calc/package.json b/examples/gjs/gtk-3-calc/package.json index edd3a730f..07a7f6c38 100644 --- a/examples/gjs/gtk-3-calc/package.json +++ b/examples/gjs/gtk-3-calc/package.json @@ -1,5 +1,5 @@ { - "name": "ts-for-gir-gtk-3-calc-example", + "name": "@ts-for-gir-example/gtk-3-calc-example", "version": "4.0.0", "description": "Simple GJS Gtk 3 calculator example app", "main": "index.js", @@ -7,9 +7,8 @@ "private": true, "scripts": { "test": "echo \"Error: no test specified\" && exit 1", - "build:types": "yarn ts-for-gir generate Gtk-3.0", "build:app": "yarn node esbuild.js", - "build": "yarn build:types && yarn build:app", + "build": "yarn build:app", "start:app": "gjs -m dist/main.js", "debug:app": "GTK_DEBUG=interactive yarn start:app", "start": "yarn build && yarn start:app", @@ -21,8 +20,10 @@ "author": "Pascal Garber ", "license": "MIT", "devDependencies": { - "@ts-for-gir/cli": "workspace:^", "esbuild": "^0.20.1", "typescript": "^5.2.2" + }, + "dependencies": { + "@girs/gtk-3.0": "workspace:^" } } diff --git a/examples/gjs/gtk-3-calc/tsconfig.json b/examples/gjs/gtk-3-calc/tsconfig.json index f7adebcb5..d6f56a4fc 100644 --- a/examples/gjs/gtk-3-calc/tsconfig.json +++ b/examples/gjs/gtk-3-calc/tsconfig.json @@ -1,5 +1,4 @@ { - "extends": "./tsconfig.alias.json", "compilerOptions": { "lib": ["ESNext"], "types": [], @@ -12,7 +11,7 @@ "noImplicitThis": true, "alwaysStrict": true, }, - "include": ["@types/gjs.d.ts"], + "include": [], "files": [ "main.ts", ] diff --git a/examples/gjs/gtk-3-editor/main.ts b/examples/gjs/gtk-3-editor/main.ts index db7b92248..0e45187a4 100644 --- a/examples/gjs/gtk-3-editor/main.ts +++ b/examples/gjs/gtk-3-editor/main.ts @@ -1,6 +1,6 @@ -import imports from './@types/gjs.js' -import * as Gtk from './@types/gtk-3.0' -import * as GtkSource from './@types/gtksource-3.0' +import imports from '@girs/gjs' +import Gtk from '@girs/gtk-3.0' +import GtkSource from '@girs/gtksource-3.0' const { gettext } = imports; Gtk.init(null) diff --git a/examples/gjs/gtk-3-editor/package.json b/examples/gjs/gtk-3-editor/package.json index 3846feac1..fc36d6e8b 100644 --- a/examples/gjs/gtk-3-editor/package.json +++ b/examples/gjs/gtk-3-editor/package.json @@ -1,14 +1,12 @@ { - "name": "ts-for-gir-gtk-3-editor-example", + "name": "@ts-for-gir-example/gtk-3-editor-example", "version": "4.0.0", "description": "", "main": "main.ts", "private": true, "scripts": { - "build": "yarn build:types && yarn build:app", + "build": "yarn build:app", "build:app": "yarn clear:app && webpack --env production", - "build:types": "yarn ts-for-gir generate Gtk-3.0 GtkSource-3.0 --noNamespace", - "clear:types": "rm -rf ./@types", "clear:app": "rm -rf ./dist", "clear": "yarn clear:app && yarn clear:types", "start": "yarn build && yarn start:app", @@ -22,11 +20,15 @@ "author": "", "license": "Apache-2.0", "devDependencies": { - "@ts-for-gir/cli": "workspace:^", "fork-ts-checker-webpack-plugin": "^9.0.2", "ts-loader": "^9.5.1", "typescript": "^5.2.2", "webpack": "^5.90.3", "webpack-cli": "^5.1.4" + }, + "dependencies": { + "@girs/gjs": "workspace:^", + "@girs/gtk-3.0": "workspace:^", + "@girs/gtksource-3.0": "workspace:^" } } diff --git a/examples/gjs/gtk-3-gettext/main.ts b/examples/gjs/gtk-3-gettext/main.ts index af61aa2c3..5cb3fde67 100644 --- a/examples/gjs/gtk-3-gettext/main.ts +++ b/examples/gjs/gtk-3-gettext/main.ts @@ -7,6 +7,10 @@ * LANGUAGE=fr_FR gjs gettext.js * the label should show a translation of 'Print help' */ +import '@girs/gjs'; +import '@girs/gtk-3.0/ambient'; + + import Gtk from 'gi://Gtk?version=3.0'; const { gettext } = imports; diff --git a/examples/gjs/gtk-3-gettext/package.json b/examples/gjs/gtk-3-gettext/package.json index 73585c457..0293dfe18 100644 --- a/examples/gjs/gtk-3-gettext/package.json +++ b/examples/gjs/gtk-3-gettext/package.json @@ -1,5 +1,5 @@ { - "name": "ts-for-gir-gtk-3-gettext-example", + "name": "@ts-for-gir-example/gtk-3-gettext-example", "version": "4.0.0", "description": "Simple GJS Gtk 3 example app that shows how you can translate strings with gettext", "main": "index.js", @@ -7,9 +7,8 @@ "private": true, "scripts": { "test": "echo \"Error: no test specified\" && exit 1", - "build:types": "yarn ts-for-gir generate Gtk-3.0", "build:app": "yarn node esbuild.js", - "build": "yarn build:types && yarn build:app", + "build": "yarn build:app", "start:app": "gjs -m dist/main.js", "debug:app": "GTK_DEBUG=interactive yarn start:app", "start": "yarn build && yarn start:app", @@ -21,8 +20,11 @@ "author": "Pascal Garber ", "license": "MIT", "devDependencies": { - "@ts-for-gir/cli": "workspace:^", "esbuild": "^0.20.1", "typescript": "^5.2.2" + }, + "dependencies": { + "@girs/gjs": "workspace:^", + "@girs/gtk-3.0": "workspace:^" } } diff --git a/examples/gjs/gtk-3-gettext/tsconfig.json b/examples/gjs/gtk-3-gettext/tsconfig.json index f7adebcb5..d6f56a4fc 100644 --- a/examples/gjs/gtk-3-gettext/tsconfig.json +++ b/examples/gjs/gtk-3-gettext/tsconfig.json @@ -1,5 +1,4 @@ { - "extends": "./tsconfig.alias.json", "compilerOptions": { "lib": ["ESNext"], "types": [], @@ -12,7 +11,7 @@ "noImplicitThis": true, "alwaysStrict": true, }, - "include": ["@types/gjs.d.ts"], + "include": [], "files": [ "main.ts", ] diff --git a/examples/gjs/gtk-3-hello-2/main.ts b/examples/gjs/gtk-3-hello-2/main.ts index 9ffe02213..150818b9d 100644 --- a/examples/gjs/gtk-3-hello-2/main.ts +++ b/examples/gjs/gtk-3-hello-2/main.ts @@ -3,7 +3,8 @@ // SPDX-FileCopyrightText: 2008 litl, LLC // Based on https://gitlab.gnome.org/GNOME/gjs/-/blob/master/examples/gtk.js -import imports from './@types/gjs.js'; +import imports from '@girs/gjs'; +import '@girs/gtk-3.0' // Include this in case both GTK3 and GTK4 installed, otherwise an exception // will be thrown diff --git a/examples/gjs/gtk-3-hello-2/package.json b/examples/gjs/gtk-3-hello-2/package.json index a9e9bab07..08042f2eb 100644 --- a/examples/gjs/gtk-3-hello-2/package.json +++ b/examples/gjs/gtk-3-hello-2/package.json @@ -1,5 +1,5 @@ { - "name": "ts-for-gir-gtk-3-hello-2-example", + "name": "@ts-for-gir-example/gtk-3-hello-2-example", "version": "4.0.0", "description": "Simple GJS Gtk 3 example app to demonstrate how you can connect to Gtk signals", "main": "index.js", @@ -7,9 +7,8 @@ "private": true, "scripts": { "test": "echo \"Error: no test specified\" && exit 1", - "build:types": "yarn ts-for-gir generate Gtk-3.0", "build:app": "yarn node esbuild.js", - "build": "yarn build:types && yarn build:app", + "build": "yarn build:app", "start:app": "gjs -m dist/main.js", "debug:app": "GTK_DEBUG=interactive yarn start:app", "start": "yarn build && yarn start:app", @@ -21,8 +20,11 @@ "author": "Pascal Garber ", "license": "MIT", "devDependencies": { - "@ts-for-gir/cli": "workspace:^", "esbuild": "^0.20.1", "typescript": "^5.2.2" + }, + "dependencies": { + "@girs/gjs": "workspace:^", + "@girs/gtk-3.0": "workspace:^" } } diff --git a/examples/gjs/gtk-3-hello-2/tsconfig.json b/examples/gjs/gtk-3-hello-2/tsconfig.json index c3570f8e1..d6f56a4fc 100644 --- a/examples/gjs/gtk-3-hello-2/tsconfig.json +++ b/examples/gjs/gtk-3-hello-2/tsconfig.json @@ -1,5 +1,4 @@ { - "extends": "./tsconfig.alias.json", "compilerOptions": { "lib": ["ESNext"], "types": [], @@ -12,7 +11,7 @@ "noImplicitThis": true, "alwaysStrict": true, }, - "include": ["@types/gjs.d.ts", "@types/gtk-3.0.d.ts"], + "include": [], "files": [ "main.ts", ] diff --git a/examples/gjs/gtk-3-hello/main.ts b/examples/gjs/gtk-3-hello/main.ts index c30421a12..472d73649 100644 --- a/examples/gjs/gtk-3-hello/main.ts +++ b/examples/gjs/gtk-3-hello/main.ts @@ -1,5 +1,5 @@ -import './@types/gjs.js' -import * as Gtk from './@types/gtk-3.0.js' +import '@girs/gjs' +import Gtk from '@girs/gtk-3.0' Gtk.init(null) diff --git a/examples/gjs/gtk-3-hello/package.json b/examples/gjs/gtk-3-hello/package.json index 2b44bd07b..1c6cf5b1d 100644 --- a/examples/gjs/gtk-3-hello/package.json +++ b/examples/gjs/gtk-3-hello/package.json @@ -1,13 +1,12 @@ { - "name": "ts-for-gir-gtk-3-hello-example", + "name": "@ts-for-gir-example/gtk-3-hello-example", "version": "4.0.0", "description": "", "main": "main.ts", "private": true, "scripts": { - "build": "yarn build:types && yarn build:app", + "build": "yarn build:app", "build:app": "yarn clear:app && webpack --env production", - "build:types": "yarn ts-for-gir generate Gtk-3.0 GtkSource-3.0 --noNamespace", "clear:types": "rm -rf ./@types", "clear:app": "rm -rf ./dist", "clear": "yarn clear:app && yarn clear:types", @@ -22,11 +21,14 @@ "author": "", "license": "Apache-2.0", "devDependencies": { - "@ts-for-gir/cli": "workspace:^", "fork-ts-checker-webpack-plugin": "^9.0.2", "ts-loader": "^9.5.1", "typescript": "^5.2.2", "webpack": "^5.90.3", "webpack-cli": "^5.1.4" + }, + "dependencies": { + "@girs/gjs": "workspace:^", + "@girs/gtk-3.0": "workspace:^" } } diff --git a/examples/gjs/gtk-3-template/main.ts b/examples/gjs/gtk-3-template/main.ts index c7907e0a4..5bb4a1559 100644 --- a/examples/gjs/gtk-3-template/main.ts +++ b/examples/gjs/gtk-3-template/main.ts @@ -3,6 +3,9 @@ // SPDX-FileCopyrightText: 2021 Andy Holmes // Based on https://gitlab.gnome.org/GNOME/gjs/-/blob/master/examples/gtk3-template.js +import '@girs/gjs'; +import '@girs/gtk-3.0'; + import GObject from 'gi://GObject?version=2.0'; import Gio from 'gi://Gio?version=2.0'; import Gtk from 'gi://Gtk?version=3.0'; diff --git a/examples/gjs/gtk-3-template/package.json b/examples/gjs/gtk-3-template/package.json index a0a139700..df8f5cc6b 100644 --- a/examples/gjs/gtk-3-template/package.json +++ b/examples/gjs/gtk-3-template/package.json @@ -1,5 +1,5 @@ { - "name": "ts-for-gir-gtk-3-template-example", + "name": "@ts-for-gir-example/gtk-3-template-example", "version": "4.0.0", "description": "Simple GJS Gtk 3 example app to demonstrate how you can use .ui template XML files", "main": "index.js", @@ -7,9 +7,8 @@ "private": true, "scripts": { "test": "echo \"Error: no test specified\" && exit 1", - "build:types": "yarn ts-for-gir generate Gtk-3.0", "build:app": "yarn node esbuild.js", - "build": "yarn build:types && yarn build:app", + "build": "yarn build:app", "start:app": "gjs -m dist/main.js", "debug:app": "GTK_DEBUG=interactive yarn start:app", "start": "yarn build && yarn start:app", @@ -21,8 +20,11 @@ "author": "Pascal Garber ", "license": "MIT", "devDependencies": { - "@ts-for-gir/cli": "workspace:^", "esbuild": "^0.20.1", "typescript": "^5.2.2" + }, + "dependencies": { + "@girs/gjs": "workspace:^", + "@girs/gtk-3.0": "workspace:^" } } diff --git a/examples/gjs/gtk-3-template/tsconfig.json b/examples/gjs/gtk-3-template/tsconfig.json index f7adebcb5..d6f56a4fc 100644 --- a/examples/gjs/gtk-3-template/tsconfig.json +++ b/examples/gjs/gtk-3-template/tsconfig.json @@ -1,5 +1,4 @@ { - "extends": "./tsconfig.alias.json", "compilerOptions": { "lib": ["ESNext"], "types": [], @@ -12,7 +11,7 @@ "noImplicitThis": true, "alwaysStrict": true, }, - "include": ["@types/gjs.d.ts"], + "include": [], "files": [ "main.ts", ] diff --git a/examples/gjs/gtk-3-webkit/main.ts b/examples/gjs/gtk-3-webkit/main.ts index 1c1df2d93..db8e9a442 100644 --- a/examples/gjs/gtk-3-webkit/main.ts +++ b/examples/gjs/gtk-3-webkit/main.ts @@ -3,7 +3,9 @@ // SPDX-FileCopyrightText: 2008 litl, LLC // Based on https://gitlab.gnome.org/GNOME/gjs/-/blob/master/examples/webkit.js -import './@types/gjs.js'; +import '@girs/gjs'; +import '@girs/webkit2-4.0'; + import Gtk from 'gi://Gtk?version=3.0'; import WebKit from 'gi://WebKit2?version=4.0'; diff --git a/examples/gjs/gtk-3-webkit/package.json b/examples/gjs/gtk-3-webkit/package.json index c5f527d96..3020a24f3 100644 --- a/examples/gjs/gtk-3-webkit/package.json +++ b/examples/gjs/gtk-3-webkit/package.json @@ -1,5 +1,5 @@ { - "name": "ts-for-gir-gtk-3-webkit-example", + "name": "@ts-for-gir-example/gtk-3-webkit-example", "version": "4.0.0", "description": "Simple GJS Gtk 3 example app to demonstrate how you can use WebKit2", "main": "index.js", @@ -7,9 +7,8 @@ "private": true, "scripts": { "test": "echo \"Error: no test specified\" && exit 1", - "build:types": "yarn ts-for-gir generate WebKit2-4.0", "build:app": "yarn node esbuild.js", - "build": "yarn build:types && yarn build:app", + "build": "yarn build:app", "start:app": "gjs -m dist/main.js", "debug:app": "GTK_DEBUG=interactive yarn start:app", "start": "yarn build && yarn start:app", @@ -21,8 +20,11 @@ "author": "Pascal Garber ", "license": "MIT", "devDependencies": { - "@ts-for-gir/cli": "workspace:^", "esbuild": "^0.20.1", "typescript": "^5.2.2" + }, + "dependencies": { + "@girs/gjs": "workspace:^", + "@girs/webkit2-4.0": "workspace:^" } } diff --git a/examples/gjs/gtk-3-webkit/tsconfig.json b/examples/gjs/gtk-3-webkit/tsconfig.json index f7adebcb5..d6f56a4fc 100644 --- a/examples/gjs/gtk-3-webkit/tsconfig.json +++ b/examples/gjs/gtk-3-webkit/tsconfig.json @@ -1,5 +1,4 @@ { - "extends": "./tsconfig.alias.json", "compilerOptions": { "lib": ["ESNext"], "types": [], @@ -12,7 +11,7 @@ "noImplicitThis": true, "alwaysStrict": true, }, - "include": ["@types/gjs.d.ts"], + "include": [], "files": [ "main.ts", ] diff --git a/examples/gjs/gtk-4-application/main.ts b/examples/gjs/gtk-4-application/main.ts index fd57b93fc..21b5d269f 100644 --- a/examples/gjs/gtk-4-application/main.ts +++ b/examples/gjs/gtk-4-application/main.ts @@ -3,6 +3,12 @@ // SPDX-License-Identifier: MIT OR LGPL-2.0-or-later // SPDX-FileCopyrightText: 2017 Andy Holmes +import '@girs/gjs'; +import '@girs/gjs/ambient'; +import '@girs/gio-2.0'; +import '@girs/glib-2.0'; +import '@girs/gtk-4.0'; + // See the note about Application.run() at the bottom of the script import System from 'system'; import Gio from 'gi://Gio?version=2.0'; diff --git a/examples/gjs/gtk-4-application/package.json b/examples/gjs/gtk-4-application/package.json index 2e81a4545..4f0a0b44b 100644 --- a/examples/gjs/gtk-4-application/package.json +++ b/examples/gjs/gtk-4-application/package.json @@ -1,5 +1,5 @@ { - "name": "ts-for-gir-gtk-4-application-example", + "name": "@ts-for-gir-example/gtk-4-application-example", "version": "4.0.0", "description": "Simple GJS Gtk 4 example app to demonstrate how you can use and extend Gtk.Application", "main": "index.js", @@ -7,9 +7,8 @@ "private": true, "scripts": { "test": "echo \"Error: no test specified\" && exit 1", - "build:types": "yarn ts-for-gir generate Gtk-4.0", "build:app": "yarn node esbuild.js", - "build": "yarn build:types && yarn build:app", + "build": "yarn build:app", "start:app": "gjs -m dist/main.js", "debug:app": "GTK_DEBUG=interactive yarn start:app", "start": "yarn build && yarn start:app", @@ -21,8 +20,11 @@ "author": "Pascal Garber ", "license": "MIT", "devDependencies": { - "@ts-for-gir/cli": "workspace:^", "esbuild": "^0.20.1", "typescript": "^5.2.2" + }, + "dependencies": { + "@girs/gjs": "workspace:^", + "@girs/gtk-4.0": "workspace:^" } } diff --git a/examples/gjs/gtk-4-application/tsconfig.json b/examples/gjs/gtk-4-application/tsconfig.json index 31e7d2e96..d6f56a4fc 100644 --- a/examples/gjs/gtk-4-application/tsconfig.json +++ b/examples/gjs/gtk-4-application/tsconfig.json @@ -1,5 +1,4 @@ { - "extends": "./tsconfig.alias.json", "compilerOptions": { "lib": ["ESNext"], "types": [], @@ -12,7 +11,7 @@ "noImplicitThis": true, "alwaysStrict": true, }, - "include": ["@types/gjs.d.ts", "@types/ambient.d.ts", "@types/gio-2.0.d.ts", "@types/glib-2.0.d.ts", "@types/gtk-3.0.d.ts"], + "include": [], "files": [ "main.ts", ] diff --git a/examples/gjs/gtk-4-custom-widget/package.json b/examples/gjs/gtk-4-custom-widget/package.json index 5ba974b6b..3908cc239 100644 --- a/examples/gjs/gtk-4-custom-widget/package.json +++ b/examples/gjs/gtk-4-custom-widget/package.json @@ -1,5 +1,5 @@ { - "name": "ts-for-gir-gjs-gtk-4-custom-widget-example", + "name": "@ts-for-gir-example/gjs-gtk-4-custom-widget-example", "version": "4.0.0", "description": "This example shows the usage of custom widgets and virtual functions in GJS", "main": "dist/index.js", @@ -7,9 +7,8 @@ "private": true, "scripts": { "test": "echo \"Error: no test specified\" && exit 1", - "build:types": "yarn ts-for-gir generate Gtk-4.0 Gdk-4.0 Graphene-1.0", "build:app": "yarn node esbuild.js", - "build": "yarn build:types && yarn build:app", + "build": "yarn build:app", "start:app": "gjs -m dist/index.js", "debug:app": "GTK_DEBUG=interactive yarn start:app", "start": "yarn build && yarn start:app", diff --git a/examples/gjs/gtk-4-custom-widget/tsconfig.json b/examples/gjs/gtk-4-custom-widget/tsconfig.json index ecac22692..ffc4c66ea 100644 --- a/examples/gjs/gtk-4-custom-widget/tsconfig.json +++ b/examples/gjs/gtk-4-custom-widget/tsconfig.json @@ -1,5 +1,4 @@ { - "extends": "./tsconfig.alias.json", "compilerOptions": { "lib": ["ESNext"], "types": [], @@ -12,7 +11,7 @@ "noImplicitThis": true, "alwaysStrict": true, }, - "include": ["@types/gjs.d.ts", "@types/dom.d.ts"], + "include": ["@girs/gjs", "@girs/gjs/dom"], "files": [ "index.ts" ] diff --git a/examples/gjs/gtk-4-list-store/main.ts b/examples/gjs/gtk-4-list-store/main.ts index 2b70991f4..48b0617e7 100644 --- a/examples/gjs/gtk-4-list-store/main.ts +++ b/examples/gjs/gtk-4-list-store/main.ts @@ -4,7 +4,7 @@ * @source https://github.com/optimisme/gjs-examples/blob/master/egList.js */ -import imports from './@types/gjs.js' +import imports from '@girs/gjs' import GObject from 'gi://GObject?version=2.0'; import GLib from 'gi://GLib?version=2.0'; import Gtk from 'gi://Gtk?version=4.0'; diff --git a/examples/gjs/gtk-4-list-store/package.json b/examples/gjs/gtk-4-list-store/package.json index 1881179b0..3a729e568 100644 --- a/examples/gjs/gtk-4-list-store/package.json +++ b/examples/gjs/gtk-4-list-store/package.json @@ -1,5 +1,5 @@ { - "name": "ts-for-gir-gtk-4-list-store-example", + "name": "@ts-for-gir-example/gtk-4-list-store-example", "version": "4.0.0", "description": "It takes the hassle away from building Gtk4 application in Python So you can create a cool application, without all the boilerplate code", "main": "index.js", @@ -7,9 +7,8 @@ "private": true, "scripts": { "test": "echo \"Error: no test specified\" && exit 1", - "build:types": "yarn ts-for-gir generate Gtk-4.0", "build:app": "yarn node esbuild.js", - "build": "yarn build:types && yarn build:app", + "build": "yarn build:app", "start:app": "gjs -m dist/main.js", "debug:app": "GTK_DEBUG=interactive gjs -m dist/main.js", "start": "yarn build && yarn start:app", @@ -21,7 +20,6 @@ "author": "Pascal Garber ", "license": "MIT", "devDependencies": { - "@ts-for-gir/cli": "workspace:^", "esbuild": "^0.20.1", "typescript": "^5.2.2" } diff --git a/examples/gjs/gtk-4-list-store/tsconfig.json b/examples/gjs/gtk-4-list-store/tsconfig.json index f7adebcb5..37a61a26f 100644 --- a/examples/gjs/gtk-4-list-store/tsconfig.json +++ b/examples/gjs/gtk-4-list-store/tsconfig.json @@ -1,5 +1,4 @@ { - "extends": "./tsconfig.alias.json", "compilerOptions": { "lib": ["ESNext"], "types": [], @@ -12,7 +11,7 @@ "noImplicitThis": true, "alwaysStrict": true, }, - "include": ["@types/gjs.d.ts"], + "include": ["@girs/gjs"], "files": [ "main.ts", ] diff --git a/examples/gjs/gtk-4-template/package.json b/examples/gjs/gtk-4-template/package.json index bfd6e2191..e39f26ddd 100644 --- a/examples/gjs/gtk-4-template/package.json +++ b/examples/gjs/gtk-4-template/package.json @@ -1,5 +1,5 @@ { - "name": "ts-for-gir-gtk-4-template-example", + "name": "@ts-for-gir-example/gtk-4-template-example", "version": "4.0.0", "description": "Simple GJS Gtk 4 example app to demonstrate how you can use .ui template XML files", "main": "index.js", @@ -7,9 +7,8 @@ "private": true, "scripts": { "test": "echo \"Error: no test specified\" && exit 1", - "build:types": "yarn ts-for-gir generate Gtk-4.0", "build:app": "yarn node esbuild.js", - "build": "yarn build:types && yarn build:app", + "build": "yarn build:app", "start:app": "gjs -m dist/main.js", "debug:app": "GTK_DEBUG=interactive yarn start:app", "start": "yarn build && yarn start:app", @@ -24,5 +23,9 @@ "@ts-for-gir/cli": "workspace:^", "esbuild": "^0.20.1", "typescript": "^5.2.2" + }, + "dependencies": { + "@girs/gjs": "workspace:^", + "@girs/gtk-4.0": "workspace:^" } } diff --git a/examples/gjs/gtk-4-template/tsconfig.json b/examples/gjs/gtk-4-template/tsconfig.json index f7adebcb5..37a61a26f 100644 --- a/examples/gjs/gtk-4-template/tsconfig.json +++ b/examples/gjs/gtk-4-template/tsconfig.json @@ -1,5 +1,4 @@ { - "extends": "./tsconfig.alias.json", "compilerOptions": { "lib": ["ESNext"], "types": [], @@ -12,7 +11,7 @@ "noImplicitThis": true, "alwaysStrict": true, }, - "include": ["@types/gjs.d.ts"], + "include": ["@girs/gjs"], "files": [ "main.ts", ] diff --git a/examples/gjs/run-async/package.json b/examples/gjs/run-async/package.json index c3abef114..df2b5ece0 100644 --- a/examples/gjs/run-async/package.json +++ b/examples/gjs/run-async/package.json @@ -1,5 +1,5 @@ { - "name": "ts-for-gir-run-async-example", + "name": "@ts-for-gir-example/run-async-example", "version": "4.0.0", "description": "Simple GJS Gtk 3 example app that shows how you can translate strings with gettext", "main": "index.js", @@ -21,5 +21,8 @@ "devDependencies": { "esbuild": "^0.20.1", "typescript": "^5.2.2" + }, + "dependencies": { + "@girs/adw-1": "workspace:^" } } diff --git a/examples/gjs/soup-3-http/package.json b/examples/gjs/soup-3-http/package.json index 5efcc8395..4d245a40c 100644 --- a/examples/gjs/soup-3-http/package.json +++ b/examples/gjs/soup-3-http/package.json @@ -1,5 +1,5 @@ { - "name": "ts-for-gir-soup-3-http-example", + "name": "@ts-for-gir-example/soup-3-http-example", "version": "4.0.0", "description": "GJS example showing how to build a http server/client using Soap 3", "main": "index.js", @@ -7,9 +7,8 @@ "private": true, "scripts": { "test": "echo \"Error: no test specified\" && exit 1", - "build:types": "yarn ts-for-gir generate Soup-3.0", "build:app": "yarn node esbuild.js", - "build": "yarn build:types && yarn build:app", + "build": "yarn build:app", "start:server": "gjs -m dist/http-server.js", "start:client": "gjs -m dist/http-client.js", "debug:server": "GTK_DEBUG=interactive yarn start:server", @@ -23,8 +22,10 @@ "author": "Pascal Garber ", "license": "MIT", "devDependencies": { - "@ts-for-gir/cli": "workspace:^", "esbuild": "^0.20.1", "typescript": "^5.2.2" + }, + "dependencies": { + "@girs/soup-3.0": "workspace:^" } } diff --git a/examples/gjs/soup-3-http/tsconfig.json b/examples/gjs/soup-3-http/tsconfig.json index 2d020c50d..e29796571 100644 --- a/examples/gjs/soup-3-http/tsconfig.json +++ b/examples/gjs/soup-3-http/tsconfig.json @@ -1,5 +1,4 @@ { - "extends": "./tsconfig.alias.json", "compilerOptions": { "lib": ["ESNext"], "types": [], @@ -12,7 +11,7 @@ "noImplicitThis": true, "alwaysStrict": true, }, - "include": ["@types/gjs.d.ts", "@types/dom.d.ts"], + "include": ["@girs/gjs", "@girs/gjs/dom"], "files": [ "http-client.ts", "http-server.ts" diff --git a/examples/gjs/soup-3-websocket/client.ts b/examples/gjs/soup-3-websocket/client.ts index d78b8a89a..fa0ccacf6 100644 --- a/examples/gjs/soup-3-websocket/client.ts +++ b/examples/gjs/soup-3-websocket/client.ts @@ -7,7 +7,7 @@ // Based on https://gitlab.gnome.org/GNOME/gjs/-/blob/master/examples/websocket-client.js -import imports from './@types/gjs.js'; +import imports from '@girs/gjs'; import GLib from 'gi://GLib?version=2.0'; import Soup from 'gi://Soup?version=3.0'; import Gio from 'gi://Gio?version=2.0'; diff --git a/examples/gjs/soup-3-websocket/package.json b/examples/gjs/soup-3-websocket/package.json index 5aab25010..bda423e26 100644 --- a/examples/gjs/soup-3-websocket/package.json +++ b/examples/gjs/soup-3-websocket/package.json @@ -1,5 +1,5 @@ { - "name": "ts-for-gir-soup-3-websocket-example", + "name": "@ts-for-gir-example/soup-3-websocket-example", "version": "4.0.0", "description": "Simple GJS Soup 3 example app to demonstrate how you can use WebSockets", "main": "index.js", @@ -7,9 +7,8 @@ "private": true, "scripts": { "test": "echo \"Error: no test specified\" && exit 1", - "build:types": "yarn ts-for-gir generate Soup-3.0", "build:client": "yarn node esbuild.js", - "build": "yarn build:types && yarn build:client", + "build": "yarn build:client", "start:client": "gjs -m dist/main.js", "debug:client": "GTK_DEBUG=interactive yarn start:client", "start": "yarn build && yarn start:client", @@ -21,8 +20,10 @@ "author": "Pascal Garber ", "license": "MIT", "devDependencies": { - "@ts-for-gir/cli": "workspace:^", "esbuild": "^0.20.1", "typescript": "^5.2.2" + }, + "dependencies": { + "@girs/soup-3.0": "workspace:^" } } diff --git a/examples/gjs/soup-3-websocket/tsconfig.json b/examples/gjs/soup-3-websocket/tsconfig.json index 9212c917f..c96aba419 100644 --- a/examples/gjs/soup-3-websocket/tsconfig.json +++ b/examples/gjs/soup-3-websocket/tsconfig.json @@ -1,5 +1,4 @@ { - "extends": "./tsconfig.alias.json", "compilerOptions": { "lib": ["ESNext"], "types": [], @@ -12,7 +11,7 @@ "noImplicitThis": true, "alwaysStrict": true, }, - "include": ["@types/gjs.d.ts", "@types/dom.d.ts"], + "include": ["@girs/gjs", "@girs/gjs/dom"], "files": [ "client.ts", ] diff --git a/examples/gjs/timers/package.json b/examples/gjs/timers/package.json index b1180f0b3..44bbae7a9 100644 --- a/examples/gjs/timers/package.json +++ b/examples/gjs/timers/package.json @@ -1,5 +1,5 @@ { - "name": "ts-for-gir-timers-example", + "name": "@ts-for-gir-example/timers-example", "version": "4.0.0", "description": "Simple GJS Gtk 4 example app to demonstrate how you can use .ui template XML files", "main": "index.js", @@ -7,9 +7,8 @@ "private": true, "scripts": { "test": "echo \"Error: no test specified\" && exit 1", - "build:types": "yarn ts-for-gir generate Gtk-4.0 --noNamespace", "build:app": "yarn node esbuild.js", - "build": "yarn build:types && yarn build:app", + "build": "yarn build:app", "start:app": "gjs dist/main.js", "debug:app": "GTK_DEBUG=interactive yarn start:app", "start": "yarn build && yarn start:app", @@ -21,8 +20,10 @@ "author": "Pascal Garber ", "license": "MIT", "devDependencies": { - "@ts-for-gir/cli": "workspace:^", "esbuild": "^0.20.1", "typescript": "^5.2.2" + }, + "dependencies": { + "@girs/gjs": "workspace:^" } } diff --git a/examples/gjs/timers/tsconfig.json b/examples/gjs/timers/tsconfig.json index c1b1f0dca..1b567d15b 100644 --- a/examples/gjs/timers/tsconfig.json +++ b/examples/gjs/timers/tsconfig.json @@ -11,7 +11,7 @@ "noImplicitThis": true, "alwaysStrict": true, }, - "include": ["@types/gjs.d.ts", "@types/dom.d.ts"], + "include": ["@girs/gjs", "@girs/gjs/dom"], "files": [ "main.ts", ] diff --git a/package.json b/package.json index 3524bfcb4..0af61da07 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "clear:build": "yarn workspaces foreach -v --include '@ts-for-gir/*' run clear:build", "clear:types": "rimraf ./@types", "clear:types:local": "rimraf ./@types", - "clear:examples": "yarn workspaces foreach -v --all --exclude @ts-for-gir/cli,@ts-for-gir/lib,@ts-for-gir/generator-base,@ts-for-gir/generator-typescript,@ts-for-gir/generator-html-doc,@gi.ts/parser --parallel run clear", + "clear:examples": "yarn workspaces foreach -v --all --exclude @ts-for-gir/*,@gi.ts/* --parallel run clear", "clear:all": "yarn clear && yarn clear:examples", "watch": "concurrently 'yarn:watch:*'", "watch:cli": "yarn workspace @ts-for-gir/cli run watch", diff --git a/yarn.lock b/yarn.lock index e46fa58d3..2dd9b7904 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8113,6 +8113,269 @@ __metadata: languageName: node linkType: hard +"@ts-for-gir-example/adw-1-hello-example@workspace:examples/gjs/adw-1-hello": + version: 0.0.0-use.local + resolution: "@ts-for-gir-example/adw-1-hello-example@workspace:examples/gjs/adw-1-hello" + dependencies: + "@babel/core": "npm:^7.23.9" + "@girs/adw-1": "workspace:^" + "@girs/gio-2.0": "workspace:^" + "@girs/gjs": "workspace:^" + "@girs/glib-2.0": "workspace:^" + "@girs/gtk-4.0": "workspace:^" + "@rollup/plugin-babel": "npm:^6.0.4" + rollup: "npm:^4.12.0" + typescript: "npm:^5.2.2" + vite: "npm:^5.1.4" + languageName: unknown + linkType: soft + +"@ts-for-gir-example/gio-2-cat-example@workspace:examples/gjs/gio-2-cat": + version: 0.0.0-use.local + resolution: "@ts-for-gir-example/gio-2-cat-example@workspace:examples/gjs/gio-2-cat" + dependencies: + "@girs/gio-2.0": "workspace:^" + "@girs/glib-2.0": "workspace:^" + esbuild: "npm:^0.20.1" + typescript: "npm:^5.2.2" + languageName: unknown + linkType: soft + +"@ts-for-gir-example/gio-2-dbus-example@workspace:examples/gjs/gio-2-dbus": + version: 0.0.0-use.local + resolution: "@ts-for-gir-example/gio-2-dbus-example@workspace:examples/gjs/gio-2-dbus" + dependencies: + "@girs/gjs": "workspace:^" + esbuild: "npm:^0.20.1" + typescript: "npm:^5.2.2" + languageName: unknown + linkType: soft + +"@ts-for-gir-example/gio-2-list-model-example@workspace:examples/gjs/gio-2-list-model": + version: 0.0.0-use.local + resolution: "@ts-for-gir-example/gio-2-list-model-example@workspace:examples/gjs/gio-2-list-model" + dependencies: + esbuild: "npm:^0.20.1" + typescript: "npm:^5.2.2" + languageName: unknown + linkType: soft + +"@ts-for-gir-example/gjs-gtk-4-custom-widget-example@workspace:examples/gjs/gtk-4-custom-widget": + version: 0.0.0-use.local + resolution: "@ts-for-gir-example/gjs-gtk-4-custom-widget-example@workspace:examples/gjs/gtk-4-custom-widget" + dependencies: + "@ts-for-gir/cli": "workspace:^" + esbuild: "npm:^0.20.1" + typescript: "npm:^5.2.2" + languageName: unknown + linkType: soft + +"@ts-for-gir-example/glib-2-spawn-command-example@workspace:examples/gjs/glib-2-spawn-command": + version: 0.0.0-use.local + resolution: "@ts-for-gir-example/glib-2-spawn-command-example@workspace:examples/gjs/glib-2-spawn-command" + dependencies: + fork-ts-checker-webpack-plugin: "npm:^9.0.2" + ts-loader: "npm:^9.5.1" + typescript: "npm:^5.2.2" + webpack: "npm:^5.90.3" + webpack-cli: "npm:^5.1.4" + languageName: unknown + linkType: soft + +"@ts-for-gir-example/glib-2-variant-example@workspace:examples/gjs/glib-2-variant": + version: 0.0.0-use.local + resolution: "@ts-for-gir-example/glib-2-variant-example@workspace:examples/gjs/glib-2-variant" + dependencies: + esbuild: "npm:^0.20.1" + typescript: "npm:^5.2.2" + languageName: unknown + linkType: soft + +"@ts-for-gir-example/gtk-3-browser-example@workspace:examples/gjs/gtk-3-browser": + version: 0.0.0-use.local + resolution: "@ts-for-gir-example/gtk-3-browser-example@workspace:examples/gjs/gtk-3-browser" + dependencies: + "@girs/gjs": "workspace:^" + "@girs/gtk-3.0": "workspace:^" + "@girs/pango-1.0": "workspace:^" + "@girs/webkit2-4.0": "workspace:^" + fork-ts-checker-webpack-plugin: "npm:^9.0.2" + ts-loader: "npm:^9.5.1" + typescript: "npm:^5.2.2" + webpack: "npm:^5.90.3" + webpack-cli: "npm:^5.1.4" + languageName: unknown + linkType: soft + +"@ts-for-gir-example/gtk-3-builder-example@workspace:examples/gjs/gtk-3-builder": + version: 0.0.0-use.local + resolution: "@ts-for-gir-example/gtk-3-builder-example@workspace:examples/gjs/gtk-3-builder" + dependencies: + "@girs/gtk-3.0": "workspace:^" + fork-ts-checker-webpack-plugin: "npm:^9.0.2" + raw-loader: "npm:^4.0.2" + ts-loader: "npm:^9.5.1" + typescript: "npm:^5.2.2" + webpack: "npm:^5.90.3" + webpack-cli: "npm:^5.1.4" + languageName: unknown + linkType: soft + +"@ts-for-gir-example/gtk-3-calc-example@workspace:examples/gjs/gtk-3-calc": + version: 0.0.0-use.local + resolution: "@ts-for-gir-example/gtk-3-calc-example@workspace:examples/gjs/gtk-3-calc" + dependencies: + "@girs/gtk-3.0": "workspace:^" + esbuild: "npm:^0.20.1" + typescript: "npm:^5.2.2" + languageName: unknown + linkType: soft + +"@ts-for-gir-example/gtk-3-editor-example@workspace:examples/gjs/gtk-3-editor": + version: 0.0.0-use.local + resolution: "@ts-for-gir-example/gtk-3-editor-example@workspace:examples/gjs/gtk-3-editor" + dependencies: + "@girs/gjs": "workspace:^" + "@girs/gtk-3.0": "workspace:^" + "@girs/gtksource-3.0": "workspace:^" + fork-ts-checker-webpack-plugin: "npm:^9.0.2" + ts-loader: "npm:^9.5.1" + typescript: "npm:^5.2.2" + webpack: "npm:^5.90.3" + webpack-cli: "npm:^5.1.4" + languageName: unknown + linkType: soft + +"@ts-for-gir-example/gtk-3-gettext-example@workspace:examples/gjs/gtk-3-gettext": + version: 0.0.0-use.local + resolution: "@ts-for-gir-example/gtk-3-gettext-example@workspace:examples/gjs/gtk-3-gettext" + dependencies: + "@girs/gjs": "workspace:^" + "@girs/gtk-3.0": "workspace:^" + esbuild: "npm:^0.20.1" + typescript: "npm:^5.2.2" + languageName: unknown + linkType: soft + +"@ts-for-gir-example/gtk-3-hello-2-example@workspace:examples/gjs/gtk-3-hello-2": + version: 0.0.0-use.local + resolution: "@ts-for-gir-example/gtk-3-hello-2-example@workspace:examples/gjs/gtk-3-hello-2" + dependencies: + "@girs/gjs": "workspace:^" + "@girs/gtk-3.0": "workspace:^" + esbuild: "npm:^0.20.1" + typescript: "npm:^5.2.2" + languageName: unknown + linkType: soft + +"@ts-for-gir-example/gtk-3-hello-example@workspace:examples/gjs/gtk-3-hello": + version: 0.0.0-use.local + resolution: "@ts-for-gir-example/gtk-3-hello-example@workspace:examples/gjs/gtk-3-hello" + dependencies: + "@girs/gjs": "workspace:^" + "@girs/gtk-3.0": "workspace:^" + fork-ts-checker-webpack-plugin: "npm:^9.0.2" + ts-loader: "npm:^9.5.1" + typescript: "npm:^5.2.2" + webpack: "npm:^5.90.3" + webpack-cli: "npm:^5.1.4" + languageName: unknown + linkType: soft + +"@ts-for-gir-example/gtk-3-template-example@workspace:examples/gjs/gtk-3-template": + version: 0.0.0-use.local + resolution: "@ts-for-gir-example/gtk-3-template-example@workspace:examples/gjs/gtk-3-template" + dependencies: + "@girs/gjs": "workspace:^" + "@girs/gtk-3.0": "workspace:^" + esbuild: "npm:^0.20.1" + typescript: "npm:^5.2.2" + languageName: unknown + linkType: soft + +"@ts-for-gir-example/gtk-3-webkit-example@workspace:examples/gjs/gtk-3-webkit": + version: 0.0.0-use.local + resolution: "@ts-for-gir-example/gtk-3-webkit-example@workspace:examples/gjs/gtk-3-webkit" + dependencies: + "@girs/gjs": "workspace:^" + "@girs/webkit2-4.0": "workspace:^" + esbuild: "npm:^0.20.1" + typescript: "npm:^5.2.2" + languageName: unknown + linkType: soft + +"@ts-for-gir-example/gtk-4-application-example@workspace:examples/gjs/gtk-4-application": + version: 0.0.0-use.local + resolution: "@ts-for-gir-example/gtk-4-application-example@workspace:examples/gjs/gtk-4-application" + dependencies: + "@girs/gjs": "workspace:^" + "@girs/gtk-4.0": "workspace:^" + esbuild: "npm:^0.20.1" + typescript: "npm:^5.2.2" + languageName: unknown + linkType: soft + +"@ts-for-gir-example/gtk-4-list-store-example@workspace:examples/gjs/gtk-4-list-store": + version: 0.0.0-use.local + resolution: "@ts-for-gir-example/gtk-4-list-store-example@workspace:examples/gjs/gtk-4-list-store" + dependencies: + esbuild: "npm:^0.20.1" + typescript: "npm:^5.2.2" + languageName: unknown + linkType: soft + +"@ts-for-gir-example/gtk-4-template-example@workspace:examples/gjs/gtk-4-template": + version: 0.0.0-use.local + resolution: "@ts-for-gir-example/gtk-4-template-example@workspace:examples/gjs/gtk-4-template" + dependencies: + "@girs/gjs": "workspace:^" + "@girs/gtk-4.0": "workspace:^" + "@ts-for-gir/cli": "workspace:^" + esbuild: "npm:^0.20.1" + typescript: "npm:^5.2.2" + languageName: unknown + linkType: soft + +"@ts-for-gir-example/run-async-example@workspace:examples/gjs/run-async": + version: 0.0.0-use.local + resolution: "@ts-for-gir-example/run-async-example@workspace:examples/gjs/run-async" + dependencies: + "@girs/adw-1": "workspace:^" + esbuild: "npm:^0.20.1" + typescript: "npm:^5.2.2" + languageName: unknown + linkType: soft + +"@ts-for-gir-example/soup-3-http-example@workspace:examples/gjs/soup-3-http": + version: 0.0.0-use.local + resolution: "@ts-for-gir-example/soup-3-http-example@workspace:examples/gjs/soup-3-http" + dependencies: + "@girs/soup-3.0": "workspace:^" + esbuild: "npm:^0.20.1" + typescript: "npm:^5.2.2" + languageName: unknown + linkType: soft + +"@ts-for-gir-example/soup-3-websocket-example@workspace:examples/gjs/soup-3-websocket": + version: 0.0.0-use.local + resolution: "@ts-for-gir-example/soup-3-websocket-example@workspace:examples/gjs/soup-3-websocket" + dependencies: + "@girs/soup-3.0": "workspace:^" + esbuild: "npm:^0.20.1" + typescript: "npm:^5.2.2" + languageName: unknown + linkType: soft + +"@ts-for-gir-example/timers-example@workspace:examples/gjs/timers": + version: 0.0.0-use.local + resolution: "@ts-for-gir-example/timers-example@workspace:examples/gjs/timers" + dependencies: + "@girs/gjs": "workspace:^" + esbuild: "npm:^0.20.1" + typescript: "npm:^5.2.2" + languageName: unknown + linkType: soft + "@ts-for-gir/cli@workspace:^, @ts-for-gir/cli@workspace:packages/cli": version: 0.0.0-use.local resolution: "@ts-for-gir/cli@workspace:packages/cli" @@ -12021,289 +12284,6 @@ __metadata: languageName: node linkType: hard -"ts-for-gir-adw-1-hello-example@workspace:examples/gjs/adw-1-hello": - version: 0.0.0-use.local - resolution: "ts-for-gir-adw-1-hello-example@workspace:examples/gjs/adw-1-hello" - dependencies: - "@babel/core": "npm:^7.23.9" - "@girs/adw-1": "workspace:^" - "@girs/gio-2.0": "workspace:^" - "@girs/gjs": "workspace:^" - "@girs/glib-2.0": "workspace:^" - "@girs/gtk-4.0": "workspace:^" - "@rollup/plugin-babel": "npm:^6.0.4" - rollup: "npm:^4.12.0" - typescript: "npm:^5.2.2" - vite: "npm:^5.1.4" - languageName: unknown - linkType: soft - -"ts-for-gir-gio-2-cat-example@workspace:examples/gjs/gio-2-cat": - version: 0.0.0-use.local - resolution: "ts-for-gir-gio-2-cat-example@workspace:examples/gjs/gio-2-cat" - dependencies: - "@ts-for-gir/cli": "workspace:^" - esbuild: "npm:^0.20.1" - typescript: "npm:^5.2.2" - languageName: unknown - linkType: soft - -"ts-for-gir-gio-2-cat-promisify-example@workspace:examples/gjs/gio-2-cat-promisify": - version: 0.0.0-use.local - resolution: "ts-for-gir-gio-2-cat-promisify-example@workspace:examples/gjs/gio-2-cat-promisify" - dependencies: - "@ts-for-gir/cli": "workspace:^" - esbuild: "npm:^0.20.1" - typescript: "npm:^5.2.2" - languageName: unknown - linkType: soft - -"ts-for-gir-gio-2-cat-promisify-packages@workspace:examples/gjs/gio-2-cat-packages": - version: 0.0.0-use.local - resolution: "ts-for-gir-gio-2-cat-promisify-packages@workspace:examples/gjs/gio-2-cat-packages" - dependencies: - "@girs/gio-2.0": "workspace:^" - "@girs/gjs": "workspace:^" - esbuild: "npm:^0.20.1" - typescript: "npm:^5.2.2" - languageName: unknown - linkType: soft - -"ts-for-gir-gio-2-cat-types-only-example@workspace:examples/gjs/gio-2-cat-types-only": - version: 0.0.0-use.local - resolution: "ts-for-gir-gio-2-cat-types-only-example@workspace:examples/gjs/gio-2-cat-types-only" - dependencies: - "@ts-for-gir/cli": "workspace:^" - esbuild: "npm:^0.20.1" - typescript: "npm:^5.2.2" - languageName: unknown - linkType: soft - -"ts-for-gir-gio-2-dbus-example@workspace:examples/gjs/gio-2-dbus": - version: 0.0.0-use.local - resolution: "ts-for-gir-gio-2-dbus-example@workspace:examples/gjs/gio-2-dbus" - dependencies: - "@ts-for-gir/cli": "workspace:^" - esbuild: "npm:^0.20.1" - typescript: "npm:^5.2.2" - languageName: unknown - linkType: soft - -"ts-for-gir-gio-2-list-model-example@workspace:examples/gjs/gio-2-list-model": - version: 0.0.0-use.local - resolution: "ts-for-gir-gio-2-list-model-example@workspace:examples/gjs/gio-2-list-model" - dependencies: - "@ts-for-gir/cli": "workspace:^" - esbuild: "npm:^0.20.1" - typescript: "npm:^5.2.2" - languageName: unknown - linkType: soft - -"ts-for-gir-gjs-gtk-4-custom-widget-example@workspace:examples/gjs/gtk-4-custom-widget": - version: 0.0.0-use.local - resolution: "ts-for-gir-gjs-gtk-4-custom-widget-example@workspace:examples/gjs/gtk-4-custom-widget" - dependencies: - "@ts-for-gir/cli": "workspace:^" - esbuild: "npm:^0.20.1" - typescript: "npm:^5.2.2" - languageName: unknown - linkType: soft - -"ts-for-gir-glib-2-spawn-command-example@workspace:examples/gjs/glib-2-spawn-command": - version: 0.0.0-use.local - resolution: "ts-for-gir-glib-2-spawn-command-example@workspace:examples/gjs/glib-2-spawn-command" - dependencies: - "@ts-for-gir/cli": "workspace:^" - fork-ts-checker-webpack-plugin: "npm:^9.0.2" - ts-loader: "npm:^9.5.1" - typescript: "npm:^5.2.2" - webpack: "npm:^5.90.3" - webpack-cli: "npm:^5.1.4" - languageName: unknown - linkType: soft - -"ts-for-gir-glib-2-variant-example@workspace:examples/gjs/glib-2-variant": - version: 0.0.0-use.local - resolution: "ts-for-gir-glib-2-variant-example@workspace:examples/gjs/glib-2-variant" - dependencies: - "@ts-for-gir/cli": "workspace:^" - esbuild: "npm:^0.20.1" - typescript: "npm:^5.2.2" - languageName: unknown - linkType: soft - -"ts-for-gir-gtk-3-browser-example@workspace:examples/gjs/gtk-3-browser": - version: 0.0.0-use.local - resolution: "ts-for-gir-gtk-3-browser-example@workspace:examples/gjs/gtk-3-browser" - dependencies: - "@ts-for-gir/cli": "workspace:^" - fork-ts-checker-webpack-plugin: "npm:^9.0.2" - ts-loader: "npm:^9.5.1" - typescript: "npm:^5.2.2" - webpack: "npm:^5.90.3" - webpack-cli: "npm:^5.1.4" - languageName: unknown - linkType: soft - -"ts-for-gir-gtk-3-builder-example@workspace:examples/gjs/gtk-3-builder": - version: 0.0.0-use.local - resolution: "ts-for-gir-gtk-3-builder-example@workspace:examples/gjs/gtk-3-builder" - dependencies: - "@ts-for-gir/cli": "workspace:^" - fork-ts-checker-webpack-plugin: "npm:^9.0.2" - raw-loader: "npm:^4.0.2" - ts-loader: "npm:^9.5.1" - typescript: "npm:^5.2.2" - webpack: "npm:^5.90.3" - webpack-cli: "npm:^5.1.4" - languageName: unknown - linkType: soft - -"ts-for-gir-gtk-3-calc-example@workspace:examples/gjs/gtk-3-calc": - version: 0.0.0-use.local - resolution: "ts-for-gir-gtk-3-calc-example@workspace:examples/gjs/gtk-3-calc" - dependencies: - "@ts-for-gir/cli": "workspace:^" - esbuild: "npm:^0.20.1" - typescript: "npm:^5.2.2" - languageName: unknown - linkType: soft - -"ts-for-gir-gtk-3-editor-example@workspace:examples/gjs/gtk-3-editor": - version: 0.0.0-use.local - resolution: "ts-for-gir-gtk-3-editor-example@workspace:examples/gjs/gtk-3-editor" - dependencies: - "@ts-for-gir/cli": "workspace:^" - fork-ts-checker-webpack-plugin: "npm:^9.0.2" - ts-loader: "npm:^9.5.1" - typescript: "npm:^5.2.2" - webpack: "npm:^5.90.3" - webpack-cli: "npm:^5.1.4" - languageName: unknown - linkType: soft - -"ts-for-gir-gtk-3-gettext-example@workspace:examples/gjs/gtk-3-gettext": - version: 0.0.0-use.local - resolution: "ts-for-gir-gtk-3-gettext-example@workspace:examples/gjs/gtk-3-gettext" - dependencies: - "@ts-for-gir/cli": "workspace:^" - esbuild: "npm:^0.20.1" - typescript: "npm:^5.2.2" - languageName: unknown - linkType: soft - -"ts-for-gir-gtk-3-hello-2-example@workspace:examples/gjs/gtk-3-hello-2": - version: 0.0.0-use.local - resolution: "ts-for-gir-gtk-3-hello-2-example@workspace:examples/gjs/gtk-3-hello-2" - dependencies: - "@ts-for-gir/cli": "workspace:^" - esbuild: "npm:^0.20.1" - typescript: "npm:^5.2.2" - languageName: unknown - linkType: soft - -"ts-for-gir-gtk-3-hello-example@workspace:examples/gjs/gtk-3-hello": - version: 0.0.0-use.local - resolution: "ts-for-gir-gtk-3-hello-example@workspace:examples/gjs/gtk-3-hello" - dependencies: - "@ts-for-gir/cli": "workspace:^" - fork-ts-checker-webpack-plugin: "npm:^9.0.2" - ts-loader: "npm:^9.5.1" - typescript: "npm:^5.2.2" - webpack: "npm:^5.90.3" - webpack-cli: "npm:^5.1.4" - languageName: unknown - linkType: soft - -"ts-for-gir-gtk-3-template-example@workspace:examples/gjs/gtk-3-template": - version: 0.0.0-use.local - resolution: "ts-for-gir-gtk-3-template-example@workspace:examples/gjs/gtk-3-template" - dependencies: - "@ts-for-gir/cli": "workspace:^" - esbuild: "npm:^0.20.1" - typescript: "npm:^5.2.2" - languageName: unknown - linkType: soft - -"ts-for-gir-gtk-3-webkit-example@workspace:examples/gjs/gtk-3-webkit": - version: 0.0.0-use.local - resolution: "ts-for-gir-gtk-3-webkit-example@workspace:examples/gjs/gtk-3-webkit" - dependencies: - "@ts-for-gir/cli": "workspace:^" - esbuild: "npm:^0.20.1" - typescript: "npm:^5.2.2" - languageName: unknown - linkType: soft - -"ts-for-gir-gtk-4-application-example@workspace:examples/gjs/gtk-4-application": - version: 0.0.0-use.local - resolution: "ts-for-gir-gtk-4-application-example@workspace:examples/gjs/gtk-4-application" - dependencies: - "@ts-for-gir/cli": "workspace:^" - esbuild: "npm:^0.20.1" - typescript: "npm:^5.2.2" - languageName: unknown - linkType: soft - -"ts-for-gir-gtk-4-list-store-example@workspace:examples/gjs/gtk-4-list-store": - version: 0.0.0-use.local - resolution: "ts-for-gir-gtk-4-list-store-example@workspace:examples/gjs/gtk-4-list-store" - dependencies: - "@ts-for-gir/cli": "workspace:^" - esbuild: "npm:^0.20.1" - typescript: "npm:^5.2.2" - languageName: unknown - linkType: soft - -"ts-for-gir-gtk-4-template-example@workspace:examples/gjs/gtk-4-template": - version: 0.0.0-use.local - resolution: "ts-for-gir-gtk-4-template-example@workspace:examples/gjs/gtk-4-template" - dependencies: - "@ts-for-gir/cli": "workspace:^" - esbuild: "npm:^0.20.1" - typescript: "npm:^5.2.2" - languageName: unknown - linkType: soft - -"ts-for-gir-run-async-example@workspace:examples/gjs/run-async": - version: 0.0.0-use.local - resolution: "ts-for-gir-run-async-example@workspace:examples/gjs/run-async" - dependencies: - esbuild: "npm:^0.20.1" - typescript: "npm:^5.2.2" - languageName: unknown - linkType: soft - -"ts-for-gir-soup-3-http-example@workspace:examples/gjs/soup-3-http": - version: 0.0.0-use.local - resolution: "ts-for-gir-soup-3-http-example@workspace:examples/gjs/soup-3-http" - dependencies: - "@ts-for-gir/cli": "workspace:^" - esbuild: "npm:^0.20.1" - typescript: "npm:^5.2.2" - languageName: unknown - linkType: soft - -"ts-for-gir-soup-3-websocket-example@workspace:examples/gjs/soup-3-websocket": - version: 0.0.0-use.local - resolution: "ts-for-gir-soup-3-websocket-example@workspace:examples/gjs/soup-3-websocket" - dependencies: - "@ts-for-gir/cli": "workspace:^" - esbuild: "npm:^0.20.1" - typescript: "npm:^5.2.2" - languageName: unknown - linkType: soft - -"ts-for-gir-timers-example@workspace:examples/gjs/timers": - version: 0.0.0-use.local - resolution: "ts-for-gir-timers-example@workspace:examples/gjs/timers" - dependencies: - "@ts-for-gir/cli": "workspace:^" - esbuild: "npm:^0.20.1" - typescript: "npm:^5.2.2" - languageName: unknown - linkType: soft - "ts-for-gir@workspace:.": version: 0.0.0-use.local resolution: "ts-for-gir@workspace:."