Do not use removed CLI options

.ts-for-gir.all.rc.js

@@ -1,5 +1,4 @@
 export default {
-    environments: ['gjs'],
     modules: ['*'],
     girDirectories: ['./vala-girs/gir-1.0', './girs'],
     ignoreVersionConflicts: true,

.ts-for-gir.gcalc.rc.js

@@ -1,5 +1,4 @@
 export default {
-    environments: ['gjs'],
     modules: [/*'GCalc-1',*/ 'GCalc-2'],
     girDirectories: ['./vala-girs/gir-1.0'],
     ignore: [],

.ts-for-gir.gio.rc.js

@@ -1,10 +1,8 @@
 export default {
-    environments: ['gjs'],
     modules: ['Gio-2.0'],
     girDirectories: ['./vala-girs/gir-1.0'],
     ignore: [],
     promisify: true,
     verbose: true,
-    package: true,
     outdir: './types',
 }

.ts-for-gir.gtk2.rc.js

@@ -1,5 +1,4 @@
 export default {
-    environments: ['gjs'],
     modules: ['Gtk-2.0'],
     girDirectories: ['./vala-girs/gir-1.0'],
     ignore: [],

.ts-for-gir.gtk3+gtk4.rc.js

@@ -1,5 +1,4 @@
 export default {
-    environments: ['gjs'],
     modules: ['Gtk-3.0', 'Gtk-4.0'],
     girDirectories: ['./vala-girs/gir-1.0'],
     ignore: [],

.ts-for-gir.gtk3.rc.js

@@ -1,5 +1,4 @@
 export default {
-    environments: ['gjs'],
     modules: ['Gtk-3.0'],
     girDirectories: ['./vala-girs/gir-1.0'],
     ignore: [],

.ts-for-gir.gtk4.rc.js

@@ -1,5 +1,4 @@
 export default {
-    environments: ['gjs'],
     modules: ['Gtk-4.0', 'Adw-1.0'],
     girDirectories: ['./vala-girs/gir-1.0'],
     ignore: [],

.ts-for-gir.modemmanager1.rc.js

@@ -1,5 +1,4 @@
 export default {
-    environments: ['gjs'],
     modules: ['ModemManager-1.0'],
     girDirectories: ['./vala-girs/gir-1.0'],
     ignore: [],

.ts-for-gir.rygelcore2.rc.js

@@ -1,5 +1,4 @@
 export default {
-    environments: ['gjs'],
     modules: ['RygelCore-2.6', 'RygelRenderer-2.6'],
     girDirectories: ['./vala-girs/gir-1.0'],
     ignore: [],

.ts-for-gir.timezonemap1.rc.js

@@ -1,5 +1,4 @@
 export default {
-    environments: ['gjs'],
     modules: ['TimezoneMap-1.0'],
     girDirectories: ['./vala-girs/gir-1.0'],
     ignore: [],

.ts-for-gir.vda1.rc.js

@@ -1,5 +1,4 @@
 export default {
-    environments: ['gjs'],
     modules: ['Vda-1'],
     girDirectories: ['./vala-girs/gir-1.0'],
     ignore: [],

.ts-for-gir.vte4.rc.js

@@ -1,5 +1,4 @@
 export default {
-    environments: ['gjs'],
     modules: ['Vte-4*'],
     girDirectories: ['./vala-girs/gir-1.0'],
     ignore: [],

.vscode/launch.json

@@ -83,19 +83,7 @@
             "cwd": "${workspaceRoot}/packages/cli",
             "runtimeExecutable": "${env:NVM_DIR}/nvm-exec",
             "args": [
-                "${workspaceRoot}/packages/cli/src/start.ts", "generate", "--configName=.ts-for-gir.all.rc.js", "--verbose", "--environments=gjs", "--outdir", "../../../tmp"
-            ],
-            "runtimeArgs": ["node", "--inspect", "--loader", "ts-node/esm"],
-            "sourceMaps": true,
-        },
-        {
-            "name": "build:types:node",
-            "type": "node",
-            "request": "launch",
-            "cwd": "${workspaceRoot}/packages/cli",
-            "runtimeExecutable": "${env:NVM_DIR}/nvm-exec",
-            "args": [
-                "${workspaceRoot}/packages/cli/src/start.ts", "generate", "--configName=.ts-for-gir.all.rc.js", "--verbose", "--environments=node", "--outdir", "../../../tmp"
+                "${workspaceRoot}/packages/cli/src/start.ts", "generate", "--configName=.ts-for-gir.all.rc.js", "--verbose", "--outdir", "../../../tmp"
             ],
             "runtimeArgs": ["node", "--inspect", "--loader", "ts-node/esm"],
             "sourceMaps": true,

examples/gjs/glib-2-spawn-command/package.json

@@ -10,7 +10,7 @@
     "watch": "yarn build:app --watch",
     "build": "yarn build:types && yarn build:app",
     "build:app": "yarn clear:ts && webpack --env production",
-    "build:types": "yarn ts-for-gir generate GLib-2.0 --environments gjs --noNamespace -t cjs",
+    "build:types": "yarn ts-for-gir generate GLib-2.0 --noNamespace -t cjs",
     "clear:types": "rm -rf ./@types",
     "clear:ts": "rm -rf ./dist",
     "clear": "yarn clear:ts && yarn clear:types",

package.json

@@ -19,19 +19,19 @@
     "publish:types:next": "yarn workspaces foreach -v --all --parallel --no-private --include '@girs/*' npm publish --tolerate-republish --tag next --access public",
     "publish:types:latest": "yarn workspaces foreach -v --all --parallel --no-private --include '@girs/*' npm publish --tolerate-republish --tag latest --access public",
     "test": "yarn build:all && yarn test:girs:all && yarn validate:examples && yarn start:cli-examples:all",
-    "test:girs:all": "yarn clear:types && yarn build:types:all && yarn validate:types:all",
-    "test:girs:gjs": "yarn clear:types && yarn build:types:gjs && yarn validate:types:gjs",
-    "test:girs:gjs:vda1": "yarn clear:types && yarn build:types:gjs:vda1 && yarn validate:types:gjs",
-    "test:girs:gjs:gtk2": "yarn clear:types && yarn build:types:gjs:gtk2 && yarn validate:types:gjs",
-    "test:girs:gjs:gtk3": "yarn clear:types && yarn build:types:gjs:gtk3 && yarn validate:types:gjs",
-    "test:girs:gjs:gtk4": "yarn clear:types && yarn build:types:gjs:gtk4 && yarn validate:types:gjs",
-    "test:girs:gjs:gtk3+gtk4": "yarn clear:types && yarn build:types:gjs:gtk3+gtk4 && yarn validate:types:gjs",
-    "test:girs:gjs:gio": "yarn clear:types && yarn build:types:gjs:gio && yarn validate:types:gjs",
-    "test:girs:gjs:vte4": "yarn clear:types && yarn build:types:gjs:vte4 && yarn validate:types:gjs",
-    "test:girs:gjs:modemmanager1": "yarn clear:types && yarn build:types:gjs:modemmanager1 && yarn validate:types:gjs",
-    "test:girs:gjs:timezonemap1": "yarn clear:types && yarn build:types:gjs:timezonemap1 && yarn validate:types:gjs",
-    "test:girs:gjs:rygelcore2": "yarn clear:types && yarn build:types:gjs:rygelcore2 && yarn validate:types:gjs",
-    "test:girs:gjs:gcalc": "yarn clear:types && yarn build:types:gjs:gcalc && yarn validate:types:gjs",
+    "test:girs:all": "yarn clear:types && yarn build:types:all && yarn validate:types:root",
+    "test:girs:gjs": "yarn clear:types && yarn build:types && yarn validate:types:root",
+    "test:girs:gjs:vda1": "yarn clear:types && yarn build:types:vda1 && yarn validate:types:root",
+    "test:girs:gjs:gtk2": "yarn clear:types && yarn build:types:gtk2 && yarn validate:types:root",
+    "test:girs:gjs:gtk3": "yarn clear:types && yarn build:types:gtk3 && yarn validate:types:root",
+    "test:girs:gjs:gtk4": "yarn clear:types && yarn build:types:gtk4 && yarn validate:types:root",
+    "test:girs:gjs:gtk3+gtk4": "yarn clear:types && yarn build:types:gtk3+gtk4 && yarn validate:types:root",
+    "test:girs:gjs:gio": "yarn clear:types && yarn build:types:gio && yarn validate:types:root",
+    "test:girs:gjs:vte4": "yarn clear:types && yarn build:types:vte4 && yarn validate:types:root",
+    "test:girs:gjs:modemmanager1": "yarn clear:types && yarn build:types:modemmanager1 && yarn validate:types:root",
+    "test:girs:gjs:timezonemap1": "yarn clear:types && yarn build:types:timezonemap1 && yarn validate:types:root",
+    "test:girs:gjs:rygelcore2": "yarn clear:types && yarn build:types:rygelcore2 && yarn validate:types:root",
+    "test:girs:gjs:gcalc": "yarn clear:types && yarn build:types:gcalc && yarn validate:types:root",
     "build": "yarn build:parser && yarn build:lib && yarn build:generators && yarn build:cli",
     "build:parser": "yarn workspace @gi.ts/parser run build",
     "build:cli": "yarn workspace @ts-for-gir/cli run build",
@@ -58,23 +58,11 @@
     "build:types:timezonemap1": "yarn ts-for-gir generate --configName='.ts-for-gir.timezonemap1.rc.js'",
     "build:types:rygelcore2": "yarn ts-for-gir generate --configName='.ts-for-gir.rygelcore2.rc.js'",
     "build:types:gcalc": "yarn ts-for-gir generate --configName='.ts-for-gir.gcalc.rc.js'",
-    "build:types:gjs": "yarn build:types:all --environments=gjs",
-    "build:types:gjs:vda1": "yarn build:types:vda1 --environments=gjs",
-    "build:types:gjs:gtk2": "yarn build:types:gtk2 --environments=gjs",
-    "build:types:gjs:gtk3": "yarn build:types:gtk3 --environments=gjs",
-    "build:types:gjs:gtk4": "yarn build:types:gtk4 --environments=gjs",
-    "build:types:gjs:gtk3+gtk4": "yarn build:types:gtk3+gtk4 --environments=gjs",
-    "build:types:gjs:gio": "yarn build:types:gio --environments=gjs",
-    "build:types:gjs:vte4": "yarn build:types:vte4 --environments=gjs",
-    "build:types:gjs:modemmanager1": "yarn build:types:modemmanager1 --environments=gjs",
-    "build:types:gjs:timezonemap1": "yarn build:types:timezonemap1 --environments=gjs",
-    "build:types:gjs:rygelcore2": "yarn build:types:rygelcore2 --environments=gjs",
-    "build:types:gjs:gcalc": "yarn build:types:gcalc --environments=gjs",
+    "build:types": "yarn build:types:all",
     "validate": "yarn workspaces foreach -v --all --parallel run validate",
     "validate:types": "yarn workspaces foreach -v --all --parallel run validate:types",
     "validate:examples": "yarn workspaces foreach -v --all --parallel run validate:app",
-    "validate:types:all": "yarn validate:types:gjs",
-    "validate:types:gjs": "NODE_OPTIONS=--max_old_space_size=9216 tsc --project tsconfig.json",
+    "validate:types:root": "NODE_OPTIONS=--max_old_space_size=9216 tsc --project tsconfig.json",
     "clear": "yarn clear:build && yarn clear:types",
     "clear:build": "yarn workspaces foreach -v --include '@ts-for-gir/*' run clear:build",
     "clear:types": "rimraf ./@types",