Skip to content

Upgrade to Rush 5 #6242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
micahgodbolt merged 28 commits into from
Sep 12, 2018
Merged

Upgrade to Rush 5 #6242

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
0bf0ab8
Upgrade config files to Rush 5 syntax
pgonzal Aug 22, 2018
b735fb5
rush update
pgonzal Aug 22, 2018
b01b9d6
Start updating scripts to avoid a phantom node_modules folder in the …
pgonzal Aug 22, 2018
5065264
Merge branch 'master' into pgonzal/upgrade-to-rush-5
natalieethell Sep 5, 2018
71cf38d
update rush version
natalieethell Sep 6, 2018
9ead827
update lint-staged to ignore common/scripts
natalieethell Sep 6, 2018
c48e710
add hooks
natalieethell Sep 6, 2018
e43a514
Merge branch 'master' into pgonzal/upgrade-to-rush-5
natalieethell Sep 6, 2018
a209403
update shrinkwrap
natalieethell Sep 6, 2018
c65703b
update snapshots
natalieethell Sep 6, 2018
79caefb
update experiments snapshot
natalieethell Sep 6, 2018
44e4e2e
change files
natalieethell Sep 6, 2018
697a844
Merge branch 'master' into pgonzal/upgrade-to-rush-5
natalieethell Sep 7, 2018
ca9fff2
update snapshots
natalieethell Sep 7, 2018
cf616d5
add tslib as a dependency in dashboard
natalieethell Sep 7, 2018
cbd57d9
dashboard change file
natalieethell Sep 7, 2018
40400cb
Merge branch 'master' into pgonzal/upgrade-to-rush-5
natalieethell Sep 11, 2018
042c57e
update DatePicker snapshots
natalieethell Sep 11, 2018
90915a7
add apps/vr-tests/** to ignore of lint-staged
natalieethell Sep 11, 2018
8a8e94c
add newline
natalieethell Sep 11, 2018
ba639d4
should be rush update --full instead of --force
natalieethell Sep 12, 2018
9ffee7a
generate runs with full and update runs without full
natalieethell Sep 12, 2018
1e82127
change type to none for upgrading react-test-renderer
natalieethell Sep 12, 2018
7990b80
add newline to package.json
natalieethell Sep 12, 2018
28a5c76
update to rush-update
natalieethell Sep 12, 2018
abaf16c
Merge branch 'master' into pgonzal/upgrade-to-rush-5
natalieethell Sep 12, 2018
37402d9
update SpinButton snapshot to remove undefined
natalieethell Sep 12, 2018
4324708
change file for prettier fixes in fabric-website
natalieethell Sep 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into pgonzal/upgrade-to-rush-5
  • Loading branch information
@natalieethell
natalieethell committed Sep 7, 2018
commit 697a8447776ae85b46a9abe6330e998206d6c3b1
46 changes: 7 additions & 39 deletions packages/office-ui-fabric-react/src/components/Modal/__snapshots__/Modal.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`Modal renders Modal correctly 1`] = `
<div
onKeyDown={[Function]}
role="dialog"
style={
Object {
"overflowY": undefined,
}
}

<span
className="ms-layer"
>
<div
className=
Expand Down Expand Up @@ -67,37 +62,10 @@ exports[`Modal renders Modal correctly 1`] = `
onSubmit={[Function]}
>
<div
className=
ms-Overlay
ms-Overlay--dark
{
background-color: rgba(0,0,0,.4);
bottom: 0px;
left: 0px;
position: absolute;
right: 0px;
top: 0px;
}
@media screen and (-ms-high-contrast: active){& {
border: 1px solid WindowText;
opacity: 0;
}
/>
<div
className=
ms-Dialog-main
test-containerClassName
{
background-color: #ffffff;
box-shadow: 0 0 5px 0 rgba(0, 0, 0, 0.4);
box-sizing: border-box;
max-height: 100%;
outline: 3px solid tranparent;
overflow-y: auto;
position: relative;
text-align: left;
}
onFocusCapture={[Function]}
aria-describedby={undefined}
aria-label={undefined}
aria-labelledby={undefined}
className={undefined}
onKeyDown={[Function]}
role="dialog"
style={
Expand Down
80 changes: 5 additions & 75 deletions packages/office-ui-fabric-react/src/components/Panel/__snapshots__/Panel.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,8 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`Panel renders Panel correctly 1`] = `
<div
aria-labelledby="Panel0-headerText"
className=


onKeyDown={[Function]}
role="dialog"
style={
Object {
"overflowY": undefined,
}
}
<span
className="ms-layer"
>
<div
className=
Expand Down Expand Up @@ -75,61 +65,8 @@ exports[`Panel renders Panel correctly 1`] = `
aria-label={undefined}
aria-labelledby="Panel0-headerText"
className=
ms-Overlay
{
animation-duration: 0.267s;
animation-fill-mode: both;
animation-name: keyframes from{opacity:0;}to{opacity:1;};
animation-timing-function: cubic-bezier(.1,.25,.75,.9);
background-color: rgba(255,255,255,.4);
bottom: 0px;
cursor: pointer;
left: 0px;
opacity: 1;
pointer-events: auto;
position: absolute;
right: 0px;
top: 0px;
transition: opacity 0.367s cubic-bezier(.1,.9,.2,1);
}
@media screen and (-ms-high-contrast: active){& {
border: 1px solid WindowText;
}
/>
<div
className=
ms-Panel-main
{
-webkit-overflow-scrolling: touch;
animation-duration: 0.367s;
animation-fill-mode: both;
animation-name: keyframes from{opacity:0;}to{opacity:1;} keyframes from{transform:translate3d(40px,0,0);}to{transform:translate3d(0,0,0);};
animation-timing-function: cubic-bezier(.1,.9,.2,1);
background-color: #ffffff;
bottom: 0px;
overflow-x: hidden;
overflow-y: auto;
position: absolute;
right: 0px;
top: 0px;
width: 100%;
}
@media (min-width: 480px){& {
border-left: 1px solid #eaeaea;
border-right: 1px solid #eaeaea;
box-shadow: -30px 0px 30px -30px rgba(0,0,0,0.2);
left: auto;
pointer-events: auto;
width: 340px;
}
$root & {
pointer-events: auto;
width: 272px;
}
@media (min-width: 480px){$root & {
width: 340px;
}
onFocusCapture={[Function]}


onKeyDown={[Function]}
role="dialog"
style={
Expand Down Expand Up @@ -224,18 +161,11 @@ exports[`Panel renders Panel correctly 1`] = `
overflow-y: auto;
}
>
<button
<div
className=
ms-Panel-commands

data-is-visible={true}
onClick={[Function]}
onKeyDown={[Function]}
onKeyPress={[Function]}
onKeyUp={[Function]}
onMouseDown={[Function]}
onMouseUp={[Function]}
type="button"
>
<div
className=
Expand Down
98 changes: 25 additions & 73 deletions packages/office-ui-fabric-react/src/components/__snapshots__/Nav.Basic.Example.tsx.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,13 @@ exports[`Component Examples renders Nav.Basic.Example.tsx correctly 1`] = `
onKeyUp={[Function]}
onMouseDown={[Function]}
onMouseUp={[Function]}
<<<<<<< HEAD
title="News"
=======
rel={undefined}
target={undefined}
title="MSN"
>>>>>>> master
>
<div
className=
Expand Down Expand Up @@ -1504,69 +1510,7 @@ exports[`Component Examples renders Nav.Basic.Example.tsx correctly 1`] = `
border: none;
box-sizing: border-box;
color: #333333;
cursor: pointer;
display: block;
font-family: 'Segoe UI', 'Segoe UI Web (West European)', 'Segoe UI', -apple-system, BlinkMacSystemFont, 'Roboto', 'Helvetica Neue', sans-serif;
font-size: 14px;
font-weight: 400;
height: 36px;
line-height: 36px;
outline: transparent;
overflow: hidden;
padding-bottom: 0;
padding-left: 3px;
padding-right: 20px;
padding-top: 0;
position: relative;
text-align: center;
text-decoration: none;
text-overflow: ellipsis;
user-select: none;
vertical-align: top;
white-space: nowrap;
width: 100%;
}
&::-moz-focus-inner {
border: 0;
}
.ms-Fabric--isFocusVisible &:focus:after {
border: 1px solid #ffffff;
bottom: 1px;
content: "";
left: 1px;
outline: 1px solid #666666;
position: absolute;
right: 1px;
top: 1px;
z-index: 1;
}
@media screen and (-ms-high-contrast: active){.ms-Fabric--isFocusVisible &:focus:after {
border: none;
bottom: -2px;
left: -2px;
outline-color: ButtonText;
right: -2px;
top: -2px;
}
&:hover {
color: #0078d4;
}
@media screen and (-ms-high-contrast: active){&:hover {
border-color: Highlight;
color: Highlight;
}
&:hover .ms-Button-icon {
color: #0078d4;
}
&:active {
color: #000000;
}
&:active .ms-Button-icon {
color: #004578;
}
.ms-Nav-compositeLink:hover & {
background-color: #f8f8f8;
color: #333333;
<<<<<<< HEAD
}
data-is-focusable={true}
href="http://cnn.com"
Expand Down Expand Up @@ -1599,7 +1543,7 @@ exports[`Component Examples renders Nav.Basic.Example.tsx correctly 1`] = `
color: #106ebe;
display: inline-block;
flex-shrink: 0;
font-family: "FabricMDL2Icons-1";
font-family: "FabricMDL2Icons";
font-size: 16px;
font-style: normal;
font-weight: normal;
Expand All @@ -1613,10 +1557,10 @@ exports[`Component Examples renders Nav.Basic.Example.tsx correctly 1`] = `
text-align: center;
vertical-align: middle;
}
data-icon-name="News"
data-icon-name="Edit"
role="presentation"
>
</i>
<span
className=
Expand All @@ -1638,7 +1582,7 @@ exports[`Component Examples renders Nav.Basic.Example.tsx correctly 1`] = `
}
id="id__24"
>
News
Edit
</span>
<div
className=
Expand Down Expand Up @@ -1696,6 +1640,8 @@ exports[`Component Examples renders Nav.Basic.Example.tsx correctly 1`] = `
border: none;
box-sizing: border-box;
color: #0078d4;
=======
>>>>>>> master
cursor: pointer;
display: block;
font-family: 'Segoe UI', 'Segoe UI Web (West European)', 'Segoe UI', -apple-system, BlinkMacSystemFont, 'Roboto', 'Helvetica Neue', sans-serif;
Expand Down Expand Up @@ -1768,7 +1714,13 @@ exports[`Component Examples renders Nav.Basic.Example.tsx correctly 1`] = `
onKeyUp={[Function]}
onMouseDown={[Function]}
onMouseUp={[Function]}
<<<<<<< HEAD
title="Delete"
=======
rel={undefined}
target={undefined}
title="News"
>>>>>>> master
>
<div
className=
Expand All @@ -1791,7 +1743,7 @@ exports[`Component Examples renders Nav.Basic.Example.tsx correctly 1`] = `
color: #106ebe;
display: inline-block;
flex-shrink: 0;
font-family: "FabricMDL2Icons";
font-family: "FabricMDL2Icons-1";
font-size: 16px;
font-style: normal;
font-weight: normal;
Expand All @@ -1805,10 +1757,10 @@ exports[`Component Examples renders Nav.Basic.Example.tsx correctly 1`] = `
text-align: center;
vertical-align: middle;
}
data-icon-name="Delete"
data-icon-name="News"
role="presentation"
>
</i>
<span
className=
Expand All @@ -1828,9 +1780,9 @@ exports[`Component Examples renders Nav.Basic.Example.tsx correctly 1`] = `
position: absolute;
width: 1px;
}
id="id__27"
id="id__24"
>
Delete
News
</span>
<div
className=
Expand All @@ -1845,7 +1797,7 @@ exports[`Component Examples renders Nav.Basic.Example.tsx correctly 1`] = `
vertical-align: middle;
}
>
Delete
News
</div>
</div>
</a>
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.