Remove deprecated url dependency

Author: shepmaster

tests/spec/features/sharing_with_others_spec.rb

@@ -44,7 +44,7 @@
 
     # Need to be logged in to URLO for this link to work
     expect(urlo_link).to match(%r{https://users.rust-lang.org/new-topic})
-    expect(urlo_link).to match(%{automated%20test})
+    expect(urlo_link).to include('automated+test')
   end
 
   def editor

ui/frontend/actions.ts

@@ -1,6 +1,5 @@
 import fetch from 'isomorphic-fetch';
 import { ThunkAction as ReduxThunkAction } from 'redux-thunk';
-import url, { UrlObject } from 'url';
 import { z } from 'zod';
 
 import {
@@ -9,6 +8,7 @@ import {
   getCrateType,
   runAsTest,
   useWebsocketSelector,
+  baseUrlSelector,
 } from './selectors';
 import State from './state';
 import {
@@ -35,14 +35,14 @@ import {
 } from './types';
 
 const routes = {
-  compile: { pathname: '/compile' },
-  execute: { pathname: '/execute' },
-  format: { pathname: '/format' },
-  clippy: { pathname: '/clippy' },
-  miri: { pathname: '/miri' },
-  macroExpansion: { pathname: '/macro-expansion' },
+  compile: '/compile',
+  execute: '/execute',
+  format: '/format',
+  clippy: '/clippy',
+  miri: '/miri',
+  macroExpansion: '/macro-expansion',
   meta: {
-    crates: { pathname: '/meta/crates' },
+    crates: '/meta/crates',
     version: {
       stable: '/meta/version/stable',
       beta: '/meta/version/beta',
@@ -51,7 +51,8 @@ const routes = {
       clippy: '/meta/version/clippy',
       miri: '/meta/version/miri',
     },
-    gist: { pathname: '/meta/gist/' },
+    gistSave: '/meta/gist',
+    gistLoad: '/meta/gist/id',
   },
 };
 
@@ -231,24 +232,22 @@ const receiveExecuteSuccess = ({ stdout, stderr }: ExecuteResponseBody) =>
 const receiveExecuteFailure = ({ error }: { error?: string }) =>
   createAction(ActionType.ExecuteFailed, { error });
 
-function jsonGet(urlObj: string | UrlObject) {
-  const urlStr = url.format(urlObj);
+type FetchArg = Parameters<typeof fetch>[0];
 
-  return fetchJson(urlStr, {
+function jsonGet(url: FetchArg) {
+  return fetchJson(url, {
     method: 'get',
   });
 }
 
-function jsonPost<T>(urlObj: UrlObject, body: Record<string, any>): Promise<T> {
-  const urlStr = url.format(urlObj);
-
-  return fetchJson(urlStr, {
+function jsonPost<T>(url: FetchArg, body: Record<string, any>): Promise<T> {
+  return fetchJson(url, {
     method: 'post',
     body: JSON.stringify(body),
   });
 }
 
-async function fetchJson(url: string, args: RequestInit) {
+async function fetchJson(url: FetchArg, args: RequestInit) {
   const headers = new Headers(args.headers);
   headers.set('Content-Type', 'application/json');
 
@@ -751,9 +750,14 @@ type PerformGistLoadProps =
   Pick<GistSuccessProps, Exclude<keyof GistSuccessProps, 'url' | 'code' | 'stdout' | 'stderr'>>;
 
 export function performGistLoad({ id, channel, mode, edition }: PerformGistLoadProps): ThunkAction {
-  return function(dispatch, _getState) {
+  return function(dispatch, getState) {
     dispatch(requestGistLoad());
-    const u = url.resolve(routes.meta.gist.pathname, id);
+
+    const state = getState();
+    const baseUrl = baseUrlSelector(state);
+    const gistUrl = new URL(routes.meta.gistLoad, baseUrl);
+    const u = new URL(id, gistUrl);
+
     jsonGet(u)
       .then(gist => dispatch(receiveGistLoadSuccess({ channel, mode, edition, ...gist })));
     // TODO: Failure case
@@ -792,7 +796,7 @@ export function performGistSave(): ThunkAction {
       },
     } = getState();
 
-    return jsonPost<GistResponseBody>(routes.meta.gist, { code })
+    return jsonPost<GistResponseBody>(routes.meta.gistSave, { code })
       .then(json => dispatch(receiveGistSaveSuccess({ ...json, code, stdout, stderr, channel, mode, edition })));
     // TODO: Failure case
   };

ui/frontend/configureStore.ts

@@ -2,7 +2,6 @@ import { merge } from 'lodash';
 import { applyMiddleware, compose, createStore } from 'redux';
 import { useDispatch } from 'react-redux';
 import thunk, { ThunkDispatch } from 'redux-thunk';
-import * as url from 'url';
 
 import { Action, initializeApplication } from './actions';
 import initializeLocalStorage from './local_storage';
@@ -11,7 +10,7 @@ import playgroundApp, { State } from './reducers';
 import { websocketMiddleware } from './websocketMiddleware';
 
 export default function configureStore(window: Window) {
-  const baseUrl = url.resolve(window.location.href, '/');
+  const baseUrl = new URL('/', window.location.href).href;
   const websocket = websocketMiddleware(window);
 
   const initialGlobalState = {

ui/frontend/package.json

@@ -29,7 +29,6 @@
     "reselect": "^4.0.0",
     "route-parser": "^0.0.5",
     "split-grid": "^1.0.9",
-    "url": "^0.11.0",
     "zod": "^3.20.3"
   },
   "devDependencies": {

ui/frontend/selectors/index.ts

@@ -1,6 +1,5 @@
 import { source } from 'common-tags';
 import { createSelector } from 'reselect';
-import * as url from 'url';
 
 import { State } from '../reducers';
 import {
@@ -175,7 +174,7 @@ export const getSomethingToShow = createSelector(
   a => a.some(hasProperties),
 );
 
-const baseUrlSelector = (state: State) =>
+export const baseUrlSelector = (state: State) =>
   state.globalConfiguration.baseUrl;
 
 const gistSelector = (state: State) =>
@@ -184,11 +183,13 @@ const gistSelector = (state: State) =>
 // Selects url.query of build configs.
 const urlQuerySelector = createSelector(
   gistSelector,
-  gist => ({
-    version: gist.channel,
-    mode: gist.mode,
-    edition: gist.edition,
-  }),
+  gist => {
+    const res = new URLSearchParams();
+    if (gist.channel) { res.set('version', gist.channel) }
+    if (gist.mode) { res.set('mode', gist.mode) }
+    if (gist.edition) { res.set('edition', gist.edition) }
+    return res;
+  },
 );
 
 export const showGistLoaderSelector = createSelector(
@@ -198,10 +199,12 @@ export const showGistLoaderSelector = createSelector(
 
 export const permalinkSelector = createSelector(
   baseUrlSelector, urlQuerySelector, gistSelector,
-  (baseUrl, query, gist) => {
-    const u = url.parse(baseUrl, true);
-    u.query = { ...query, gist: gist.id };
-    return url.format(u);
+  (baseUrl, originalQuery, gist) => {
+    const u = new URL(baseUrl);
+    const query = new URLSearchParams(originalQuery);
+    if (gist.id) { query.set('gist', gist.id) }
+    u.search = query.toString();
+    return u.href;
   },
 );
 
@@ -257,18 +260,20 @@ const snippetSelector = createSelector(
 export const urloUrlSelector = createSelector(
   snippetSelector,
   snippet => {
-    const newUsersPostUrl = url.parse('https://users.rust-lang.org/new-topic', true);
-    newUsersPostUrl.query = { body: snippet };
-    return url.format(newUsersPostUrl);
+    const newUsersPostUrl = new URL('https://users.rust-lang.org/new-topic');
+    newUsersPostUrl.searchParams.set('body', snippet);
+    return newUsersPostUrl.href;
   },
 );
 
 export const codeUrlSelector = createSelector(
   baseUrlSelector, urlQuerySelector, gistSelector,
-  (baseUrl, query, gist) => {
-    const u = url.parse(baseUrl, true);
-    u.query = { ...query, code: gist.code };
-    return url.format(u);
+  (baseUrl, originalQuery, gist) => {
+    const u = new URL(baseUrl);
+    const query = new URLSearchParams(originalQuery);
+    if (gist.code) { query.set('code', gist.code) }
+    u.search = new URLSearchParams(query).toString();
+    return u.href;
   },
 );
 

ui/frontend/yarn.lock

@@ -5003,11 +5003,6 @@ prr@~1.0.1:
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
   integrity sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==
 
-punycode@1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
-  integrity sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==
-
 punycode@^2.1.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f"
@@ -5020,11 +5015,6 @@ qs@^6.4.0:
   dependencies:
     side-channel "^1.0.4"
 
-querystring@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
-  integrity sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==
-
 queue-microtask@^1.2.2:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
@@ -6147,14 +6137,6 @@ uri-js@^4.2.2:
   dependencies:
     punycode "^2.1.0"
 
-url@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
-  integrity sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==
-  dependencies:
-    punycode "1.3.2"
-    querystring "0.2.0"
-
 use-sync-external-store@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz#7dbefd6ef3fe4e767a0cf5d7287aacfb5846928a"