Skip to content

Commit

Permalink
Merge pull request microsoft#5 from OfficeDev/master
Browse files Browse the repository at this point in the history
master update
  • Loading branch information
Swapnil Vaibhav authored May 16, 2019
2 parents 12e07a1 + 3da6cfa commit 52b5b76
Show file tree
Hide file tree
Showing 129 changed files with 1,906 additions and 690 deletions.
12 changes: 7 additions & 5 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ azure-pipelines.yml @ecraig12345 @kenotron

#### Apps
# component-demo/
fabric-website/ @jordandrako
fabric-website/ @jordandrako @ecraig12345
fabric-website-resources/ @ecraig12345
# ssr-tests/
# test-bundle-button/ @dzearing
# todo-app/
Expand All @@ -44,10 +45,11 @@ Controls/web.tsx @Vitalius1 @natalieethell
packages/charting/ @Raghurk @veeray @chankev
packages/codepen-loader/ @ecraig12345 @kenotron
packages/foundation/ @JasonGore
# packages/example-app-base/
packages/example-app-base/ @ecraig12345
packages/file-type-icons/ @KatherineThayerMicrosoft @jahnp @bigbadcapers
# packages/icons/
# packages/jest-serializer-merge-styles/
packages/lists/ @dzearing @KevinTCoughlin @aditima
# packages/merge-styles/
# packages/prettier-rules/
# packages/tslint-rules/
Expand Down Expand Up @@ -83,14 +85,14 @@ Checkbox/ @cliffkoh
ChoiceGroup/ @srideshpande
CollapsibleSection/ @JasonGore
ColorPicker/ @ecraig12345
ComboBox/ @ecraig12345
ComboBox/ @joschect
CommandBar/ @micahgodbolt @joschect
ContextualMenu/ @joschect
DatePicker/ @OfficeDev/uifabric-calendar
DetailsList/ @KevinTCoughlin
Dialog/ @kkjeer
DocumentCard/ @yiminwu
Dropdown/ @ecraig12345
Dropdown/ @joschect
Fabric/ @dzearing
FacePile/ @markionium
FolderCover/ @ThomasMichon
Expand All @@ -107,7 +109,7 @@ List/ @KevinTCoughlin
MarqueeSelection/ @dzearing
MessageBar/ @ecraig12345
Modal/ @JasonGore
Nav/ @jdhuntington
office-ui-fabric-react/src/components/Nav/ @jdhuntington
OverflowSet/ @micahgodbolt
Overlay/ @kkjeer
Pagination/ @caradong
Expand Down
2 changes: 1 addition & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"program": "${workspaceRoot}/scripts/debug-test.js",
"cwd": "${fileDirname}",
"stopOnEntry": false,
"args": ["-i", "--testPathPattern=${file}"],
"args": ["-i", "--testPathPattern=${fileBasenameNoExtension}"],
"runtimeExecutable": null,
"runtimeArgs": ["--nolazy", "--debug"],
"env": {
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 @@ -17,7 +17,7 @@
"axe-sarif-converter": "^1.0.0",
"concurrently": "^4.1.0",
"mkdirp": "^0.5.1",
"office-ui-fabric-react": "^6.181.1",
"office-ui-fabric-react": "^6.182.1",
"puppeteer": "^1.13.0",
"tslib": "^1.7.1",
"wait-on": "^3.2.0"
Expand Down
2 changes: 1 addition & 1 deletion apps/dom-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"@microsoft/load-themed-styles": "^1.7.13",
"es6-promise": "^4.1.0",
"immutability-helper": "~2.8.1",
"office-ui-fabric-react": "^6.181.1",
"office-ui-fabric-react": "^6.182.1",
"react": ">=16.8.0 <17.0.0",
"react-dom": ">=16.8.0 <17.0.0",
"tslib": "^1.7.1"
Expand Down
20 changes: 11 additions & 9 deletions apps/dom-tests/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import * as ReactDOM from 'react-dom';
import { Router, Route } from 'office-ui-fabric-react/lib/utilities/router/index';
import { setBaseUrl } from 'office-ui-fabric-react/lib/Utilities';
import { Fabric } from 'office-ui-fabric-react/lib/Fabric';
import { IRouteProps } from '../../../packages/office-ui-fabric-react/lib/utilities/router/Route';

setBaseUrl('./dist/');

Expand All @@ -23,15 +24,16 @@ function _onLoad(): void {

function _getRoutes(): JSX.Element[] {
return require('./pages/pageList')
.map((page: string) => {
return {
component: (require(`./pages/${page}`) as any).default,
key: page,
name: page,
url: `#/${page}`
};
})
.map((page: any) => <Route key={page.key} path={page.url} component={page.component} />);
.map(
(page: string): IRouteProps => {
return {
component: require(`./pages/${page}`).default,
key: page,
path: `#/${page}`
};
}
)
.map((page: IRouteProps) => <Route key={page.key} {...page} />);
}

function _onUnload(): void {
Expand Down
3 changes: 2 additions & 1 deletion apps/dom-tests/src/pages/pageList.ts
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
module.exports = ['FocusZone.example1'];
const pages: string[] = ['FocusZone.example1'];
module.exports = pages;
6 changes: 3 additions & 3 deletions apps/dom-tests/src/test/FocusZone.test.dom.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as puppeteer from 'puppeteer';

describe('FocusZone', () => {
let browser: any;
let browser: puppeteer.Browser;

beforeAll(async () => {
browser = await puppeteer.launch({ headless: true });
Expand All @@ -19,9 +19,9 @@ describe('FocusZone', () => {
// Act
// 'Nesting FocusZons in list rows'
const focusZone = await page.$('#fz');
await focusZone.focus();
await focusZone!.focus();

// Assert
expect(await page.$eval('#a', (button: any) => document.activeElement === button));
expect(await page.$eval('#a', (button: Element) => document.activeElement === button));
});
});
4 changes: 1 addition & 3 deletions apps/dom-tests/tslint.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
{
"extends": ["@uifabric/tslint-rules"],
"rules": {
"no-any": false
}
"rules": {}
}
4 changes: 2 additions & 2 deletions apps/fabric-website-resources/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"es6-weak-map": "^2.0.2",
"highlight.js": "^9.12.0",
"office-ui-fabric-core": "^9.0.0",
"office-ui-fabric-react": "^6.181.1",
"office-ui-fabric-react": "^6.182.1",
"react": "~16.6.3",
"react-dom": "~16.6.3",
"react-highlight": "0.10.0",
Expand All @@ -59,7 +59,7 @@
"@microsoft/load-themed-styles": "^1.7.13",
"@uifabric/api-docs": "^1.1.1",
"@uifabric/azure-themes": "^0.1.9",
"@uifabric/example-app-base": "^6.20.1",
"@uifabric/example-app-base": "^6.21.0",
"@uifabric/fluent-theme": "^0.16.9",
"@uifabric/icons": "^6.5.2",
"@uifabric/merge-styles": "^6.17.3",
Expand Down
58 changes: 58 additions & 0 deletions apps/fabric-website/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,64 @@
{
"name": "@uifabric/fabric-website",
"entries": [
{
"version": "6.18.4",
"tag": "@uifabric/fabric-website_v6.18.4",
"date": "Thu, 16 May 2019 12:21:56 GMT",
"comments": {
"patch": [
{
"comment": "Add versioned release notes and demo section",
"author": "Kevin Coughlin <[email protected]>",
"commit": "d80271e480c1ab7e986d9dd547be7f5a9dae621e"
}
]
}
},
{
"version": "6.18.3",
"tag": "@uifabric/fabric-website_v6.18.3",
"date": "Thu, 16 May 2019 05:28:50 GMT",
"comments": {
"patch": [
{
"comment": "Adding mobile examples and docs for Button.",
"author": "lynamemi <[email protected]>",
"commit": "4382ed8bf9bc3793fe0511fdfae36a51b02f2ebb"
}
],
"dependency": [
{
"comment": "Updating dependency \"@uifabric/file-type-icons\" from `^6.4.9` to `^6.4.10`"
},
{
"comment": "Updating dependency \"office-ui-fabric-react\" from `^6.182.0` to `^6.182.1`"
}
]
}
},
{
"version": "6.18.2",
"tag": "@uifabric/fabric-website_v6.18.2",
"date": "Wed, 15 May 2019 12:31:44 GMT",
"comments": {
"patch": [
{
"comment": "Add 404 page",
"author": "Jordan Janzen <[email protected]>",
"commit": "1a7b6c65005dab8fbcc6fe21dbaa42ed042465eb"
}
],
"dependency": [
{
"comment": "Updating dependency \"@uifabric/example-app-base\" from `^6.20.1` to `^6.21.0`"
},
{
"comment": "Updating dependency \"office-ui-fabric-react\" from `^6.181.1` to `^6.182.0`"
}
]
}
},
{
"version": "6.18.1",
"tag": "@uifabric/fabric-website_v6.18.1",
Expand Down
23 changes: 22 additions & 1 deletion apps/fabric-website/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,27 @@
# Change Log - @uifabric/fabric-website

This log was last generated on Tue, 14 May 2019 07:50:30 GMT and should not be manually modified.
This log was last generated on Thu, 16 May 2019 12:21:56 GMT and should not be manually modified.

## 6.18.4
Thu, 16 May 2019 12:21:56 GMT

### Patches

- Add versioned release notes and demo section

## 6.18.3
Thu, 16 May 2019 05:28:50 GMT

### Patches

- Adding mobile examples and docs for Button.

## 6.18.2
Wed, 15 May 2019 12:31:44 GMT

### Patches

- Add 404 page

## 6.18.1
Tue, 14 May 2019 07:50:30 GMT
Expand Down
5 changes: 3 additions & 2 deletions apps/fabric-website/just-task.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
const preset = require('@uifabric/build/just-task');
const { task, option } = preset.just;
const createFlightConfigTaskFactory = require('./scripts/createFlightConfig');
const { createInternalFlightConfigTask, createPublicFlightConfigTask } = require('./scripts/createFlightConfig');

module.exports = function() {
preset();
option('baseCDNUrl', { default: './dist' });
task('create-flight-config', createFlightConfigTaskFactory());
task('create-internal-flight-config', createInternalFlightConfigTask());
task('create-public-flight-config', createPublicFlightConfigTask());
};
11 changes: 6 additions & 5 deletions apps/fabric-website/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@uifabric/fabric-website",
"version": "6.18.1",
"version": "6.18.4",
"description": "Reusable React components for building experiences for Office 365.",
"main": "lib-commonjs/index.js",
"module": "lib/index.js",
Expand All @@ -12,7 +12,8 @@
},
"scripts": {
"build": "node node_modules/@uifabric/build/just.js build",
"create-flight-config": "node node_modules/@uifabric/build/just.js create-flight-config",
"create-internal-flight-config": "node node_modules/@uifabric/build/just.js create-internal-flight-config",
"create-public-flight-config": "node node_modules/@uifabric/build/just.js create-public-flight-config",
"just": "node node_modules/@uifabric/build/just.js",
"clean": "node node_modules/@uifabric/build/just.js clean",
"code-style": "node node_modules/@uifabric/build/just.js code-style",
Expand Down Expand Up @@ -48,17 +49,17 @@
"dependencies": {
"@microsoft/load-themed-styles": "^1.7.13",
"@uifabric/api-docs": "^1.1.1",
"@uifabric/example-app-base": "^6.20.1",
"@uifabric/example-app-base": "^6.21.0",
"@uifabric/experiments": "^6.76.2",
"@uifabric/fabric-website-resources": "^6.18.1",
"@uifabric/file-type-icons": "^6.4.9",
"@uifabric/file-type-icons": "^6.4.10",
"@uifabric/fluent-theme": "^0.16.9",
"@uifabric/icons": "^6.5.2",
"@uifabric/set-version": "^1.1.3",
"@uifabric/theme-samples": "^0.1.6",
"react-app-polyfill": "~1.0.1",
"json-loader": "^0.5.7",
"office-ui-fabric-react": "^6.181.1",
"office-ui-fabric-react": "^6.182.1",
"tslib": "^1.7.1",
"whatwg-fetch": "2.0.4"
}
Expand Down
35 changes: 33 additions & 2 deletions apps/fabric-website/scripts/createFlightConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,11 @@ const fs = require('fs');
const path = require('path');
const { argv, logger } = require('@uifabric/build/just-task').just;

module.exports = function createFlightConfigTaskFactory() {
return function createFlightConfigTask() {
/**
* A Task Function for Fabric Website that Generates a Manifest for Non-UHF "Internal" Site
*/
module.exports.createInternalFlightConfigTask = function() {
return function() {
let date = new Date();

// Produces date string of the form yyyyMMdd, e.g. 20180701
Expand All @@ -31,6 +34,34 @@ module.exports = function createFlightConfigTaskFactory() {
};
};

/**
* A Task Function for Fabric Website that Generates a Manifest for UHF Public Site
*/
module.exports.createPublicFlightConfigTask = function() {
return function() {
let date = new Date();

// Produces date string of the form yyyyMMdd, e.g. 20180701
let today = date.getFullYear() + ('0' + (date.getMonth() + 1)).slice(-2) + ('0' + date.getDate()).slice(-2);

let configsToGenerate = ['fabric-website-prod', 'fabric-website-df'];

let configData = {
version: process.env.BUILD_BUILDNUMBER || '0',
baseCDNUrl: path.join(argv().baseCDNUrl, process.env.BUILD_BUILDNUMBER) + '/',
buildName: process.env.BUILD_DEFINITIONNAME || 'localbuild',
createdDate: today
};

logger.info('config data:');
logger.info(configData);

configsToGenerate.forEach(fileName => {
generateConfig(fileName, path.resolve(process.cwd(), 'flights'), configData);
});
};
};

function generateConfig(fileName, outDir, configData) {
try {
if (!fs.existsSync(outDir)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,19 @@ export const controlsPagesAndroid: INavPage[] = [
component: () => <LoadingComponent title="Controls" />,
getComponent: cb => require.ensure([], require => cb(require<any>('../../../pages/Overviews/ControlsPage/ControlsPage').ControlsPage))
},
{
title: 'Basic Inputs',
url: '#/controls/android/button',
isCategory: true,
pages: [
{
title: 'Button',
url: '#/controls/android/button',
component: () => <LoadingComponent title="Button" />,
getComponent: cb => require.ensure([], require => cb(require<any>('../../../pages/Controls/ButtonPage/ButtonPage').ButtonPage))
}
]
},
{
title: 'Pickers',
url: '#/controls/android/date-time-picker',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,19 @@ export const controlsPagesIos: INavPage[] = [
component: () => <LoadingComponent title="Controls" />,
getComponent: cb => require.ensure([], require => cb(require<any>('../../../pages/Overviews/ControlsPage/ControlsPage').ControlsPage))
},
{
title: 'Basic Inputs',
url: '#/controls/ios/button',
isCategory: true,
pages: [
{
title: 'Button',
url: '#/controls/ios/button',
component: () => <LoadingComponent title="Button" />,
getComponent: cb => require.ensure([], require => cb(require<any>('../../../pages/Controls/ButtonPage/ButtonPage').ButtonPage))
}
]
},
{
title: 'Pickers',
url: '#/controls/ios/date-time-picker',
Expand Down
Loading

0 comments on commit 52b5b76

Please sign in to comment.