Skip to content
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

Jump to bottom

fix(deps): update wordpress monorepo #38554

Merged
merged 7 commits into from
Jan 13, 2020
+858 −479
Merged

fix(deps): update wordpress monorepo #38554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e3b7840
fix(deps): update wordpress monorepo
renovate-bot Dec 24, 2019
41177f8
Gutenboarding: Update z-index to match @wp/base-styles v1.1.0
ockham Dec 29, 2019
bf3bbbe
Update locks
sirreal Jan 8, 2020
4992e9a
Dedupe
sirreal Jan 8, 2020
29d834e
Update to latest
sirreal Jan 8, 2020
10478bd
Update @wordpress/components types
sirreal Jan 8, 2020
e1f9673
Import module css via SASS
sirreal Jan 13, 2020
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
851 changes: 602 additions & 249 deletions apps/full-site-editing/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions apps/full-site-editing/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
"@automattic/calypso-build": "^4.2.1",
"@testing-library/jest-dom": "4.2.4",
"@testing-library/react": "9.3.3",
"@wordpress/jest-preset-default": "5.2.0",
"@wordpress/scripts": "6.0.0",
"@wordpress/jest-preset-default": "5.3.1",
"@wordpress/scripts": "6.1.1",
"eslint-plugin-jest": "23.1.1"
}
}
8 changes: 4 additions & 4 deletions apps/o2-blocks/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
"build": "calypso-build editor='./src/editor.js' --env.WP"
},
"dependencies": {
"@wordpress/blocks": "6.8.0",
"@wordpress/components": "8.4.0",
"@wordpress/editor": "9.8.0",
"@wordpress/element": "2.9.0",
"@wordpress/blocks": "6.9.0",
"@wordpress/components": "8.5.0",
"@wordpress/editor": "9.9.0",
"@wordpress/element": "2.10.0",
"@wordpress/i18n": "3.7.0",
"classnames": "2.2.6"
}
Expand Down
2 changes: 1 addition & 1 deletion client/landing/gutenboarding/components/header/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
border-bottom: 1px solid $light-gray-500;
height: $header-height;
background: $white;
z-index: z-index( '.edit-post-header' );
z-index: z-index( '.edit-post-editor-regions__header' );

left: 0;
right: 0;
Expand Down
4 changes: 3 additions & 1 deletion client/landing/gutenboarding/gutenboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ import { useSelect } from '@wordpress/data';
import '@wordpress/format-library';
import classnames from 'classnames';
import React, { useRef, useState } from 'react';
import '@wordpress/components/build-style/style.css';
// Uncomment and remove the redundant sass import from `./style.css` when a release after @wordpress/[email protected] is published.
// See https://github.com/WordPress/gutenberg/pull/19535
// import '@wordpress/components/build-style/style.css';
import { useRouteMatch } from 'react-router-dom';

/**
Expand Down
3 changes: 3 additions & 0 deletions client/landing/gutenboarding/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// @TODO: Remove this line and restore the import in `./gutenboard.tsx` when a release after @wordpress/[email protected] is published.
// See https://github.com/WordPress/gutenberg/pull/19535
@import '~@wordpress/components/build-style/style';
@import 'assets/stylesheets/gutenberg-base-styles';

// Override core variables: we don't have wp-admin header and sidebar in Calypso
Expand Down
Loading