Skip to content

Commit ee7931d

Browse files
author
Tom German
committed
Merge branch 'dev' into dynamic-form-list-customization
2 parents 62e483e + b07aa00 commit ee7931d

File tree

5 files changed

+16
-2
lines changed

5 files changed

+16
-2
lines changed

.github/workflows/greetings.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Greetings
22

3-
on: [pull_request, issues]
3+
on: [pull_request_target, issues]
44

55
jobs:
66
greeting:

CHANGELOG.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
"`FieldCollectionData`: added date field control and updated number field [#1600](https://github.com/pnp/sp-dev-fx-controls-react/pull/1600)",
1212
"`ListItemComments`: Added ListItemComments component to Controls.tsx [#1621](https://github.com/pnp/sp-dev-fx-controls-react/pull/1621)",
1313
"`FolderPicker`: Improve documentation of FolderPicker [#1379](https://github.com/pnp/sp-dev-fx-controls-react/pull/1379)",
14-
"`RichText`: Add https:// as placeholder instead of textbox value when adding url [#1651](https://github.com/pnp/sp-dev-fx-controls-react/pull/1656)"
14+
"`RichText`: Add https:// as placeholder instead of textbox value when adding url [#1651](https://github.com/pnp/sp-dev-fx-controls-react/pull/1656)",
15+
"Fix package.json to remove phantom dependencies issues [#1660](https://github.com/pnp/sp-dev-fx-controls-react/issues/1660)"
1516
],
1617
"fixes": [
1718
"`AccessibleAccordion`: fix typo in documentation [#1634](https://github.com/pnp/sp-dev-fx-controls-react/pull/1634)",

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
- `ListItemComments`: Added ListItemComments component to Controls.tsx [#1621](https://github.com/pnp/sp-dev-fx-controls-react/pull/1621)
1414
- `FolderPicker`: Improve documentation of FolderPicker [#1379](https://github.com/pnp/sp-dev-fx-controls-react/pull/1379)
1515
- `RichText`: Add https:// as placeholder instead of textbox value when adding url [#1651](https://github.com/pnp/sp-dev-fx-controls-react/pull/1656)
16+
- Fix package.json to remove phantom dependencies issues [#1660](https://github.com/pnp/sp-dev-fx-controls-react/issues/1660)
1617

1718
### Fixes
1819

docs/documentation/docs/about/release-notes.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
- `ListItemComments`: Added ListItemComments component to Controls.tsx [#1621](https://github.com/pnp/sp-dev-fx-controls-react/pull/1621)
1414
- `FolderPicker`: Improve documentation of FolderPicker [#1379](https://github.com/pnp/sp-dev-fx-controls-react/pull/1379)
1515
- `RichText`: Add https:// as placeholder instead of textbox value when adding url [#1651](https://github.com/pnp/sp-dev-fx-controls-react/pull/1656)
16+
- Fix package.json to remove phantom dependencies issues [#1660](https://github.com/pnp/sp-dev-fx-controls-react/issues/1660)
1617

1718
### Fixes
1819

package.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,31 +20,42 @@
2020
"prepare": "husky install"
2121
},
2222
"dependencies": {
23+
"@fluentui/merge-styles": "8.5.12",
2324
"@fluentui/react": "^7.199.1",
2425
"@fluentui/react-file-type-icons": "^8.8.3",
2526
"@fluentui/react-hooks": "^8.2.6",
2627
"@fluentui/react-icons": "^2.0.200",
28+
"@fluentui/react-icons-northstar": "0.66.5",
2729
"@fluentui/react-northstar": "0.66.0",
2830
"@fluentui/react-theme-provider": "^0.19.16",
2931
"@fluentui/scheme-utilities": "^8.2.12",
32+
"@fluentui/styles": "0.66.5",
3033
"@fluentui/theme": "^2.6.6",
3134
"@microsoft/decorators": "1.17.3",
3235
"@microsoft/mgt-react": "2.10.1",
3336
"@microsoft/mgt-spfx": "2.6.1",
3437
"@microsoft/sp-application-base": "1.17.3",
38+
"@microsoft/sp-component-base": "1.17.3",
3539
"@microsoft/sp-core-library": "1.17.3",
3640
"@microsoft/sp-dialog": "1.17.3",
41+
"@microsoft/sp-extension-base": "1.17.3",
42+
"@microsoft/sp-http": "1.17.3",
3743
"@microsoft/sp-listview-extensibility": "1.17.3",
3844
"@microsoft/sp-loader": "1.17.3",
3945
"@microsoft/sp-lodash-subset": "1.17.3",
4046
"@microsoft/sp-office-ui-fabric-core": "1.17.3",
47+
"@microsoft/sp-page-context": "1.17.3",
4148
"@microsoft/sp-property-pane": "1.17.3",
4249
"@microsoft/sp-webpart-base": "1.17.3",
4350
"@monaco-editor/loader": "^1.3.1",
51+
"@pnp/common": "2.5.0",
52+
"@pnp/odata": "2.5.0",
4453
"@pnp/sp": "2.5.0",
4554
"@pnp/telemetry-js": "2.0.0",
4655
"@popperjs/core": "2.5.4",
4756
"@uifabric/icons": "7.9.5",
57+
"@uifabric/react-hooks": "7.16.4",
58+
"@uifabric/utilities": "7.38.2",
4859
"adaptive-expressions": "^4.15.0",
4960
"adaptivecards": "2.11.2",
5061
"adaptivecards-designer": "2.4.3",

0 commit comments

Comments
 (0)