From 78a5d29404ea9175b2176166dd401e8c492adc84 Mon Sep 17 00:00:00 2001 From: Hoppe Wang Date: Thu, 7 Nov 2024 15:40:42 -0800 Subject: [PATCH 1/2] update peerDependencies tslib requirement and rm @fluentui/react-theme-provider dependency --- desktop/package-lock.json | 3 +- desktop/package.json | 6 +- package-lock.json | 225 +----------------- package.json | 3 +- packages/bonito-ui/package-lock.json | 3 +- packages/bonito-ui/package.json | 3 +- .../src/components/layout/root-pane.tsx | 2 +- packages/bonito-ui/src/theme/theme-util.ts | 2 +- packages/playground/package-lock.json | 3 +- packages/playground/package.json | 3 +- .../demo/form/textfield/textfield-demo.tsx | 2 +- packages/react/package-lock.json | 3 +- packages/react/package.json | 3 +- packages/service/package-lock.json | 2 +- packages/service/package.json | 2 +- 15 files changed, 19 insertions(+), 246 deletions(-) diff --git a/desktop/package-lock.json b/desktop/package-lock.json index 9e3fad96a7..d4eea81636 100644 --- a/desktop/package-lock.json +++ b/desktop/package-lock.json @@ -147,12 +147,11 @@ "peerDependencies": { "@fluentui/azure-themes": ">=8.6.34 < 9.0.0", "@fluentui/react": ">=8.97.2 <9.0.0", - "@fluentui/react-theme-provider": ">=0.19.16 <1.0.0", "mobx": "^6.3.2", "mobx-react-lite": "^3.2.0", "react": ">=17.0.2 <18.0.0", "react-dom": ">=17.0.2 <18.0.0", - "tslib": "~2.3.1" + "tslib": "^2.6.2" } }, "node_modules/@ampproject/remapping": { diff --git a/desktop/package.json b/desktop/package.json index a8865f3325..124a2e47d8 100644 --- a/desktop/package.json +++ b/desktop/package.json @@ -93,12 +93,16 @@ "peerDependencies": { "@fluentui/azure-themes": ">=8.6.34 < 9.0.0", "@fluentui/react": ">=8.97.2 <9.0.0", +<<<<<<< HEAD "@fluentui/react-theme-provider": ">=0.19.16 <1.0.0", +======= + "@fluentui/azure-themes": ">=8.6.34 < 9.0.0", +>>>>>>> 7fe3dbee (update peerDependencies tslib requirement and rm @fluentui/react-theme-provider dependency) "mobx": "^6.3.2", "mobx-react-lite": "^3.2.0", "react": ">=17.0.2 <18.0.0", "react-dom": ">=17.0.2 <18.0.0", - "tslib": "~2.3.1" + "tslib": "^2.6.2" }, "devDependencies": { "@angular-eslint/eslint-plugin": "^13.2.1", diff --git a/package-lock.json b/package-lock.json index 8b95297c82..4bfdd8bcd5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,13 +12,12 @@ "dependencies": { "@fluentui/azure-themes": "8.6.34", "@fluentui/react": "8.97.2", - "@fluentui/react-theme-provider": "0.19.16", "mobx": "^6.3.2", "mobx-react-lite": "^3.2.0", "monaco-editor": "~0.31.0", "react": "17.0.2", "react-dom": "17.0.2", - "tslib": "^2.3.1" + "tslib": "^2.6.2" }, "devDependencies": { "@azure-tools/typespec-client-generator-cli": "^0.3.0", @@ -553,27 +552,6 @@ "react-dom": ">=16.8.0 <18.0.0" } }, - "node_modules/@fluentui/react-compose": { - "version": "0.19.24", - "resolved": "https://registry.npmjs.org/@fluentui/react-compose/-/react-compose-0.19.24.tgz", - "integrity": "sha512-4PO7WSIZjwBGObpknjK8d1+PhPHJGSlVSXKFHGEoBjLWVlCTMw6Xa1S4+3K6eE3TEBbe9rsqwwocMTFHjhWwtQ==", - "dependencies": { - "@types/classnames": "^2.2.9", - "@uifabric/set-version": "^7.0.24", - "@uifabric/utilities": "^7.38.2", - "classnames": "^2.2.6", - "tslib": "^1.10.0" - }, - "peerDependencies": { - "@types/react": ">=16.8.0 <18.0.0", - "react": ">=16.8.0 <18.0.0" - } - }, - "node_modules/@fluentui/react-compose/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - }, "node_modules/@fluentui/react-focus": { "version": "8.8.31", "resolved": "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.8.31.tgz", @@ -618,82 +596,6 @@ "react": ">=16.14.0 <19.0.0" } }, - "node_modules/@fluentui/react-stylesheets": { - "version": "0.2.9", - "resolved": "https://registry.npmjs.org/@fluentui/react-stylesheets/-/react-stylesheets-0.2.9.tgz", - "integrity": "sha512-6GDU/cUEG/eJ4owqQXDWPmP5L1zNh2NLEDKdEzxd7cWtGnoXLeMjbs4vF4t5wYGzGaxZmUQILOvJdgCIuc9L9Q==", - "dependencies": { - "@uifabric/set-version": "^7.0.24", - "tslib": "^1.10.0" - }, - "peerDependencies": { - "@types/react": ">=16.8.0 <18.0.0", - "react": ">=16.8.0 <18.0.0" - } - }, - "node_modules/@fluentui/react-stylesheets/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - }, - "node_modules/@fluentui/react-theme-provider": { - "version": "0.19.16", - "resolved": "https://registry.npmjs.org/@fluentui/react-theme-provider/-/react-theme-provider-0.19.16.tgz", - "integrity": "sha512-Kf7z4ZfNLS/onaFL5eQDSlizgwy2ytn6SDyjEKV+9VhxIXdDtOh8AaMXWE7dsj1cRBfBUvuGPVnsnoaGdHxJ+A==", - "dependencies": { - "@fluentui/react-compose": "^0.19.24", - "@fluentui/react-stylesheets": "^0.2.9", - "@fluentui/react-window-provider": "^1.0.6", - "@fluentui/theme": "^1.7.13", - "@uifabric/merge-styles": "^7.20.2", - "@uifabric/react-hooks": "^7.16.4", - "@uifabric/set-version": "^7.0.24", - "@uifabric/utilities": "^7.38.2", - "classnames": "^2.2.6", - "tslib": "^1.10.0" - }, - "peerDependencies": { - "@types/react": ">=16.8.0 <18.0.0", - "react": ">=16.8.0 <18.0.0" - } - }, - "node_modules/@fluentui/react-theme-provider/node_modules/@fluentui/react-window-provider": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-1.0.6.tgz", - "integrity": "sha512-m2HoxhU2m/yWxUauf79y+XZvrrWNx+bMi7ZiL6DjiAKHjTSa8KOyvicbOXd/3dvuVzOaNTnLDdZAvhRFcelOIA==", - "dependencies": { - "@uifabric/set-version": "^7.0.24", - "tslib": "^1.10.0" - }, - "peerDependencies": { - "@types/react": ">=16.8.0 <18.0.0", - "@types/react-dom": ">=16.8.0 <18.0.0", - "react": ">=16.8.0 <18.0.0", - "react-dom": ">=16.8.0 <18.0.0" - } - }, - "node_modules/@fluentui/react-theme-provider/node_modules/@fluentui/theme": { - "version": "1.7.13", - "resolved": "https://registry.npmjs.org/@fluentui/theme/-/theme-1.7.13.tgz", - "integrity": "sha512-/1ZDHZNzV7Wgohay47DL9TAH4uuib5+B2D6Rxoc3T6ULoWcFzwLeVb+VZB/WOCTUbG+NGTrmsWPBOz5+lbuOxA==", - "dependencies": { - "@uifabric/merge-styles": "^7.20.2", - "@uifabric/set-version": "^7.0.24", - "@uifabric/utilities": "^7.38.2", - "tslib": "^1.10.0" - }, - "peerDependencies": { - "@types/react": ">=16.8.0 <18.0.0", - "@types/react-dom": ">=16.8.0 <18.0.0", - "react": ">=16.8.0 <18.0.0", - "react-dom": ">=16.8.0 <18.0.0" - } - }, - "node_modules/@fluentui/react-theme-provider/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - }, "node_modules/@fluentui/react-window-provider": { "version": "2.2.15", "resolved": "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-2.2.15.tgz", @@ -3592,15 +3494,6 @@ "integrity": "sha512-XTIieEY+gvJ39ChLcB4If5zHtPxt3Syj5rgZR+e1ctpmK8NjPf0zFqsz4JpLJT0xla9GFDKjy8Cpu331nrmE1Q==", "dev": true }, - "node_modules/@types/classnames": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@types/classnames/-/classnames-2.3.1.tgz", - "integrity": "sha512-zeOWb0JGBoVmlQoznvqXbE0tEC/HONsnoUNH19Hc96NFsTAwTXbTqb8FMYkru1F/iqp7a18Ws3nWJvtA1sHD1A==", - "deprecated": "This is a stub types definition. classnames provides its own type definitions, so you do not need this installed.", - "dependencies": { - "classnames": "*" - } - }, "node_modules/@types/json-schema": { "version": "7.0.11", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz", @@ -3998,102 +3891,6 @@ "node": ">=12" } }, - "node_modules/@uifabric/merge-styles": { - "version": "7.20.2", - "resolved": "https://registry.npmjs.org/@uifabric/merge-styles/-/merge-styles-7.20.2.tgz", - "integrity": "sha512-cJy8hW9smlWOKgz9xSDMCz/A0yMl4mdo466pcGlIOn84vz+e94grfA7OoTuTzg3Cl0Gj6ODBSf1o0ZwIXYL1Xg==", - "dependencies": { - "@uifabric/set-version": "^7.0.24", - "tslib": "^1.10.0" - } - }, - "node_modules/@uifabric/merge-styles/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - }, - "node_modules/@uifabric/react-hooks": { - "version": "7.16.4", - "resolved": "https://registry.npmjs.org/@uifabric/react-hooks/-/react-hooks-7.16.4.tgz", - "integrity": "sha512-k8RJYTMICWA6varT5Y+oCf2VDHHXN0tC2GuPD4I2XqYCTLaXtNCm4+dMcVA2x8mv1HIO7khvm/8aqKheU/tDfQ==", - "dependencies": { - "@fluentui/react-window-provider": "^1.0.6", - "@uifabric/set-version": "^7.0.24", - "@uifabric/utilities": "^7.38.2", - "tslib": "^1.10.0" - }, - "peerDependencies": { - "@types/react": ">=16.8.0 <18.0.0", - "@types/react-dom": ">=16.8.0 <18.0.0", - "react": ">=16.8.0 <18.0.0", - "react-dom": ">=16.8.0 <18.0.0" - } - }, - "node_modules/@uifabric/react-hooks/node_modules/@fluentui/react-window-provider": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-1.0.6.tgz", - "integrity": "sha512-m2HoxhU2m/yWxUauf79y+XZvrrWNx+bMi7ZiL6DjiAKHjTSa8KOyvicbOXd/3dvuVzOaNTnLDdZAvhRFcelOIA==", - "dependencies": { - "@uifabric/set-version": "^7.0.24", - "tslib": "^1.10.0" - }, - "peerDependencies": { - "@types/react": ">=16.8.0 <18.0.0", - "@types/react-dom": ">=16.8.0 <18.0.0", - "react": ">=16.8.0 <18.0.0", - "react-dom": ">=16.8.0 <18.0.0" - } - }, - "node_modules/@uifabric/react-hooks/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - }, - "node_modules/@uifabric/set-version": { - "version": "7.0.24", - "resolved": "https://registry.npmjs.org/@uifabric/set-version/-/set-version-7.0.24.tgz", - "integrity": "sha512-t0Pt21dRqdC707/ConVJC0WvcQ/KF7tKLU8AZY7YdjgJpMHi1c0C427DB4jfUY19I92f60LOQyhJ4efH+KpFEg==", - "dependencies": { - "tslib": "^1.10.0" - } - }, - "node_modules/@uifabric/set-version/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - }, - "node_modules/@uifabric/utilities": { - "version": "7.38.2", - "resolved": "https://registry.npmjs.org/@uifabric/utilities/-/utilities-7.38.2.tgz", - "integrity": "sha512-5yM4sm142VEBg3/Q5SFheBXqnrZi9CNF5rjHNoex0GgGtG3AHPuS7U8gjm+/Io1MvbuCrn6lyyIw0MDvh1Ebkw==", - "dependencies": { - "@fluentui/dom-utilities": "^1.1.2", - "@uifabric/merge-styles": "^7.20.2", - "@uifabric/set-version": "^7.0.24", - "prop-types": "^15.7.2", - "tslib": "^1.10.0" - }, - "peerDependencies": { - "@types/react": ">=16.8.0 <18.0.0", - "@types/react-dom": ">=16.8.0 <18.0.0", - "react": ">=16.8.0 <18.0.0", - "react-dom": ">=16.8.0 <18.0.0" - } - }, - "node_modules/@uifabric/utilities/node_modules/@fluentui/dom-utilities": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@fluentui/dom-utilities/-/dom-utilities-1.1.2.tgz", - "integrity": "sha512-XqPS7l3YoMwxdNlaYF6S2Mp0K3FmVIOIy2K3YkMc+eRxu9wFK6emr2Q/3rBhtG5u/On37NExRT7/5CTLnoi9gw==", - "dependencies": { - "@uifabric/set-version": "^7.0.24", - "tslib": "^1.10.0" - } - }, - "node_modules/@uifabric/utilities/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - }, "node_modules/@yarnpkg/lockfile": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz", @@ -4804,11 +4601,6 @@ "node": ">=8" } }, - "node_modules/classnames": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz", - "integrity": "sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==" - }, "node_modules/clean-stack": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", @@ -10722,16 +10514,6 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/prop-types": { - "version": "15.8.1", - "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", - "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", - "dependencies": { - "loose-envify": "^1.4.0", - "object-assign": "^4.1.1", - "react-is": "^16.13.1" - } - }, "node_modules/protocols": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/protocols/-/protocols-2.0.1.tgz", @@ -10823,11 +10605,6 @@ "react": ">=16.13.1" } }, - "node_modules/react-is": { - "version": "16.13.1", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", - "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" - }, "node_modules/read": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/read/-/read-2.1.0.tgz", diff --git a/package.json b/package.json index a0aab00694..cd184aea00 100644 --- a/package.json +++ b/package.json @@ -18,13 +18,12 @@ "dependencies": { "@fluentui/azure-themes": "8.6.34", "@fluentui/react": "8.97.2", - "@fluentui/react-theme-provider": "0.19.16", "mobx": "^6.3.2", "mobx-react-lite": "^3.2.0", "monaco-editor": "~0.31.0", "react": "17.0.2", "react-dom": "17.0.2", - "tslib": "^2.3.1" + "tslib": "^2.6.2" }, "devDependencies": { "@azure-tools/typespec-client-generator-cli": "^0.3.0", diff --git a/packages/bonito-ui/package-lock.json b/packages/bonito-ui/package-lock.json index 39c9a9c4e8..b125e9da38 100644 --- a/packages/bonito-ui/package-lock.json +++ b/packages/bonito-ui/package-lock.json @@ -21,13 +21,12 @@ "peerDependencies": { "@fluentui/azure-themes": ">=8.6.34 < 9.0.0", "@fluentui/react": ">=8.97.2 <9.0.0", - "@fluentui/react-theme-provider": ">=0.16.2 <1.0.0", "mobx": "^6.3.2", "mobx-react-lite": "^3.2.0", "monaco-editor": ">=0.30.0 <0.40.0", "react": ">=17.0.2 <18.0.0", "react-dom": ">=17.0.2 <18.0.0", - "tslib": "~2.3.1" + "tslib": "^2.6.2" } }, "node_modules/@ampproject/remapping": { diff --git a/packages/bonito-ui/package.json b/packages/bonito-ui/package.json index c63e7a9962..37d63b4656 100644 --- a/packages/bonito-ui/package.json +++ b/packages/bonito-ui/package.json @@ -62,14 +62,13 @@ }, "peerDependencies": { "@fluentui/react": ">=8.97.2 <9.0.0", - "@fluentui/react-theme-provider": ">=0.16.2 <1.0.0", "@fluentui/azure-themes": ">=8.6.34 < 9.0.0", "mobx": "^6.3.2", "mobx-react-lite": "^3.2.0", "monaco-editor": ">=0.30.0 <0.40.0", "react": ">=17.0.2 <18.0.0", "react-dom": ">=17.0.2 <18.0.0", - "tslib": "~2.3.1" + "tslib": "^2.6.2" }, "dependencies": { "@azure/bonito-core": "^1.0.0" diff --git a/packages/bonito-ui/src/components/layout/root-pane.tsx b/packages/bonito-ui/src/components/layout/root-pane.tsx index 2d508d0876..5863ca6f95 100644 --- a/packages/bonito-ui/src/components/layout/root-pane.tsx +++ b/packages/bonito-ui/src/components/layout/root-pane.tsx @@ -1,6 +1,6 @@ import * as React from "react"; import { ThemeName, getTheme } from "../../theme"; -import { ThemeProvider } from "@fluentui/react-theme-provider"; +import { ThemeProvider } from "@fluentui/react/lib/Theme"; import { loadTheme } from "@fluentui/react/lib/Styling"; export interface RootPaneProps { diff --git a/packages/bonito-ui/src/theme/theme-util.ts b/packages/bonito-ui/src/theme/theme-util.ts index 1eb50f31c0..92d876771f 100644 --- a/packages/bonito-ui/src/theme/theme-util.ts +++ b/packages/bonito-ui/src/theme/theme-util.ts @@ -12,7 +12,7 @@ import { ExplorerThemeLight, } from "./explorer-theme"; import { AppTheme } from "./app-theme"; -import { useTheme } from "@fluentui/react-theme-provider"; +import { useTheme } from "@fluentui/react/lib/Theme"; import { getLogger } from "@azure/bonito-core"; import { CycleThemeDark, diff --git a/packages/playground/package-lock.json b/packages/playground/package-lock.json index dc3f0be96d..0936cdad8b 100644 --- a/packages/playground/package-lock.json +++ b/packages/playground/package-lock.json @@ -20,13 +20,12 @@ "peerDependencies": { "@fluentui/azure-themes": ">=8.6.34 < 9.0.0", "@fluentui/react": ">=8.97.2 <9.0.0", - "@fluentui/react-theme-provider": ">=0.19.16 <1.0.0", "mobx": "^6.3.2", "mobx-react-lite": "^3.2.0", "monaco-editor": ">=0.30.0 <0.40.0", "react": ">=17.0.2 <18.0.0", "react-dom": ">=17.0.2 <18.0.0", - "tslib": "~2.3.1" + "tslib": "^2.6.2" } }, "node_modules/@ampproject/remapping": { diff --git a/packages/playground/package.json b/packages/playground/package.json index 85ab7967f4..27d78a36a3 100644 --- a/packages/playground/package.json +++ b/packages/playground/package.json @@ -58,14 +58,13 @@ }, "peerDependencies": { "@fluentui/react": ">=8.97.2 <9.0.0", - "@fluentui/react-theme-provider": ">=0.19.16 <1.0.0", "@fluentui/azure-themes": ">=8.6.34 < 9.0.0", "mobx": "^6.3.2", "mobx-react-lite": "^3.2.0", "monaco-editor": ">=0.30.0 <0.40.0", "react": ">=17.0.2 <18.0.0", "react-dom": ">=17.0.2 <18.0.0", - "tslib": "~2.3.1" + "tslib": "^2.6.2" }, "dependencies": { "@azure/bonito-core": "^1.0.0", diff --git a/packages/playground/src/demo/form/textfield/textfield-demo.tsx b/packages/playground/src/demo/form/textfield/textfield-demo.tsx index c680ac392b..e9d03c9beb 100644 --- a/packages/playground/src/demo/form/textfield/textfield-demo.tsx +++ b/packages/playground/src/demo/form/textfield/textfield-demo.tsx @@ -20,7 +20,7 @@ import { IStackTokens, } from "@fluentui/react/lib/Stack"; import { ITextFieldStyles } from "@fluentui/react/lib/TextField"; -import { IStyleFunctionOrObject } from "@uifabric/merge-styles"; +import { IStyleFunctionOrObject } from "@fluentui/react/lib/Utilities"; export const TextFieldDemo: React.FC = () => { /* diff --git a/packages/react/package-lock.json b/packages/react/package-lock.json index 381634856c..a2c0fc9ee7 100644 --- a/packages/react/package-lock.json +++ b/packages/react/package-lock.json @@ -21,13 +21,12 @@ "peerDependencies": { "@fluentui/azure-themes": ">=8.6.34 < 9.0.0", "@fluentui/react": ">=8.97.2 <9.0.0", - "@fluentui/react-theme-provider": ">=0.16.2 <1.0.0", "mobx": "^6.3.2", "mobx-react-lite": "^3.2.0", "monaco-editor": ">=0.30.0 <0.40.0", "react": ">=17.0.2 <18.0.0", "react-dom": ">=17.0.2 <18.0.0", - "tslib": "~2.3.1" + "tslib": "^2.6.2" } }, "node_modules/@ampproject/remapping": { diff --git a/packages/react/package.json b/packages/react/package.json index 47906a5b38..cff14c6b86 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -63,14 +63,13 @@ }, "peerDependencies": { "@fluentui/react": ">=8.97.2 <9.0.0", - "@fluentui/react-theme-provider": ">=0.16.2 <1.0.0", "@fluentui/azure-themes": ">=8.6.34 < 9.0.0", "mobx": "^6.3.2", "mobx-react-lite": "^3.2.0", "monaco-editor": ">=0.30.0 <0.40.0", "react": ">=17.0.2 <18.0.0", "react-dom": ">=17.0.2 <18.0.0", - "tslib": "~2.3.1" + "tslib": "^2.6.2" }, "dependencies": { "@azure/bonito-core": "^1.0.0", diff --git a/packages/service/package-lock.json b/packages/service/package-lock.json index 9175e527a6..b08f08ff83 100644 --- a/packages/service/package-lock.json +++ b/packages/service/package-lock.json @@ -25,7 +25,7 @@ }, "peerDependencies": { "mobx": "^6.3.2", - "tslib": "~2.3.1" + "tslib": "^2.6.2" } }, "node_modules/@ampproject/remapping": { diff --git a/packages/service/package.json b/packages/service/package.json index b49e105b31..76f98067ee 100644 --- a/packages/service/package.json +++ b/packages/service/package.json @@ -61,7 +61,7 @@ }, "peerDependencies": { "mobx": "^6.3.2", - "tslib": "~2.3.1" + "tslib": "^2.6.2" }, "dependencies": { "@azure-rest/core-client": "^1.4.0", From 76a03c0ec73dfcb3aa41836f3c8fb64458abda12 Mon Sep 17 00:00:00 2001 From: Hoppe Wang Date: Thu, 7 Nov 2024 15:55:52 -0800 Subject: [PATCH 2/2] fix package.json --- desktop/package.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/desktop/package.json b/desktop/package.json index 124a2e47d8..eb2e8d6195 100644 --- a/desktop/package.json +++ b/desktop/package.json @@ -93,11 +93,6 @@ "peerDependencies": { "@fluentui/azure-themes": ">=8.6.34 < 9.0.0", "@fluentui/react": ">=8.97.2 <9.0.0", -<<<<<<< HEAD - "@fluentui/react-theme-provider": ">=0.19.16 <1.0.0", -======= - "@fluentui/azure-themes": ">=8.6.34 < 9.0.0", ->>>>>>> 7fe3dbee (update peerDependencies tslib requirement and rm @fluentui/react-theme-provider dependency) "mobx": "^6.3.2", "mobx-react-lite": "^3.2.0", "react": ">=17.0.2 <18.0.0",