Commit b27261b 1 parent a8de1d4 commit b27261b Copy full SHA for b27261b
File tree 4 files changed +9
-13
lines changed
4 files changed +9
-13
lines changed Original file line number Diff line number Diff line change 7
7
* later version: http://www.gnu.org/licenses/gpl-2.0.txt
8
8
*/
9
9
10
- import { URL } from 'url' ;
11
-
12
10
import * as React from 'react' ;
13
11
14
12
import { CatalystContext } from '../context' ;
Original file line number Diff line number Diff line change 7
7
* later version: http://www.gnu.org/licenses/gpl-2.0.txt
8
8
*/
9
9
10
- import URL from 'url' ;
11
-
12
10
import * as React from 'react' ;
13
11
14
12
import EntityLink from '../../static/scripts/common/components/EntityLink' ;
@@ -20,7 +18,7 @@ import isDisabledLink from '../../utility/isDisabledLink';
20
18
21
19
function faviconClass ( urlEntity ) {
22
20
let matchingClass ;
23
- const urlObject = URL . parse ( urlEntity . name , false , true ) ;
21
+ const urlObject = new URL ( urlEntity . name ) ;
24
22
25
23
for ( const key in FAVICON_CLASSES ) {
26
24
if ( ( key . indexOf ( '/' ) >= 0 && urlEntity . name . indexOf ( key ) >= 0 ) ||
Original file line number Diff line number Diff line change 7
7
* later version: http://www.gnu.org/licenses/gpl-2.0.txt
8
8
*/
9
9
10
- import { URL } from 'url' ;
11
-
12
10
import * as React from 'react' ;
13
11
import * as ReactDOMServer from 'react-dom/server' ;
14
12
Original file line number Diff line number Diff line change 7
7
* later version: http://www.gnu.org/licenses/gpl-2.0.txt
8
8
*/
9
9
10
- import url from 'url' ;
11
-
12
10
export default function uriWith < T : { ...} > (
13
11
uriString: string,
14
12
params: T,
15
13
): string {
16
- const u = url . parse ( uriString , true ) ;
14
+ const urlObject = new URL ( uriString ) ;
15
+ const searchParams = new URLSearchParams ( urlObject . search ) ;
16
+
17
+ for ( const key of Object . keys ( params ) ) {
18
+ searchParams . set ( key , params [ key ] ) ;
19
+ }
17
20
18
- u . query = Object . assign ( u . query , params ) ;
19
- u . search = null ;
21
+ urlObject . search = searchParams . toString ( ) ;
20
22
21
- return url . format ( u ) ;
23
+ return urlObject . href ;
22
24
}
You can’t perform that action at this time.
0 commit comments