From 042354d36ac6dcb0b1c067553197d6fec5893694 Mon Sep 17 00:00:00 2001 From: greweb Date: Fri, 15 May 2026 20:53:39 +0200 Subject: [PATCH 1/2] fix: make yarn build work cleanly (node-modules linker + TypeScript fixes) - Switch to nodeLinker: node-modules so tsc can resolve packages properly - Force gl@9.0.0-rc.9 in resolutions to avoid gl@5.0.3 (fails to compile on GCC 13) - Enable allowDeclareFields in babel preset-typescript - Use declare modifier on context class fields (Bus, Node, connectSize) - Fix as unknown as casts in getContext.ts (TS2352) - Fix readonly index signature delete in GLViewDOM and gl-react-headless (TS2542) - Fix version string cast in GLViewDOM (TS2345) - Add globals.d.ts stubs for react-native/__DEV__/global in expo/native packages - Fix build.sh to delete .tsbuildinfo on clean so tsc always regenerates .d.ts - Extend typeRoots in gl-react tsconfig to include @types/node Co-Authored-By: Claude Sonnet 4.6 --- .yarnrc.yml | 1 + babel.config.js | 2 +- package.json | 3 +- packages/gl-react-dom/src/GLViewDOM.tsx | 4 +- packages/gl-react-dom/src/getContext.ts | 8 +- packages/gl-react-expo/src/GLViewNative.tsx | 1 + packages/gl-react-expo/src/globals.d.ts | 8 + packages/gl-react-headless/src/index.tsx | 2 +- packages/gl-react-native/src/globals.d.ts | 7 + packages/gl-react/src/Bus.tsx | 2 +- packages/gl-react/src/Node.tsx | 2 +- packages/gl-react/src/connectSize.tsx | 2 +- packages/gl-react/tsconfig.json | 2 +- scripts/build.sh | 2 +- yarn.lock | 487 +------------------- 15 files changed, 49 insertions(+), 484 deletions(-) create mode 100644 .yarnrc.yml create mode 100644 packages/gl-react-expo/src/globals.d.ts create mode 100644 packages/gl-react-native/src/globals.d.ts diff --git a/.yarnrc.yml b/.yarnrc.yml new file mode 100644 index 00000000..3186f3f0 --- /dev/null +++ b/.yarnrc.yml @@ -0,0 +1 @@ +nodeLinker: node-modules diff --git a/babel.config.js b/babel.config.js index f3b94186..0150f2da 100755 --- a/babel.config.js +++ b/babel.config.js @@ -10,6 +10,6 @@ module.exports = { }, ], "@babel/preset-react", - "@babel/preset-typescript", + ["@babel/preset-typescript", { allowDeclareFields: true }], ], }; diff --git a/package.json b/package.json index 69d5e2ea..1f355d38 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,8 @@ "fast-uri": "^3.1.2", "follow-redirects": "^1.16.0", "ip-address": "^10.2.0", - "@xmldom/xmldom": "^0.8.13" + "@xmldom/xmldom": "^0.8.13", + "gl": "9.0.0-rc.9" }, "devDependencies": { "@babel/cli": "^7.26.0", diff --git a/packages/gl-react-dom/src/GLViewDOM.tsx b/packages/gl-react-dom/src/GLViewDOM.tsx index 2eb4bdc6..8c356e97 100755 --- a/packages/gl-react-dom/src/GLViewDOM.tsx +++ b/packages/gl-react-dom/src/GLViewDOM.tsx @@ -145,7 +145,7 @@ export default class GLViewDOM extends Component< ); for (let k in propTypes) { if (rest.hasOwnProperty(k)) { - delete rest[k]; + delete (rest as any)[k]; } } return ( @@ -177,7 +177,7 @@ export default class GLViewDOM extends Component< debug ? { ...webglContextAttributes, preserveDrawingBuffer: true } : webglContextAttributes, - version || "auto" + (version || "auto") as "webgl" | "webgl2" | "auto" ); this.webglContextAttributes = webglContextAttributes || {}; return gl; diff --git a/packages/gl-react-dom/src/getContext.ts b/packages/gl-react-dom/src/getContext.ts index 14f84515..e55970ac 100755 --- a/packages/gl-react-dom/src/getContext.ts +++ b/packages/gl-react-dom/src/getContext.ts @@ -5,19 +5,19 @@ const getContext = ( ) => { let gl: WebGLRenderingContext | null = null; if (version === "webgl2" || version === "auto") { - gl = canvas.getContext("webgl2", opts) as WebGLRenderingContext | null; + gl = canvas.getContext("webgl2", opts) as unknown as WebGLRenderingContext | null; } if (!gl && (version === "webgl" || version === "auto")) { gl = - (canvas.getContext("webgl", opts) as WebGLRenderingContext | null) || + (canvas.getContext("webgl", opts) as unknown as WebGLRenderingContext | null) || (canvas.getContext( "webgl-experimental" as any, opts - ) as WebGLRenderingContext | null) || + ) as unknown as WebGLRenderingContext | null) || (canvas.getContext( "experimental-webgl" as any, opts - ) as WebGLRenderingContext | null); + ) as unknown as WebGLRenderingContext | null); } return gl; }; diff --git a/packages/gl-react-expo/src/GLViewNative.tsx b/packages/gl-react-expo/src/GLViewNative.tsx index 4b391a86..a288aa6e 100755 --- a/packages/gl-react-expo/src/GLViewNative.tsx +++ b/packages/gl-react-expo/src/GLViewNative.tsx @@ -55,6 +55,7 @@ export default class GLViewNative extends Component<{ style={[{ position: "relative", overflow: "hidden" }, style]} > number; + cancelAnimationFrame: (id: number) => void; +}; diff --git a/packages/gl-react-headless/src/index.tsx b/packages/gl-react-headless/src/index.tsx index f54ff3be..31de2d7c 100755 --- a/packages/gl-react-headless/src/index.tsx +++ b/packages/gl-react-headless/src/index.tsx @@ -91,7 +91,7 @@ class GLView extends Component<{ render() { const { width, height, debug, children, ...rest } = this.props; for (let k in propTypes) { - delete rest[k]; + delete (rest as any)[k]; } return ( diff --git a/packages/gl-react-native/src/globals.d.ts b/packages/gl-react-native/src/globals.d.ts new file mode 100644 index 00000000..0761401f --- /dev/null +++ b/packages/gl-react-native/src/globals.d.ts @@ -0,0 +1,7 @@ +declare module "react-native" { + export const View: any; +} +declare var global: typeof globalThis & { + requestAnimationFrame: (callback: FrameRequestCallback) => number; + cancelAnimationFrame: (id: number) => void; +}; diff --git a/packages/gl-react/src/Bus.tsx b/packages/gl-react/src/Bus.tsx index 53a4b152..4ead5cb8 100755 --- a/packages/gl-react/src/Bus.tsx +++ b/packages/gl-react/src/Bus.tsx @@ -22,7 +22,7 @@ export default class Bus extends Component { id: number = genId(); static contextType = GLContext; - context!: { + declare context: { glParent: any; glSurface: any; glSizable: any; diff --git a/packages/gl-react/src/Node.tsx b/packages/gl-react/src/Node.tsx index 97848911..066526ec 100755 --- a/packages/gl-react/src/Node.tsx +++ b/packages/gl-react/src/Node.tsx @@ -286,7 +286,7 @@ const NodePropTypes = { */ export default class Node extends Component { drawProps: Props = this.props; - context!: SurfaceContext; + declare context: SurfaceContext; framebuffer?: Framebuffer; backbuffer?: Framebuffer; _needsRedraw: boolean = false; diff --git a/packages/gl-react/src/connectSize.tsx b/packages/gl-react/src/connectSize.tsx index b9bd5009..909ecbe0 100755 --- a/packages/gl-react/src/connectSize.tsx +++ b/packages/gl-react/src/connectSize.tsx @@ -13,7 +13,7 @@ const connectSize = (GLComponent: any) => children?: any; onConnectSizeComponentRef?: (ref: any) => void; }> { - context!: { + declare context: { glSizable: { getGLSize: () => [number, number] }; glParent: any; glSurface: any; diff --git a/packages/gl-react/tsconfig.json b/packages/gl-react/tsconfig.json index 9e27bc1a..11cf4034 100644 --- a/packages/gl-react/tsconfig.json +++ b/packages/gl-react/tsconfig.json @@ -14,7 +14,7 @@ "outDir": "lib", "rootDir": "src", "composite": true, - "typeRoots": ["./src/types"] + "typeRoots": ["./src/types", "../../node_modules/@types"] }, "include": ["src/**/*.ts", "src/**/*.tsx"], "exclude": ["lib", "node_modules"] diff --git a/scripts/build.sh b/scripts/build.sh index 04ef05c8..34792049 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -7,7 +7,7 @@ export BABEL_ENV=production for d in ./packages/gl-react*; do cd $d - rm -rf lib + rm -rf lib *.tsbuildinfo babel --root-mode upward --source-maps --extensions '.ts,.tsx' -d lib src cd - 1> /dev/null done diff --git a/yarn.lock b/yarn.lock index 566e55c0..a7086792 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2579,13 +2579,6 @@ __metadata: languageName: node linkType: hard -"@gar/promisify@npm:^1.1.3": - version: 1.1.3 - resolution: "@gar/promisify@npm:1.1.3" - checksum: 10c0/0b3c9958d3cd17f4add3574975e3115ae05dc7f1298a60810414b16f6f558c137b5fb3cd3905df380bacfd955ec13f67c1e6710cbb5c246a7e8d65a8289b2bff - languageName: node - linkType: hard - "@hapi/hoek@npm:^9.0.0, @hapi/hoek@npm:^9.3.0": version: 9.3.0 resolution: "@hapi/hoek@npm:9.3.0" @@ -3067,16 +3060,6 @@ __metadata: languageName: node linkType: hard -"@npmcli/fs@npm:^2.1.0": - version: 2.1.2 - resolution: "@npmcli/fs@npm:2.1.2" - dependencies: - "@gar/promisify": "npm:^1.1.3" - semver: "npm:^7.3.5" - checksum: 10c0/c50d087733d0d8df23be24f700f104b19922a28677aa66fdbe06ff6af6431cc4a5bb1e27683cbc661a5dafa9bafdc603e6a0378121506dfcd394b2b6dd76a187 - languageName: node - linkType: hard - "@npmcli/fs@npm:^4.0.0": version: 4.0.0 resolution: "@npmcli/fs@npm:4.0.0" @@ -3095,16 +3078,6 @@ __metadata: languageName: node linkType: hard -"@npmcli/move-file@npm:^2.0.0": - version: 2.0.1 - resolution: "@npmcli/move-file@npm:2.0.1" - dependencies: - mkdirp: "npm:^1.0.4" - rimraf: "npm:^3.0.2" - checksum: 10c0/11b2151e6d1de6f6eb23128de5aa8a429fd9097d839a5190cb77aa47a6b627022c42d50fa7c47a00f1c9f8f0c1560092b09b061855d293fa0741a2a94cfb174d - languageName: node - linkType: hard - "@npmcli/redact@npm:^4.0.0": version: 4.0.0 resolution: "@npmcli/redact@npm:4.0.0" @@ -4146,13 +4119,6 @@ __metadata: languageName: node linkType: hard -"abbrev@npm:^1.0.0": - version: 1.1.1 - resolution: "abbrev@npm:1.1.1" - checksum: 10c0/3f762677702acb24f65e813070e306c61fafe25d4b2583f9dfc935131f774863f3addd5741572ed576bd69cabe473c5af18e1e108b829cb7b6b4747884f726e6 - languageName: node - linkType: hard - "abbrev@npm:^3.0.0": version: 3.0.1 resolution: "abbrev@npm:3.0.1" @@ -4298,7 +4264,7 @@ __metadata: languageName: node linkType: hard -"agent-base@npm:6, agent-base@npm:^6.0.2": +"agent-base@npm:6": version: 6.0.2 resolution: "agent-base@npm:6.0.2" dependencies: @@ -4314,25 +4280,6 @@ __metadata: languageName: node linkType: hard -"agentkeepalive@npm:^4.2.1": - version: 4.6.0 - resolution: "agentkeepalive@npm:4.6.0" - dependencies: - humanize-ms: "npm:^1.2.1" - checksum: 10c0/235c182432f75046835b05f239708107138a40103deee23b6a08caee5136873709155753b394ec212e49e60e94a378189562cb01347765515cff61b692c69187 - languageName: node - linkType: hard - -"aggregate-error@npm:^3.0.0": - version: 3.1.0 - resolution: "aggregate-error@npm:3.1.0" - dependencies: - clean-stack: "npm:^2.0.0" - indent-string: "npm:^4.0.0" - checksum: 10c0/a42f67faa79e3e6687a4923050e7c9807db3848a037076f791d10e092677d65c1d2d863b7848560699f40fc0502c19f40963fb1cd1fb3d338a7423df8e45e039 - languageName: node - linkType: hard - "ajv@npm:^6.12.4": version: 6.12.6 resolution: "ajv@npm:6.12.6" @@ -4463,23 +4410,6 @@ __metadata: languageName: node linkType: hard -"aproba@npm:^1.0.3 || ^2.0.0": - version: 2.1.0 - resolution: "aproba@npm:2.1.0" - checksum: 10c0/ec8c1d351bac0717420c737eb062766fb63bde1552900e0f4fdad9eb064c3824fef23d1c416aa5f7a80f21ca682808e902d79b7c9ae756d342b5f1884f36932f - languageName: node - linkType: hard - -"are-we-there-yet@npm:^3.0.0": - version: 3.0.1 - resolution: "are-we-there-yet@npm:3.0.1" - dependencies: - delegates: "npm:^1.0.0" - readable-stream: "npm:^3.6.0" - checksum: 10c0/8373f289ba42e4b5ec713bb585acdac14b5702c75f2a458dc985b9e4fa5762bc5b46b40a21b72418a3ed0cfb5e35bdc317ef1ae132f3035f633d581dd03168c3 - languageName: node - linkType: hard - "arg@npm:^5.0.2": version: 5.0.2 resolution: "arg@npm:5.0.2" @@ -5307,32 +5237,6 @@ __metadata: languageName: node linkType: hard -"cacache@npm:^16.1.0": - version: 16.1.3 - resolution: "cacache@npm:16.1.3" - dependencies: - "@npmcli/fs": "npm:^2.1.0" - "@npmcli/move-file": "npm:^2.0.0" - chownr: "npm:^2.0.0" - fs-minipass: "npm:^2.1.0" - glob: "npm:^8.0.1" - infer-owner: "npm:^1.0.4" - lru-cache: "npm:^7.7.1" - minipass: "npm:^3.1.6" - minipass-collect: "npm:^1.0.2" - minipass-flush: "npm:^1.0.5" - minipass-pipeline: "npm:^1.2.4" - mkdirp: "npm:^1.0.4" - p-map: "npm:^4.0.0" - promise-inflight: "npm:^1.0.1" - rimraf: "npm:^3.0.2" - ssri: "npm:^9.0.0" - tar: "npm:^6.1.11" - unique-filename: "npm:^2.0.0" - checksum: 10c0/cdf6836e1c457d2a5616abcaf5d8240c0346b1f5bd6fdb8866b9d84b6dff0b54e973226dc11e0d099f35394213d24860d1989c8358d2a41b39eb912b3000e749 - languageName: node - linkType: hard - "cacache@npm:^19.0.1": version: 19.0.1 resolution: "cacache@npm:19.0.1" @@ -5513,13 +5417,6 @@ __metadata: languageName: node linkType: hard -"chownr@npm:^2.0.0": - version: 2.0.0 - resolution: "chownr@npm:2.0.0" - checksum: 10c0/594754e1303672171cc04e50f6c398ae16128eb134a88f801bf5354fd96f205320f23536a045d9abd8b51024a149696e51231565891d4efdab8846021ecf88e6 - languageName: node - linkType: hard - "chownr@npm:^3.0.0": version: 3.0.0 resolution: "chownr@npm:3.0.0" @@ -5587,13 +5484,6 @@ __metadata: languageName: node linkType: hard -"clean-stack@npm:^2.0.0": - version: 2.2.0 - resolution: "clean-stack@npm:2.2.0" - checksum: 10c0/1f90262d5f6230a17e27d0c190b09d47ebe7efdd76a03b5a1127863f7b3c9aec4c3e6c8bb3a7bbf81d553d56a1fd35728f5a8ef4c63f867ac8d690109742a8c1 - languageName: node - linkType: hard - "cli-cursor@npm:^2.1.0": version: 2.1.0 resolution: "cli-cursor@npm:2.1.0" @@ -5694,15 +5584,6 @@ __metadata: languageName: node linkType: hard -"color-support@npm:^1.1.3": - version: 1.1.3 - resolution: "color-support@npm:1.1.3" - bin: - color-support: bin.js - checksum: 10c0/8ffeaa270a784dc382f62d9be0a98581db43e11eee301af14734a6d089bd456478b1a8b3e7db7ca7dc5b18a75f828f775c44074020b51c05fc00e6d0992b1cc6 - languageName: node - linkType: hard - "colorette@npm:^1.0.7": version: 1.4.0 resolution: "colorette@npm:1.4.0" @@ -5842,13 +5723,6 @@ __metadata: languageName: node linkType: hard -"console-control-strings@npm:^1.1.0": - version: 1.1.0 - resolution: "console-control-strings@npm:1.1.0" - checksum: 10c0/7ab51d30b52d461412cd467721bb82afe695da78fff8f29fe6f6b9cbaac9a2328e27a22a966014df9532100f6dd85370460be8130b9c677891ba36d96a343f50 - languageName: node - linkType: hard - "constants-browserify@npm:~1.0.0": version: 1.0.0 resolution: "constants-browserify@npm:1.0.0" @@ -6086,7 +5960,7 @@ __metadata: languageName: node linkType: hard -"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4, debug@npm:^4.3.5, debug@npm:^4.4.0, debug@npm:^4.4.1, debug@npm:^4.4.3": +"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4, debug@npm:^4.3.5, debug@npm:^4.4.0, debug@npm:^4.4.1, debug@npm:^4.4.3": version: 4.4.3 resolution: "debug@npm:4.4.3" dependencies: @@ -6222,13 +6096,6 @@ __metadata: languageName: node linkType: hard -"delegates@npm:^1.0.0": - version: 1.0.0 - resolution: "delegates@npm:1.0.0" - checksum: 10c0/ba05874b91148e1db4bf254750c042bf2215febd23a6d3cda2e64896aef79745fbd4b9996488bd3cafb39ce19dbce0fd6e3b6665275638befffe1c9b312b91b5 - languageName: node - linkType: hard - "depd@npm:2.0.0, depd@npm:~2.0.0": version: 2.0.0 resolution: "depd@npm:2.0.0" @@ -7542,15 +7409,6 @@ __metadata: languageName: node linkType: hard -"fs-minipass@npm:^2.0.0, fs-minipass@npm:^2.1.0": - version: 2.1.0 - resolution: "fs-minipass@npm:2.1.0" - dependencies: - minipass: "npm:^3.0.0" - checksum: 10c0/703d16522b8282d7299337539c3ed6edddd1afe82435e4f5b76e34a79cd74e488a8a0e26a636afc2440e1a23b03878e2122e3a2cfe375a5cf63c37d92b86a004 - languageName: node - linkType: hard - "fs-minipass@npm:^3.0.0": version: 3.0.3 resolution: "fs-minipass@npm:3.0.3" @@ -7619,22 +7477,6 @@ __metadata: languageName: node linkType: hard -"gauge@npm:^4.0.3": - version: 4.0.4 - resolution: "gauge@npm:4.0.4" - dependencies: - aproba: "npm:^1.0.3 || ^2.0.0" - color-support: "npm:^1.1.3" - console-control-strings: "npm:^1.1.0" - has-unicode: "npm:^2.0.1" - signal-exit: "npm:^3.0.7" - string-width: "npm:^4.2.3" - strip-ansi: "npm:^6.0.1" - wide-align: "npm:^1.1.5" - checksum: 10c0/ef10d7981113d69225135f994c9f8c4369d945e64a8fc721d655a3a38421b738c9fe899951721d1b47b73c41fdb5404ac87cc8903b2ecbed95d2800363e7e58c - languageName: node - linkType: hard - "generator-function@npm:^2.0.0": version: 2.0.1 resolution: "generator-function@npm:2.0.1" @@ -8063,21 +7905,6 @@ __metadata: languageName: node linkType: hard -"gl@npm:^5.0.0": - version: 5.0.3 - resolution: "gl@npm:5.0.3" - dependencies: - bindings: "npm:^1.5.0" - bit-twiddle: "npm:^1.0.2" - glsl-tokenizer: "npm:^2.1.5" - nan: "npm:^2.16.0" - node-abi: "npm:^3.22.0" - node-gyp: "npm:^9.0.0" - prebuild-install: "npm:^7.1.1" - checksum: 10c0/c4ed739e90b357c10e9264b1238f6ada9d3fbf6520e15069481036dd44dea21340b7e9d1485d836f61e143851b6e7065916577bbe8df0ac850878daae0c40839 - languageName: node - linkType: hard - "glob-parent@npm:^5.1.2, glob-parent@npm:~5.1.2": version: 5.1.2 resolution: "glob-parent@npm:5.1.2" @@ -8137,19 +7964,6 @@ __metadata: languageName: node linkType: hard -"glob@npm:^8.0.1": - version: 8.1.0 - resolution: "glob@npm:8.1.0" - dependencies: - fs.realpath: "npm:^1.0.0" - inflight: "npm:^1.0.4" - inherits: "npm:2" - minimatch: "npm:^5.0.1" - once: "npm:^1.3.0" - checksum: 10c0/cb0b5cab17a59c57299376abe5646c7070f8acb89df5595b492dba3bfb43d301a46c01e5695f01154e6553168207cb60d4eaf07d3be4bc3eb9b0457c5c561d0f - languageName: node - linkType: hard - "globals@npm:^14.0.0": version: 14.0.0 resolution: "globals@npm:14.0.0" @@ -8249,13 +8063,6 @@ __metadata: languageName: node linkType: hard -"has-unicode@npm:^2.0.1": - version: 2.0.1 - resolution: "has-unicode@npm:2.0.1" - checksum: 10c0/ebdb2f4895c26bb08a8a100b62d362e49b2190bcfd84b76bc4be1a3bd4d254ec52d0dd9f2fbcc093fc5eb878b20c52146f9dfd33e2686ed28982187be593b47c - languageName: node - linkType: hard - "hash-base@npm:^3.0.0, hash-base@npm:^3.1.2": version: 3.1.2 resolution: "hash-base@npm:3.1.2" @@ -8397,7 +8204,7 @@ __metadata: languageName: node linkType: hard -"http-cache-semantics@npm:^4.1.0, http-cache-semantics@npm:^4.1.1": +"http-cache-semantics@npm:^4.1.1": version: 4.2.0 resolution: "http-cache-semantics@npm:4.2.0" checksum: 10c0/45b66a945cf13ec2d1f29432277201313babf4a01d9e52f44b31ca923434083afeca03f18417f599c9ab3d0e7b618ceb21257542338b57c54b710463b4a53e37 @@ -8445,7 +8252,7 @@ __metadata: languageName: node linkType: hard -"https-proxy-agent@npm:^5.0.0, https-proxy-agent@npm:^5.0.1": +"https-proxy-agent@npm:^5.0.1": version: 5.0.1 resolution: "https-proxy-agent@npm:5.0.1" dependencies: @@ -8472,15 +8279,6 @@ __metadata: languageName: node linkType: hard -"humanize-ms@npm:^1.2.1": - version: 1.2.1 - resolution: "humanize-ms@npm:1.2.1" - dependencies: - ms: "npm:^2.0.0" - checksum: 10c0/f34a2c20161d02303c2807badec2f3b49cbfbbb409abd4f95a07377ae01cfe6b59e3d15ac609cffcd8f2521f0eb37b7e1091acf65da99aa2a4f1ad63c21e7e7a - languageName: node - linkType: hard - "iconv-lite@npm:0.6.3, iconv-lite@npm:^0.6.2": version: 0.6.3 resolution: "iconv-lite@npm:0.6.3" @@ -8569,20 +8367,6 @@ __metadata: languageName: node linkType: hard -"indent-string@npm:^4.0.0": - version: 4.0.0 - resolution: "indent-string@npm:4.0.0" - checksum: 10c0/1e1904ddb0cb3d6cce7cd09e27a90184908b7a5d5c21b92e232c93579d314f0b83c246ffb035493d0504b1e9147ba2c9b21df0030f48673fba0496ecd698161f - languageName: node - linkType: hard - -"infer-owner@npm:^1.0.4": - version: 1.0.4 - resolution: "infer-owner@npm:1.0.4" - checksum: 10c0/a7b241e3149c26e37474e3435779487f42f36883711f198c45794703c7556bc38af224088bd4d1a221a45b8208ae2c2bcf86200383621434d0c099304481c5b9 - languageName: node - linkType: hard - "inflight@npm:^1.0.4": version: 1.0.6 resolution: "inflight@npm:1.0.6" @@ -8788,13 +8572,6 @@ __metadata: languageName: node linkType: hard -"is-lambda@npm:^1.0.1": - version: 1.0.1 - resolution: "is-lambda@npm:1.0.1" - checksum: 10c0/85fee098ae62ba6f1e24cf22678805473c7afd0fb3978a3aa260e354cb7bcb3a5806cf0a98403188465efedec41ab4348e8e4e79305d409601323855b3839d4d - languageName: node - linkType: hard - "is-number@npm:^7.0.0": version: 7.0.0 resolution: "is-number@npm:7.0.0" @@ -9959,13 +9736,6 @@ __metadata: languageName: node linkType: hard -"lru-cache@npm:^7.7.1": - version: 7.18.3 - resolution: "lru-cache@npm:7.18.3" - checksum: 10c0/b3a452b491433db885beed95041eb104c157ef7794b9c9b4d647be503be91769d11206bb573849a16b4cc0d03cbd15ffd22df7960997788b74c1d399ac7a4fed - languageName: node - linkType: hard - "make-dir@npm:^2.1.0": version: 2.1.0 resolution: "make-dir@npm:2.1.0" @@ -9985,30 +9755,6 @@ __metadata: languageName: node linkType: hard -"make-fetch-happen@npm:^10.0.3": - version: 10.2.1 - resolution: "make-fetch-happen@npm:10.2.1" - dependencies: - agentkeepalive: "npm:^4.2.1" - cacache: "npm:^16.1.0" - http-cache-semantics: "npm:^4.1.0" - http-proxy-agent: "npm:^5.0.0" - https-proxy-agent: "npm:^5.0.0" - is-lambda: "npm:^1.0.1" - lru-cache: "npm:^7.7.1" - minipass: "npm:^3.1.6" - minipass-collect: "npm:^1.0.2" - minipass-fetch: "npm:^2.0.3" - minipass-flush: "npm:^1.0.5" - minipass-pipeline: "npm:^1.2.4" - negotiator: "npm:^0.6.3" - promise-retry: "npm:^2.0.1" - socks-proxy-agent: "npm:^7.0.0" - ssri: "npm:^9.0.0" - checksum: 10c0/28ec392f63ab93511f400839dcee83107eeecfaad737d1e8487ea08b4332cd89a8f3319584222edd9f6f1d0833cf516691469496d46491863f9e88c658013949 - languageName: node - linkType: hard - "make-fetch-happen@npm:^14.0.3": version: 14.0.3 resolution: "make-fetch-happen@npm:14.0.3" @@ -10699,15 +10445,6 @@ __metadata: languageName: node linkType: hard -"minimatch@npm:^5.0.1": - version: 5.1.9 - resolution: "minimatch@npm:5.1.9" - dependencies: - brace-expansion: "npm:^2.0.1" - checksum: 10c0/4202718683815a7288b13e470160a4f9560cf392adef4f453927505817e01ef6b3476ecde13cfcaed17e7326dd3b69ad44eb2daeb19a217c5500f9277893f1d6 - languageName: node - linkType: hard - "minimatch@npm:^9.0.0": version: 9.0.9 resolution: "minimatch@npm:9.0.9" @@ -10733,15 +10470,6 @@ __metadata: languageName: node linkType: hard -"minipass-collect@npm:^1.0.2": - version: 1.0.2 - resolution: "minipass-collect@npm:1.0.2" - dependencies: - minipass: "npm:^3.0.0" - checksum: 10c0/8f82bd1f3095b24f53a991b04b67f4c710c894e518b813f0864a31de5570441a509be1ca17e0bb92b047591a8fdbeb886f502764fefb00d2f144f4011791e898 - languageName: node - linkType: hard - "minipass-collect@npm:^2.0.1": version: 2.0.1 resolution: "minipass-collect@npm:2.0.1" @@ -10751,21 +10479,6 @@ __metadata: languageName: node linkType: hard -"minipass-fetch@npm:^2.0.3": - version: 2.1.2 - resolution: "minipass-fetch@npm:2.1.2" - dependencies: - encoding: "npm:^0.1.13" - minipass: "npm:^3.1.6" - minipass-sized: "npm:^1.0.3" - minizlib: "npm:^2.1.2" - dependenciesMeta: - encoding: - optional: true - checksum: 10c0/33ab2c5bdb3d91b9cb8bc6ae42d7418f4f00f7f7beae14b3bb21ea18f9224e792f560a6e17b6f1be12bbeb70dbe99a269f4204c60e5d99130a0777b153505c43 - languageName: node - linkType: hard - "minipass-fetch@npm:^4.0.0": version: 4.0.1 resolution: "minipass-fetch@npm:4.0.1" @@ -10832,7 +10545,7 @@ __metadata: languageName: node linkType: hard -"minipass@npm:^3.0.0, minipass@npm:^3.1.1, minipass@npm:^3.1.6": +"minipass@npm:^3.0.0": version: 3.3.6 resolution: "minipass@npm:3.3.6" dependencies: @@ -10841,13 +10554,6 @@ __metadata: languageName: node linkType: hard -"minipass@npm:^5.0.0": - version: 5.0.0 - resolution: "minipass@npm:5.0.0" - checksum: 10c0/a91d8043f691796a8ac88df039da19933ef0f633e3d7f0d35dcd5373af49131cf2399bfc355f41515dc495e3990369c3858cd319e5c2722b4753c90bf3152462 - languageName: node - linkType: hard - "minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.2, minipass@npm:^7.0.3, minipass@npm:^7.0.4, minipass@npm:^7.1.2": version: 7.1.2 resolution: "minipass@npm:7.1.2" @@ -10862,16 +10568,6 @@ __metadata: languageName: node linkType: hard -"minizlib@npm:^2.1.1, minizlib@npm:^2.1.2": - version: 2.1.2 - resolution: "minizlib@npm:2.1.2" - dependencies: - minipass: "npm:^3.0.0" - yallist: "npm:^4.0.0" - checksum: 10c0/64fae024e1a7d0346a1102bb670085b17b7f95bf6cfdf5b128772ec8faf9ea211464ea4add406a3a6384a7d87a0cd1a96263692134323477b4fb43659a6cab78 - languageName: node - linkType: hard - "minizlib@npm:^3.0.1, minizlib@npm:^3.1.0": version: 3.1.0 resolution: "minizlib@npm:3.1.0" @@ -10888,7 +10584,7 @@ __metadata: languageName: node linkType: hard -"mkdirp@npm:^1.0.3, mkdirp@npm:^1.0.4": +"mkdirp@npm:^1.0.4": version: 1.0.4 resolution: "mkdirp@npm:1.0.4" bin: @@ -10938,7 +10634,7 @@ __metadata: languageName: node linkType: hard -"ms@npm:2.1.3, ms@npm:^2.0.0, ms@npm:^2.1.1, ms@npm:^2.1.3": +"ms@npm:2.1.3, ms@npm:^2.1.1, ms@npm:^2.1.3": version: 2.1.3 resolution: "ms@npm:2.1.3" checksum: 10c0/d924b57e7312b3b63ad21fc5b3dc0af5e78d61a1fc7cfb5457edaf26326bf62be5307cc87ffb6862ef1c2b33b0233cdb5d4f01c4c958cc0d660948b65a287a48 @@ -10956,15 +10652,6 @@ __metadata: languageName: node linkType: hard -"nan@npm:^2.16.0": - version: 2.27.0 - resolution: "nan@npm:2.27.0" - dependencies: - node-gyp: "npm:latest" - checksum: 10c0/38eb00b06e40f0c65b6a98d75795f17d651a8b7b52f03873dff6902d0053f12e7638d7f64fc52bda6c8f8ec454d69636e3988c8a9eb2bc749c2d5c255ba55f4c - languageName: node - linkType: hard - "nan@npm:^2.24.0": version: 2.26.2 resolution: "nan@npm:2.26.2" @@ -11023,13 +10710,6 @@ __metadata: languageName: node linkType: hard -"negotiator@npm:^0.6.3, negotiator@npm:~0.6.4": - version: 0.6.4 - resolution: "negotiator@npm:0.6.4" - checksum: 10c0/3e677139c7fb7628a6f36335bf11a885a62c21d5390204590a1a214a5631fcbe5ea74ef6a610b60afe84b4d975cbe0566a23f20ee17c77c73e74b80032108dea - languageName: node - linkType: hard - "negotiator@npm:^1.0.0": version: 1.0.0 resolution: "negotiator@npm:1.0.0" @@ -11037,6 +10717,13 @@ __metadata: languageName: node linkType: hard +"negotiator@npm:~0.6.4": + version: 0.6.4 + resolution: "negotiator@npm:0.6.4" + checksum: 10c0/3e677139c7fb7628a6f36335bf11a885a62c21d5390204590a1a214a5631fcbe5ea74ef6a610b60afe84b4d975cbe0566a23f20ee17c77c73e74b80032108dea + languageName: node + linkType: hard + "nested-error-stacks@npm:~2.0.1": version: 2.0.1 resolution: "nested-error-stacks@npm:2.0.1" @@ -11051,15 +10738,6 @@ __metadata: languageName: node linkType: hard -"node-abi@npm:^3.22.0": - version: 3.92.0 - resolution: "node-abi@npm:3.92.0" - dependencies: - semver: "npm:^7.3.5" - checksum: 10c0/d5fe063701542e1beef9017251b64dd648db200ae8d76745ddd07d475504734066ee69966609322ed4842a3b2f20cd3fbb0e1d2e675e3c25ff925d1e20fd06be - languageName: node - linkType: hard - "node-abi@npm:^3.3.0": version: 3.78.0 resolution: "node-abi@npm:3.78.0" @@ -11096,27 +10774,6 @@ __metadata: languageName: node linkType: hard -"node-gyp@npm:^9.0.0": - version: 9.4.1 - resolution: "node-gyp@npm:9.4.1" - dependencies: - env-paths: "npm:^2.2.0" - exponential-backoff: "npm:^3.1.1" - glob: "npm:^7.1.4" - graceful-fs: "npm:^4.2.6" - make-fetch-happen: "npm:^10.0.3" - nopt: "npm:^6.0.0" - npmlog: "npm:^6.0.0" - rimraf: "npm:^3.0.2" - semver: "npm:^7.3.5" - tar: "npm:^6.1.2" - which: "npm:^2.0.2" - bin: - node-gyp: bin/node-gyp.js - checksum: 10c0/f7d676cfa79f27d35edf17fe9c80064123670362352d19729e5dc9393d7e99f1397491c3107eddc0c0e8941442a6244a7ba6c860cfbe4b433b4cae248a55fe10 - languageName: node - linkType: hard - "node-gyp@npm:latest": version: 11.4.2 resolution: "node-gyp@npm:11.4.2" @@ -11172,17 +10829,6 @@ __metadata: languageName: node linkType: hard -"nopt@npm:^6.0.0": - version: 6.0.0 - resolution: "nopt@npm:6.0.0" - dependencies: - abbrev: "npm:^1.0.0" - bin: - nopt: bin/nopt.js - checksum: 10c0/837b52c330df16fcaad816b1f54fec6b2854ab1aa771d935c1603fbcf9b023bb073f1466b1b67f48ea4dce127ae675b85b9d9355700e9b109de39db490919786 - languageName: node - linkType: hard - "nopt@npm:^8.0.0": version: 8.1.0 resolution: "nopt@npm:8.1.0" @@ -11233,18 +10879,6 @@ __metadata: languageName: node linkType: hard -"npmlog@npm:^6.0.0": - version: 6.0.2 - resolution: "npmlog@npm:6.0.2" - dependencies: - are-we-there-yet: "npm:^3.0.0" - console-control-strings: "npm:^1.1.0" - gauge: "npm:^4.0.3" - set-blocking: "npm:^2.0.0" - checksum: 10c0/0cacedfbc2f6139c746d9cd4a85f62718435ad0ca4a2d6459cd331dd33ae58206e91a0742c1558634efcde3f33f8e8e7fd3adf1bfe7978310cf00bd55cccf890 - languageName: node - linkType: hard - "nullthrows@npm:^1.1.1": version: 1.1.1 resolution: "nullthrows@npm:1.1.1" @@ -11496,15 +11130,6 @@ __metadata: languageName: node linkType: hard -"p-map@npm:^4.0.0": - version: 4.0.0 - resolution: "p-map@npm:4.0.0" - dependencies: - aggregate-error: "npm:^3.0.0" - checksum: 10c0/592c05bd6262c466ce269ff172bb8de7c6975afca9b50c975135b974e9bdaafbfe80e61aaaf5be6d1200ba08b30ead04b88cfa7e25ff1e3b93ab28c9f62a2c75 - languageName: node - linkType: hard - "p-map@npm:^7.0.2": version: 7.0.3 resolution: "p-map@npm:7.0.3" @@ -11933,7 +11558,7 @@ __metadata: languageName: node linkType: hard -"prebuild-install@npm:^7.1.1, prebuild-install@npm:^7.1.3": +"prebuild-install@npm:^7.1.3": version: 7.1.3 resolution: "prebuild-install@npm:7.1.3" dependencies: @@ -12064,13 +11689,6 @@ __metadata: languageName: node linkType: hard -"promise-inflight@npm:^1.0.1": - version: 1.0.1 - resolution: "promise-inflight@npm:1.0.1" - checksum: 10c0/d179d148d98fbff3d815752fa9a08a87d3190551d1420f17c4467f628214db12235ae068d98cd001f024453676d8985af8f28f002345646c4ece4600a79620bc - languageName: node - linkType: hard - "promise-retry@npm:^2.0.1": version: 2.0.1 resolution: "promise-retry@npm:2.0.1" @@ -13361,17 +12979,6 @@ __metadata: languageName: node linkType: hard -"socks-proxy-agent@npm:^7.0.0": - version: 7.0.0 - resolution: "socks-proxy-agent@npm:7.0.0" - dependencies: - agent-base: "npm:^6.0.2" - debug: "npm:^4.3.3" - socks: "npm:^2.6.2" - checksum: 10c0/b859f7eb8e96ec2c4186beea233ae59c02404094f3eb009946836af27d6e5c1627d1975a69b4d2e20611729ed543b6db3ae8481eb38603433c50d0345c987600 - languageName: node - linkType: hard - "socks-proxy-agent@npm:^8.0.3": version: 8.0.5 resolution: "socks-proxy-agent@npm:8.0.5" @@ -13383,16 +12990,6 @@ __metadata: languageName: node linkType: hard -"socks@npm:^2.6.2": - version: 2.8.9 - resolution: "socks@npm:2.8.9" - dependencies: - ip-address: "npm:^10.1.1" - smart-buffer: "npm:^4.2.0" - checksum: 10c0/2d4350c31142b0931eb1758825b426bcbf4bfb5eed682ca48bc46dc9e7d1930ec366ea574ad49fc6c1fd9e9e17ce243be0ef13e31fc4b0319d9093f1fb19743c - languageName: node - linkType: hard - "socks@npm:^2.8.3": version: 2.8.7 resolution: "socks@npm:2.8.7" @@ -13492,15 +13089,6 @@ __metadata: languageName: node linkType: hard -"ssri@npm:^9.0.0": - version: 9.0.1 - resolution: "ssri@npm:9.0.1" - dependencies: - minipass: "npm:^3.1.1" - checksum: 10c0/c5d153ce03b5980d683ecaa4d805f6a03d8dc545736213803e168a1907650c46c08a4e5ce6d670a0205482b35c35713d9d286d9133bdd79853a406e22ad81f04 - languageName: node - linkType: hard - "stack-utils@npm:^2.0.3": version: 2.0.6 resolution: "stack-utils@npm:2.0.6" @@ -13599,7 +13187,7 @@ __metadata: languageName: node linkType: hard -"string-width-cjs@npm:string-width@^4.2.0, string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.3": +"string-width-cjs@npm:string-width@^4.2.0, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.3": version: 4.2.3 resolution: "string-width@npm:4.2.3" dependencies: @@ -13878,20 +13466,6 @@ __metadata: languageName: node linkType: hard -"tar@npm:^6.1.11, tar@npm:^6.1.2": - version: 6.2.1 - resolution: "tar@npm:6.2.1" - dependencies: - chownr: "npm:^2.0.0" - fs-minipass: "npm:^2.0.0" - minipass: "npm:^5.0.0" - minizlib: "npm:^2.1.1" - mkdirp: "npm:^1.0.3" - yallist: "npm:^4.0.0" - checksum: 10c0/a5eca3eb50bc11552d453488344e6507156b9193efd7635e98e867fab275d527af53d8866e2370cd09dfe74378a18111622ace35af6a608e5223a7d27fe99537 - languageName: node - linkType: hard - "tar@npm:^7.4.3": version: 7.5.1 resolution: "tar@npm:7.5.1" @@ -14338,15 +13912,6 @@ __metadata: languageName: node linkType: hard -"unique-filename@npm:^2.0.0": - version: 2.0.1 - resolution: "unique-filename@npm:2.0.1" - dependencies: - unique-slug: "npm:^3.0.0" - checksum: 10c0/55d95cd670c4a86117ebc34d394936d712d43b56db6bc511f9ca00f666373818bf9f075fb0ab76bcbfaf134592ef26bb75aad20786c1ff1ceba4457eaba90fb8 - languageName: node - linkType: hard - "unique-filename@npm:^4.0.0": version: 4.0.0 resolution: "unique-filename@npm:4.0.0" @@ -14356,15 +13921,6 @@ __metadata: languageName: node linkType: hard -"unique-slug@npm:^3.0.0": - version: 3.0.0 - resolution: "unique-slug@npm:3.0.0" - dependencies: - imurmurhash: "npm:^0.1.4" - checksum: 10c0/617240eb921af803b47d322d75a71a363dacf2e56c29ae5d1404fad85f64f4ec81ef10ee4fd79215d0202cbe1e5a653edb0558d59c9c81d3bd538c2d58e4c026 - languageName: node - linkType: hard - "unique-slug@npm:^5.0.0": version: 5.0.0 resolution: "unique-slug@npm:5.0.0" @@ -14856,7 +14412,7 @@ __metadata: languageName: node linkType: hard -"which@npm:^2.0.1, which@npm:^2.0.2": +"which@npm:^2.0.1": version: 2.0.2 resolution: "which@npm:2.0.2" dependencies: @@ -14889,15 +14445,6 @@ __metadata: languageName: node linkType: hard -"wide-align@npm:^1.1.5": - version: 1.1.5 - resolution: "wide-align@npm:1.1.5" - dependencies: - string-width: "npm:^1.0.2 || 2 || 3 || 4" - checksum: 10c0/1d9c2a3e36dfb09832f38e2e699c367ef190f96b82c71f809bc0822c306f5379df87bab47bed27ea99106d86447e50eb972d3c516c2f95782807a9d082fbea95 - languageName: node - linkType: hard - "wonka@npm:^6.3.2": version: 6.3.5 resolution: "wonka@npm:6.3.5" From 062e69949b0ca2f599e8e79285f6b0ab24e57f8f Mon Sep 17 00:00:00 2001 From: greweb Date: Fri, 15 May 2026 20:58:38 +0200 Subject: [PATCH 2/2] fix: update tests package to use gl-react ^6.0.0 (node-modules linker needs version match) --- packages/tests/package.json | 4 ++-- yarn.lock | 21 +++------------------ 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/packages/tests/package.json b/packages/tests/package.json index c8f7c608..a131ec2c 100755 --- a/packages/tests/package.json +++ b/packages/tests/package.json @@ -18,8 +18,8 @@ }, "version": "5.2.1", "dependencies": { - "gl-react": "^5.2.0", - "gl-react-headless": "^5.2.1", + "gl-react": "^6.0.0", + "gl-react-headless": "^6.0.0", "gl-texture2d": "^2.0.12", "invariant": "^2.2.4", "jest": "^29.7.0", diff --git a/yarn.lock b/yarn.lock index a7086792..ff9100ef 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7758,22 +7758,7 @@ __metadata: languageName: unknown linkType: soft -"gl-react-headless@npm:^5.2.1": - version: 5.2.1 - resolution: "gl-react-headless@npm:5.2.1" - dependencies: - gl: "npm:^5.0.0" - invariant: "npm:^2.2.4" - prop-types: "npm:^15.7.2" - raf: "npm:^3.4.1" - peerDependencies: - gl-react: "*" - react: "*" - checksum: 10c0/61922e9378acc15d5e76fd38a2c57d0f8b443410fcd4672750a17b571391b880fbf5a09ea28a85ca53204db8a8ba96d65332b90bd9054116bc156691205038d8 - languageName: node - linkType: hard - -"gl-react-headless@workspace:packages/gl-react-headless": +"gl-react-headless@npm:^6.0.0, gl-react-headless@workspace:packages/gl-react-headless": version: 0.0.0-use.local resolution: "gl-react-headless@workspace:packages/gl-react-headless" dependencies: @@ -7813,8 +7798,8 @@ __metadata: "@babel/preset-flow": "npm:^7.25.0" "@babel/preset-react": "npm:^7.26.0" babel-jest: "npm:^29.7.0" - gl-react: "npm:^5.2.0" - gl-react-headless: "npm:^5.2.1" + gl-react: "npm:^6.0.0" + gl-react-headless: "npm:^6.0.0" gl-texture2d: "npm:^2.0.12" invariant: "npm:^2.2.4" jest: "npm:^29.7.0"