@@ -86,11 +81,11 @@ export const settings = {
( isPreview || isDisabled ) ? (
) : (
-
setAttributes( { content } ) }
+ placeholder={ __( 'Write HTMLâŚ' ) }
+ aria-label={ __( 'HTML' ) }
/>
)
) }
diff --git a/packages/block-library/src/html/test/__snapshots__/index.js.snap b/packages/block-library/src/html/test/__snapshots__/index.js.snap
new file mode 100644
index 00000000000000..5d35f054994fb2
--- /dev/null
+++ b/packages/block-library/src/html/test/__snapshots__/index.js.snap
@@ -0,0 +1,14 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`core/html block edit matches snapshot 1`] = `
+
+
+
+`;
diff --git a/block-library/html/test/index.js b/packages/block-library/src/html/test/index.js
similarity index 75%
rename from block-library/html/test/index.js
rename to packages/block-library/src/html/test/index.js
index a967d46af1419c..2da5c107bea5be 100644
--- a/block-library/html/test/index.js
+++ b/packages/block-library/src/html/test/index.js
@@ -2,7 +2,7 @@
* Internal dependencies
*/
import { name, settings } from '../';
-import { blockEditRender } from '../../../packages/block-library/src/test/helpers';
+import { blockEditRender } from '../../test/helpers';
describe( 'core/html', () => {
test( 'block edit matches snapshot', () => {
diff --git a/packages/block-library/src/index.js b/packages/block-library/src/index.js
index 6d8ef11b8770e0..3c71cb52c702a4 100644
--- a/packages/block-library/src/index.js
+++ b/packages/block-library/src/index.js
@@ -5,6 +5,7 @@ import '@wordpress/core-data';
import {
registerBlockType,
setDefaultBlockName,
+ setUnknownTypeHandlerName,
} from '@wordpress/blocks';
/**
@@ -25,6 +26,7 @@ import * as column from './columns/column';
import * as coverImage from './cover-image';
import * as embed from './embed';
import * as file from './file';
+import * as html from './html';
import * as latestComments from './latest-comments';
import * as latestPosts from './latest-posts';
import * as list from './list';
@@ -43,6 +45,8 @@ import * as textColumns from './text-columns';
import * as verse from './verse';
import * as video from './video';
+import * as classic from './classic';
+
export const registerCoreBlocks = () => {
[
// Common blocks are grouped at the top to prioritize their display
@@ -68,6 +72,8 @@ export const registerCoreBlocks = () => {
...embed.common,
...embed.others,
file,
+ window.wp && window.wp.oldEditor ? classic : null, // Only add the classic block in WP Context
+ html,
latestComments,
latestPosts,
more,
@@ -83,9 +89,16 @@ export const registerCoreBlocks = () => {
textColumns,
verse,
video,
- ].forEach( ( { name, settings } ) => {
+ ].forEach( ( block ) => {
+ if ( ! block ) {
+ return;
+ }
+ const { name, settings } = block;
registerBlockType( name, settings );
} );
setDefaultBlockName( paragraph.name );
+ if ( window.wp && window.wp.oldEditor ) {
+ setUnknownTypeHandlerName( classic.name );
+ }
};
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index a7cfc9de314379..ce0669fe42a39f 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -22,7 +22,6 @@
./bin
- ./block-library
./packages/block-library/src
./lib
./lib/parser.php
diff --git a/test/unit/__mocks__/@wordpress/block-library.js b/test/unit/__mocks__/@wordpress/block-library.js
new file mode 100644
index 00000000000000..72c9351ad7dad9
--- /dev/null
+++ b/test/unit/__mocks__/@wordpress/block-library.js
@@ -0,0 +1,5 @@
+// Make sure the classic block is registered.
+window.wp = window.wp || {};
+window.wp.oldEditor = {};
+
+export * from '../../../../packages/block-library/src';
diff --git a/test/unit/jest.config.json b/test/unit/jest.config.json
index 095317caed655d..fbab20dac0d773 100644
--- a/test/unit/jest.config.json
+++ b/test/unit/jest.config.json
@@ -1,7 +1,7 @@
{
"rootDir": "../../",
"collectCoverageFrom": [
- "(edit-post|block-library)/**/*.js",
+ "(edit-post)/**/*.js",
"packages/**/*.js"
],
"coveragePathIgnorePatterns": [
@@ -13,7 +13,7 @@
"/gutenberg-mobile/"
],
"moduleNameMapper": {
- "@wordpress\\/(components|edit-post|block-library)$": "$1",
+ "@wordpress\\/(components|edit-post)$": "$1",
"@wordpress\\/(block-serialization-spec-parser|is-shallow-equal)$": "packages/$1",
"@wordpress\\/([a-z0-9-]+)$": "packages/$1/src"
},
diff --git a/webpack.config.js b/webpack.config.js
index 1bc044099563fa..15dbd779cca286 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -21,21 +21,6 @@ const mainCSSExtractTextPlugin = new ExtractTextPlugin( {
filename: './build/[basename]/style.css',
} );
-// CSS loader for styles specific to block editing.
-const editBlocksCSSPlugin = new ExtractTextPlugin( {
- filename: './build/block-library/edit-blocks.css',
-} );
-
-// CSS loader for styles specific to blocks in general.
-const blocksCSSPlugin = new ExtractTextPlugin( {
- filename: './build/block-library/style.css',
-} );
-
-// CSS loader for default visual block styles.
-const themeBlocksCSSPlugin = new ExtractTextPlugin( {
- filename: './build/block-library/theme.css',
-} );
-
// Configuration for the ExtractTextPlugin.
const extractConfig = {
use: [
@@ -78,7 +63,6 @@ function camelCaseDash( string ) {
const entryPointNames = [
'components',
'edit-post',
- 'block-library',
];
const gutenbergPackages = [
@@ -87,6 +71,7 @@ const gutenbergPackages = [
'autop',
'blob',
'blocks',
+ 'block-library',
'block-serialization-default-parser',
'block-serialization-spec-parser',
'compose',
@@ -182,40 +167,13 @@ const config = {
],
use: 'babel-loader',
},
- {
- test: /style\.s?css$/,
- include: [
- /block-library/,
- ],
- use: blocksCSSPlugin.extract( extractConfig ),
- },
- {
- test: /editor\.s?css$/,
- include: [
- /block-library/,
- ],
- use: editBlocksCSSPlugin.extract( extractConfig ),
- },
- {
- test: /theme\.s?css$/,
- include: [
- /block-library/,
- ],
- use: themeBlocksCSSPlugin.extract( extractConfig ),
- },
{
test: /\.s?css$/,
- exclude: [
- /block-library/,
- ],
use: mainCSSExtractTextPlugin.extract( extractConfig ),
},
],
},
plugins: [
- blocksCSSPlugin,
- editBlocksCSSPlugin,
- themeBlocksCSSPlugin,
mainCSSExtractTextPlugin,
// Create RTL files with a -rtl suffix
new WebpackRTLPlugin( {