From f909853bc43f20bccc677ad44851a04e81570c89 Mon Sep 17 00:00:00 2001 From: Andrew Duthie Date: Wed, 23 Jan 2019 12:13:50 -0500 Subject: [PATCH] Plugin: Avoid calling deprecated gutenberg_silence_rest_errors --- bin/install-wordpress.sh | 4 ++ gutenberg.php | 4 -- package-lock.json | 42 ++++++++++++++----- packages/e2e-test-utils/src/index.js | 1 + .../src/observe-page-warnings.js | 15 +++++++ .../e2e-tests/config/setup-test-framework.js | 2 + packages/scripts/CHANGELOG.md | 4 ++ packages/scripts/package.json | 2 +- 8 files changed, 59 insertions(+), 15 deletions(-) create mode 100644 packages/e2e-test-utils/src/observe-page-warnings.js diff --git a/bin/install-wordpress.sh b/bin/install-wordpress.sh index 40eec0810bd90e..9b61299d4651e8 100755 --- a/bin/install-wordpress.sh +++ b/bin/install-wordpress.sh @@ -87,6 +87,10 @@ if [ "$CURRENT_URL" != "http://localhost:$HOST_PORT" ]; then docker-compose $DOCKER_COMPOSE_FILE_OPTIONS run --rm -u 33 $CLI option update siteurl "http://localhost:$HOST_PORT" --quiet fi +# Configure site constants. +echo -e $(status_message "Configuring site constants...") +docker-compose $DOCKER_COMPOSE_FILE_OPTIONS run --rm -u 33 $CLI config set WP_DEBUG true --quiet + # Activate Gutenberg. echo -e $(status_message "Activating Gutenberg...") docker-compose $DOCKER_COMPOSE_FILE_OPTIONS run --rm -u 33 $CLI plugin activate gutenberg --quiet diff --git a/gutenberg.php b/gutenberg.php index 655e883859fda6..29259acfadc277 100644 --- a/gutenberg.php +++ b/gutenberg.php @@ -187,10 +187,6 @@ function gutenberg_pre_init() { require_once dirname( __FILE__ ) . '/lib/load.php'; - if ( function_exists( 'gutenberg_silence_rest_errors' ) ) { - gutenberg_silence_rest_errors(); - } - add_filter( 'replace_editor', 'gutenberg_init', 10, 2 ); } diff --git a/package-lock.json b/package-lock.json index 307215cb6a5b25..f6e235aa479d0d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2427,6 +2427,7 @@ "@babel/runtime": "^7.0.0", "@wordpress/api-fetch": "file:packages/api-fetch", "@wordpress/data": "file:packages/data", + "@wordpress/deprecated": "file:packages/deprecated", "@wordpress/url": "file:packages/url", "equivalent-key-map": "^0.2.2", "lodash": "^4.17.10", @@ -2786,7 +2787,7 @@ "jest": "^23.6.0", "jest-puppeteer": "3.2.1", "npm-package-json-lint": "^3.3.1", - "puppeteer": "1.6.1", + "puppeteer": "1.11.0", "read-pkg-up": "^1.0.1", "resolve-bin": "^0.4.0", "stylelint": "^9.10.1", @@ -16677,25 +16678,46 @@ "dev": true }, "puppeteer": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-1.6.1.tgz", - "integrity": "sha512-qz6DLwK+PhlBMjJZOMOsgVCnweYLtmiqnmJYUDPT++ElMz+cQgbsCNKPw4YDVpg3RTbsRX/pqQqr20zrp0cuKw==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-1.11.0.tgz", + "integrity": "sha512-iG4iMOHixc2EpzqRV+pv7o3GgmU2dNYEMkvKwSaQO/vMZURakwSOn/EYJ6OIRFYOque1qorzIBvrytPIQB3YzQ==", "dev": true, "requires": { - "debug": "^3.1.0", + "debug": "^4.1.0", "extract-zip": "^1.6.6", "https-proxy-agent": "^2.2.1", "mime": "^2.0.3", - "progress": "^2.0.0", + "progress": "^2.0.1", "proxy-from-env": "^1.0.0", "rimraf": "^2.6.1", - "ws": "^5.1.1" + "ws": "^6.1.0" }, "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", + "dev": true + }, + "progress": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", + "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", + "dev": true + }, "ws": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz", - "integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==", + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/ws/-/ws-6.1.2.tgz", + "integrity": "sha512-rfUqzvz0WxmSXtJpPMX2EeASXabOrSMk1ruMOV3JBTBjo4ac2lDjGGsbQSyxj8Odhw5fBib8ZKEjDNvgouNKYw==", "dev": true, "requires": { "async-limiter": "~1.0.0" diff --git a/packages/e2e-test-utils/src/index.js b/packages/e2e-test-utils/src/index.js index 5534c981f46a9e..f84d399c8085cb 100644 --- a/packages/e2e-test-utils/src/index.js +++ b/packages/e2e-test-utils/src/index.js @@ -22,6 +22,7 @@ export { installPlugin } from './install-plugin'; export { isCurrentURL } from './is-current-url'; export { loginUser } from './login-user'; export { observeFocusLoss } from './observe-focus-loss'; +export { observePageWarnings } from './observe-page-warnings'; export { openDocumentSettingsSidebar } from './open-document-settings-sidebar'; export { openPublishPanel } from './open-publish-panel'; export { pressKeyTimes } from './press-key-times'; diff --git a/packages/e2e-test-utils/src/observe-page-warnings.js b/packages/e2e-test-utils/src/observe-page-warnings.js new file mode 100644 index 00000000000000..4f18d2dd3aef37 --- /dev/null +++ b/packages/e2e-test-utils/src/observe-page-warnings.js @@ -0,0 +1,15 @@ +/** + * Binds to the document on page load which throws an error if any warnings had + * been logged to the page. This assumes both that the server is configured to + * display warnings, and that the warnings would be output to the page before + * the ``. + */ +export function observePageWarnings() { + page.on( 'load', async () => { + const hasDoctype = await page.evaluate( () => !! document.doctype ); + + if ( ! hasDoctype ) { + throw new Error( 'Unexpected page warnings' ); + } + } ); +} diff --git a/packages/e2e-tests/config/setup-test-framework.js b/packages/e2e-tests/config/setup-test-framework.js index 20d96e29fb5707..d49c5d059b00e0 100644 --- a/packages/e2e-tests/config/setup-test-framework.js +++ b/packages/e2e-tests/config/setup-test-framework.js @@ -11,6 +11,7 @@ import '@wordpress/jest-console'; import { clearLocalStorage, enablePageDialogAccept, + observePageWarnings, setBrowserViewport, visitAdminPage, } from '@wordpress/e2e-test-utils'; @@ -151,6 +152,7 @@ beforeAll( async () => { capturePageEventsForTearDown(); enablePageDialogAccept(); observeConsoleLogging(); + observePageWarnings(); await trashExistingPosts(); await setupBrowser(); diff --git a/packages/scripts/CHANGELOG.md b/packages/scripts/CHANGELOG.md index 40210edd4b1391..e7dce246c7df73 100644 --- a/packages/scripts/CHANGELOG.md +++ b/packages/scripts/CHANGELOG.md @@ -5,6 +5,10 @@ - Added support for `build` script ([#12837](https://github.com/WordPress/gutenberg/pull/12837)) - Added support for `start` script ([#12837](https://github.com/WordPress/gutenberg/pull/12837)) +### Internal + +- Update `puppeteer` dependency from 1.6.1 to 1.11.0 ([#13446](https://github.com/WordPress/gutenberg/pull/13446)) + ## 2.5.0 (2019-01-09) ### New Features diff --git a/packages/scripts/package.json b/packages/scripts/package.json index 86d4211b874d5e..f2286d61e5d478 100644 --- a/packages/scripts/package.json +++ b/packages/scripts/package.json @@ -42,7 +42,7 @@ "jest": "^23.6.0", "jest-puppeteer": "3.2.1", "npm-package-json-lint": "^3.3.1", - "puppeteer": "1.6.1", + "puppeteer": "1.11.0", "read-pkg-up": "^1.0.1", "resolve-bin": "^0.4.0", "stylelint": "^9.10.1",