From c3d347d2973e411cba0bc27d5ccaca0c8257c6db Mon Sep 17 00:00:00 2001 From: Ryan Ling Date: Fri, 11 Oct 2024 08:59:11 +1100 Subject: [PATCH] LocationSelectMap: Fix Braid 33 compatibility (#1185) --- .changeset/poor-emus-eat.md | 5 +++++ fe/.eslintignore | 10 +++------ fe/.gitignore | 4 ++-- fe/.prettierignore | 10 +++------ .../LocationSelectMap/LocationSelectMap.tsx | 3 +-- fe/package.json | 2 +- pnpm-lock.yaml | 22 +++++++++---------- 7 files changed, 25 insertions(+), 31 deletions(-) create mode 100644 .changeset/poor-emus-eat.md diff --git a/.changeset/poor-emus-eat.md b/.changeset/poor-emus-eat.md new file mode 100644 index 000000000..a5364ab0a --- /dev/null +++ b/.changeset/poor-emus-eat.md @@ -0,0 +1,5 @@ +--- +'wingman-fe': patch +--- + +LocationSelectMap: Fix Braid 33 compatibility diff --git a/fe/.eslintignore b/fe/.eslintignore index 4d0886895..a8fee4a3e 100644 --- a/fe/.eslintignore +++ b/fe/.eslintignore @@ -1,12 +1,8 @@ # managed by sku -.eslintcache -.eslintrc -.prettierrc +*.less.d.ts +.storybook/main.js coverage/ +dist-storybook/ dist/ -pnpm-lock.yaml report/ -tsconfig.json # end managed by sku - -dist-storybook/ diff --git a/fe/.gitignore b/fe/.gitignore index 76603b148..278b927fe 100644 --- a/fe/.gitignore +++ b/fe/.gitignore @@ -5,10 +5,10 @@ npm-debug.log .eslintcache .eslintrc .prettierrc +.storybook/main.js coverage/ +dist-storybook/ dist/ report/ tsconfig.json # end managed by sku - -dist-storybook/ diff --git a/fe/.prettierignore b/fe/.prettierignore index 5070025be..c7f95c0fa 100644 --- a/fe/.prettierignore +++ b/fe/.prettierignore @@ -1,14 +1,10 @@ # sku generates non-compliant files # managed by sku -.eslintcache -.eslintrc -.prettierrc +*.less.d.ts +.storybook/main.js coverage/ +dist-storybook/ dist/ -pnpm-lock.yaml report/ -tsconfig.json # end managed by sku - -dist-storybook/ diff --git a/fe/lib/components/LocationSelectMap/LocationSelectMap.tsx b/fe/lib/components/LocationSelectMap/LocationSelectMap.tsx index 4405db7b7..e71f235ea 100644 --- a/fe/lib/components/LocationSelectMap/LocationSelectMap.tsx +++ b/fe/lib/components/LocationSelectMap/LocationSelectMap.tsx @@ -106,8 +106,7 @@ export const LocationSelectMap = ({ {isDesktopOrAbove ? ( } - tone="secondary" + icon={} id="clear-nearest-suggestions-button" label="Clear Suggestions" onClick={() => setShowSuggestions(false)} diff --git a/fe/package.json b/fe/package.json index 43ff165ec..1ac606f4c 100644 --- a/fe/package.json +++ b/fe/package.json @@ -27,7 +27,7 @@ "@types/react-dom": "18.3.0", "@vanilla-extract/css": "1.16.0", "@vanilla-extract/css-utils": "0.1.4", - "braid-design-system": "32.24.1", + "braid-design-system": "33.0.0-next-20241010041150", "clsx": "2.1.1", "content-disposition": "0.5.4", "date-fns": "4.1.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7b27f6019..10d4e2015 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -116,8 +116,8 @@ importers: specifier: 0.1.4 version: 0.1.4 braid-design-system: - specifier: 32.24.1 - version: 32.24.1(@types/react@18.3.11)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sku@13.1.3(@storybook/react-webpack5@8.3.2(@swc/core@1.7.26)(esbuild@0.23.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@8.3.2)(typescript@5.5.4))(@types/node@22.7.4)(@types/react@18.3.11)(react@18.3.1)(terser@5.34.1)(ts-node@10.9.2(@swc/core@1.7.26)(@types/node@22.7.4)(typescript@5.5.4))(type-fest@2.19.0)(webpack-hot-middleware@2.26.1)) + specifier: 33.0.0-next-20241010041150 + version: 33.0.0-next-20241010041150(@types/react@18.3.11)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) clsx: specifier: 2.1.1 version: 2.1.1 @@ -147,7 +147,7 @@ importers: version: 6.22.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) scoobie: specifier: 17.2.0 - version: 17.2.0(dfuhube5fnbepeau6bofeafnh4) + version: 17.2.0(@babel/core@7.25.2)(babel-plugin-macros@3.1.0)(braid-design-system@33.0.0-next-20241010041150(@types/react@18.3.11)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-router-dom@6.22.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1)(sku@13.1.3(@storybook/react-webpack5@8.3.2(@swc/core@1.7.26)(esbuild@0.23.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@8.3.2)(typescript@5.5.4))(@types/node@22.7.4)(@types/react@18.3.11)(react@18.3.1)(terser@5.34.1)(ts-node@10.9.2(@swc/core@1.7.26)(@types/node@22.7.4)(typescript@5.5.4))(type-fest@2.19.0)(webpack-hot-middleware@2.26.1))(webpack@5.95.0(@swc/core@1.7.26)(esbuild@0.23.1)) storybook: specifier: 8.3.2 version: 8.3.2 @@ -3066,13 +3066,12 @@ packages: resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==} engines: {node: '>=8'} - braid-design-system@32.24.1: - resolution: {integrity: sha512-93Co2nr5iiIjTpmC5C6BYrb3pXC09Z24UNTBTED2AqwI9pKqxYZN5yp9hAmmIo6fD+vUrS6vd6YS0S3ejEZOrQ==} + braid-design-system@33.0.0-next-20241010041150: + resolution: {integrity: sha512-OxnCfONip3iMomYS/tRJZLtrlIDgkBo6uT54rVwxPOZTiP/xwZ+DOJtet3ACQwFxPR69nSP8adPJpEoLU60xbw==} hasBin: true peerDependencies: - react: ^17 || ^18 - react-dom: ^17 || ^18 - sku: '>=10.13.1' + react: ^18 + react-dom: ^18 browser-assert@1.2.1: resolution: {integrity: sha512-nfulgvOR6S4gt9UKCeGJOuSGBPGiFT6oQ/2UBnvTY/5aQ1PnksW72fhZkM30DzoRRv2WpwZf1vHHEr3mtuXIWQ==} @@ -11429,7 +11428,7 @@ snapshots: dependencies: fill-range: 7.1.1 - braid-design-system@32.24.1(@types/react@18.3.11)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sku@13.1.3(@storybook/react-webpack5@8.3.2(@swc/core@1.7.26)(esbuild@0.23.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@8.3.2)(typescript@5.5.4))(@types/node@22.7.4)(@types/react@18.3.11)(react@18.3.1)(terser@5.34.1)(ts-node@10.9.2(@swc/core@1.7.26)(@types/node@22.7.4)(typescript@5.5.4))(type-fest@2.19.0)(webpack-hot-middleware@2.26.1)): + braid-design-system@33.0.0-next-20241010041150(@types/react@18.3.11)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@capsizecss/core': 4.1.2 '@capsizecss/metrics': 3.3.0 @@ -11453,7 +11452,6 @@ snapshots: react-is: 18.3.1 react-popper-tooltip: 4.4.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react-remove-scroll: 2.6.0(@types/react@18.3.11)(react@18.3.1) - sku: 13.1.3(@storybook/react-webpack5@8.3.2(@swc/core@1.7.26)(esbuild@0.23.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@8.3.2)(typescript@5.5.4))(@types/node@22.7.4)(@types/react@18.3.11)(react@18.3.1)(terser@5.34.1)(ts-node@10.9.2(@swc/core@1.7.26)(@types/node@22.7.4)(typescript@5.5.4))(type-fest@2.19.0)(webpack-hot-middleware@2.26.1) utility-types: 3.11.0 uuid: 8.3.2 transitivePeerDependencies: @@ -15399,7 +15397,7 @@ snapshots: ajv-formats: 2.1.1(ajv@8.17.1) ajv-keywords: 5.1.0(ajv@8.17.1) - scoobie@17.2.0(dfuhube5fnbepeau6bofeafnh4): + scoobie@17.2.0(@babel/core@7.25.2)(babel-plugin-macros@3.1.0)(braid-design-system@33.0.0-next-20241010041150(@types/react@18.3.11)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-router-dom@6.22.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1)(sku@13.1.3(@storybook/react-webpack5@8.3.2(@swc/core@1.7.26)(esbuild@0.23.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@8.3.2)(typescript@5.5.4))(@types/node@22.7.4)(@types/react@18.3.11)(react@18.3.1)(terser@5.34.1)(ts-node@10.9.2(@swc/core@1.7.26)(@types/node@22.7.4)(typescript@5.5.4))(type-fest@2.19.0)(webpack-hot-middleware@2.26.1))(webpack@5.95.0(@swc/core@1.7.26)(esbuild@0.23.1)): dependencies: '@capsizecss/core': 4.1.2 '@mdx-js/react': 1.6.22(react@18.3.1) @@ -15407,7 +15405,7 @@ snapshots: '@vanilla-extract/css': 1.16.0(babel-plugin-macros@3.1.0) '@vanilla-extract/css-utils': 0.1.4 babel-loader: 9.2.1(@babel/core@7.25.2)(webpack@5.95.0(@swc/core@1.7.26)(esbuild@0.23.1)) - braid-design-system: 32.24.1(@types/react@18.3.11)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sku@13.1.3(@storybook/react-webpack5@8.3.2(@swc/core@1.7.26)(esbuild@0.23.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@8.3.2)(typescript@5.5.4))(@types/node@22.7.4)(@types/react@18.3.11)(react@18.3.1)(terser@5.34.1)(ts-node@10.9.2(@swc/core@1.7.26)(@types/node@22.7.4)(typescript@5.5.4))(type-fest@2.19.0)(webpack-hot-middleware@2.26.1)) + braid-design-system: 33.0.0-next-20241010041150(@types/react@18.3.11)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) clsx: 2.1.1 deepmerge-ts: 7.1.0 find-up: 5.0.0