Skip to content

Commit 774a631

Browse files
JumpLinkJumpLink
authored
Merge pull request #49 from gjsify/v47.0.0
Next version: GNOME Shell 47
2 parents 7b03706 + ffc8978 commit 774a631

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+1986
-1833
lines changed

‎.vscode/settings.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,8 @@
1111
"cSpell.words": [
1212
"girs"
1313
],
14-
"prettier.prettierPath": ".yarn/sdks/prettier/index.cjs"
14+
"prettier.prettierPath": ".yarn/sdks/prettier/index.cjs",
15+
"[typescript]": {
16+
"editor.defaultFormatter": "esbenp.prettier-vscode"
17+
}
1518
}

‎.yarn/releases/yarn-4.3.1.cjs

-894
This file was deleted.

‎.yarn/releases/yarn-4.5.1.cjs

+934
Large diffs are not rendered by default.

‎.yarn/sdks/prettier/bin/prettier.cjs

+6-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ const {pathToFileURL} = require(`url`);
88
const relPnpApiPath = "../../../../.pnp.cjs";
99

1010
const absPnpApiPath = resolve(__dirname, relPnpApiPath);
11+
const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
1112
const absRequire = createRequire(absPnpApiPath);
1213

1314
const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
@@ -23,5 +24,9 @@ if (existsSync(absPnpApiPath)) {
2324
}
2425
}
2526

27+
const wrapWithUserWrapper = existsSync(absUserWrapperPath)
28+
? exports => absRequire(absUserWrapperPath)(exports)
29+
: exports => exports;
30+
2631
// Defer to the real prettier/bin/prettier.cjs your application uses
27-
module.exports = absRequire(`prettier/bin/prettier.cjs`);
32+
module.exports = wrapWithUserWrapper(absRequire(`prettier/bin/prettier.cjs`));

‎.yarn/sdks/prettier/index.cjs

+6-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ const {pathToFileURL} = require(`url`);
88
const relPnpApiPath = "../../../.pnp.cjs";
99

1010
const absPnpApiPath = resolve(__dirname, relPnpApiPath);
11+
const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
1112
const absRequire = createRequire(absPnpApiPath);
1213

1314
const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
@@ -23,5 +24,9 @@ if (existsSync(absPnpApiPath)) {
2324
}
2425
}
2526

27+
const wrapWithUserWrapper = existsSync(absUserWrapperPath)
28+
? exports => absRequire(absUserWrapperPath)(exports)
29+
: exports => exports;
30+
2631
// Defer to the real prettier your application uses
27-
module.exports = absRequire(`prettier`);
32+
module.exports = wrapWithUserWrapper(absRequire(`prettier`));

‎.yarn/sdks/typescript/bin/tsc

+6-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ const {pathToFileURL} = require(`url`);
88
const relPnpApiPath = "../../../../.pnp.cjs";
99

1010
const absPnpApiPath = resolve(__dirname, relPnpApiPath);
11+
const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
1112
const absRequire = createRequire(absPnpApiPath);
1213

1314
const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
@@ -23,5 +24,9 @@ if (existsSync(absPnpApiPath)) {
2324
}
2425
}
2526

27+
const wrapWithUserWrapper = existsSync(absUserWrapperPath)
28+
? exports => absRequire(absUserWrapperPath)(exports)
29+
: exports => exports;
30+
2631
// Defer to the real typescript/bin/tsc your application uses
27-
module.exports = absRequire(`typescript/bin/tsc`);
32+
module.exports = wrapWithUserWrapper(absRequire(`typescript/bin/tsc`));

‎.yarn/sdks/typescript/bin/tsserver

+6-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ const {pathToFileURL} = require(`url`);
88
const relPnpApiPath = "../../../../.pnp.cjs";
99

1010
const absPnpApiPath = resolve(__dirname, relPnpApiPath);
11+
const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
1112
const absRequire = createRequire(absPnpApiPath);
1213

1314
const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
@@ -23,5 +24,9 @@ if (existsSync(absPnpApiPath)) {
2324
}
2425
}
2526

27+
const wrapWithUserWrapper = existsSync(absUserWrapperPath)
28+
? exports => absRequire(absUserWrapperPath)(exports)
29+
: exports => exports;
30+
2631
// Defer to the real typescript/bin/tsserver your application uses
27-
module.exports = absRequire(`typescript/bin/tsserver`);
32+
module.exports = wrapWithUserWrapper(absRequire(`typescript/bin/tsserver`));

‎.yarn/sdks/typescript/lib/tsc.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ const {pathToFileURL} = require(`url`);
88
const relPnpApiPath = "../../../../.pnp.cjs";
99

1010
const absPnpApiPath = resolve(__dirname, relPnpApiPath);
11+
const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
1112
const absRequire = createRequire(absPnpApiPath);
1213

1314
const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
@@ -23,5 +24,9 @@ if (existsSync(absPnpApiPath)) {
2324
}
2425
}
2526

27+
const wrapWithUserWrapper = existsSync(absUserWrapperPath)
28+
? exports => absRequire(absUserWrapperPath)(exports)
29+
: exports => exports;
30+
2631
// Defer to the real typescript/lib/tsc.js your application uses
27-
module.exports = absRequire(`typescript/lib/tsc.js`);
32+
module.exports = wrapWithUserWrapper(absRequire(`typescript/lib/tsc.js`));

‎.yarn/sdks/typescript/lib/tsserver.js

+10-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ const {pathToFileURL} = require(`url`);
88
const relPnpApiPath = "../../../../.pnp.cjs";
99

1010
const absPnpApiPath = resolve(__dirname, relPnpApiPath);
11+
const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
1112
const absRequire = createRequire(absPnpApiPath);
1213

1314
const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
@@ -23,7 +24,15 @@ if (existsSync(absPnpApiPath)) {
2324
}
2425
}
2526

26-
const moduleWrapper = tsserver => {
27+
const wrapWithUserWrapper = existsSync(absUserWrapperPath)
28+
? exports => absRequire(absUserWrapperPath)(exports)
29+
: exports => exports;
30+
31+
const moduleWrapper = exports => {
32+
return wrapWithUserWrapper(moduleWrapperFn(exports));
33+
};
34+
35+
const moduleWrapperFn = tsserver => {
2736
if (!process.versions.pnp) {
2837
return tsserver;
2938
}

‎.yarn/sdks/typescript/lib/tsserverlibrary.js

+10-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ const {pathToFileURL} = require(`url`);
88
const relPnpApiPath = "../../../../.pnp.cjs";
99

1010
const absPnpApiPath = resolve(__dirname, relPnpApiPath);
11+
const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
1112
const absRequire = createRequire(absPnpApiPath);
1213

1314
const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
@@ -23,7 +24,15 @@ if (existsSync(absPnpApiPath)) {
2324
}
2425
}
2526

26-
const moduleWrapper = tsserver => {
27+
const wrapWithUserWrapper = existsSync(absUserWrapperPath)
28+
? exports => absRequire(absUserWrapperPath)(exports)
29+
: exports => exports;
30+
31+
const moduleWrapper = exports => {
32+
return wrapWithUserWrapper(moduleWrapperFn(exports));
33+
};
34+
35+
const moduleWrapperFn = tsserver => {
2736
if (!process.versions.pnp) {
2837
return tsserver;
2938
}

‎.yarn/sdks/typescript/lib/typescript.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ const {pathToFileURL} = require(`url`);
88
const relPnpApiPath = "../../../../.pnp.cjs";
99

1010
const absPnpApiPath = resolve(__dirname, relPnpApiPath);
11+
const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
1112
const absRequire = createRequire(absPnpApiPath);
1213

1314
const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
@@ -23,5 +24,9 @@ if (existsSync(absPnpApiPath)) {
2324
}
2425
}
2526

27+
const wrapWithUserWrapper = existsSync(absUserWrapperPath)
28+
? exports => absRequire(absUserWrapperPath)(exports)
29+
: exports => exports;
30+
2631
// Defer to the real typescript your application uses
27-
module.exports = absRequire(`typescript`);
32+
module.exports = wrapWithUserWrapper(absRequire(`typescript`));

‎.yarn/sdks/typescript/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "typescript",
3-
"version": "5.5.3-sdk",
3+
"version": "5.6.2-sdk",
44
"main": "./lib/typescript.js",
55
"type": "commonjs",
66
"bin": {

‎.yarnrc.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ compressionLevel: mixed
22

33
enableGlobalCache: false
44

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

‎examples/hello-world/esbuild.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { build } from 'esbuild';
2-
import { copyFileSync } from 'fs';
2+
import { copyFileSync, readFileSync } from 'fs';
33
import { resolve, dirname } from 'path';
44
import { fileURLToPath } from 'url';
55
import AdmZip from 'adm-zip';
6-
import metadata from './src/metadata.json' assert { type: 'json' };
76

87
const __dirname = dirname(fileURLToPath(import.meta.url));
8+
const metadata = JSON.parse(readFileSync('./src/metadata.json', 'utf8'));
99

1010
console.debug(`Building ${metadata.name} v${metadata.version}...`);
1111

‎examples/hello-world/package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@gjsify/gnome-shell-hello-world-example",
3-
"version": "46.0.2",
3+
"version": "47.0.0-next.4",
44
"description": "Simple Gnome Shell Hello World Extension example",
55
"type": "module",
66
"main": "dist/extension.js",
@@ -15,14 +15,14 @@
1515
"license": "MIT",
1616
"devDependencies": {
1717
"@tsconfig/strictest": "^2.0.5",
18-
"adm-zip": "^0.5.14",
19-
"esbuild": "^0.23.0",
20-
"typescript": "5.5.4"
18+
"adm-zip": "^0.5.16",
19+
"esbuild": "^0.24.0",
20+
"typescript": "5.6.3"
2121
},
2222
"dependencies": {
23-
"@girs/gjs": "^4.0.0-beta.12",
23+
"@girs/gjs": "^4.0.0-beta.17",
2424
"@girs/gnome-shell": "workspace:^",
25-
"@girs/gobject-2.0": "^2.80.3-4.0.0-beta.12",
26-
"@girs/st-14": "^14.0.0-4.0.0-beta.12"
25+
"@girs/gobject-2.0": "^2.82.2-4.0.0-beta.17",
26+
"@girs/st-15": "^15.0.0-4.0.0-beta.17"
2727
}
2828
}

‎examples/hello-world/src/extension.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import '@girs/gjs'; // For global types like `log()`
2-
import St from '@girs/st-14';
2+
import St from '@girs/st-15';
33

44
import '@girs/gnome-shell/extensions/global'; // For global shell types
55
import { Extension, gettext as _ } from '@girs/gnome-shell/extensions/extension';

‎package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "gnome-shell",
3-
"version": "46.0.2",
3+
"version": "47.0.0-next.4",
44
"description": "GJS TypeScript type definitions for GNOME Shell Extensions",
55
"main": "src/index.js",
66
"type": "module",
@@ -52,9 +52,9 @@
5252
"url": "https://github.com/gjsify/gnome-shell/issues"
5353
},
5454
"homepage": "https://github.com/gjsify/gnome-shell#readme",
55-
"packageManager": "yarn@4.3.1",
55+
"packageManager": "yarn@4.5.1",
5656
"devDependencies": {
5757
"prettier": "^3.3.3",
58-
"typescript": "5.5.4"
58+
"typescript": "5.6.3"
5959
}
6060
}

‎packages/gnome-shell/package.json

+37-26
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@girs/gnome-shell",
3-
"version": "46.0.2",
3+
"version": "47.0.0-next.4",
44
"description": "GJS TypeScript type definitions for GNOME Shell Extensions",
55
"type": "module",
66
"main": "./dist/index.js",
@@ -182,6 +182,17 @@
182182
}
183183
},
184184
"./misc/systemActions/ambient": "./dist/misc/systemActions-ambient.d.ts",
185+
"./misc/util": {
186+
"import": {
187+
"types": "./dist/misc/util.d.ts",
188+
"default": "./dist/misc/util.js"
189+
},
190+
"require": {
191+
"types": "./dist/misc/util.d.ts",
192+
"default": "./dist/misc/util.cjs"
193+
}
194+
},
195+
"./misc/util/ambient": "./dist/misc/util-ambient.d.ts",
185196
"./ui/accessDialog": {
186197
"import": {
187198
"types": "./dist/ui/accessDialog.d.ts",
@@ -972,34 +983,34 @@
972983
"generate:types": "node ./scripts/generate-types.js"
973984
},
974985
"dependencies": {
975-
"@girs/accountsservice-1.0": "^1.0.0-4.0.0-beta.12",
976-
"@girs/adw-1": "^1.6.0-4.0.0-beta.12",
977-
"@girs/atk-1.0": "^2.52.0-4.0.0-beta.12",
978-
"@girs/cally-14": "^14.0.0-4.0.0-beta.12",
979-
"@girs/clutter-14": "^14.0.0-4.0.0-beta.12",
980-
"@girs/cogl-2.0": "^2.0.0-4.0.0-beta.12",
981-
"@girs/gcr-4": "^4.3.0-4.0.0-beta.12",
982-
"@girs/gdm-1.0": "^1.0.0-4.0.0-beta.12",
983-
"@girs/gio-2.0": "^2.80.3-4.0.0-beta.12",
984-
"@girs/gjs": "^4.0.0-beta.12",
985-
"@girs/glib-2.0": "^2.80.3-4.0.0-beta.12",
986-
"@girs/gnomebg-4.0": "^4.0.0-4.0.0-beta.12",
987-
"@girs/gnomebluetooth-3.0": "^3.0.0-4.0.0-beta.12",
988-
"@girs/gnomedesktop-4.0": "^4.0.0-4.0.0-beta.12",
989-
"@girs/gobject-2.0": "^2.80.3-4.0.0-beta.12",
990-
"@girs/gtk-4.0": "^4.14.4-4.0.0-beta.12",
991-
"@girs/gvc-1.0": "^1.0.0-4.0.0-beta.12",
992-
"@girs/meta-14": "^14.0.0-4.0.0-beta.12",
993-
"@girs/mtk-14": "^14.0.0-4.0.0-beta.12",
994-
"@girs/polkit-1.0": "^1.0.0-4.0.0-beta.12",
995-
"@girs/shell-14": "^14.0.0-4.0.0-beta.12",
996-
"@girs/shew-0": "^0.0.0-4.0.0-beta.12",
997-
"@girs/st-14": "^14.0.0-4.0.0-beta.12",
998-
"@girs/upowerglib-1.0": "^0.99.1-4.0.0-beta.12"
986+
"@girs/accountsservice-1.0": "1.0.0-4.0.0-beta.17",
987+
"@girs/adw-1": "^1.7.0-4.0.0-beta.17",
988+
"@girs/atk-1.0": "^2.54.0-4.0.0-beta.17",
989+
"@girs/cally-15": "^15.0.0-4.0.0-beta.17",
990+
"@girs/clutter-15": "^15.0.0-4.0.0-beta.17",
991+
"@girs/cogl-2.0": "^2.0.0-4.0.0-beta.17",
992+
"@girs/gcr-4": "^4.3.0-4.0.0-beta.17",
993+
"@girs/gdm-1.0": "^1.0.0-4.0.0-beta.17",
994+
"@girs/gio-2.0": "^2.82.2-4.0.0-beta.17",
995+
"@girs/gjs": "^4.0.0-beta.17",
996+
"@girs/glib-2.0": "^2.82.2-4.0.0-beta.17",
997+
"@girs/gnomebg-4.0": "^4.0.0-4.0.0-beta.17",
998+
"@girs/gnomebluetooth-3.0": "^3.0.0-4.0.0-beta.17",
999+
"@girs/gnomedesktop-4.0": "^4.0.0-4.0.0-beta.17",
1000+
"@girs/gobject-2.0": "^2.82.2-4.0.0-beta.17",
1001+
"@girs/gtk-4.0": "^4.16.3-4.0.0-beta.17",
1002+
"@girs/gvc-1.0": "^1.0.0-4.0.0-beta.17",
1003+
"@girs/meta-15": "^15.0.0-4.0.0-beta.17",
1004+
"@girs/mtk-15": "^15.0.0-4.0.0-beta.17",
1005+
"@girs/polkit-1.0": "^1.0.0-4.0.0-beta.17",
1006+
"@girs/shell-15": "^15.0.0-4.0.0-beta.17",
1007+
"@girs/shew-0": "^0.0.0-4.0.0-beta.17",
1008+
"@girs/st-15": "^15.0.0-4.0.0-beta.17",
1009+
"@girs/upowerglib-1.0": "^0.99.1-4.0.0-beta.17"
9991010
},
10001011
"devDependencies": {
10011012
"@tsconfig/strictest": "^2.0.5",
1002-
"typescript": "5.5.4"
1013+
"typescript": "5.6.3"
10031014
},
10041015
"keywords": [
10051016
"Gir",

‎packages/gnome-shell/src/extensions/global.d.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import type Shell from '@girs/shell-14';
2-
import type Clutter from '@girs/clutter-14';
1+
import type Shell from '@girs/shell-15';
2+
import type Clutter from '@girs/clutter-15';
33
declare global {
44
/**
55
* Global shell object created by GNOME Shell on startup.
@@ -88,7 +88,7 @@ type AnimatableActorFields =
8888

8989
interface EasingParamsWithProperties extends EasingParams, Partial<Pick<Clutter.Actor, AnimatableActorFields>> {}
9090

91-
declare module '@girs/st-14' {
91+
declare module '@girs/st-15' {
9292
export namespace St {
9393
interface Adjustment {
9494
/**
@@ -103,7 +103,7 @@ declare module '@girs/st-14' {
103103
}
104104
}
105105

106-
declare module '@girs/clutter-14' {
106+
declare module '@girs/clutter-15' {
107107
export namespace Clutter {
108108
interface Actor {
109109
/**

0 commit comments

Comments
 (0)