Merge pull request #49 from gjsify/v47.0.0

Next version: GNOME Shell 47
gjsify · Nov 3, 2024 · 774a631 · 774a631
2 parents 7b03706 + ffc8978
commit 774a631
Show file tree

Hide file tree

Showing 73 changed files with 1,986 additions and 1,833 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -11,5 +11,8 @@
   "cSpell.words": [
     "girs"
   ],
-  "prettier.prettierPath": ".yarn/sdks/prettier/index.cjs"
+  "prettier.prettierPath": ".yarn/sdks/prettier/index.cjs",
+  "[typescript]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  }
 }
diff --git a/.yarn/releases/yarn-4.3.1.cjs b/.yarn/releases/yarn-4.3.1.cjs
diff --git a/.yarn/releases/yarn-4.5.1.cjs b/.yarn/releases/yarn-4.5.1.cjs
diff --git a/.yarn/sdks/prettier/bin/prettier.cjs b/.yarn/sdks/prettier/bin/prettier.cjs
@@ -8,6 +8,7 @@ const {pathToFileURL} = require(`url`);
 const relPnpApiPath = "../../../../.pnp.cjs";
 
 const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
 const absRequire = createRequire(absPnpApiPath);
 
 const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
@@ -23,5 +24,9 @@ if (existsSync(absPnpApiPath)) {
   }
 }
 
+const wrapWithUserWrapper = existsSync(absUserWrapperPath)
+  ? exports => absRequire(absUserWrapperPath)(exports)
+  : exports => exports;
+
 // Defer to the real prettier/bin/prettier.cjs your application uses
-module.exports = absRequire(`prettier/bin/prettier.cjs`);
+module.exports = wrapWithUserWrapper(absRequire(`prettier/bin/prettier.cjs`));
diff --git a/.yarn/sdks/prettier/index.cjs b/.yarn/sdks/prettier/index.cjs
@@ -8,6 +8,7 @@ const {pathToFileURL} = require(`url`);
 const relPnpApiPath = "../../../.pnp.cjs";
 
 const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
 const absRequire = createRequire(absPnpApiPath);
 
 const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
@@ -23,5 +24,9 @@ if (existsSync(absPnpApiPath)) {
   }
 }
 
+const wrapWithUserWrapper = existsSync(absUserWrapperPath)
+  ? exports => absRequire(absUserWrapperPath)(exports)
+  : exports => exports;
+
 // Defer to the real prettier your application uses
-module.exports = absRequire(`prettier`);
+module.exports = wrapWithUserWrapper(absRequire(`prettier`));
diff --git a/.yarn/sdks/typescript/bin/tsc b/.yarn/sdks/typescript/bin/tsc
@@ -8,6 +8,7 @@ const {pathToFileURL} = require(`url`);
 const relPnpApiPath = "../../../../.pnp.cjs";
 
 const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
 const absRequire = createRequire(absPnpApiPath);
 
 const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
@@ -23,5 +24,9 @@ if (existsSync(absPnpApiPath)) {
   }
 }
 
+const wrapWithUserWrapper = existsSync(absUserWrapperPath)
+  ? exports => absRequire(absUserWrapperPath)(exports)
+  : exports => exports;
+
 // Defer to the real typescript/bin/tsc your application uses
-module.exports = absRequire(`typescript/bin/tsc`);
+module.exports = wrapWithUserWrapper(absRequire(`typescript/bin/tsc`));
diff --git a/.yarn/sdks/typescript/bin/tsserver b/.yarn/sdks/typescript/bin/tsserver
@@ -8,6 +8,7 @@ const {pathToFileURL} = require(`url`);
 const relPnpApiPath = "../../../../.pnp.cjs";
 
 const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
 const absRequire = createRequire(absPnpApiPath);
 
 const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
@@ -23,5 +24,9 @@ if (existsSync(absPnpApiPath)) {
   }
 }
 
+const wrapWithUserWrapper = existsSync(absUserWrapperPath)
+  ? exports => absRequire(absUserWrapperPath)(exports)
+  : exports => exports;
+
 // Defer to the real typescript/bin/tsserver your application uses
-module.exports = absRequire(`typescript/bin/tsserver`);
+module.exports = wrapWithUserWrapper(absRequire(`typescript/bin/tsserver`));
diff --git a/.yarn/sdks/typescript/lib/tsc.js b/.yarn/sdks/typescript/lib/tsc.js
@@ -8,6 +8,7 @@ const {pathToFileURL} = require(`url`);
 const relPnpApiPath = "../../../../.pnp.cjs";
 
 const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
 const absRequire = createRequire(absPnpApiPath);
 
 const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
@@ -23,5 +24,9 @@ if (existsSync(absPnpApiPath)) {
   }
 }
 
+const wrapWithUserWrapper = existsSync(absUserWrapperPath)
+  ? exports => absRequire(absUserWrapperPath)(exports)
+  : exports => exports;
+
 // Defer to the real typescript/lib/tsc.js your application uses
-module.exports = absRequire(`typescript/lib/tsc.js`);
+module.exports = wrapWithUserWrapper(absRequire(`typescript/lib/tsc.js`));
diff --git a/.yarn/sdks/typescript/lib/tsserver.js b/.yarn/sdks/typescript/lib/tsserver.js
@@ -8,6 +8,7 @@ const {pathToFileURL} = require(`url`);
 const relPnpApiPath = "../../../../.pnp.cjs";
 
 const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
 const absRequire = createRequire(absPnpApiPath);
 
 const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
@@ -23,7 +24,15 @@ if (existsSync(absPnpApiPath)) {
   }
 }
 
-const moduleWrapper = tsserver => {
+const wrapWithUserWrapper = existsSync(absUserWrapperPath)
+  ? exports => absRequire(absUserWrapperPath)(exports)
+  : exports => exports;
+
+const moduleWrapper = exports => {
+  return wrapWithUserWrapper(moduleWrapperFn(exports));
+};
+
+const moduleWrapperFn = tsserver => {
   if (!process.versions.pnp) {
     return tsserver;
   }

diff --git a/.yarn/sdks/typescript/lib/tsserverlibrary.js b/.yarn/sdks/typescript/lib/tsserverlibrary.js
@@ -8,6 +8,7 @@ const {pathToFileURL} = require(`url`);
 const relPnpApiPath = "../../../../.pnp.cjs";
 
 const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
 const absRequire = createRequire(absPnpApiPath);
 
 const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
@@ -23,7 +24,15 @@ if (existsSync(absPnpApiPath)) {
   }
 }
 
-const moduleWrapper = tsserver => {
+const wrapWithUserWrapper = existsSync(absUserWrapperPath)
+  ? exports => absRequire(absUserWrapperPath)(exports)
+  : exports => exports;
+
+const moduleWrapper = exports => {
+  return wrapWithUserWrapper(moduleWrapperFn(exports));
+};
+
+const moduleWrapperFn = tsserver => {
   if (!process.versions.pnp) {
     return tsserver;
   }

diff --git a/.yarn/sdks/typescript/lib/typescript.js b/.yarn/sdks/typescript/lib/typescript.js
@@ -8,6 +8,7 @@ const {pathToFileURL} = require(`url`);
 const relPnpApiPath = "../../../../.pnp.cjs";
 
 const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
 const absRequire = createRequire(absPnpApiPath);
 
 const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
@@ -23,5 +24,9 @@ if (existsSync(absPnpApiPath)) {
   }
 }
 
+const wrapWithUserWrapper = existsSync(absUserWrapperPath)
+  ? exports => absRequire(absUserWrapperPath)(exports)
+  : exports => exports;
+
 // Defer to the real typescript your application uses
-module.exports = absRequire(`typescript`);
+module.exports = wrapWithUserWrapper(absRequire(`typescript`));
diff --git a/.yarn/sdks/typescript/package.json b/.yarn/sdks/typescript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "typescript",
-  "version": "5.5.3-sdk",
+  "version": "5.6.2-sdk",
   "main": "./lib/typescript.js",
   "type": "commonjs",
   "bin": {

diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -2,4 +2,4 @@ compressionLevel: mixed
 
 enableGlobalCache: false
 
-yarnPath: .yarn/releases/yarn-4.3.1.cjs
+yarnPath: .yarn/releases/yarn-4.5.1.cjs
diff --git a/examples/hello-world/esbuild.js b/examples/hello-world/esbuild.js
@@ -1,11 +1,11 @@
 import { build } from 'esbuild';
-import { copyFileSync } from 'fs';
+import { copyFileSync, readFileSync } from 'fs';
 import { resolve, dirname } from 'path';
 import { fileURLToPath } from 'url';
 import AdmZip from 'adm-zip';
-import metadata from './src/metadata.json' assert { type: 'json' };
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
+const metadata = JSON.parse(readFileSync('./src/metadata.json', 'utf8'));
 
 console.debug(`Building ${metadata.name} v${metadata.version}...`);
 

diff --git a/examples/hello-world/package.json b/examples/hello-world/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gjsify/gnome-shell-hello-world-example",
-  "version": "46.0.2",
+  "version": "47.0.0-next.4",
   "description": "Simple Gnome Shell Hello World Extension example",
   "type": "module",
   "main": "dist/extension.js",
@@ -15,14 +15,14 @@
   "license": "MIT",
   "devDependencies": {
     "@tsconfig/strictest": "^2.0.5",
-    "adm-zip": "^0.5.14",
-    "esbuild": "^0.23.0",
-    "typescript": "5.5.4"
+    "adm-zip": "^0.5.16",
+    "esbuild": "^0.24.0",
+    "typescript": "5.6.3"
   },
   "dependencies": {
-    "@girs/gjs": "^4.0.0-beta.12",
+    "@girs/gjs": "^4.0.0-beta.17",
     "@girs/gnome-shell": "workspace:^",
-    "@girs/gobject-2.0": "^2.80.3-4.0.0-beta.12",
-    "@girs/st-14": "^14.0.0-4.0.0-beta.12"
+    "@girs/gobject-2.0": "^2.82.2-4.0.0-beta.17",
+    "@girs/st-15": "^15.0.0-4.0.0-beta.17"
   }
 }
diff --git a/examples/hello-world/src/extension.ts b/examples/hello-world/src/extension.ts
@@ -1,5 +1,5 @@
 import '@girs/gjs'; // For global types like `log()`
-import St from '@girs/st-14';
+import St from '@girs/st-15';
 
 import '@girs/gnome-shell/extensions/global'; // For global shell types
 import { Extension, gettext as _ } from '@girs/gnome-shell/extensions/extension';

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "gnome-shell",
-    "version": "46.0.2",
+    "version": "47.0.0-next.4",
     "description": "GJS TypeScript type definitions for GNOME Shell Extensions",
     "main": "src/index.js",
     "type": "module",
@@ -52,9 +52,9 @@
         "url": "https://github.com/gjsify/gnome-shell/issues"
     },
     "homepage": "https://github.com/gjsify/gnome-shell#readme",
-    "packageManager": "yarn@4.3.1",
+    "packageManager": "yarn@4.5.1",
     "devDependencies": {
         "prettier": "^3.3.3",
-        "typescript": "5.5.4"
+        "typescript": "5.6.3"
     }
 }
diff --git a/packages/gnome-shell/package.json b/packages/gnome-shell/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@girs/gnome-shell",
-  "version": "46.0.2",
+  "version": "47.0.0-next.4",
   "description": "GJS TypeScript type definitions for GNOME Shell Extensions",
   "type": "module",
   "main": "./dist/index.js",
@@ -182,6 +182,17 @@
       }
     },
     "./misc/systemActions/ambient": "./dist/misc/systemActions-ambient.d.ts",
+    "./misc/util": {
+      "import": {
+        "types": "./dist/misc/util.d.ts",
+        "default": "./dist/misc/util.js"
+      },
+      "require": {
+        "types": "./dist/misc/util.d.ts",
+        "default": "./dist/misc/util.cjs"
+      }
+    },
+    "./misc/util/ambient": "./dist/misc/util-ambient.d.ts",
     "./ui/accessDialog": {
       "import": {
         "types": "./dist/ui/accessDialog.d.ts",
@@ -972,34 +983,34 @@
     "generate:types": "node ./scripts/generate-types.js"
   },
   "dependencies": {
-    "@girs/accountsservice-1.0": "^1.0.0-4.0.0-beta.12",
-    "@girs/adw-1": "^1.6.0-4.0.0-beta.12",
-    "@girs/atk-1.0": "^2.52.0-4.0.0-beta.12",
-    "@girs/cally-14": "^14.0.0-4.0.0-beta.12",
-    "@girs/clutter-14": "^14.0.0-4.0.0-beta.12",
-    "@girs/cogl-2.0": "^2.0.0-4.0.0-beta.12",
-    "@girs/gcr-4": "^4.3.0-4.0.0-beta.12",
-    "@girs/gdm-1.0": "^1.0.0-4.0.0-beta.12",
-    "@girs/gio-2.0": "^2.80.3-4.0.0-beta.12",
-    "@girs/gjs": "^4.0.0-beta.12",
-    "@girs/glib-2.0": "^2.80.3-4.0.0-beta.12",
-    "@girs/gnomebg-4.0": "^4.0.0-4.0.0-beta.12",
-    "@girs/gnomebluetooth-3.0": "^3.0.0-4.0.0-beta.12",
-    "@girs/gnomedesktop-4.0": "^4.0.0-4.0.0-beta.12",
-    "@girs/gobject-2.0": "^2.80.3-4.0.0-beta.12",
-    "@girs/gtk-4.0": "^4.14.4-4.0.0-beta.12",
-    "@girs/gvc-1.0": "^1.0.0-4.0.0-beta.12",
-    "@girs/meta-14": "^14.0.0-4.0.0-beta.12",
-    "@girs/mtk-14": "^14.0.0-4.0.0-beta.12",
-    "@girs/polkit-1.0": "^1.0.0-4.0.0-beta.12",
-    "@girs/shell-14": "^14.0.0-4.0.0-beta.12",
-    "@girs/shew-0": "^0.0.0-4.0.0-beta.12",
-    "@girs/st-14": "^14.0.0-4.0.0-beta.12",
-    "@girs/upowerglib-1.0": "^0.99.1-4.0.0-beta.12"
+    "@girs/accountsservice-1.0": "1.0.0-4.0.0-beta.17",
+    "@girs/adw-1": "^1.7.0-4.0.0-beta.17",
+    "@girs/atk-1.0": "^2.54.0-4.0.0-beta.17",
+    "@girs/cally-15": "^15.0.0-4.0.0-beta.17",
+    "@girs/clutter-15": "^15.0.0-4.0.0-beta.17",
+    "@girs/cogl-2.0": "^2.0.0-4.0.0-beta.17",
+    "@girs/gcr-4": "^4.3.0-4.0.0-beta.17",
+    "@girs/gdm-1.0": "^1.0.0-4.0.0-beta.17",
+    "@girs/gio-2.0": "^2.82.2-4.0.0-beta.17",
+    "@girs/gjs": "^4.0.0-beta.17",
+    "@girs/glib-2.0": "^2.82.2-4.0.0-beta.17",
+    "@girs/gnomebg-4.0": "^4.0.0-4.0.0-beta.17",
+    "@girs/gnomebluetooth-3.0": "^3.0.0-4.0.0-beta.17",
+    "@girs/gnomedesktop-4.0": "^4.0.0-4.0.0-beta.17",
+    "@girs/gobject-2.0": "^2.82.2-4.0.0-beta.17",
+    "@girs/gtk-4.0": "^4.16.3-4.0.0-beta.17",
+    "@girs/gvc-1.0": "^1.0.0-4.0.0-beta.17",
+    "@girs/meta-15": "^15.0.0-4.0.0-beta.17",
+    "@girs/mtk-15": "^15.0.0-4.0.0-beta.17",
+    "@girs/polkit-1.0": "^1.0.0-4.0.0-beta.17",
+    "@girs/shell-15": "^15.0.0-4.0.0-beta.17",
+    "@girs/shew-0": "^0.0.0-4.0.0-beta.17",
+    "@girs/st-15": "^15.0.0-4.0.0-beta.17",
+    "@girs/upowerglib-1.0": "^0.99.1-4.0.0-beta.17"
   },
   "devDependencies": {
     "@tsconfig/strictest": "^2.0.5",
-    "typescript": "5.5.4"
+    "typescript": "5.6.3"
   },
   "keywords": [
     "Gir",

diff --git a/packages/gnome-shell/src/extensions/global.d.ts b/packages/gnome-shell/src/extensions/global.d.ts
@@ -1,5 +1,5 @@
-import type Shell from '@girs/shell-14';
-import type Clutter from '@girs/clutter-14';
+import type Shell from '@girs/shell-15';
+import type Clutter from '@girs/clutter-15';
 declare global {
     /**
      * Global shell object created by GNOME Shell on startup.
@@ -88,7 +88,7 @@ type AnimatableActorFields =
 
 interface EasingParamsWithProperties extends EasingParams, Partial<Pick<Clutter.Actor, AnimatableActorFields>> {}
 
-declare module '@girs/st-14' {
+declare module '@girs/st-15' {
     export namespace St {
         interface Adjustment {
             /**
@@ -103,7 +103,7 @@ declare module '@girs/st-14' {
     }
 }
 
-declare module '@girs/clutter-14' {
+declare module '@girs/clutter-15' {
     export namespace Clutter {
         interface Actor {
             /**
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@ compressionLevel: mixed

		enableGlobalCache: false

		yarnPath: .yarn/releases/yarn-4.3.1.cjs
		yarnPath: .yarn/releases/yarn-4.5.1.cjs