From 05d9775d4aba828c1de120b88d7e20de78a71284 Mon Sep 17 00:00:00 2001 From: Alireza Date: Sat, 16 Mar 2024 15:50:51 +0100 Subject: [PATCH] fix minor build issues --- packages/example-app/package.json | 1 - .../src/tree-utils/groupByDirectory.spec.ts | 32 +++++---- packages/jui/src/List/story-helpers.tsx | 2 +- packages/jui/src/Tooltip/index.ts | 1 + yarn.lock | 71 ++++++++----------- 5 files changed, 47 insertions(+), 60 deletions(-) diff --git a/packages/example-app/package.json b/packages/example-app/package.json index ad351e78..b06187f2 100644 --- a/packages/example-app/package.json +++ b/packages/example-app/package.json @@ -28,7 +28,6 @@ "intl-messageformat": "^9.11.2", "isomorphic-git": "^1.24.3", "monaco-editor": "^0.28.1", - "nodegit": "^0.27.0", "pify": "^5.0.0", "ramda": "^0.27.1", "react": "17", diff --git a/packages/example-app/src/tree-utils/groupByDirectory.spec.ts b/packages/example-app/src/tree-utils/groupByDirectory.spec.ts index 0dfcdd01..1cd5eb27 100644 --- a/packages/example-app/src/tree-utils/groupByDirectory.spec.ts +++ b/packages/example-app/src/tree-utils/groupByDirectory.spec.ts @@ -40,7 +40,9 @@ const groupByDirectoryMergingPaths = createGroupByDirectory< describe("groupByDirectory", () => { it("groups by directory", () => { - const groups = groupByDirectory([change("/a/b/x.js"), change("/a/c/y.js")]); + const y = change("/a/c/y.js"); + const x = change("/a/b/x.js"); + const groups = groupByDirectory([x, y]); expect(groups).toMatchObject([ { dirPath: "/a", @@ -49,12 +51,12 @@ describe("groupByDirectory", () => { expect.objectContaining({ dirPath: "/a/b", parentNodePath: "/a", - children: [change("/a/b/x.js")], + children: [x], }), expect.objectContaining({ dirPath: "/a/c", parentNodePath: "/a", - children: [change("/a/c/y.js")], + children: [y], }), ]), }, @@ -62,29 +64,29 @@ describe("groupByDirectory", () => { }); it("merges directories all the way through", () => { - const groups = groupByDirectoryMergingPaths([change("/a/b/c/d/x.js")]); + const x = change("/a/b/c/d/x.js"); + const groups = groupByDirectoryMergingPaths([x]); expect(groups).toMatchObject([ { dirPath: "/a/b/c/d", parentNodePath: "", - children: [change("/a/b/c/d/x.js")], + children: [x], }, ]); }); it("merges directories when possible", () => { - const groups = groupByDirectoryMergingPaths([ - change("/a/b/bc/h/g/x.js"), - change("/e/f/g/u.js"), - change("/a/b/bc/d/y.js"), - change("/a/z.js"), - ]); + const x = change("/a/b/bc/h/g/x.js"); + const u = change("/e/f/g/u.js"); + const y = change("/a/b/bc/d/y.js"); + const z = change("/a/z.js"); + const groups = groupByDirectoryMergingPaths([x, u, y, z]); expect(groups).toMatchObject([ { dirPath: "/a", parentNodePath: "", children: expect.arrayContaining([ - change("/a/z.js"), + z, expect.objectContaining({ dirPath: "/a/b/bc", parentNodePath: "/a", @@ -92,12 +94,12 @@ describe("groupByDirectory", () => { expect.objectContaining({ dirPath: "/a/b/bc/d", parentNodePath: "/a/b/bc", - children: [change("/a/b/bc/d/y.js")], + children: [y], }), expect.objectContaining({ dirPath: "/a/b/bc/h/g", parentNodePath: "/a/b/bc", - children: [change("/a/b/bc/h/g/x.js")], + children: [x], }), ]), }), @@ -106,7 +108,7 @@ describe("groupByDirectory", () => { { dirPath: "/e/f/g", parentNodePath: "", - children: [change("/e/f/g/u.js")], + children: [u], }, ]); }); diff --git a/packages/jui/src/List/story-helpers.tsx b/packages/jui/src/List/story-helpers.tsx index ebff73d9..17180256 100644 --- a/packages/jui/src/List/story-helpers.tsx +++ b/packages/jui/src/List/story-helpers.tsx @@ -56,7 +56,7 @@ export const commonListStories = { withConnectedInput: (ListCmp: typeof List) => { const WithConnectedInput: Story> = (props) => { const [isFocused, setIsFocused] = React.useState(false); - const listRef = React.useRef(null); + const listRef = React.useRef(null); const selectionManagerRef = React.useRef(null); const { collectionSearchInputProps } = useCollectionSearchInput({ collectionRef: listRef, diff --git a/packages/jui/src/Tooltip/index.ts b/packages/jui/src/Tooltip/index.ts index 6fe88078..581505ed 100644 --- a/packages/jui/src/Tooltip/index.ts +++ b/packages/jui/src/Tooltip/index.ts @@ -14,3 +14,4 @@ export { ValidationTooltip, type ValidationTooltipProps, } from "./ValidationTooltip"; +export { TooltipPointerPosition } from "./TooltipPointer"; diff --git a/yarn.lock b/yarn.lock index 5ac72c88..e1578f06 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4134,7 +4134,7 @@ __metadata: storybook-addon-theme-provider: ^0.1.10 stream-browserify: ^3.0.0 ts-loader: ^8 - typescript: "*" + typescript: "workspace:*" webpack: 5 peerDependencies: react: ">=16.8" @@ -9683,6 +9683,13 @@ __metadata: languageName: node linkType: hard +"@types/diff@npm:^5.0.9": + version: 5.0.9 + resolution: "@types/diff@npm:5.0.9" + checksum: fb5cb6d6407e3ebcd8883bdc9f9124b57ebc04720cfb605afc5f839f9a71878ccf895da66b09d5d8df25e684cfe57a6f6f4bf65f87ccc0ce0b58a18b1f3ce5b0 + languageName: node + linkType: hard + "@types/doctrine@npm:^0.0.3": version: 0.0.3 resolution: "@types/doctrine@npm:0.0.3" @@ -12710,6 +12717,13 @@ __metadata: languageName: node linkType: hard +"clipboard-copy@npm:^4.0.1": + version: 4.0.1 + resolution: "clipboard-copy@npm:4.0.1" + checksum: 530a09de80dfd0536793fdefb6559a2dfb6c2706b027c41c672a0f18debafd420e69111224f3265555afcd73f9cd97517dcaf494aa25996a58a8f550a3426080 + languageName: node + linkType: hard + "cliui@npm:^7.0.2": version: 7.0.4 resolution: "cliui@npm:7.0.4" @@ -14144,6 +14158,13 @@ __metadata: languageName: node linkType: hard +"diff@npm:^5.2.0": + version: 5.2.0 + resolution: "diff@npm:5.2.0" + checksum: 12b63ca9c36c72bafa3effa77121f0581b4015df18bc16bac1f8e263597735649f1a173c26f7eba17fb4162b073fee61788abe49610e6c70a2641fe1895443fd + languageName: node + linkType: hard + "diffie-hellman@npm:^5.0.0": version: 5.0.3 resolution: "diffie-hellman@npm:5.0.3" @@ -19358,10 +19379,13 @@ __metadata: "@isomorphic-git/lightning-fs": ^4.6.0 "@monaco-editor/react": ^4.2.2 "@recoiljs/refine": ^0.1.1 + "@types/diff": ^5.0.9 "@types/jest": ^29.5.2 "@types/uuid": ^9.0.7 browserfs: ^2.0.0 caf: ^15.0.0-preB + clipboard-copy: ^4.0.1 + diff: ^5.2.0 fast-xml-parser: ^4.2.7 intl-messageformat: ^9.11.2 isomorphic-git: ^1.24.3 @@ -19374,6 +19398,7 @@ __metadata: recoil: ^0.7.7 recoil-sync: ^0.2.0 styled-components: ^5 + typescript: "workspace:*" uuid: ^9.0.1 xterm-for-react: ^1.0.4 languageName: unknown @@ -25893,16 +25918,6 @@ __metadata: languageName: node linkType: hard -"typescript@npm:*": - version: 4.8.3 - resolution: "typescript@npm:4.8.3" - bin: - tsc: bin/tsc - tsserver: bin/tsserver - checksum: 8286a5edcaf3d68e65c451aa1e7150ad1cf53ee0813c07ec35b7abdfdb10f355ecaa13c6a226a694ae7a67785fd7eeebf89f845da0b4f7e4a35561ddc459aba0 - languageName: node - linkType: hard - "typescript@npm:4.7.4": version: 4.7.4 resolution: "typescript@npm:4.7.4" @@ -25913,27 +25928,7 @@ __metadata: languageName: node linkType: hard -"typescript@npm:~4.6.3": - version: 4.6.4 - resolution: "typescript@npm:4.6.4" - bin: - tsc: bin/tsc - tsserver: bin/tsserver - checksum: e7bfcc39cd4571a63a54e5ea21f16b8445268b9900bf55aee0e02ad981be576acc140eba24f1af5e3c1457767c96cea6d12861768fb386cf3ffb34013718631a - languageName: node - linkType: hard - -"typescript@patch:typescript@*#~builtin": - version: 4.8.3 - resolution: "typescript@patch:typescript@npm%3A4.8.3#~builtin::version=4.8.3&hash=7ad353" - bin: - tsc: bin/tsc - tsserver: bin/tsserver - checksum: 0404a09c625df01934ef774b45ce1ca57ccae41cd625fcdbb82056715320d9329e70d9d75c2c732ec6ef947444ca978c189a332b71fa21f5c1437d5a83e24906 - languageName: node - linkType: hard - -"typescript@patch:typescript@4.7.4#~builtin": +"typescript@patch:typescript@npm%3A4.7.4#~builtin": version: 4.7.4 resolution: "typescript@patch:typescript@npm%3A4.7.4#~builtin::version=4.7.4&hash=7ad353" bin: @@ -25943,16 +25938,6 @@ __metadata: languageName: node linkType: hard -"typescript@patch:typescript@~4.6.3#~builtin": - version: 4.6.4 - resolution: "typescript@patch:typescript@npm%3A4.6.4#~builtin::version=4.6.4&hash=7ad353" - bin: - tsc: bin/tsc - tsserver: bin/tsserver - checksum: 1cb434fbc637d347be90e3a0c6cd05e33c38f941713c8786d3031faf1842c2c148ba91d2fac01e7276b0ae3249b8633f1660e32686cc7a8c6a8fd5361dc52c66 - languageName: node - linkType: hard - "ua-parser-js@npm:^0.7.30": version: 0.7.31 resolution: "ua-parser-js@npm:0.7.31" @@ -26964,7 +26949,7 @@ __metadata: react-dom: ^17.0.1 stream-browserify: ^3.0.0 styled-components: ^5 - typescript: "*" + typescript: "workspace:*" url-loader: ^4.1.1 webpack: ^5.73.0 languageName: unknown