Skip to content

refactor(@angular-devkit/build-angular): remove usage of deprecated url methods #22312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alan-agius4 merged 1 commit into from
Dec 8, 2021
Merged

refactor(@angular-devkit/build-angular): remove usage of deprecated url methods #22312

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions packages/angular_devkit/build_angular/src/webpack/configs/dev-server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import { logging, tags } from '@angular-devkit/core';
import { existsSync, promises as fsPromises } from 'fs';
import { extname, posix, resolve } from 'path';
import * as url from 'url';
import { URL, pathToFileURL } from 'url';
import { Configuration, RuleSetRule } from 'webpack';
import { Configuration as DevServerConfiguration } from 'webpack-dev-server';
import { WebpackConfigOptions, WebpackDevServerOptions } from '../../utils/build-options';
Expand Down Expand Up @@ -72,7 +72,7 @@ export async function getDevServerConfig(
rewrites: [
{
from: new RegExp(`^(?!${servePath})/.*`),
to: (context) => url.format(context.parsedUrl),
to: (context) => context.parsedUrl.href,
},
],
},
Expand Down Expand Up @@ -198,7 +198,7 @@ async function addProxyConfig(root: string, proxyConfig: string | undefined) {
// Load the ESM configuration file using the TypeScript dynamic import workaround.
// Once TypeScript provides support for keeping the dynamic import this workaround can be
// changed to a direct dynamic import.
return (await loadEsmModule<{ default: unknown }>(url.pathToFileURL(proxyPath))).default;
return (await loadEsmModule<{ default: unknown }>(pathToFileURL(proxyPath))).default;
case '.cjs':
return require(proxyPath);
default:
Expand All @@ -211,7 +211,7 @@ async function addProxyConfig(root: string, proxyConfig: string | undefined) {
// Load the ESM configuration file using the TypeScript dynamic import workaround.
// Once TypeScript provides support for keeping the dynamic import this workaround can be
// changed to a direct dynamic import.
return (await loadEsmModule<{ default: unknown }>(url.pathToFileURL(proxyPath))).default;
return (await loadEsmModule<{ default: unknown }>(pathToFileURL(proxyPath))).default;
}

throw e;
Expand Down Expand Up @@ -300,11 +300,8 @@ function getAllowedHostsConfig(
function getPublicHostOptions(options: WebpackDevServerOptions, webSocketPath: string): string {
let publicHost: string | null | undefined = options.publicHost;
if (publicHost) {
if (!/^\w+:\/\//.test(publicHost)) {
publicHost = `https://${publicHost}`;
}

publicHost = url.parse(publicHost).host;
const hostWithProtocol = !/^\w+:\/\//.test(publicHost) ? `https://${publicHost}` : publicHost;
publicHost = new URL(hostWithProtocol).host;
}

return `auto://${publicHost || '0.0.0.0:0'}${webSocketPath}`;
Expand Down