diff --git a/NEWS.md b/NEWS.md index 08a02b84b..34e623fea 100644 --- a/NEWS.md +++ b/NEWS.md @@ -3,6 +3,11 @@ - Create a Reporter to create a text or json file with warnings like unknown types, renaming, etc and a summary of all that (e.g. 5 type conflicts resolved, 8 unknown types of *gint) - Update types for GJS v1.75.2, see https://gitlab.gnome.org/GNOME/gjs/-/commit/666755b3b09d765e43d415e76105b828517b5509 +# 3.2.5 +- Upgrade dependencies +- Allow ambient modules without version for NPM packages, see #139 +- Add information about ESM and CommonJS modules to README.md for NPM packages + # 3.2.4 - Upgrade dependencies - Add instruction to install `GnomeBluetooth-3.0.gir` on Fedora diff --git a/examples/gjs/adw-1-hello/package.json b/examples/gjs/adw-1-hello/package.json index 846b08067..b338bbdb2 100644 --- a/examples/gjs/adw-1-hello/package.json +++ b/examples/gjs/adw-1-hello/package.json @@ -1,6 +1,6 @@ { "name": "ts-for-gir-adw-1-hello-example", - "version": "3.2.4", + "version": "3.2.5", "description": "Simple GJS Typescript hello-world example using Libadwaita", "main": "index.js", "type": "module", diff --git a/examples/gjs/gio-2-cat-alias/package.json b/examples/gjs/gio-2-cat-alias/package.json index b750efe78..30c333108 100644 --- a/examples/gjs/gio-2-cat-alias/package.json +++ b/examples/gjs/gio-2-cat-alias/package.json @@ -1,6 +1,6 @@ { "name": "ts-for-gir-gio-2-cat-alias-example", - "version": "3.2.4", + "version": "3.2.5", "description": "Simple GJS Gtk 3 example app that shows how you can translate strings with gettext", "main": "index.js", "type": "module", diff --git a/examples/gjs/gio-2-cat-packages/package.json b/examples/gjs/gio-2-cat-packages/package.json index 3e99f15da..f6791780f 100644 --- a/examples/gjs/gio-2-cat-packages/package.json +++ b/examples/gjs/gio-2-cat-packages/package.json @@ -1,6 +1,6 @@ { "name": "ts-for-gir-gio-2-cat-promisify-packages", - "version": "3.2.4", + "version": "3.2.5", "description": "Simple GJS Gtk 3 example app that shows how you can translate strings with gettext", "main": "index.js", "type": "module", diff --git a/examples/gjs/gio-2-cat-promisify/package.json b/examples/gjs/gio-2-cat-promisify/package.json index 5d4fd8456..4d2aabd0a 100644 --- a/examples/gjs/gio-2-cat-promisify/package.json +++ b/examples/gjs/gio-2-cat-promisify/package.json @@ -1,6 +1,6 @@ { "name": "ts-for-gir-gio-2-cat-promisify-example", - "version": "3.2.4", + "version": "3.2.5", "description": "Simple GJS Gtk 3 example app that shows how you can translate strings with gettext", "main": "index.js", "type": "module", diff --git a/examples/gjs/gio-2-cat-types-only/package.json b/examples/gjs/gio-2-cat-types-only/package.json index bcf6ca29c..24ec44051 100644 --- a/examples/gjs/gio-2-cat-types-only/package.json +++ b/examples/gjs/gio-2-cat-types-only/package.json @@ -1,6 +1,6 @@ { "name": "ts-for-gir-gio-2-cat-types-only-example", - "version": "3.2.4", + "version": "3.2.5", "description": "Simple GJS Gtk 3 example app that shows how you can translate strings with gettext", "main": "index.js", "type": "module", diff --git a/examples/gjs/gio-2-cat/package.json b/examples/gjs/gio-2-cat/package.json index 44f12bd43..036cfb6cc 100644 --- a/examples/gjs/gio-2-cat/package.json +++ b/examples/gjs/gio-2-cat/package.json @@ -1,6 +1,6 @@ { "name": "ts-for-gir-gio-2-cat-example", - "version": "3.2.4", + "version": "3.2.5", "description": "Simple GJS Gtk 3 example app that shows how you can translate strings with gettext", "main": "index.js", "type": "module", diff --git a/examples/gjs/gio-2-dbus/package.json b/examples/gjs/gio-2-dbus/package.json index ea0ea9bb2..a8dd6cda0 100644 --- a/examples/gjs/gio-2-dbus/package.json +++ b/examples/gjs/gio-2-dbus/package.json @@ -1,6 +1,6 @@ { "name": "ts-for-gir-gio-2-dbus-example", - "version": "3.2.4", + "version": "3.2.5", "description": "GJS example showing how to build a DBus server/client", "main": "index.js", "type": "module", diff --git a/examples/gjs/gio-2-list-model/package.json b/examples/gjs/gio-2-list-model/package.json index ba1ca3144..c142d3deb 100644 --- a/examples/gjs/gio-2-list-model/package.json +++ b/examples/gjs/gio-2-list-model/package.json @@ -1,6 +1,6 @@ { "name": "ts-for-gir-gio-2-list-model-example", - "version": "3.2.4", + "version": "3.2.5", "description": "An example of implementing the GListModel interface in GJS", "main": "index.js", "type": "module", diff --git a/examples/gjs/glib-2-spawn-command/package.json b/examples/gjs/glib-2-spawn-command/package.json index 94ae91f25..da4eb0964 100644 --- a/examples/gjs/glib-2-spawn-command/package.json +++ b/examples/gjs/glib-2-spawn-command/package.json @@ -1,6 +1,6 @@ { "name": "ts-for-gir-glib-2-spawn-command-example", - "version": "3.2.4", + "version": "3.2.5", "description": "", "module": "dist/main.js", "private": true, diff --git a/examples/gjs/glib-2-variant/package.json b/examples/gjs/glib-2-variant/package.json index 2956383a4..f3036bf9f 100644 --- a/examples/gjs/glib-2-variant/package.json +++ b/examples/gjs/glib-2-variant/package.json @@ -1,6 +1,6 @@ { "name": "ts-for-gir-glib-2-variant-example", - "version": "3.2.4", + "version": "3.2.5", "description": "ts-for-gir GVariant example based on https://gjs.guide/guides/glib/gvariant.html", "main": "index.js", "type": "module", diff --git a/examples/gjs/gtk-3-application/package.json b/examples/gjs/gtk-3-application/package.json index a17f55857..82c64f5f9 100644 --- a/examples/gjs/gtk-3-application/package.json +++ b/examples/gjs/gtk-3-application/package.json @@ -1,6 +1,6 @@ { "name": "ts-for-gir-gtk-3-application-example", - "version": "3.2.4", + "version": "3.2.5", "description": "Simple GJS Gtk 3 example app to demonstrate how you can use and extend Gtk.Application", "main": "index.js", "type": "module", diff --git a/examples/gjs/gtk-3-browser/package.json b/examples/gjs/gtk-3-browser/package.json index 2fe377386..04d2bf6cb 100644 --- a/examples/gjs/gtk-3-browser/package.json +++ b/examples/gjs/gtk-3-browser/package.json @@ -1,6 +1,6 @@ { "name": "ts-for-gir-gtk-3-browser-example", - "version": "3.2.4", + "version": "3.2.5", "description": "", "module": "dist/main.js", "type": "module", diff --git a/examples/gjs/gtk-3-builder/package.json b/examples/gjs/gtk-3-builder/package.json index 8bf3115cf..d6b214d56 100644 --- a/examples/gjs/gtk-3-builder/package.json +++ b/examples/gjs/gtk-3-builder/package.json @@ -1,6 +1,6 @@ { "name": "ts-for-gir-gtk-3-builder-example", - "version": "3.2.4", + "version": "3.2.5", "description": "", "main": "main.ts", "private": true, diff --git a/examples/gjs/gtk-3-calc/package.json b/examples/gjs/gtk-3-calc/package.json index 7fbad9b50..5bc2d2974 100644 --- a/examples/gjs/gtk-3-calc/package.json +++ b/examples/gjs/gtk-3-calc/package.json @@ -1,6 +1,6 @@ { "name": "ts-for-gir-gtk-3-calc-example", - "version": "3.2.4", + "version": "3.2.5", "description": "Simple GJS Gtk 3 calculator example app", "main": "index.js", "type": "module", diff --git a/examples/gjs/gtk-3-editor/package.json b/examples/gjs/gtk-3-editor/package.json index 033e295aa..3196f63a6 100644 --- a/examples/gjs/gtk-3-editor/package.json +++ b/examples/gjs/gtk-3-editor/package.json @@ -1,6 +1,6 @@ { "name": "ts-for-gir-gtk-3-editor-example", - "version": "3.2.4", + "version": "3.2.5", "description": "", "main": "main.ts", "private": true, diff --git a/examples/gjs/gtk-3-gettext/package.json b/examples/gjs/gtk-3-gettext/package.json index 713b1ed0b..dc2a9ea83 100644 --- a/examples/gjs/gtk-3-gettext/package.json +++ b/examples/gjs/gtk-3-gettext/package.json @@ -1,6 +1,6 @@ { "name": "ts-for-gir-gtk-3-gettext-example", - "version": "3.2.4", + "version": "3.2.5", "description": "Simple GJS Gtk 3 example app that shows how you can translate strings with gettext", "main": "index.js", "type": "module", diff --git a/examples/gjs/gtk-3-hello-2/package.json b/examples/gjs/gtk-3-hello-2/package.json index 89a7272e4..4be772611 100644 --- a/examples/gjs/gtk-3-hello-2/package.json +++ b/examples/gjs/gtk-3-hello-2/package.json @@ -1,6 +1,6 @@ { "name": "ts-for-gir-gtk-3-hello-2-example", - "version": "3.2.4", + "version": "3.2.5", "description": "Simple GJS Gtk 3 example app to demonstrate how you can connect to Gtk signals", "main": "index.js", "type": "module", diff --git a/examples/gjs/gtk-3-hello/package.json b/examples/gjs/gtk-3-hello/package.json index cd37e1686..69b845635 100644 --- a/examples/gjs/gtk-3-hello/package.json +++ b/examples/gjs/gtk-3-hello/package.json @@ -1,6 +1,6 @@ { "name": "ts-for-gir-gtk-3-hello-example", - "version": "3.2.4", + "version": "3.2.5", "description": "", "main": "main.ts", "private": true, diff --git a/examples/gjs/gtk-3-template/package.json b/examples/gjs/gtk-3-template/package.json index 18ce0eb7e..cb47afa53 100644 --- a/examples/gjs/gtk-3-template/package.json +++ b/examples/gjs/gtk-3-template/package.json @@ -1,6 +1,6 @@ { "name": "ts-for-gir-gtk-3-template-example", - "version": "3.2.4", + "version": "3.2.5", "description": "Simple GJS Gtk 3 example app to demonstrate how you can use .ui template XML files", "main": "index.js", "type": "module", diff --git a/examples/gjs/gtk-3-webkit/package.json b/examples/gjs/gtk-3-webkit/package.json index c869cfdc3..d9937d7d5 100644 --- a/examples/gjs/gtk-3-webkit/package.json +++ b/examples/gjs/gtk-3-webkit/package.json @@ -1,6 +1,6 @@ { "name": "ts-for-gir-gtk-3-webkit-example", - "version": "3.2.4", + "version": "3.2.5", "description": "Simple GJS Gtk 3 example app to demonstrate how you can use WebKit2", "main": "index.js", "type": "module", diff --git a/examples/gjs/gtk-4-custom-widget/package.json b/examples/gjs/gtk-4-custom-widget/package.json index 5f00ff2b1..aefd0eb2d 100644 --- a/examples/gjs/gtk-4-custom-widget/package.json +++ b/examples/gjs/gtk-4-custom-widget/package.json @@ -1,6 +1,6 @@ { "name": "ts-for-gir-gjs-gtk-4-custom-widget-example", - "version": "3.2.4", + "version": "3.2.5", "description": "This example shows the usage of custom widgets and virtual functions in GJS", "main": "dist/index.js", "type": "module", diff --git a/examples/gjs/gtk-4-list-store/package.json b/examples/gjs/gtk-4-list-store/package.json index 5595401e7..6d5c2f2b0 100644 --- a/examples/gjs/gtk-4-list-store/package.json +++ b/examples/gjs/gtk-4-list-store/package.json @@ -1,6 +1,6 @@ { "name": "ts-for-gir-gtk-4-list-store-example", - "version": "3.2.4", + "version": "3.2.5", "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", "type": "module", diff --git a/examples/gjs/gtk-4-template/package.json b/examples/gjs/gtk-4-template/package.json index 5c9b162f0..75bdabc38 100644 --- a/examples/gjs/gtk-4-template/package.json +++ b/examples/gjs/gtk-4-template/package.json @@ -1,6 +1,6 @@ { "name": "ts-for-gir-gtk-4-template-example", - "version": "3.2.4", + "version": "3.2.5", "description": "Simple GJS Gtk 4 example app to demonstrate how you can use .ui template XML files", "main": "index.js", "type": "module", diff --git a/examples/gjs/soup-3-http/package.json b/examples/gjs/soup-3-http/package.json index 80407a970..b23074017 100644 --- a/examples/gjs/soup-3-http/package.json +++ b/examples/gjs/soup-3-http/package.json @@ -1,6 +1,6 @@ { "name": "ts-for-gir-soup-3-http-example", - "version": "3.2.4", + "version": "3.2.5", "description": "GJS example showing how to build a http server/client using Soap 3", "main": "index.js", "type": "module", diff --git a/examples/gjs/soup-3-websocket/package.json b/examples/gjs/soup-3-websocket/package.json index 85e203dd7..aa4c7776f 100644 --- a/examples/gjs/soup-3-websocket/package.json +++ b/examples/gjs/soup-3-websocket/package.json @@ -1,6 +1,6 @@ { "name": "ts-for-gir-soup-3-websocket-example", - "version": "3.2.4", + "version": "3.2.5", "description": "Simple GJS Soup 3 example app to demonstrate how you can use WebSockets", "main": "index.js", "type": "module", diff --git a/examples/gjs/timers/package.json b/examples/gjs/timers/package.json index edf809207..68f4fcc73 100644 --- a/examples/gjs/timers/package.json +++ b/examples/gjs/timers/package.json @@ -1,6 +1,6 @@ { "name": "ts-for-gir-timers-example", - "version": "3.2.4", + "version": "3.2.5", "description": "Simple GJS Gtk 4 example app to demonstrate how you can use .ui template XML files", "main": "index.js", "type": "module", diff --git a/examples/node-gtk/gio-2-cat-packages/package.json b/examples/node-gtk/gio-2-cat-packages/package.json index 6b7118b6e..4c732e7b9 100644 --- a/examples/node-gtk/gio-2-cat-packages/package.json +++ b/examples/node-gtk/gio-2-cat-packages/package.json @@ -1,6 +1,6 @@ { "name": "ts-for-gir-node-gtk-gio-2-cat-promisify-packages", - "version": "3.2.4", + "version": "3.2.5", "description": "Simple Node Gtk 3 example app that shows how you can translate strings with gettext", "main": "index.js", "type": "commonjs", diff --git a/examples/node-gtk/glib-2-spawn-command/package.json b/examples/node-gtk/glib-2-spawn-command/package.json index f069a7648..1e4fb39c6 100644 --- a/examples/node-gtk/glib-2-spawn-command/package.json +++ b/examples/node-gtk/glib-2-spawn-command/package.json @@ -1,6 +1,6 @@ { "name": "ts-for-gir-node-glib-2-spawn-command-example", - "version": "3.2.4", + "version": "3.2.5", "description": "", "main": "main.ts", "private": true, diff --git a/examples/node-gtk/gtk-3-browser/package.json b/examples/node-gtk/gtk-3-browser/package.json index b39a9f606..71455daeb 100644 --- a/examples/node-gtk/gtk-3-browser/package.json +++ b/examples/node-gtk/gtk-3-browser/package.json @@ -1,6 +1,6 @@ { "name": "ts-for-gir-node-gtk-3-browser-example", - "version": "3.2.4", + "version": "3.2.5", "description": "", "main": "dist/main.js", "private": true, diff --git a/examples/node-gtk/gtk-3-builder-auto-connect-signals/package.json b/examples/node-gtk/gtk-3-builder-auto-connect-signals/package.json index a1f794555..90f1448fb 100644 --- a/examples/node-gtk/gtk-3-builder-auto-connect-signals/package.json +++ b/examples/node-gtk/gtk-3-builder-auto-connect-signals/package.json @@ -1,6 +1,6 @@ { "name": "ts-for-gir-node-gtk-3-builder-auto-connect-signals-example", - "version": "3.2.4", + "version": "3.2.5", "description": "", "main": "main.ts", "private": true, diff --git a/examples/node-gtk/gtk-3-builder/package.json b/examples/node-gtk/gtk-3-builder/package.json index 6f49baeaf..764151aa1 100644 --- a/examples/node-gtk/gtk-3-builder/package.json +++ b/examples/node-gtk/gtk-3-builder/package.json @@ -1,6 +1,6 @@ { "name": "ts-for-gir-node-gtk-3-builder-example", - "version": "3.2.4", + "version": "3.2.5", "description": "", "main": "main.ts", "private": true, diff --git a/examples/node-gtk/gtk-3-editor/package.json b/examples/node-gtk/gtk-3-editor/package.json index 86083e9b4..d4bf5688d 100644 --- a/examples/node-gtk/gtk-3-editor/package.json +++ b/examples/node-gtk/gtk-3-editor/package.json @@ -1,6 +1,6 @@ { "name": "ts-for-gir-node-gtk-3-editor-example", - "version": "3.2.4", + "version": "3.2.5", "description": "", "main": "main.ts", "private": true, diff --git a/examples/node-gtk/gtk-3-hello/package.json b/examples/node-gtk/gtk-3-hello/package.json index de1fe303f..bc668d906 100644 --- a/examples/node-gtk/gtk-3-hello/package.json +++ b/examples/node-gtk/gtk-3-hello/package.json @@ -1,6 +1,6 @@ { "name": "ts-for-gir-node-gtk-3-hello-example", - "version": "3.2.4", + "version": "3.2.5", "description": "", "main": "dist/main.js", "private": true, diff --git a/examples/node-gtk/gtk-4-custom-widget/package.json b/examples/node-gtk/gtk-4-custom-widget/package.json index 2bb433ae3..e88a0cd26 100644 --- a/examples/node-gtk/gtk-4-custom-widget/package.json +++ b/examples/node-gtk/gtk-4-custom-widget/package.json @@ -1,6 +1,6 @@ { "name": "ts-for-gir-node-gtk-gtk-4-custom-widget-example", - "version": "3.2.4", + "version": "3.2.5", "description": "This example shows the usage of custom widgets and virtual functions in node-gtk", "main": "dist/index.js", "private": true, diff --git a/examples/node-gtk/soup-3-http/package.json b/examples/node-gtk/soup-3-http/package.json index 87e20b056..d3d37d466 100644 --- a/examples/node-gtk/soup-3-http/package.json +++ b/examples/node-gtk/soup-3-http/package.json @@ -1,6 +1,6 @@ { "name": "ts-for-gir-node-soup-3-http-example", - "version": "3.2.4", + "version": "3.2.5", "description": "Node-gtk example showing how to build a http server/client using Soap 3", "main": "dist/http-server.js", "private": true, diff --git a/package.json b/package.json index 23a3ed6dc..954140ee2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ts-for-gir", - "version": "3.2.4", + "version": "3.2.5", "description": "Typescript .d.ts generator from GIR for gjs and node-gtk", "type": "module", "private": true, diff --git a/packages/cli/package.json b/packages/cli/package.json index 5ba27ed7a..362427ad1 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@ts-for-gir/cli", - "version": "3.2.4", + "version": "3.2.5", "description": "TypeScript type definition generator for GObject introspection GIR files", "module": "lib/index.js", "main": "lib/index.js", diff --git a/packages/generator-base/package.json b/packages/generator-base/package.json index b9c467925..4d316ec20 100644 --- a/packages/generator-base/package.json +++ b/packages/generator-base/package.json @@ -1,6 +1,6 @@ { "name": "@ts-for-gir/generator-base", - "version": "3.2.4", + "version": "3.2.5", "description": "Base generator for ts-for-gir", "module": "lib/index.js", "main": "lib/index.js", diff --git a/packages/generator-html-doc/package.json b/packages/generator-html-doc/package.json index cfc2d72af..672b108af 100644 --- a/packages/generator-html-doc/package.json +++ b/packages/generator-html-doc/package.json @@ -1,6 +1,6 @@ { "name": "@ts-for-gir/generator-html-doc", - "version": "3.2.4", + "version": "3.2.5", "description": "HTML Documentation generator for ts-for-gir", "module": "lib/index.js", "main": "lib/index.js", diff --git a/packages/generator-typescript/package.json b/packages/generator-typescript/package.json index 7fc0967b8..c391b7490 100644 --- a/packages/generator-typescript/package.json +++ b/packages/generator-typescript/package.json @@ -1,6 +1,6 @@ { "name": "@ts-for-gir/generator-typescript", - "version": "3.2.4", + "version": "3.2.5", "description": "TypeScript type definition generator for ts-for-gir", "module": "lib/index.js", "main": "lib/index.js", diff --git a/packages/generator-typescript/templates/gjs/module-import.d.ts b/packages/generator-typescript/templates/gjs/module-import.d.ts index e814f85cf..b1d48402f 100644 --- a/packages/generator-typescript/templates/gjs/module-import.d.ts +++ b/packages/generator-typescript/templates/gjs/module-import.d.ts @@ -1,6 +1,6 @@ <%# - This EJS template is used to extend the global GjsGiImports interface with the GIR module, for `imports.gi[namespace] GJS GIR types` -%> + // This EJS template is used to extend the global GjsGiImports interface with the GIR module, for `imports.gi[namespace] GJS GIR types` +_%> <%_ if(!package && !dep.isLatestVersion(girModule.namespace, girModule.version)){ _%> <%_ return `// Module import type definition not generated, otherwise this would cause a type conflict, this is because several GIR modules were generated with the same namespace: "${ girModule.namespace }"` _%> <%_ } _%> diff --git a/packages/lib/package.json b/packages/lib/package.json index 18a3e27be..c5b6348af 100644 --- a/packages/lib/package.json +++ b/packages/lib/package.json @@ -1,6 +1,6 @@ { "name": "@ts-for-gir/lib", - "version": "3.2.4", + "version": "3.2.5", "description": "Typescript .d.ts generator from GIR for gjs and node-gtk", "module": "lib/index.js", "main": "lib/index.js",