Skip to content

Commit 1530cce

Browse files
MLoughryMLoughry
committed
Merge branch 'master' of github.com:microsoft/fluentui into react-next-copy/ContextualMenu
2 parents 8fe4134 + 5be1ae0 commit 1530cce

File tree

241 files changed

+3098
-1187
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

241 files changed

+3098
-1187
lines changed

‎apps/a11y-tests/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
"update-snapshots": "just-scripts jest -u"
1414
},
1515
"dependencies": {
16-
"@uifabric/fabric-website-resources": "^7.6.83",
16+
"@uifabric/fabric-website-resources": "^7.6.84",
1717
"axe-core": "^3.2.2",
1818
"axe-puppeteer": "^1.0.0",
1919
"axe-sarif-converter": "^2.0.1",
2020
"glob": "^7.1.2",
2121
"mkdirp": "^0.5.1",
22-
"office-ui-fabric-react": "^7.121.0",
22+
"office-ui-fabric-react": "^7.121.2",
2323
"puppeteer": "^1.13.0",
2424
"tslib": "^1.10.0",
2525
"react": "16.8.6",
@@ -35,7 +35,7 @@
3535
"@types/react-dom": "16.8.4",
3636
"@types/sarif": "^2.1.1",
3737
"@uifabric/build": "^7.0.0",
38-
"@uifabric/icons": "^7.3.52",
38+
"@uifabric/icons": "^7.3.53",
3939
"@uifabric/tslint-rules": "^7.2.1"
4040
}
4141
}

‎apps/dom-tests/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
"@types/react": "16.8.25",
2020
"@types/webpack-env": "1.15.1",
2121
"@uifabric/build": "^7.0.0",
22-
"@uifabric/example-app-base": "^7.12.80",
22+
"@uifabric/example-app-base": "^7.12.81",
2323
"@uifabric/tslint-rules": "^7.2.1",
2424
"expect-puppeteer": "4.1.0",
2525
"jest-environment-node": "~24.9.0",
2626
"jest-environment-puppeteer": "^4.1.0",
2727
"jest-puppeteer": "^4.0.0",
28-
"office-ui-fabric-react": "^7.121.0",
28+
"office-ui-fabric-react": "^7.121.2",
2929
"puppeteer": "^1.13.0",
3030
"react-dom": "16.8.6",
3131
"react": "16.8.6",

‎apps/fabric-website-resources/package.json

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@uifabric/fabric-website-resources",
3-
"version": "7.6.83",
3+
"version": "7.6.84",
44
"description": "Fluent UI React local demo app",
55
"main": "lib-commonjs/index.js",
66
"module": "lib/index.js",
@@ -37,22 +37,22 @@
3737
},
3838
"dependencies": {
3939
"@microsoft/load-themed-styles": "^1.10.26",
40-
"@uifabric/api-docs": "^7.3.1",
41-
"@uifabric/azure-themes": "^7.1.28",
42-
"@uifabric/example-app-base": "^7.12.80",
43-
"@uifabric/fluent-theme": "^7.1.97",
44-
"@uifabric/icons": "^7.3.52",
45-
"@uifabric/mdl2-theme": "^0.1.98",
40+
"@uifabric/api-docs": "^7.3.2",
41+
"@uifabric/azure-themes": "^7.1.29",
42+
"@uifabric/example-app-base": "^7.12.81",
43+
"@uifabric/fluent-theme": "^7.1.98",
44+
"@uifabric/icons": "^7.3.53",
45+
"@uifabric/mdl2-theme": "^0.1.99",
4646
"@uifabric/merge-styles": "^7.14.1",
47-
"@uifabric/react-cards": "^0.109.100",
47+
"@uifabric/react-cards": "^0.109.101",
4848
"@uifabric/set-version": "^7.0.13",
49-
"@uifabric/styling": "^7.13.0",
49+
"@uifabric/styling": "^7.13.1",
5050
"@uifabric/theme-samples": "^7.0.94",
51-
"@uifabric/tsx-editor": "^0.11.96",
52-
"@uifabric/utilities": "^7.21.0",
51+
"@uifabric/tsx-editor": "^0.11.97",
52+
"@uifabric/utilities": "^7.21.1",
5353
"@uifabric/variants": "^7.1.84",
5454
"office-ui-fabric-core": "^11.0.0",
55-
"office-ui-fabric-react": "^7.121.0",
55+
"office-ui-fabric-react": "^7.121.2",
5656
"tslib": "^1.10.0"
5757
},
5858
"peerDependencies": {

‎apps/fabric-website/package.json

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@uifabric/fabric-website",
3-
"version": "7.10.72",
3+
"version": "7.10.73",
44
"description": "The official website for the Fluent UI project.",
55
"main": "lib-commonjs/index.js",
66
"module": "lib/index.js",
@@ -33,7 +33,7 @@
3333
"@types/webpack-env": "1.15.1",
3434
"@uifabric/build": "^7.0.0",
3535
"@uifabric/tslint-rules": "^7.2.1",
36-
"@uifabric/tsx-editor": "^0.11.96",
36+
"@uifabric/tsx-editor": "^0.11.97",
3737
"office-ui-fabric-core": "^11.0.0",
3838
"react": "16.8.6",
3939
"react-app-polyfill": "~1.0.1",
@@ -42,18 +42,18 @@
4242
},
4343
"dependencies": {
4444
"@microsoft/load-themed-styles": "^1.10.26",
45-
"@uifabric/api-docs": "^7.3.1",
46-
"@uifabric/example-app-base": "^7.12.80",
47-
"@uifabric/experiments": "^7.26.5",
48-
"@uifabric/fabric-website-resources": "^7.6.83",
49-
"@uifabric/file-type-icons": "^7.3.5",
50-
"@uifabric/fluent-theme": "^7.1.97",
51-
"@uifabric/icons": "^7.3.52",
52-
"@uifabric/react-cards": "^0.109.100",
45+
"@uifabric/api-docs": "^7.3.2",
46+
"@uifabric/example-app-base": "^7.12.81",
47+
"@uifabric/experiments": "^7.26.6",
48+
"@uifabric/fabric-website-resources": "^7.6.84",
49+
"@uifabric/file-type-icons": "^7.3.6",
50+
"@uifabric/fluent-theme": "^7.1.98",
51+
"@uifabric/icons": "^7.3.53",
52+
"@uifabric/react-cards": "^0.109.101",
5353
"@uifabric/set-version": "^7.0.13",
5454
"@uifabric/theme-samples": "^7.0.94",
5555
"json-loader": "^0.5.7",
56-
"office-ui-fabric-react": "^7.121.0",
56+
"office-ui-fabric-react": "^7.121.2",
5757
"tslib": "^1.10.0",
5858
"whatwg-fetch": "2.0.4"
5959
}

‎apps/perf-test/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
"lodash": "^4.17.15"
2525
},
2626
"dependencies": {
27-
"@fluentui/react-button": "^0.3.5",
28-
"@fluentui/react-next": "^8.0.0-alpha.44",
27+
"@fluentui/react-button": "^0.3.7",
28+
"@fluentui/react-next": "^8.0.0-alpha.46",
2929
"@uifabric/set-version": "^7.0.13",
30-
"@uifabric/example-app-base": "^7.12.80",
31-
"@uifabric/experiments": "^7.26.5",
30+
"@uifabric/example-app-base": "^7.12.81",
31+
"@uifabric/experiments": "^7.26.6",
3232
"@microsoft/load-themed-styles": "^1.10.26",
33-
"office-ui-fabric-react": "^7.121.0",
33+
"office-ui-fabric-react": "^7.121.2",
3434
"querystring": "^0.2.0",
3535
"react": "16.8.6",
3636
"react-app-polyfill": "~1.0.1",

‎apps/pr-deploy-site/package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
"license": "MIT",
1414
"dependencies": {
1515
"@fluentui/docs": "^0.50.0",
16-
"@uifabric/charting": "^2.3.0",
17-
"@uifabric/date-time": "^7.8.102",
18-
"@uifabric/experiments": "^7.26.5",
19-
"@uifabric/fabric-website": "^7.10.72",
20-
"@uifabric/fabric-website-resources": "^7.6.83",
21-
"office-ui-fabric-react": "^7.121.0",
16+
"@uifabric/charting": "^2.3.2",
17+
"@uifabric/date-time": "^7.9.1",
18+
"@uifabric/experiments": "^7.26.6",
19+
"@uifabric/fabric-website": "^7.10.73",
20+
"@uifabric/fabric-website-resources": "^7.6.84",
21+
"office-ui-fabric-react": "^7.121.2",
2222
"perf-test": "^7.0.0",
2323
"theming-designer": "^7.0.0",
2424
"todo-app": "^7.0.0"

‎apps/server-rendered-app/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
},
2828
"dependencies": {
2929
"@microsoft/load-themed-styles": "^1.10.26",
30-
"@uifabric/icons": "^7.3.52",
30+
"@uifabric/icons": "^7.3.53",
3131
"@uifabric/merge-styles": "^7.14.1",
3232
"@uifabric/set-version": "^7.0.13",
33-
"office-ui-fabric-react": "^7.121.0",
33+
"office-ui-fabric-react": "^7.121.2",
3434
"react": "16.8.6",
3535
"react-app-polyfill": "~1.0.1",
3636
"react-dom": "16.8.6",

‎apps/ssr-tests/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
"@types/mocha": "2.2.39",
1818
"@types/webpack-env": "1.15.1",
1919
"@uifabric/build": "^7.0.0",
20-
"@uifabric/fabric-website-resources": "^7.6.83",
20+
"@uifabric/fabric-website-resources": "^7.6.84",
2121
"just-scripts-utils": "^0.8.3",
2222
"mocha": "^3.3.0",
23-
"office-ui-fabric-react": "^7.121.0",
23+
"office-ui-fabric-react": "^7.121.2",
2424
"raw-loader": "^0.5.1",
2525
"react": "16.8.6",
2626
"react-app-polyfill": "~1.0.1",

‎apps/test-bundles/package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@
3030
},
3131
"dependencies": {
3232
"@fluentui/keyboard-key": "^0.2.1",
33-
"@fluentui/react-button": "^0.3.5",
34-
"@fluentui/react-compose": "^0.11.2",
35-
"@fluentui/react-next": "^8.0.0-alpha.44",
36-
"@uifabric/experiments": "^7.26.5",
33+
"@fluentui/react-button": "^0.3.7",
34+
"@fluentui/react-compose": "^0.11.3",
35+
"@fluentui/react-next": "^8.0.0-alpha.46",
36+
"@uifabric/experiments": "^7.26.6",
3737
"@uifabric/set-version": "^7.0.13",
38-
"@uifabric/styling": "^7.13.0",
39-
"office-ui-fabric-react": "^7.121.0",
38+
"@uifabric/styling": "^7.13.1",
39+
"office-ui-fabric-react": "^7.121.2",
4040
"react": "16.8.6",
4141
"react-app-polyfill": "~1.0.1",
4242
"react-dom": "16.8.6",

‎apps/test-bundles/webpack.config.js

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ const resolvePath = (packageName, entryFileName = 'index.js') =>
1111

1212
// Create entries for all top level imports.
1313
const Entries = _buildEntries('office-ui-fabric-react');
14-
_buildEntries('@fluentui/react-button', Entries);
1514
_buildEntries('@fluentui/react-next', Entries);
1615

1716
// Create entries for single top level import.

‎apps/theming-designer/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
"@uifabric/build": "^7.0.0"
2222
},
2323
"dependencies": {
24-
"@uifabric/react-cards": "^0.109.100",
24+
"@uifabric/react-cards": "^0.109.101",
2525
"@uifabric/merge-styles": "^7.14.1",
26-
"@uifabric/example-app-base": "^7.12.80",
26+
"@uifabric/example-app-base": "^7.12.81",
2727
"@uifabric/variants": "^7.1.84",
2828
"@uifabric/set-version": "^7.0.13",
29-
"@uifabric/icons": "^7.3.52",
29+
"@uifabric/icons": "^7.3.53",
3030
"@microsoft/load-themed-styles": "^1.10.26",
31-
"office-ui-fabric-react": "^7.121.0",
31+
"office-ui-fabric-react": "^7.121.2",
3232
"react": "16.8.6",
3333
"react-app-polyfill": "~1.0.1",
3434
"react-dom": "16.8.6",

‎apps/todo-app/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"@microsoft/load-themed-styles": "^1.10.26",
2727
"es6-promise": "^4.1.0",
2828
"immutability-helper": "~2.8.1",
29-
"office-ui-fabric-react": "^7.121.0",
29+
"office-ui-fabric-react": "^7.121.2",
3030
"react": "16.8.6",
3131
"react-app-polyfill": "~1.0.1",
3232
"react-dom": "16.8.6",

‎apps/vr-tests/package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
"test": "just-scripts test"
1515
},
1616
"dependencies": {
17-
"@fluentui/react-button": "^0.3.5",
18-
"@fluentui/react-next": "^8.0.0-alpha.44",
17+
"@fluentui/react-button": "^0.3.7",
18+
"@fluentui/react-next": "^8.0.0-alpha.46",
1919
"@uifabric/example-data": "^7.0.15",
20-
"@uifabric/experiments": "^7.26.5",
21-
"@uifabric/react-cards": "^0.109.100",
20+
"@uifabric/experiments": "^7.26.6",
21+
"@uifabric/react-cards": "^0.109.101",
2222
"@uifabric/set-version": "^7.0.13",
23-
"office-ui-fabric-react": "^7.121.0",
23+
"office-ui-fabric-react": "^7.121.2",
2424
"react": "16.8.6",
2525
"react-app-polyfill": "~1.0.1",
2626
"react-dom": "16.8.6",
@@ -37,7 +37,7 @@
3737
"@types/react-dom": "16.8.4",
3838
"@types/webpack-env": "1.15.1",
3939
"@uifabric/build": "^7.0.0",
40-
"@uifabric/date-time": "^7.8.102",
40+
"@uifabric/date-time": "^7.9.1",
4141
"@uifabric/tslint-rules": "^7.2.1",
4242
"awesome-typescript-loader": "^3.2.3",
4343
"babel-loader": "^8.0.6",

‎change/@fluentui-date-time-utilities-2020-06-17-15-40-06-feat-datetimeutilities-extract.json

-8
This file was deleted.

‎change/@fluentui-react-button-2020-06-17-17-52-16-reactButtonAPI.json

-8
This file was deleted.

‎change/@fluentui-react-button-2020-06-18-14-00-55-react-button-conformance.json

-8
This file was deleted.

‎change/@fluentui-react-next-2020-06-17-19-25-00-react-conformance.json

-8
This file was deleted.

‎change/@uifabric-date-time-2020-06-17-15-40-06-feat-datetimeutilities-extract.json

-8
This file was deleted.

‎change/office-ui-fabric-react-2020-06-17-19-25-00-react-conformance.json

-8
This file was deleted.

‎change/office-ui-fabric-react-2020-06-18-19-32-38-feat-datetimeutilities-extract.json

-8
This file was deleted.

‎packages/api-docs/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@uifabric/api-docs",
3-
"version": "7.3.1",
3+
"version": "7.3.2",
44
"description": "A package that transforms api-extractor .api.json files into page.json files",
55
"repository": {
66
"type": "git",
@@ -22,11 +22,11 @@
2222
"@types/node": "^10.3.2",
2323
"@uifabric/build": "^7.0.0",
2424
"@uifabric/merge-styles": "^7.14.1",
25-
"@uifabric/react-cards": "^0.109.100",
26-
"@uifabric/styling": "^7.13.0",
25+
"@uifabric/react-cards": "^0.109.101",
26+
"@uifabric/styling": "^7.13.1",
2727
"@uifabric/tslint-rules": "^7.2.1",
28-
"@uifabric/utilities": "^7.21.0",
29-
"office-ui-fabric-react": "^7.121.0"
28+
"@uifabric/utilities": "^7.21.1",
29+
"office-ui-fabric-react": "^7.121.2"
3030
},
3131
"dependencies": {
3232
"@microsoft/api-extractor-model": "7.7.1",

‎packages/azure-themes/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@uifabric/azure-themes",
3-
"version": "7.1.28",
3+
"version": "7.1.29",
44
"description": "Azure themes for Fluent UI React",
55
"main": "lib-commonjs/index.js",
66
"module": "lib/index.js",
@@ -25,14 +25,14 @@
2525
"devDependencies": {
2626
"@uifabric/build": "^7.0.0",
2727
"@uifabric/example-data": "^7.0.15",
28-
"@uifabric/react-hooks": "^7.4.6",
28+
"@uifabric/react-hooks": "^7.4.7",
2929
"@uifabric/tslint-rules": "^7.2.1",
3030
"react": "16.8.6"
3131
},
3232
"dependencies": {
3333
"@uifabric/merge-styles": "^7.14.1",
3434
"@uifabric/set-version": "^7.0.13",
35-
"office-ui-fabric-react": "^7.121.0",
35+
"office-ui-fabric-react": "^7.121.2",
3636
"tslib": "^1.10.0"
3737
}
3838
}

0 commit comments

Comments
 (0)