Skip to content
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

使“umi block add” 命令可以添加局域网内搭建gitlab #2559

Closed
wants to merge 1 commit into from
Closed

使“umi block add” 命令可以添加局域网内搭建gitlab #2559

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
5 changes: 4 additions & 1 deletion packages/umi-build-dev/src/plugins/commands/block/download.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)?$/;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

建议用 https://www.npmjs.com/package/git-url-parse 重构，这样能解决各种情况。

export function isGitUrl(url) {
return gitSiteParser.test(url);
}
Expand Down