Skip to content

Commit a79ace0

Browse files
committed
Remove is-url-valid. It was causing issues with re2
1 parent d00ecc7 commit a79ace0

File tree

5 files changed

+22
-596
lines changed

5 files changed

+22
-596
lines changed

buildAndReleaseTask/index.ts

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
import tl = require('azure-pipelines-task-lib/task');
2-
import trm = require('azure-pipelines-task-lib/toolrunner');
3-
import path = require('path');
4-
import fs = require('fs');
5-
import http = require('http');
6-
import url = require('url');
7-
import makeDir = require('make-dir');
8-
import pkg = require('./package.json');
1+
import * as tl from 'azure-pipelines-task-lib/task';
2+
import * as trm from 'azure-pipelines-task-lib/toolrunner';
3+
import * as path from 'path';
4+
import * as fs from 'fs';
5+
import * as http from 'http';
6+
import * as url from 'url';
7+
import * as makeDir from 'make-dir';
8+
import * as pkg from './package.json';
99

1010
const needle = require('needle');
1111
const ProxyAgent = require('proxy-agent');
12-
const isUrlHttp = require('is-url-http');
1312

1413
const os = tl.getVariable('Agent.OS') || "";
1514
const token = tl.getInput('accessToken', true) || "";
@@ -89,11 +88,18 @@ function getProxyURL(): string {
8988
* @param url
9089
* @returns true if valid
9190
*/
92-
function isValidURL(url: string): boolean {
93-
if (!url) {
91+
function isValidURL(url_input: string): boolean {
92+
if (!url_input) {
9493
return false;
9594
}
96-
return isUrlHttp(url);
95+
try {
96+
const validUrl = new url.URL(url_input);
97+
return !!validUrl.href;
98+
} catch(err){
99+
tl.debug(err);
100+
}
101+
102+
return false;
97103
}
98104

99105
/**

0 commit comments

Comments
 (0)