From 5959b2122ee4f540ae4d5112e8c6b038928ae7f4 Mon Sep 17 00:00:00 2001 From: Ib Green Date: Sun, 5 Apr 2026 10:24:06 -0400 Subject: [PATCH 1/2] chore: Bump to typescript 6 --- package.json | 4 +++- tsconfig.json | 1 + yarn.lock | 48 ++++++++++++++++++++++++------------------------ 3 files changed, 28 insertions(+), 25 deletions(-) diff --git a/package.json b/package.json index 875dd56e..d0112900 100644 --- a/package.json +++ b/package.json @@ -35,10 +35,12 @@ }, "resolutions_notes": { "typescript": "Control the version of TypeScript to avoid breaking changes", + "ts-patch": "Keep the TS transformer patch layer compatible with the selected TypeScript version", "tape": "New versions mess up numeric equality tests" }, "resolutions": { - "typescript": "5.6.2", + "typescript": "6.0.2", + "ts-patch": "3.3.0", "tape": "4.5.0" }, "pre-commit": [ diff --git a/tsconfig.json b/tsconfig.json index 1c3268b1..7f737357 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -13,6 +13,7 @@ "esModuleInterop": true, "allowSyntheticDefaultImports": true, "baseUrl": ".", + "ignoreDeprecations": "6.0", "useDefineForClassFields": false, // BEGIN TYPE CHECK SETTINGS diff --git a/yarn.lock b/yarn.lock index db9a9484..3d154312 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5241,14 +5241,14 @@ __metadata: languageName: node linkType: hard -"global-prefix@npm:^3.0.0": - version: 3.0.0 - resolution: "global-prefix@npm:3.0.0" +"global-prefix@npm:^4.0.0": + version: 4.0.0 + resolution: "global-prefix@npm:4.0.0" dependencies: - ini: "npm:^1.3.5" - kind-of: "npm:^6.0.2" - which: "npm:^1.3.1" - checksum: 10c0/510f489fb68d1cc7060f276541709a0ee6d41356ef852de48f7906c648ac223082a1cc8fce86725ca6c0e032bcdc1189ae77b4744a624b29c34a9d0ece498269 + ini: "npm:^4.1.3" + kind-of: "npm:^6.0.3" + which: "npm:^4.0.0" + checksum: 10c0/a757bba494f0542a34e82716450506a076e769e05993a9739aea3bf27c3f710cd5635d0f4c1c242650c0dc133bf20a8e8fc9cfd3d1d1c371717218ef561f1ac4 languageName: node linkType: hard @@ -5631,7 +5631,7 @@ __metadata: languageName: node linkType: hard -"ini@npm:^1.3.2, ini@npm:^1.3.5, ini@npm:^1.3.8": +"ini@npm:^1.3.2, ini@npm:^1.3.8": version: 1.3.8 resolution: "ini@npm:1.3.8" checksum: 10c0/ec93838d2328b619532e4f1ff05df7909760b6f66d9c9e2ded11e5c1897d6f2f9980c54dd638f88654b00919ce31e827040631eab0a3969e4d1abefa0719516a @@ -9272,7 +9272,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.0, semver@npm:^7.6.3": +"semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.3, semver@npm:^7.6.0, semver@npm:^7.6.3": version: 7.6.3 resolution: "semver@npm:7.6.3" bin: @@ -10156,20 +10156,20 @@ __metadata: languageName: node linkType: hard -"ts-patch@npm:^3.1.2": - version: 3.2.1 - resolution: "ts-patch@npm:3.2.1" +"ts-patch@npm:3.3.0": + version: 3.3.0 + resolution: "ts-patch@npm:3.3.0" dependencies: chalk: "npm:^4.1.2" - global-prefix: "npm:^3.0.0" + global-prefix: "npm:^4.0.0" minimist: "npm:^1.2.8" resolve: "npm:^1.22.2" - semver: "npm:^7.5.4" + semver: "npm:^7.6.3" strip-ansi: "npm:^6.0.1" bin: ts-patch: bin/ts-patch.js tspc: bin/tspc.js - checksum: 10c0/c214e0218f905c6445830821d400280c9b127fa41f2984bbad59c1f19eda7b6a0529457af7bc6d80fdfa38289207d5b5e2f40912c33758a243ca2064ed0aa137 + checksum: 10c0/41abfa08ea70755f44f39c32b8906479cddf66f163ea37bdd8b543dcda548ec6cc3d7b6f53371161fbfaa9ff48e4fbb0d5839f46f425f7058f7710253e607c20 languageName: node linkType: hard @@ -10365,23 +10365,23 @@ __metadata: languageName: node linkType: hard -"typescript@npm:5.6.2": - version: 5.6.2 - resolution: "typescript@npm:5.6.2" +"typescript@npm:6.0.2": + version: 6.0.2 + resolution: "typescript@npm:6.0.2" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10c0/3ed8297a8c7c56b7fec282532503d1ac795239d06e7c4966b42d4330c6cf433a170b53bcf93a130a7f14ccc5235de5560df4f1045eb7f3550b46ebed16d3c5e5 + checksum: 10c0/4b860b0bf87cc0fee0f66d8ef2640b5a8a8a8c74d1129adb82e389e5f97124383823c47946bef8a73ede371461143a3aa8544399d2133c7b2e4f07e81860af7f languageName: node linkType: hard -"typescript@patch:typescript@npm%3A5.6.2#optional!builtin": - version: 5.6.2 - resolution: "typescript@patch:typescript@npm%3A5.6.2#optional!builtin::version=5.6.2&hash=8c6c40" +"typescript@patch:typescript@npm%3A6.0.2#optional!builtin": + version: 6.0.2 + resolution: "typescript@patch:typescript@npm%3A6.0.2#optional!builtin::version=6.0.2&hash=5786d5" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10c0/94eb47e130d3edd964b76da85975601dcb3604b0c848a36f63ac448d0104e93819d94c8bdf6b07c00120f2ce9c05256b8b6092d23cf5cf1c6fa911159e4d572f + checksum: 10c0/49f0b84fc6ca55653e77752b8a61beabc09ee3dae5d965c31596225aa6ef213c5727b1d2e895b900416dc603854ba0872ac4a812c2a4ed6793a601f9c675de02 languageName: node linkType: hard @@ -10769,7 +10769,7 @@ __metadata: languageName: node linkType: hard -"which@npm:^1.2.9, which@npm:^1.3.1": +"which@npm:^1.2.9": version: 1.3.1 resolution: "which@npm:1.3.1" dependencies: From d4af50a954dc0482a7554efc6a53e408f806d9f8 Mon Sep 17 00:00:00 2001 From: Ib Green Date: Sun, 5 Apr 2026 11:56:28 -0400 Subject: [PATCH 2/2] wip --- .ocularrc.js | 2 ++ tsconfig.json | 1 + 2 files changed, 3 insertions(+) diff --git a/.ocularrc.js b/.ocularrc.js index d357af4a..96267c70 100644 --- a/.ocularrc.js +++ b/.ocularrc.js @@ -1,6 +1,8 @@ import {resolve} from 'path'; export default { + ocularPath: resolve('./node_modules/@vis.gl/dev-tools'), + lint: { paths: ['dev-docs', 'docs', 'modules', 'test'], // 'examples', 'website' extensions: ['js', 'mjs', 'jsx', 'ts', 'tsx', 'd.ts', 'md'] diff --git a/tsconfig.json b/tsconfig.json index 7f737357..671f9cf4 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -12,6 +12,7 @@ "moduleResolution": "node", "esModuleInterop": true, "allowSyntheticDefaultImports": true, + "rootDir": ".", "baseUrl": ".", "ignoreDeprecations": "6.0", "useDefineForClassFields": false,