From 68a466aadb35303996017a949fcc93cb02a29541 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=94=E4=BA=94=E7=8F=AD=E7=8F=AD=E9=95=BF?= Date: Mon, 10 Jun 2019 10:06:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E2=80=9Cumi=20block=20add=E2=80=9D=20?= =?UTF-8?q?=E5=91=BD=E4=BB=A4=E5=8F=AF=E4=BB=A5=E6=B7=BB=E5=8A=A0=E5=B1=80?= =?UTF-8?q?=E5=9F=9F=E7=BD=91=E5=86=85=E6=90=AD=E5=BB=BAgitlab?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 因为局域网内搭建的gitlab通常都是以IP地址开头，并没有域名，通过正则过滤部分添加了IP地址的过滤来使IP地址开头的gitlab地址也能符合isGitUrl() --- .../umi-build-dev/src/plugins/commands/block/download.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/umi-build-dev/src/plugins/commands/block/download.js b/packages/umi-build-dev/src/plugins/commands/block/download.js index fd5aafeb6207..4fc6ddd26e82 100644 --- a/packages/umi-build-dev/src/plugins/commands/block/download.js +++ b/packages/umi-build-dev/src/plugins/commands/block/download.js @@ -61,7 +61,10 @@ export function downloadFromGit(url, id, branch = 'master', log, args = {}) { // or http://gitlab.alitest-inc.com/bigfish/testblocks // or https://github.com/umijs/umi-blocks/tree/master/demo // or https://github.com/alibaba/ice/tree/master/react-blocks/blocks/AbilityIntroduction -const gitSiteParser = /^(https\:\/\/|http\:\/\/|git\@)((github|gitlab)[\.\w\-]+)(\/|\:)([\w\-]+)\/([\w\-]+)(\/tree\/([\w\.\-]+)([\w\-\/]+))?(.git)?$/; +// or http://192.168.1.11/bigfish/bigfish-blocks/tree/master/demo +// or http://192.168.1.11/bigfish/testblocks/tree/master +// or http://192.168.1.11/bigfish/testblocks +const gitSiteParser = /^(https\:\/\/|http\:\/\/|git\@)((github[\.\w\-]+|gitlab[\.\w\-]+|((25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(25[0-5]|2[0-4]\d|[01]?\d\d?)))(\/|\:)([\w\-]+)\/([\w\-]+)(\/tree\/([\w\.\-]+)([\w\-\/]+))?(.git)?$/; export function isGitUrl(url) { return gitSiteParser.test(url); }