Skip to content

Commit

Permalink
Merge branch 'master' into migrate-storybook
Browse files Browse the repository at this point in the history
  • Loading branch information
TristanWatanabe committed Jul 16, 2021
2 parents 0a03584 + a1f1516 commit e60aba3
Show file tree
Hide file tree
Showing 92 changed files with 914 additions and 77 deletions.
15 changes: 15 additions & 0 deletions apps/a11y-tests/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
{
"name": "a11y-tests",
"entries": [
{
"date": "Fri, 16 Jul 2021 07:32:14 GMT",
"tag": "a11y-tests_v1.0.0",
"version": "1.0.0",
"comments": {
"none": [
{
"comment": "Bump @fluentui/react to v8.23.5",
"author": "[email protected]",
"commit": "2d09c451d74f72d248d805e875865ab5944661df",
"package": "a11y-tests"
}
]
}
},
{
"date": "Fri, 16 Jul 2021 00:35:31 GMT",
"tag": "a11y-tests_v1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion apps/a11y-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"update-snapshots": "just-scripts jest -u"
},
"dependencies": {
"@fluentui/react": "^8.23.4",
"@fluentui/react": "^8.23.5",
"axe-core": "3.5.0",
"axe-puppeteer": "^1.0.0",
"axe-sarif-converter": "^2.0.1",
Expand Down
15 changes: 15 additions & 0 deletions apps/perf-test/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
{
"name": "perf-test",
"entries": [
{
"date": "Fri, 16 Jul 2021 07:32:14 GMT",
"tag": "perf-test_v1.0.0",
"version": "1.0.0",
"comments": {
"none": [
{
"comment": "Bump @fluentui/react to v8.23.5",
"author": "[email protected]",
"commit": "2d09c451d74f72d248d805e875865ab5944661df",
"package": "perf-test"
}
]
}
},
{
"date": "Fri, 16 Jul 2021 00:35:31 GMT",
"tag": "perf-test_v1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion apps/perf-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"dependencies": {
"@fluentui/eslint-plugin": "^1.3.2",
"@fluentui/make-styles": "^9.0.0-alpha.28",
"@fluentui/react": "^8.23.4",
"@fluentui/react": "^8.23.5",
"@fluentui/react-avatar": "^9.0.0-alpha.56",
"@fluentui/react-button": "^9.0.0-alpha.60",
"@fluentui/react-provider": "^9.0.0-alpha.56",
Expand Down
15 changes: 15 additions & 0 deletions apps/public-docsite-resources/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
{
"name": "@fluentui/public-docsite-resources",
"entries": [
{
"date": "Fri, 16 Jul 2021 07:32:14 GMT",
"tag": "@fluentui/public-docsite-resources_v8.1.41",
"version": "8.1.41",
"comments": {
"none": [
{
"comment": "Bump @fluentui/react to v8.23.5",
"author": "[email protected]",
"commit": "2d09c451d74f72d248d805e875865ab5944661df",
"package": "@fluentui/public-docsite-resources"
}
]
}
},
{
"date": "Fri, 16 Jul 2021 00:35:31 GMT",
"tag": "@fluentui/public-docsite-resources_v8.1.41",
Expand Down
2 changes: 1 addition & 1 deletion apps/public-docsite-resources/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"react-dom": "16.8.6"
},
"dependencies": {
"@fluentui/react": "^8.23.4",
"@fluentui/react": "^8.23.5",
"@fluentui/react-examples": "^8.34.4",
"@microsoft/load-themed-styles": "^1.10.26",
"@fluentui/api-docs": "^8.1.35",
Expand Down
15 changes: 15 additions & 0 deletions apps/public-docsite/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
{
"name": "@fluentui/public-docsite",
"entries": [
{
"date": "Fri, 16 Jul 2021 07:32:14 GMT",
"tag": "@fluentui/public-docsite_v8.2.41",
"version": "8.2.41",
"comments": {
"none": [
{
"comment": "Bump @fluentui/react to v8.23.5",
"author": "[email protected]",
"commit": "2d09c451d74f72d248d805e875865ab5944661df",
"package": "@fluentui/public-docsite"
}
]
}
},
{
"date": "Fri, 16 Jul 2021 00:35:31 GMT",
"tag": "@fluentui/public-docsite_v8.2.41",
Expand Down
2 changes: 1 addition & 1 deletion apps/public-docsite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"@fluentui/api-docs": "^8.1.35",
"@fluentui/font-icons-mdl2": "^8.1.6",
"@fluentui/public-docsite-setup": "^0.3.6",
"@fluentui/react": "^8.23.4",
"@fluentui/react": "^8.23.5",
"@fluentui/react-docsite-components": "^8.2.39",
"@fluentui/react-examples": "^8.34.4",
"@fluentui/react-experiments": "^8.1.42",
Expand Down
15 changes: 15 additions & 0 deletions apps/server-rendered-app/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
{
"name": "server-rendered-app",
"entries": [
{
"date": "Fri, 16 Jul 2021 07:32:14 GMT",
"tag": "server-rendered-app_v1.0.0",
"version": "1.0.0",
"comments": {
"none": [
{
"comment": "Bump @fluentui/react to v8.23.5",
"author": "[email protected]",
"commit": "2d09c451d74f72d248d805e875865ab5944661df",
"package": "server-rendered-app"
}
]
}
},
{
"date": "Fri, 16 Jul 2021 00:35:31 GMT",
"tag": "server-rendered-app_v1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion apps/server-rendered-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"dependencies": {
"@fluentui/font-icons-mdl2": "^8.1.6",
"@fluentui/merge-styles": "^8.1.3",
"@fluentui/react": "^8.23.4",
"@fluentui/react": "^8.23.5",
"@microsoft/load-themed-styles": "^1.10.26",
"react": "16.8.6",
"react-dom": "16.8.6",
Expand Down
15 changes: 15 additions & 0 deletions apps/ssr-tests/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
{
"name": "ssr-tests",
"entries": [
{
"date": "Fri, 16 Jul 2021 07:32:14 GMT",
"tag": "ssr-tests_v1.0.0",
"version": "1.0.0",
"comments": {
"none": [
{
"comment": "Bump @fluentui/public-docsite-resources to v8.1.41",
"author": "[email protected]",
"commit": "2d09c451d74f72d248d805e875865ab5944661df",
"package": "ssr-tests"
}
]
}
},
{
"date": "Fri, 16 Jul 2021 00:35:31 GMT",
"tag": "ssr-tests_v1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion apps/ssr-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
},
"license": "MIT",
"devDependencies": {
"@fluentui/react": "^8.23.4",
"@fluentui/react": "^8.23.5",
"@microsoft/load-themed-styles": "^1.10.26",
"@types/mocha": "^7.0.2",
"@fluentui/scripts": "^1.0.0",
Expand Down
15 changes: 15 additions & 0 deletions apps/theming-designer/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
{
"name": "theming-designer",
"entries": [
{
"date": "Fri, 16 Jul 2021 07:32:14 GMT",
"tag": "theming-designer_v1.0.0",
"version": "1.0.0",
"comments": {
"none": [
{
"comment": "Bump @fluentui/react to v8.23.5",
"author": "[email protected]",
"commit": "2d09c451d74f72d248d805e875865ab5944661df",
"package": "theming-designer"
}
]
}
},
{
"date": "Fri, 16 Jul 2021 00:35:31 GMT",
"tag": "theming-designer_v1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion apps/theming-designer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@fluentui/scripts": "^1.0.0"
},
"dependencies": {
"@fluentui/react": "^8.23.4",
"@fluentui/react": "^8.23.5",
"@fluentui/merge-styles": "^8.1.3",
"@fluentui/react-docsite-components": "^8.2.39",
"@fluentui/foundation-legacy": "^8.1.6",
Expand Down
15 changes: 15 additions & 0 deletions apps/todo-app/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
{
"name": "todo-app",
"entries": [
{
"date": "Fri, 16 Jul 2021 07:32:14 GMT",
"tag": "todo-app_v1.0.0",
"version": "1.0.0",
"comments": {
"none": [
{
"comment": "Bump @fluentui/react to v8.23.5",
"author": "[email protected]",
"commit": "2d09c451d74f72d248d805e875865ab5944661df",
"package": "todo-app"
}
]
}
},
{
"date": "Fri, 16 Jul 2021 00:35:31 GMT",
"tag": "todo-app_v1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion apps/todo-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"@fluentui/scripts": "^1.0.0"
},
"dependencies": {
"@fluentui/react": "^8.23.4",
"@fluentui/react": "^8.23.5",
"@microsoft/load-themed-styles": "^1.10.26",
"es6-promise": "^4.1.0",
"immutability-helper": "~2.8.1",
Expand Down
15 changes: 15 additions & 0 deletions apps/vr-tests/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
{
"name": "vr-tests",
"entries": [
{
"date": "Fri, 16 Jul 2021 07:32:14 GMT",
"tag": "vr-tests_v1.0.0",
"version": "1.0.0",
"comments": {
"none": [
{
"comment": "Bump @fluentui/react to v8.23.5",
"author": "[email protected]",
"commit": "2d09c451d74f72d248d805e875865ab5944661df",
"package": "vr-tests"
}
]
}
},
{
"date": "Fri, 16 Jul 2021 00:35:31 GMT",
"tag": "vr-tests_v1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion apps/vr-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"@fluentui/eslint-plugin": "^1.3.2",
"@fluentui/example-data": "^8.2.4",
"@fluentui/font-icons-mdl2": "^8.1.6",
"@fluentui/react": "^8.23.4",
"@fluentui/react": "^8.23.5",
"@fluentui/react-accordion": "^9.0.0-alpha.52",
"@fluentui/react-avatar": "^9.0.0-alpha.56",
"@fluentui/react-button": "^9.0.0-alpha.60",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "handle MemberExpression as a mixin",
"packageName": "@fluentui/babel-make-styles",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "base implementation of the loader",
"packageName": "@fluentui/make-styles-webpack-loader",
"email": "[email protected]",
"dependentChangeType": "patch"
}
5 changes: 5 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@
"@testing-library/react": "10.4.9",
"@testing-library/react-hooks": "5.0.3",
"@types/copy-webpack-plugin": "6.4.0",
"@types/enhanced-resolve": "3.0.7",
"@types/express": "4.17.2",
"@types/eslint": "7.2.13",
"@types/fs-extra": "8.0.1",
Expand Down Expand Up @@ -136,6 +137,7 @@
"cypress-storybook": "0.5.1",
"danger": "^6.0.5",
"del": "6.0.0",
"enhanced-resolve": "5.8.2",
"eslint": "7.25.0",
"eslint-plugin-es": "4.1.0",
"eslint-plugin-import": "2.22.1",
Expand Down Expand Up @@ -168,6 +170,7 @@
"lerna": "^3.21.0",
"lint-staged": "^10.2.9",
"node-fetch": "2.6.1",
"memfs": "3.2.2",
"postcss": "8.2.10",
"postcss-loader": "4.1.0",
"postcss-modules": "4.1.3",
Expand Down Expand Up @@ -197,6 +200,7 @@
"webpack-dev-middleware": "4.2.0",
"webpack-dev-server": "4.0.0-beta.0",
"webpack-hot-middleware": "2.25.0",
"webpack-merge": "5.7.3",
"workspace-tools": "0.12.3",
"yargs": "13.3.2"
},
Expand Down Expand Up @@ -260,6 +264,7 @@
"@typescript-eslint/experimental-utils",
"@typescript-eslint/parser",
"chalk",
"enhanced-resolve",
"eslint-config-airbnb",
"eslint-config-prettier",
"eslint-import-resolver-typescript",
Expand Down
15 changes: 15 additions & 0 deletions packages/api-docs/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
{
"name": "@fluentui/api-docs",
"entries": [
{
"date": "Fri, 16 Jul 2021 07:32:14 GMT",
"tag": "@fluentui/api-docs_v8.1.35",
"version": "8.1.35",
"comments": {
"none": [
{
"comment": "Bump @fluentui/react to v8.23.5",
"author": "[email protected]",
"commit": "2d09c451d74f72d248d805e875865ab5944661df",
"package": "@fluentui/api-docs"
}
]
}
},
{
"date": "Fri, 16 Jul 2021 00:35:31 GMT",
"tag": "@fluentui/api-docs_v8.1.35",
Expand Down
2 changes: 1 addition & 1 deletion packages/api-docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"dependencies": {
"@fluentui/date-time-utilities": "^8.2.1",
"@fluentui/merge-styles": "^8.1.3",
"@fluentui/react": "^8.23.4",
"@fluentui/react": "^8.23.5",
"@fluentui/react-focus": "^8.1.8",
"@fluentui/style-utilities": "^8.2.0",
"@fluentui/theme": "^2.1.4",
Expand Down
15 changes: 15 additions & 0 deletions packages/azure-themes/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
{
"name": "@fluentui/azure-themes",
"entries": [
{
"date": "Fri, 16 Jul 2021 07:32:14 GMT",
"tag": "@fluentui/azure-themes_v8.1.39",
"version": "8.1.39",
"comments": {
"none": [
{
"comment": "Bump @fluentui/react to v8.23.5",
"author": "[email protected]",
"commit": "2d09c451d74f72d248d805e875865ab5944661df",
"package": "@fluentui/azure-themes"
}
]
}
},
{
"date": "Fri, 16 Jul 2021 00:35:31 GMT",
"tag": "@fluentui/azure-themes_v8.1.39",
Expand Down
2 changes: 1 addition & 1 deletion packages/azure-themes/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"react": "16.8.6"
},
"dependencies": {
"@fluentui/react": "^8.23.4",
"@fluentui/react": "^8.23.5",
"@fluentui/set-version": "^8.1.3",
"tslib": "^2.1.0"
}
Expand Down
Loading

0 comments on commit e60aba3

Please sign in to comment.