Framework: Use WHATWG URL in place of legacy url module (#19823)

* Block Editor: Use WHATWG URL in place of legacy url module * Block Library: Use WHATWG URL in place of legacy url module * E2E Test Utils: Block Editor: Use WHATWG URL in place of legacy url module * E2E Tests: Use WHATWG URL in place of legacy url module
WordPress · Mar 12, 2020 · 3b63be6 · 3b63be6
1 parent 4f3b69e
commit 3b63be6
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 27 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/block-editor/src/utils/transform-styles/transforms/url-rewrite.js b/packages/block-editor/src/utils/transform-styles/transforms/url-rewrite.js
@@ -1,8 +1,3 @@
-/**
- * External dependencies
- */
-import { parse, resolve } from 'url';
-
 /**
  * Return `true` if the given path is http/https.
  *
@@ -62,10 +57,7 @@ function isValidURL( meta ) {
  * @return {string}              the full path to the file
  */
 function getResourcePath( str, baseURL ) {
-	const pathname = parse( str ).pathname;
-	const filePath = resolve( baseURL, pathname );
-
-	return filePath;
+	return new URL( str, baseURL ).toString();
 }
 
 /**

diff --git a/packages/block-library/package.json b/packages/block-library/package.json
@@ -55,8 +55,7 @@
 		"lodash": "^4.17.15",
 		"memize": "^1.0.5",
 		"moment": "^2.22.1",
-		"tinycolor2": "^1.4.1",
-		"url": "^0.11.0"
+		"tinycolor2": "^1.4.1"
 	},
 	"publishConfig": {
 		"access": "public"

diff --git a/packages/block-library/src/embed/embed-preview.js b/packages/block-library/src/embed/embed-preview.js
@@ -7,7 +7,6 @@ import { getPhotoHtml } from './util';
 /**
  * External dependencies
  */
-import { parse } from 'url';
 import { includes } from 'lodash';
 import classnames from 'classnames/dedupe';
 
@@ -69,7 +68,7 @@ class EmbedPreview extends Component {
 		const { interactive } = this.state;
 
 		const html = 'photo' === type ? getPhotoHtml( preview ) : preview.html;
-		const parsedHost = parse( url ).host.split( '.' );
+		const parsedHost = new URL( url ).host.split( '.' );
 		const parsedHostBaseUrl = parsedHost
 			.splice( parsedHost.length - 2, parsedHost.length - 1 )
 			.join( '.' );

diff --git a/packages/e2e-test-utils/src/create-url.js b/packages/e2e-test-utils/src/create-url.js
@@ -2,7 +2,6 @@
  * External dependencies
  */
 import { join } from 'path';
-import { URL } from 'url';
 
 /**
  * Internal dependencies

diff --git a/packages/e2e-test-utils/src/is-current-url.js b/packages/e2e-test-utils/src/is-current-url.js
@@ -1,8 +1,3 @@
-/**
- * External dependencies
- */
-import { URL } from 'url';
-
 /**
  * Internal dependencies
  */

diff --git a/packages/e2e-tests/specs/editor/various/preview.test.js b/packages/e2e-tests/specs/editor/various/preview.test.js
@@ -2,7 +2,6 @@
  * External dependencies
  */
 import { last } from 'lodash';
-import { parse } from 'url';
 
 /**
  * WordPress dependencies
@@ -187,9 +186,9 @@ describe( 'Preview', () => {
 		expect( previewTitle ).toBe( 'Hello World! And more.' );
 
 		// Published preview URL should include ID and nonce parameters.
-		const { query } = parse( previewPage.url(), true );
-		expect( query ).toHaveProperty( 'preview_id' );
-		expect( query ).toHaveProperty( 'preview_nonce' );
+		const { searchParams } = new URL( previewPage.url() );
+		expect( searchParams.has( 'preview_id' ) ).toBe( true );
+		expect( searchParams.has( 'preview_nonce' ) ).toBe( true );
 
 		// Return to editor. Previewing already-autosaved preview tab should
 		// reuse the opened tab, skipping interstitial. This resolves an edge