diff --git a/samples/react-fluentui-9/.eslintrc.js b/samples/react-fluentui-9/.eslintrc.js index 4c9d66e8f..473df80cd 100644 --- a/samples/react-fluentui-9/.eslintrc.js +++ b/samples/react-fluentui-9/.eslintrc.js @@ -118,7 +118,7 @@ module.exports = { // // STANDARDIZED BY: @typescript-eslint\eslint-plugin\dist\configs\recommended.json // Set to 1 (warning) or 2 (error) to enable the rule - '@typescript-eslint/no-parameter-properties': 0, + '@typescript-eslint/parameter-properties': 0, // RATIONALE: When left in shipping code, unused variables often indicate a mistake. Dead code // may impact performance. // diff --git a/samples/react-fluentui-9/README.md b/samples/react-fluentui-9/README.md index 64cca9921..cdee49493 100644 --- a/samples/react-fluentui-9/README.md +++ b/samples/react-fluentui-9/README.md @@ -7,6 +7,8 @@ This demos the use of the new [Fluent UI version 9](https://github.com/microsoft ![SharePoint View](assets/FQzNLB4XwAIFMRh.jpg "SharePoint View") ![Teams View](assets/FQzO9YjWUAgFlrU.jpg "Teams View") +⚠️ AS of Fluent UI 9.40+ you will need to temporarily override some Fluent UI 9 components for webpack to run ⚠️ + ## Compatibility | :warning: Important | @@ -14,8 +16,8 @@ This demos the use of the new [Fluent UI version 9](https://github.com/microsoft | Every SPFx version is only compatible with specific version(s) of Node.js. In order to be able to build this sample, please ensure that the version of Node on your workstation matches one of the versions listed in this section. This sample will not work on a different version of Node.| |Refer to for more information on SPFx compatibility. | -![SPFx 1.17.2](https://img.shields.io/badge/SPFx-1.17.2-green.svg) -![Node.js v16](https://img.shields.io/badge/Node.js-v16-green.svg) +![SPFx 1.18.2](https://img.shields.io/badge/SPFx-1.18.2-green.svg) +![Node.js v18](https://img.shields.io/badge/Node.js-v18-green.svg) ![Compatible with SharePoint Online](https://img.shields.io/badge/SharePoint%20Online-Compatible-green.svg) ![Does not work with SharePoint 2019](https://img.shields.io/badge/SharePoint%20Server%202019-Incompatible-red.svg "SharePoint Server 2019 requires SPFx 1.4.1 or lower") ![Does not work with SharePoint 2016 (Feature Pack 2)](https://img.shields.io/badge/SharePoint%20Server%202016%20(Feature%20Pack%202)-Incompatible-red.svg "SharePoint Server 2016 Feature Pack 2 requires SPFx 1.1") @@ -51,6 +53,7 @@ Version|Date|Comments 1.0.1|November 14, 2022|Updated to SPFx 1.15, latest Fluent UI 9, shim based theme mapping 1.0.2|January 18, 2023|Updated SPFx 1.16.1 1.0.2|May 15, 2023|Updated SPFx 1.17.2, latest Fluent UI 9 +1.0.4|January 6, 2023|Updated SPFx 1.18.2, latest Fluent UI 9, override to get package builds working - Clone this repository (or [download this solution as a .ZIP file](https://pnp.github.io/download-partial/?url=https://github.com/pnp/sp-dev-fx-webparts/tree/main/samples/react-fluentui-9) then unzip it) - From your command-line, change your current directory to the directory containing this sample (`react-fluentui-9`, located under `samples`) diff --git a/samples/react-fluentui-9/config/package-solution.json b/samples/react-fluentui-9/config/package-solution.json index 52b8bd1cc..2ee7af648 100644 --- a/samples/react-fluentui-9/config/package-solution.json +++ b/samples/react-fluentui-9/config/package-solution.json @@ -4,7 +4,7 @@ "name": "react-fluentui-9-client-side-solution", "title": "SPFX + Fluent UI 9 Demo", "id": "d955a989-7441-475a-b4eb-ff132968b3c5", - "version": "1.0.2.0", + "version": "1.0.3.0", "includeClientSideAssets": true, "skipFeatureDeployment": true, "isDomainIsolated": false, @@ -13,7 +13,7 @@ "websiteUrl": "https://nbdev.uk", "privacyUrl": "", "termsOfUseUrl": "", - "mpnId": "Undefined-1.16.0" + "mpnId": "Undefined-1.18.2" }, "metadata": { "shortDescription": { diff --git a/samples/react-fluentui-9/package.json b/samples/react-fluentui-9/package.json index 1e1e2944d..00c196049 100644 --- a/samples/react-fluentui-9/package.json +++ b/samples/react-fluentui-9/package.json @@ -3,7 +3,7 @@ "version": "0.0.1", "private": true, "engines": { - "node": ">=16.13.0 <17.0.0" + "node": ">=16.13.0 <17.0.0 || >=18.17.1 <19.0.0" }, "main": "lib/index.js", "scripts": { @@ -12,24 +12,24 @@ "test": "gulp test" }, "dependencies": { - "@fluentui/react-components": "^9.20.0", - "@fluentui/react-migration-v8-v9": "^9.2.11", - "@microsoft/sp-component-base": "1.17.2", - "@microsoft/sp-core-library": "1.17.2", - "@microsoft/sp-lodash-subset": "1.17.2", - "@microsoft/sp-office-ui-fabric-core": "1.17.2", - "@microsoft/sp-property-pane": "1.17.2", - "@microsoft/sp-webpart-base": "1.17.2", + "@fluentui/react-components": "^9.44.0", + "@fluentui/react-migration-v8-v9": "^9.4.42", + "@microsoft/sp-component-base": "1.18.2", + "@microsoft/sp-core-library": "1.18.2", + "@microsoft/sp-lodash-subset": "1.18.2", + "@microsoft/sp-office-ui-fabric-core": "1.18.2", + "@microsoft/sp-property-pane": "1.18.2", + "@microsoft/sp-webpart-base": "1.18.2", "react": "17.0.1", "react-dom": "17.0.1", "tslib": "2.3.1" }, "devDependencies": { - "@microsoft/eslint-config-spfx": "1.17.2", - "@microsoft/eslint-plugin-spfx": "1.17.2", - "@microsoft/rush-stack-compiler-4.5": "0.5.0", - "@microsoft/sp-build-web": "1.17.2", - "@microsoft/sp-module-interfaces": "1.17.2", + "@microsoft/eslint-config-spfx": "1.18.2", + "@microsoft/eslint-plugin-spfx": "1.18.2", + "@microsoft/rush-stack-compiler-4.7": "0.1.0", + "@microsoft/sp-build-web": "1.18.2", + "@microsoft/sp-module-interfaces": "1.18.2", "@rushstack/eslint-config": "2.5.1", "@types/react": "17.0.45", "@types/react-dom": "17.0.17", @@ -38,6 +38,13 @@ "eslint": "8.7.0", "eslint-plugin-react-hooks": "4.3.0", "gulp": "4.0.2", - "typescript": "4.5.5" + "typescript": "4.7.4" + }, + "overrides": { + "@fluentui/react-positioning": "9.10.2", + "@fluentui/react-combobox": "9.5.35", + "@fluentui/react-popover": "9.8.23", + "@fluentui/react-menu": "9.12.37", + "@fluentui/react-tooltip": "9.4.3" } } diff --git a/samples/react-fluentui-9/tsconfig.json b/samples/react-fluentui-9/tsconfig.json index 237ce91ab..efb4ccb00 100644 --- a/samples/react-fluentui-9/tsconfig.json +++ b/samples/react-fluentui-9/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "./node_modules/@microsoft/rush-stack-compiler-4.5/includes/tsconfig-web.json", + "extends": "./node_modules/@microsoft/rush-stack-compiler-4.7/includes/tsconfig-web.json", "compilerOptions": { "target": "es5", "forceConsistentCasingInFileNames": true,