Skip to content

Commit

Permalink
Merge branch 'master' into mapol/allow-overriding-root-element-on-link
Browse files Browse the repository at this point in the history
* master: (31 commits)
  Charting (microsoft#4954)
  Deprecation lint rule! (microsoft#5109)
  Implement selection for selected items list (microsoft#5036)
  Ignore common/changes and don't prettify json files (microsoft#5112)
  Part 2 of demo page refactor (microsoft#5089)
  Update jest.js
  fixing official example page and datepicker/calendar components using… (microsoft#5108)
  Don't run prettier and tslint in parallel as it might cause conflicts (microsoft#5100)
  FocusTrapZone - restore last focused descendant element (microsoft#5103)
  Coachmark/TeachingBubble: Fix SCSS selectors for buttons and Close Icon (microsoft#4835)
  HoverCard: IE11 fix (microsoft#5105)
  FocusTrapZone bug allows breaking out of the trap (microsoft#4898)
  Applying package updates.
  Update ISSUE_TEMPLATE.md
  Experiment/Nav component: hide nav group header if all the links under it are hidden (microsoft#5095)
  Add optional prop to not dismiss Callout on focus loss (microsoft#5092)
  Experiments: moves ShimmerTile from Shimmer to Tile. (microsoft#5090)
  Run jest in parallel on Windows (microsoft#5096)
  Applying package updates.
  Major bump jest-serializer-merge-styles
  ...
  • Loading branch information
Markionium committed Jun 6, 2018
2 parents 742b349 + 0d91de6 commit da6ec79
Show file tree
Hide file tree
Showing 1,486 changed files with 44,083 additions and 44,427 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

- __Package version(s)__: (fill this out)
- __Browser and OS versions__: (fill this out if relevant)
- __Microsoft Alias__: (if you are a Microsoft employee)

#### Priorities and help requested (not applicable if asking question):

Expand All @@ -28,4 +27,5 @@ Products/sites affected: (if applicable)

### If applicable, please provide a codepen repro:

<!-- See https://codepen.io/FabricReact/ for a starting template -->
<!-- See http://codepen.io/dzearing/pens/public/?grid_type=list for a variety of examples -->
12 changes: 12 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package.json
packages/*/package.json

**/*.d.ts
**/*.api.ts

**/lib/**/*.js
**/lib-commonjs/**/*.js
**/dist/*.js
**/common/changes/**/*.*

**/CHANGELOG.json
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ script:
fi
- npm run buildfast
- npm run bundlesize
- npm run vrtest
- npm run vrtest
- npm run check-for-changed-files
8 changes: 8 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
// See http://go.microsoft.com/fwlink/?LinkId=827846
// for the documentation about the extensions.json format
"recommendations": [
// Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
"esbenp.prettier-vscode"
]
}
63 changes: 13 additions & 50 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,9 @@
"program": "${workspaceRoot}/scripts/debug-test.js",
"cwd": "${fileDirname}",
"stopOnEntry": false,
"args": [
"-i"
],
"args": ["-i"],
"runtimeExecutable": null,
"runtimeArgs": [
"--nolazy",
"--debug"
],
"runtimeArgs": ["--nolazy", "--debug"],
"env": {
"NODE_ENV": "development"
},
Expand All @@ -28,14 +23,9 @@
"program": "${workspaceRoot}/scripts/build.js",
"cwd": "${workspaceRoot}/packages/office-ui-fabric-react",
"stopOnEntry": false,
"args": [
"ts"
],
"args": ["ts"],
"runtimeExecutable": null,
"runtimeArgs": [
"--nolazy",
"--debug"
],
"runtimeArgs": ["--nolazy", "--debug"],
"env": {
"NODE_ENV": "development"
},
Expand All @@ -47,17 +37,10 @@
"request": "launch",
"program": "${workspaceRoot}/scripts/build.js",
"stopOnEntry": false,
"args": [
"webpack",
"--",
"--production"
],
"args": ["webpack", "--", "--production"],
"cwd": "${workspaceRoot}/apps/fabric-website",
"runtimeExecutable": null,
"runtimeArgs": [
"--nolazy",
"--debug"
],
"runtimeArgs": ["--nolazy", "--debug"],
"env": {
"NODE_ENV": "development"
}
Expand All @@ -68,18 +51,10 @@
"request": "launch",
"program": "${workspaceRoot}/scripts/build.js",
"stopOnEntry": false,
"args": [
"webpack",
"--",
"--production",
"--dogfood"
],
"args": ["webpack", "--", "--production", "--dogfood"],
"cwd": "${workspaceRoot}/apps/fabric-website",
"runtimeExecutable": null,
"runtimeArgs": [
"--nolazy",
"--debug"
],
"runtimeArgs": ["--nolazy", "--debug"],
"env": {
"NODE_ENV": "development"
}
Expand All @@ -90,16 +65,10 @@
"request": "launch",
"program": "${workspaceRoot}/apps/ssr-tests/node_modules/mocha/bin/_mocha",
"stopOnEntry": true,
"args": [
"--debug",
"dist/test-bundle.js"
],
"args": ["--debug", "dist/test-bundle.js"],
"cwd": "${workspaceRoot}/apps/ssr-tests",
"runtimeExecutable": null,
"runtimeArgs": [
"--nolazy",
"--debug"
],
"runtimeArgs": ["--nolazy", "--debug"],
"env": {
"NODE_ENV": "development"
},
Expand All @@ -112,19 +81,13 @@
"program": "${workspaceRoot}/scripts/create-component.js",
"cwd": "${workspaceRoot}",
"stopOnEntry": false,
"args": [
"--name",
"TestComponentName"
],
"args": ["--name", "TestComponentName"],
"runtimeExecutable": null,
"runtimeArgs": [
"--nolazy",
"--debug"
],
"runtimeArgs": ["--nolazy", "--debug"],
"env": {
"NODE_ENV": "development"
},
"sourceMaps": true
}
]
}
}
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@
"editor.formatOnSave": true,
"typescript.tsdk": "./common/temp/node_modules/typescript/lib",
"tslint.autoFixOnSave": false
}
}
18 changes: 3 additions & 15 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,7 @@
"label": "Typescript (oufr) watch",
"type": "process",
"command": "node",
"args": [
"./scripts/node_modules/typescript/bin/tsc",
"-p",
"packages/office-ui-fabric-react/tsconfig.json",
"-w",
"--noEmit"
],
"args": ["./scripts/node_modules/typescript/bin/tsc", "-p", "packages/office-ui-fabric-react/tsconfig.json", "-w", "--noEmit"],
"problemMatcher": "$tsc",
"group": {
"kind": "build",
Expand All @@ -22,18 +16,12 @@
"label": "Typescript (vr-tests) watch",
"type": "process",
"command": "node",
"args": [
"./scripts/node_modules/typescript/bin/tsc",
"-p",
"apps/vr-tests/tsconfig.json",
"-w",
"--noEmit"
],
"args": ["./scripts/node_modules/typescript/bin/tsc", "-p", "apps/vr-tests/tsconfig.json", "-w", "--noEmit"],
"problemMatcher": "$tsc",
"group": {
"kind": "build",
"isDefault": true
}
}
]
}
}
2 changes: 1 addition & 1 deletion apps/fabric-website/.vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"typescript.tsdk": "./node_modules/typescript/lib"
}
}
45 changes: 45 additions & 0 deletions apps/fabric-website/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,51 @@
{
"name": "@uifabric/fabric-website",
"entries": [
{
"version": "6.0.3",
"tag": "@uifabric/fabric-website_v6.0.3",
"date": "Tue, 05 Jun 2018 00:44:30 GMT",
"comments": {
"patch": [
{
"author": "Mark Polak <mark@thedutchies.com>",
"commit": "cfa7a19ec1d6f98c13f822a828e0751f64507dbd",
"comment": "Added Prettier"
}
],
"dependency": [
{
"comment": "Updating dependency \"office-ui-fabric-react\" from `>=6.4.0 <7.0.0` to `>=6.4.1 <7.0.0`"
}
]
}
},
{
"version": "6.0.2",
"tag": "@uifabric/fabric-website_v6.0.2",
"date": "Mon, 04 Jun 2018 10:16:13 GMT",
"comments": {
"none": [
{
"author": "Jordan Janzen <jordancjanzen@gmail.com>",
"commit": "2e2a1aba56f9d401d699ef23dafeeba49c86c715",
"comment": "Add addins-sketch-toolkit link"
}
],
"patch": [
{
"author": "David Zearing <dzearing@microsoft.com>",
"commit": "4e1cd119bbf0f75e0432b0f92bad342714b57bef",
"comment": "Updating react typings."
}
],
"dependency": [
{
"comment": "Updating dependency \"office-ui-fabric-react\" from `>=6.2.0 <7.0.0` to `>=6.3.0 <7.0.0`"
}
]
}
},
{
"version": "6.0.1",
"tag": "@uifabric/fabric-website_v6.0.1",
Expand Down
16 changes: 15 additions & 1 deletion apps/fabric-website/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,20 @@
# Change Log - @uifabric/fabric-website

This log was last generated on Thu, 31 May 2018 10:18:58 GMT and should not be manually modified.
This log was last generated on Tue, 05 Jun 2018 00:44:30 GMT and should not be manually modified.

## 6.0.3
Tue, 05 Jun 2018 00:44:30 GMT

### Patches

- Added Prettier

## 6.0.2
Mon, 04 Jun 2018 10:16:13 GMT

### Patches

- Updating react typings.

## 6.0.1
Thu, 31 May 2018 10:18:58 GMT
Expand Down
6 changes: 2 additions & 4 deletions apps/fabric-website/config/pre-copy.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
{
"copyTo": {
"lib": [
"./src/**/*.json"
]
"lib": ["./src/**/*.json"]
}
}
}
7 changes: 4 additions & 3 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.0.1",
"version": "6.0.3",
"description": "Reusable React components for building experiences for Office 365.",
"main": "lib-commonjs/index.js",
"module": "lib/index.js",
Expand All @@ -13,6 +13,7 @@
"scripts": {
"build": "node ../../scripts/build.js",
"clean": "node ../../scripts/clean.js",
"code-style": "node ../../scripts/code-style.js",
"start": "node ../../scripts/start.js",
"production": "node --max_old_space_size=8192 ../../scripts/build.js --production",
"dogfood": "node --max_old_space_size=8192 ../../scripts/build.js --dogfood",
Expand All @@ -24,7 +25,7 @@
"@types/node": "8.0.26",
"@types/prop-types": "15.5.2",
"@types/resemblejs": "~1.3.28",
"@types/react": "16.3.14",
"@types/react": "16.3.16",
"@types/react-dom": "16.0.5",
"@types/webpack-env": "1.13.0",
"es6-promise": "^4.1.0",
Expand All @@ -41,7 +42,7 @@
"@microsoft/load-themed-styles": "^1.7.13",
"color-functions": "1.1.0",
"json-loader": "^0.5.7",
"office-ui-fabric-react": ">=6.2.0 <7.0.0",
"office-ui-fabric-react": ">=6.5.0 <7.0.0",
"tslib": "^1.7.1"
}
}
17 changes: 8 additions & 9 deletions apps/fabric-website/scripts/createVsoPullRequest.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,29 +54,28 @@ const title = baseTitle + ' - ' + packageData.version;
*/
const description = process.env.DESCRIPTION;


/**
* Object of data to POST to the API
*/
const postFields = {
"sourceRefName": baseBranchPath + srcRefName,
"targetRefName": baseBranchPath + targetRefName,
"title": { title },
"description": { prDescription }
sourceRefName: baseBranchPath + srcRefName,
targetRefName: baseBranchPath + targetRefName,
title: { title },
description: { prDescription }
};

/**
* Main function to kick off the post request
*/
function createVsoBranch() {
request.post({ url: vsoApiUrl, form: postFields }, function (err, httpResponse, body) {
request.post({ url: vsoApiUrl, form: postFields }, function(err, httpResponse, body) {
if (err) {
console.error(err);
}

console.log("HTTP Response:", httpResponse);
console.log("Body Response:", body)
console.log('HTTP Response:', httpResponse);
console.log('Body Response:', body);
});
}

createVsoBranch();
createVsoBranch();
2 changes: 1 addition & 1 deletion apps/fabric-website/src/appConfig.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export let baseURL = ' https://static2.sharepointonline.com/files/fabric/';
export let baseURL = ' https://static2.sharepointonline.com/files/fabric/';
Loading

0 comments on commit da6ec79

Please sign in to comment.