From 5bd9a6626b7027e3e0b5c9211357ed3ded292035 Mon Sep 17 00:00:00 2001 From: jolheiser Date: Sun, 2 Feb 2020 00:44:19 -0600 Subject: [PATCH 01/28] Add octicon SVG sprite Signed-off-by: jolheiser --- go.mod | 2 +- go.sum | 4 +- public/img/svg/octicons.svg | 204 +++++++++++++++++++++++++++++++++++ scripts/generate-octicons.go | 60 +++++++++++ templates/repo/header.tmpl | 3 +- web_src/less/_svg.less | 15 +++ web_src/less/index.less | 1 + 7 files changed, 285 insertions(+), 4 deletions(-) create mode 100755 public/img/svg/octicons.svg create mode 100644 scripts/generate-octicons.go create mode 100644 web_src/less/_svg.less diff --git a/go.mod b/go.mod index cb1dca4b5d75..86188c680f37 100644 --- a/go.mod +++ b/go.mod @@ -97,7 +97,7 @@ require ( github.com/yuin/goldmark v1.1.19 go.etcd.io/bbolt v1.3.3 // indirect golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876 - golang.org/x/net v0.0.0-20191101175033-0deb6923b6d9 + golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 golang.org/x/sys v0.0.0-20191127021746-63cb32ae39b2 golang.org/x/text v0.3.2 diff --git a/go.sum b/go.sum index 13ffa7750222..0ead3b9e0d94 100644 --- a/go.sum +++ b/go.sum @@ -616,8 +616,8 @@ golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191101175033-0deb6923b6d9 h1:DPz9iiH3YoKiKhX/ijjoZvT0VFwK2c6CWYWQ7Zyr8TU= -golang.org/x/net v0.0.0-20191101175033-0deb6923b6d9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa h1:F+8P+gmewFQYRk6JoLQLwjBCTu3mcIURZfNkVweuRKA= +golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/oauth2 v0.0.0-20180620175406-ef147856a6dd/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= diff --git a/public/img/svg/octicons.svg b/public/img/svg/octicons.svg new file mode 100755 index 000000000000..e2ea394c9995 --- /dev/null +++ b/public/img/svg/octicons.svg @@ -0,0 +1,204 @@ + +alert +archive +arrow-both +arrow-down +arrow-left +arrow-right +arrow-small-down +arrow-small-left +arrow-small-right +arrow-small-up +arrow-up +beaker +bell +bold +book +bookmark +briefcase +broadcast +browser +bug +calendar +check +checklist +chevron-down +chevron-left +chevron-right +chevron-up +circle-slash +circuit-board +clippy +clock +cloud-download +cloud-upload +code +comment +comment-discussion +credit-card +dash +dashboard +database +dependent +desktop-download +device-camera +device-camera-video +device-desktop +device-mobile +diff +diff-added +diff-ignored +diff-modified +diff-removed +diff-renamed +ellipsis +eye +eye-closed +file +file-binary +file-code +file-directory +file-media +file-pdf +file-submodule +file-symlink-directory +file-symlink-file +file-zip +flame +fold +fold-down +fold-up +gear +gift +gist +gist-secret +git-branch +git-commit +git-compare +git-merge +git-pull-request +github-action +globe +grabber +graph +heart +heart-outline +history +home +horizontal-rule +hubot +inbox +infinity +info +issue-closed +issue-opened +issue-reopened +italic +jersey +kebab-horizontal +kebab-vertical +key +keyboard +law +light-bulb +line-arrow-down +line-arrow-left +line-arrow-right +line-arrow-up +link +link-external +list-ordered +list-unordered +location +lock +logo-gist +logo-github +mail +mail-read +mark-github +markdown +megaphone +mention +milestone +mirror +mortar-board +mute +no-newline +note +octoface +organization +package +paintcan +pencil +person +pin +play +plug +plus +plus-small +primitive-dot +primitive-dot-stroke +primitive-square +project +pulse +question +quote +radio-tower +reply +repo +repo-clone +repo-force-push +repo-forked +repo-pull +repo-push +repo-template +repo-template-private +report +request-changes +rocket +rss +ruby +saved +screen-full +screen-normal +search +server +settings +shield +shield-check +shield-lock +shield-x +sign-in +sign-out +skip +smiley +squirrel +star +stop +sync +tag +tasklist +telescope +terminal +text-size +three-bars +thumbsdown +thumbsup +tools +trashcan +triangle-down +triangle-left +triangle-right +triangle-up +unfold +unmute +unsaved +unverified +verified +versions +watch +workflow +workflow-all +x +zap + \ No newline at end of file diff --git a/scripts/generate-octicons.go b/scripts/generate-octicons.go new file mode 100644 index 000000000000..ecb51885ee03 --- /dev/null +++ b/scripts/generate-octicons.go @@ -0,0 +1,60 @@ +// Copyright 2020 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +// +build ignore + +package main + +import ( + "bytes" + "fmt" + "io/ioutil" + "os" + "strings" + + "gitea.com/jolheiser/octicon" + + "golang.org/x/net/html" +) + +const outFile = "public/img/svg/octicons.svg" + +func main() { + if err := generateOcticons(); err != nil { + fmt.Printf("could not generate Octicons: %v\n", err) + } +} + +func generateOcticons() error { + sprite := `` + for _, name := range octicon.Icons { + icon := octicon.Icon(name) + + page, err := html.Parse(bytes.NewBufferString(icon.XML)) + if err != nil { + return err + } + node := page.FirstChild.LastChild.FirstChild + + var viewBox html.Attribute + for _, attr := range node.Attr { + if attr.Key == "viewBox" { + viewBox = attr + } + } + node.Attr = []html.Attribute{viewBox} + xml := &strings.Builder{} + if err := html.Render(xml, node); err != nil { + return err + } + + sprite += fmt.Sprintf("\n"+``, icon.Name, xml.String()[4:len(xml.String())-4]) + } + sprite += "\n" + + if err := ioutil.WriteFile(outFile, []byte(sprite), os.ModePerm); err != nil { + return err + } + return nil +} diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index b3757b2764be..024c21e87741 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -5,6 +5,8 @@
{{if .RelAvatarLink}} + {{else if .IsTemplate}} + {{else}} {{end}} @@ -12,7 +14,6 @@
/
{{.Name}} {{if and .RelAvatarLink .IsPrivate}}{{end}} - {{if .IsTemplate}}{{end}} {{if .IsArchived}}{{end}} {{if .IsMirror}}
{{$.i18n.Tr "repo.mirror_from"}} {{if .SanitizedOriginalURL}}{{.SanitizedOriginalURL}}{{else}}{{MirrorAddress $.Mirror}}{{end}}
{{end}} {{if .IsFork}}
{{$.i18n.Tr "repo.forked_from"}} {{SubStr .BaseRepo.RelLink 1 -1}}
{{end}} diff --git a/web_src/less/_svg.less b/web_src/less/_svg.less new file mode 100644 index 000000000000..b152e1d23b2e --- /dev/null +++ b/web_src/less/_svg.less @@ -0,0 +1,15 @@ +.octicon-svg { + width: 16px; + height: 16px; + display: inline-block; + vertical-align: text-top; + fill: currentColor; +} + +.mega-octicon-svg { + width: 30px; + height: 30px; + display: inline-block; + vertical-align: text-top; + fill: currentColor; +} diff --git a/web_src/less/index.less b/web_src/less/index.less index a8ef18953d07..b7a63cc985f4 100644 --- a/web_src/less/index.less +++ b/web_src/less/index.less @@ -13,5 +13,6 @@ @import "_admin"; @import "_explore"; @import "_review"; +@import "_svg"; @import "~highlight.js/styles/github.css"; @import "../css/gitGraph.css"; From e2249e78786390ec7ca8f0a54259c6de6c7bb963 Mon Sep 17 00:00:00 2001 From: jolheiser Date: Sun, 2 Feb 2020 13:52:39 -0600 Subject: [PATCH 02/28] Static prefix Signed-off-by: jolheiser --- templates/repo/header.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index 024c21e87741..d3037d7f684f 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -6,7 +6,7 @@ {{if .RelAvatarLink}} {{else if .IsTemplate}} - + {{else}} {{end}} From 7273e68c96a0bdf8f035bf325cd7a27f4bee5c33 Mon Sep 17 00:00:00 2001 From: jolheiser Date: Sun, 2 Feb 2020 13:54:49 -0600 Subject: [PATCH 03/28] SVG for all repo icons Signed-off-by: jolheiser --- templates/repo/header.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index d3037d7f684f..6610d310b559 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -8,7 +8,7 @@ {{else if .IsTemplate}} {{else}} - + {{end}} {{.Owner.Name}}
/
From 215242b259c0a71d2e00b8d89b5daf3ce898916c Mon Sep 17 00:00:00 2001 From: jolheiser Date: Sun, 2 Feb 2020 13:56:16 -0600 Subject: [PATCH 04/28] make vendor Signed-off-by: jolheiser --- vendor/golang.org/x/net/html/const.go | 1 - vendor/golang.org/x/net/html/foreign.go | 1 - vendor/golang.org/x/net/html/parse.go | 298 ++++++++++++------------ vendor/golang.org/x/net/html/render.go | 31 ++- vendor/golang.org/x/net/html/token.go | 3 +- vendor/modules.txt | 2 +- 6 files changed, 170 insertions(+), 166 deletions(-) diff --git a/vendor/golang.org/x/net/html/const.go b/vendor/golang.org/x/net/html/const.go index a3a918f0b381..73804d3472cf 100644 --- a/vendor/golang.org/x/net/html/const.go +++ b/vendor/golang.org/x/net/html/const.go @@ -52,7 +52,6 @@ var isSpecialElementMap = map[string]bool{ "iframe": true, "img": true, "input": true, - "isindex": true, // The 'isindex' element has been removed, but keep it for backwards compatibility. "keygen": true, "li": true, "link": true, diff --git a/vendor/golang.org/x/net/html/foreign.go b/vendor/golang.org/x/net/html/foreign.go index 01477a96397c..74774c458ae6 100644 --- a/vendor/golang.org/x/net/html/foreign.go +++ b/vendor/golang.org/x/net/html/foreign.go @@ -172,7 +172,6 @@ var svgAttributeAdjustments = map[string]string{ "diffuseconstant": "diffuseConstant", "edgemode": "edgeMode", "externalresourcesrequired": "externalResourcesRequired", - "filterres": "filterRes", "filterunits": "filterUnits", "glyphref": "glyphRef", "gradienttransform": "gradientTransform", diff --git a/vendor/golang.org/x/net/html/parse.go b/vendor/golang.org/x/net/html/parse.go index 992cff2a33a5..2cd12fc816e7 100644 --- a/vendor/golang.org/x/net/html/parse.go +++ b/vendor/golang.org/x/net/html/parse.go @@ -184,6 +184,17 @@ func (p *parser) clearStackToContext(s scope) { } } +// parseGenericRawTextElements implements the generic raw text element parsing +// algorithm defined in 12.2.6.2. +// https://html.spec.whatwg.org/multipage/parsing.html#parsing-elements-that-contain-only-text +// TODO: Since both RAWTEXT and RCDATA states are treated as tokenizer's part +// officially, need to make tokenizer consider both states. +func (p *parser) parseGenericRawTextElement() { + p.addElement() + p.originalIM = p.im + p.im = textIM +} + // generateImpliedEndTags pops nodes off the stack of open elements as long as // the top node has a tag name of dd, dt, li, optgroup, option, p, rb, rp, rt or rtc. // If exceptions are specified, nodes with that name will not be popped off. @@ -192,16 +203,17 @@ func (p *parser) generateImpliedEndTags(exceptions ...string) { loop: for i = len(p.oe) - 1; i >= 0; i-- { n := p.oe[i] - if n.Type == ElementNode { - switch n.DataAtom { - case a.Dd, a.Dt, a.Li, a.Optgroup, a.Option, a.P, a.Rb, a.Rp, a.Rt, a.Rtc: - for _, except := range exceptions { - if n.Data == except { - break loop - } + if n.Type != ElementNode { + break + } + switch n.DataAtom { + case a.Dd, a.Dt, a.Li, a.Optgroup, a.Option, a.P, a.Rb, a.Rp, a.Rt, a.Rtc: + for _, except := range exceptions { + if n.Data == except { + break loop } - continue } + continue } break } @@ -369,8 +381,7 @@ findIdenticalElements: // Section 12.2.4.3. func (p *parser) clearActiveFormattingElements() { for { - n := p.afe.pop() - if len(p.afe) == 0 || n.Type == scopeMarkerNode { + if n := p.afe.pop(); len(p.afe) == 0 || n.Type == scopeMarkerNode { return } } @@ -625,25 +636,29 @@ func inHeadIM(p *parser) bool { switch p.tok.DataAtom { case a.Html: return inBodyIM(p) - case a.Base, a.Basefont, a.Bgsound, a.Command, a.Link, a.Meta: + case a.Base, a.Basefont, a.Bgsound, a.Link, a.Meta: p.addElement() p.oe.pop() p.acknowledgeSelfClosingTag() return true case a.Noscript: - p.addElement() if p.scripting { - p.setOriginalIM() - p.im = textIM - } else { - p.im = inHeadNoscriptIM + p.parseGenericRawTextElement() + return true } + p.addElement() + p.im = inHeadNoscriptIM + // Don't let the tokenizer go into raw text mode when scripting is disabled. + p.tokenizer.NextIsNotRawText() return true - case a.Script, a.Title, a.Noframes, a.Style: + case a.Script, a.Title: p.addElement() p.setOriginalIM() p.im = textIM return true + case a.Noframes, a.Style: + p.parseGenericRawTextElement() + return true case a.Head: // Ignore the token. return true @@ -855,7 +870,7 @@ func inBodyIM(p *parser) bool { return true } copyAttributes(p.oe[0], p.tok) - case a.Base, a.Basefont, a.Bgsound, a.Command, a.Link, a.Meta, a.Noframes, a.Script, a.Style, a.Template, a.Title: + case a.Base, a.Basefont, a.Bgsound, a.Link, a.Meta, a.Noframes, a.Script, a.Style, a.Template, a.Title: return inHeadIM(p) case a.Body: if p.oe.contains(a.Template) { @@ -881,7 +896,7 @@ func inBodyIM(p *parser) bool { p.addElement() p.im = inFramesetIM return true - case a.Address, a.Article, a.Aside, a.Blockquote, a.Center, a.Details, a.Dir, a.Div, a.Dl, a.Fieldset, a.Figcaption, a.Figure, a.Footer, a.Header, a.Hgroup, a.Menu, a.Nav, a.Ol, a.P, a.Section, a.Summary, a.Ul: + case a.Address, a.Article, a.Aside, a.Blockquote, a.Center, a.Details, a.Dialog, a.Dir, a.Div, a.Dl, a.Fieldset, a.Figcaption, a.Figure, a.Footer, a.Header, a.Hgroup, a.Main, a.Menu, a.Nav, a.Ol, a.P, a.Section, a.Summary, a.Ul: p.popUntil(buttonScope, a.P) p.addElement() case a.H1, a.H2, a.H3, a.H4, a.H5, a.H6: @@ -1014,53 +1029,6 @@ func inBodyIM(p *parser) bool { p.tok.DataAtom = a.Img p.tok.Data = a.Img.String() return false - case a.Isindex: - if p.form != nil { - // Ignore the token. - return true - } - action := "" - prompt := "This is a searchable index. Enter search keywords: " - attr := []Attribute{{Key: "name", Val: "isindex"}} - for _, t := range p.tok.Attr { - switch t.Key { - case "action": - action = t.Val - case "name": - // Ignore the attribute. - case "prompt": - prompt = t.Val - default: - attr = append(attr, t) - } - } - p.acknowledgeSelfClosingTag() - p.popUntil(buttonScope, a.P) - p.parseImpliedToken(StartTagToken, a.Form, a.Form.String()) - if p.form == nil { - // NOTE: The 'isindex' element has been removed, - // and the 'template' element has not been designed to be - // collaborative with the index element. - // - // Ignore the token. - return true - } - if action != "" { - p.form.Attr = []Attribute{{Key: "action", Val: action}} - } - p.parseImpliedToken(StartTagToken, a.Hr, a.Hr.String()) - p.parseImpliedToken(StartTagToken, a.Label, a.Label.String()) - p.addText(prompt) - p.addChild(&Node{ - Type: ElementNode, - DataAtom: a.Input, - Data: a.Input.String(), - Attr: attr, - }) - p.oe.pop() - p.parseImpliedToken(EndTagToken, a.Label, a.Label.String()) - p.parseImpliedToken(StartTagToken, a.Hr, a.Hr.String()) - p.parseImpliedToken(EndTagToken, a.Form, a.Form.String()) case a.Textarea: p.addElement() p.setOriginalIM() @@ -1070,18 +1038,21 @@ func inBodyIM(p *parser) bool { p.popUntil(buttonScope, a.P) p.reconstructActiveFormattingElements() p.framesetOK = false - p.addElement() - p.setOriginalIM() - p.im = textIM + p.parseGenericRawTextElement() case a.Iframe: p.framesetOK = false + p.parseGenericRawTextElement() + case a.Noembed: + p.parseGenericRawTextElement() + case a.Noscript: + if p.scripting { + p.parseGenericRawTextElement() + return true + } + p.reconstructActiveFormattingElements() p.addElement() - p.setOriginalIM() - p.im = textIM - case a.Noembed, a.Noscript: - p.addElement() - p.setOriginalIM() - p.im = textIM + // Don't let the tokenizer go into raw text mode when scripting is disabled. + p.tokenizer.NextIsNotRawText() case a.Select: p.reconstructActiveFormattingElements() p.addElement() @@ -1137,7 +1108,7 @@ func inBodyIM(p *parser) bool { return false } return true - case a.Address, a.Article, a.Aside, a.Blockquote, a.Button, a.Center, a.Details, a.Dir, a.Div, a.Dl, a.Fieldset, a.Figcaption, a.Figure, a.Footer, a.Header, a.Hgroup, a.Listing, a.Menu, a.Nav, a.Ol, a.Pre, a.Section, a.Summary, a.Ul: + case a.Address, a.Article, a.Aside, a.Blockquote, a.Button, a.Center, a.Details, a.Dialog, a.Dir, a.Div, a.Dl, a.Fieldset, a.Figcaption, a.Figure, a.Footer, a.Header, a.Hgroup, a.Listing, a.Main, a.Menu, a.Nav, a.Ol, a.Pre, a.Section, a.Summary, a.Ul: p.popUntil(defaultScope, p.tok.DataAtom) case a.Form: if p.oe.contains(a.Template) { @@ -1198,14 +1169,13 @@ func inBodyIM(p *parser) bool { if len(p.templateStack) > 0 { p.im = inTemplateIM return false - } else { - for _, e := range p.oe { - switch e.DataAtom { - case a.Dd, a.Dt, a.Li, a.Optgroup, a.Option, a.P, a.Rb, a.Rp, a.Rt, a.Rtc, a.Tbody, a.Td, a.Tfoot, a.Th, - a.Thead, a.Tr, a.Body, a.Html: - default: - return true - } + } + for _, e := range p.oe { + switch e.DataAtom { + case a.Dd, a.Dt, a.Li, a.Optgroup, a.Option, a.P, a.Rb, a.Rp, a.Rt, a.Rtc, a.Tbody, a.Td, a.Tfoot, a.Th, + a.Thead, a.Tr, a.Body, a.Html: + default: + return true } } } @@ -1221,9 +1191,15 @@ func (p *parser) inBodyEndTagFormatting(tagAtom a.Atom, tagName string) { // Once the code successfully parses the comprehensive test suite, we should // refactor this code to be more idiomatic. - // Steps 1-4. The outer loop. + // Steps 1-2 + if current := p.oe.top(); current.Data == tagName && p.afe.index(current) == -1 { + p.oe.pop() + return + } + + // Steps 3-5. The outer loop. for i := 0; i < 8; i++ { - // Step 5. Find the formatting element. + // Step 6. Find the formatting element. var formattingElement *Node for j := len(p.afe) - 1; j >= 0; j-- { if p.afe[j].Type == scopeMarkerNode { @@ -1238,17 +1214,22 @@ func (p *parser) inBodyEndTagFormatting(tagAtom a.Atom, tagName string) { p.inBodyEndTagOther(tagAtom, tagName) return } + + // Step 7. Ignore the tag if formatting element is not in the stack of open elements. feIndex := p.oe.index(formattingElement) if feIndex == -1 { p.afe.remove(formattingElement) return } + // Step 8. Ignore the tag if formatting element is not in the scope. if !p.elementInScope(defaultScope, tagAtom) { // Ignore the tag. return } - // Steps 9-10. Find the furthest block. + // Step 9. This step is omitted because it's just a parse error but no need to return. + + // Steps 10-11. Find the furthest block. var furthestBlock *Node for _, e := range p.oe[feIndex:] { if isSpecialElement(e) { @@ -1265,47 +1246,65 @@ func (p *parser) inBodyEndTagFormatting(tagAtom a.Atom, tagName string) { return } - // Steps 11-12. Find the common ancestor and bookmark node. + // Steps 12-13. Find the common ancestor and bookmark node. commonAncestor := p.oe[feIndex-1] bookmark := p.afe.index(formattingElement) - // Step 13. The inner loop. Find the lastNode to reparent. + // Step 14. The inner loop. Find the lastNode to reparent. lastNode := furthestBlock node := furthestBlock x := p.oe.index(node) - // Steps 13.1-13.2 - for j := 0; j < 3; j++ { - // Step 13.3. + // Step 14.1. + j := 0 + for { + // Step 14.2. + j++ + // Step. 14.3. x-- node = p.oe[x] - // Step 13.4 - 13.5. + // Step 14.4. Go to the next step if node is formatting element. + if node == formattingElement { + break + } + // Step 14.5. Remove node from the list of active formatting elements if + // inner loop counter is greater than three and node is in the list of + // active formatting elements. + if ni := p.afe.index(node); j > 3 && ni > -1 { + p.afe.remove(node) + // If any element of the list of active formatting elements is removed, + // we need to take care whether bookmark should be decremented or not. + // This is because the value of bookmark may exceed the size of the + // list by removing elements from the list. + if ni <= bookmark { + bookmark-- + } + continue + } + // Step 14.6. Continue the next inner loop if node is not in the list of + // active formatting elements. if p.afe.index(node) == -1 { p.oe.remove(node) continue } - // Step 13.6. - if node == formattingElement { - break - } - // Step 13.7. + // Step 14.7. clone := node.clone() p.afe[p.afe.index(node)] = clone p.oe[p.oe.index(node)] = clone node = clone - // Step 13.8. + // Step 14.8. if lastNode == furthestBlock { bookmark = p.afe.index(node) + 1 } - // Step 13.9. + // Step 14.9. if lastNode.Parent != nil { lastNode.Parent.RemoveChild(lastNode) } node.AppendChild(lastNode) - // Step 13.10. + // Step 14.10. lastNode = node } - // Step 14. Reparent lastNode to the common ancestor, + // Step 15. Reparent lastNode to the common ancestor, // or for misnested table nodes, to the foster parent. if lastNode.Parent != nil { lastNode.Parent.RemoveChild(lastNode) @@ -1317,13 +1316,13 @@ func (p *parser) inBodyEndTagFormatting(tagAtom a.Atom, tagName string) { commonAncestor.AppendChild(lastNode) } - // Steps 15-17. Reparent nodes from the furthest block's children + // Steps 16-18. Reparent nodes from the furthest block's children // to a clone of the formatting element. clone := formattingElement.clone() reparentChildren(clone, furthestBlock) furthestBlock.AppendChild(clone) - // Step 18. Fix up the list of active formatting elements. + // Step 19. Fix up the list of active formatting elements. if oldLoc := p.afe.index(formattingElement); oldLoc != -1 && oldLoc < bookmark { // Move the bookmark with the rest of the list. bookmark-- @@ -1331,7 +1330,7 @@ func (p *parser) inBodyEndTagFormatting(tagAtom a.Atom, tagName string) { p.afe.remove(formattingElement) p.afe.insert(bookmark, clone) - // Step 19. Fix up the stack of open elements. + // Step 20. Fix up the stack of open elements. p.oe.remove(formattingElement) p.oe.insert(p.oe.index(furthestBlock)+1, clone) } @@ -1502,14 +1501,13 @@ func inCaptionIM(p *parser) bool { case StartTagToken: switch p.tok.DataAtom { case a.Caption, a.Col, a.Colgroup, a.Tbody, a.Td, a.Tfoot, a.Thead, a.Tr: - if p.popUntil(tableScope, a.Caption) { - p.clearActiveFormattingElements() - p.im = inTableIM - return false - } else { + if !p.popUntil(tableScope, a.Caption) { // Ignore the token. return true } + p.clearActiveFormattingElements() + p.im = inTableIM + return false case a.Select: p.reconstructActiveFormattingElements() p.addElement() @@ -1526,14 +1524,13 @@ func inCaptionIM(p *parser) bool { } return true case a.Table: - if p.popUntil(tableScope, a.Caption) { - p.clearActiveFormattingElements() - p.im = inTableIM - return false - } else { + if !p.popUntil(tableScope, a.Caption) { // Ignore the token. return true } + p.clearActiveFormattingElements() + p.im = inTableIM + return false case a.Body, a.Col, a.Colgroup, a.Html, a.Tbody, a.Td, a.Tfoot, a.Th, a.Thead, a.Tr: // Ignore the token. return true @@ -1777,12 +1774,11 @@ func inSelectIM(p *parser) bool { } p.addElement() case a.Select: - if p.popUntil(selectScope, a.Select) { - p.resetInsertionMode() - } else { + if !p.popUntil(selectScope, a.Select) { // Ignore the token. return true } + p.resetInsertionMode() case a.Input, a.Keygen, a.Textarea: if p.elementInScope(selectScope, a.Select) { p.parseImpliedToken(EndTagToken, a.Select, a.Select.String()) @@ -1810,12 +1806,11 @@ func inSelectIM(p *parser) bool { p.oe = p.oe[:i] } case a.Select: - if p.popUntil(selectScope, a.Select) { - p.resetInsertionMode() - } else { + if !p.popUntil(selectScope, a.Select) { // Ignore the token. return true } + p.resetInsertionMode() case a.Template: return inHeadIM(p) } @@ -2136,28 +2131,31 @@ func parseForeignContent(p *parser) bool { Data: p.tok.Data, }) case StartTagToken: - b := breakout[p.tok.Data] - if p.tok.DataAtom == a.Font { - loop: - for _, attr := range p.tok.Attr { - switch attr.Key { - case "color", "face", "size": - b = true - break loop + if !p.fragment { + b := breakout[p.tok.Data] + if p.tok.DataAtom == a.Font { + loop: + for _, attr := range p.tok.Attr { + switch attr.Key { + case "color", "face", "size": + b = true + break loop + } } } - } - if b { - for i := len(p.oe) - 1; i >= 0; i-- { - n := p.oe[i] - if n.Namespace == "" || htmlIntegrationPoint(n) || mathMLTextIntegrationPoint(n) { - p.oe = p.oe[:i+1] - break + if b { + for i := len(p.oe) - 1; i >= 0; i-- { + n := p.oe[i] + if n.Namespace == "" || htmlIntegrationPoint(n) || mathMLTextIntegrationPoint(n) { + p.oe = p.oe[:i+1] + break + } } + return false } - return false } - switch p.top().Namespace { + current := p.adjustedCurrentNode() + switch current.Namespace { case "math": adjustAttributeNames(p.tok.Attr, mathMLAttributeAdjustments) case "svg": @@ -2172,7 +2170,7 @@ func parseForeignContent(p *parser) bool { panic("html: bad parser state: unexpected namespace") } adjustForeignAttributes(p.tok.Attr) - namespace := p.top().Namespace + namespace := current.Namespace p.addElement() p.top().Namespace = namespace if namespace != "" { @@ -2201,12 +2199,20 @@ func parseForeignContent(p *parser) bool { return true } +// Section 12.2.4.2. +func (p *parser) adjustedCurrentNode() *Node { + if len(p.oe) == 1 && p.fragment && p.context != nil { + return p.context + } + return p.oe.top() +} + // Section 12.2.6. func (p *parser) inForeignContent() bool { if len(p.oe) == 0 { return false } - n := p.oe[len(p.oe)-1] + n := p.adjustedCurrentNode() if n.Namespace == "" { return false } @@ -2341,8 +2347,7 @@ func ParseWithOptions(r io.Reader, opts ...ParseOption) (*Node, error) { f(p) } - err := p.parse() - if err != nil { + if err := p.parse(); err != nil { return nil, err } return p.doc, nil @@ -2364,7 +2369,6 @@ func ParseFragmentWithOptions(r io.Reader, context *Node, opts ...ParseOption) ( contextTag = context.DataAtom.String() } p := &parser{ - tokenizer: NewTokenizerFragment(r, contextTag), doc: &Node{ Type: DocumentNode, }, @@ -2372,6 +2376,11 @@ func ParseFragmentWithOptions(r io.Reader, context *Node, opts ...ParseOption) ( fragment: true, context: context, } + if context != nil && context.Namespace != "" { + p.tokenizer = NewTokenizer(r) + } else { + p.tokenizer = NewTokenizerFragment(r, contextTag) + } for _, f := range opts { f(p) @@ -2396,8 +2405,7 @@ func ParseFragmentWithOptions(r io.Reader, context *Node, opts ...ParseOption) ( } } - err := p.parse() - if err != nil { + if err := p.parse(); err != nil { return nil, err } diff --git a/vendor/golang.org/x/net/html/render.go b/vendor/golang.org/x/net/html/render.go index d34564f49dd1..8bf47ede7978 100644 --- a/vendor/golang.org/x/net/html/render.go +++ b/vendor/golang.org/x/net/html/render.go @@ -252,20 +252,19 @@ func writeQuoted(w writer, s string) error { // Section 12.1.2, "Elements", gives this list of void elements. Void elements // are those that can't have any contents. var voidElements = map[string]bool{ - "area": true, - "base": true, - "br": true, - "col": true, - "command": true, - "embed": true, - "hr": true, - "img": true, - "input": true, - "keygen": true, - "link": true, - "meta": true, - "param": true, - "source": true, - "track": true, - "wbr": true, + "area": true, + "base": true, + "br": true, + "col": true, + "embed": true, + "hr": true, + "img": true, + "input": true, + "keygen": true, + "link": true, + "meta": true, + "param": true, + "source": true, + "track": true, + "wbr": true, } diff --git a/vendor/golang.org/x/net/html/token.go b/vendor/golang.org/x/net/html/token.go index ae0d1b05cd38..877709f991b5 100644 --- a/vendor/golang.org/x/net/html/token.go +++ b/vendor/golang.org/x/net/html/token.go @@ -296,8 +296,7 @@ func (z *Tokenizer) Buffered() []byte { // too many times in succession. func readAtLeastOneByte(r io.Reader, b []byte) (int, error) { for i := 0; i < 100; i++ { - n, err := r.Read(b) - if n != 0 || err != nil { + if n, err := r.Read(b); n != 0 || err != nil { return n, err } } diff --git a/vendor/modules.txt b/vendor/modules.txt index 5203c24e4a9b..41ac06517dff 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -473,7 +473,7 @@ golang.org/x/crypto/scrypt golang.org/x/crypto/ssh golang.org/x/crypto/ssh/agent golang.org/x/crypto/ssh/knownhosts -# golang.org/x/net v0.0.0-20191101175033-0deb6923b6d9 +# golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa golang.org/x/net/context golang.org/x/net/context/ctxhttp golang.org/x/net/html From d7d6e68ca7c6a0f08abdee580d7e11315f9e7239 Mon Sep 17 00:00:00 2001 From: jolheiser Date: Mon, 3 Feb 2020 23:39:46 -0600 Subject: [PATCH 05/28] Swap out octicons Signed-off-by: jolheiser --- Makefile | 4 + modules/base/tool.go | 2 +- modules/templates/helper.go | 7 + package-lock.json | 869 +++++++++++++++--- package.json | 2 + public/img/svg/octicons.svg | 205 +---- public/vendor/assets/octicons/LICENSE | 21 - public/vendor/assets/octicons/octicons.eot | Bin 44098 -> 0 bytes .../vendor/assets/octicons/octicons.min.css | 1 - public/vendor/assets/octicons/octicons.svg | 429 --------- public/vendor/assets/octicons/octicons.ttf | Bin 43920 -> 0 bytes public/vendor/assets/octicons/octicons.woff | Bin 24004 -> 0 bytes public/vendor/assets/octicons/octicons.woff2 | Bin 20248 -> 0 bytes scripts/generate-octicons.go | 60 -- templates/admin/org/list.tmpl | 2 +- templates/admin/repo/list.tmpl | 2 +- templates/base/head.tmpl | 2 - templates/base/head_navbar.tmpl | 28 +- templates/explore/navbar.tmpl | 8 +- templates/explore/organizations.tmpl | 18 +- templates/explore/repo_list.tmpl | 12 +- templates/explore/users.tmpl | 16 +- templates/home.tmpl | 8 +- templates/org/header.tmpl | 4 +- templates/org/home.tmpl | 12 +- templates/org/member/members.tmpl | 10 +- templates/org/settings/delete.tmpl | 2 +- templates/org/team/navbar.tmpl | 6 +- templates/org/team/repositories.tmpl | 10 +- templates/org/team/sidebar.tmpl | 2 +- templates/org/team/teams.tmpl | 2 +- templates/repo/activity.tmpl | 20 +- templates/repo/blame.tmpl | 8 +- templates/repo/branch/list.tmpl | 26 +- templates/repo/branch_dropdown.tmpl | 6 +- templates/repo/commit_page.tmpl | 2 +- templates/repo/commits.tmpl | 2 +- templates/repo/commits_table.tmpl | 4 +- templates/repo/diff/blob_excerpt.tmpl | 6 +- templates/repo/diff/box.tmpl | 2 +- templates/repo/diff/comment_form.tmpl | 2 +- templates/repo/diff/compare.tmpl | 2 +- templates/repo/diff/section_unified.tmpl | 2 +- templates/repo/editor/commit_form.tmpl | 6 +- templates/repo/editor/edit.tmpl | 8 +- templates/repo/editor/upload.tmpl | 2 +- templates/repo/empty.tmpl | 2 +- templates/repo/header.tmpl | 56 +- templates/repo/home.tmpl | 6 +- .../repo/issue/branch_selector_field.tmpl | 4 +- templates/repo/issue/labels.tmpl | 8 +- templates/repo/issue/list.tmpl | 24 +- templates/repo/issue/milestone_issues.tmpl | 30 +- templates/repo/issue/milestones.tmpl | 24 +- templates/repo/issue/new_form.tmpl | 14 +- .../repo/issue/view_content/add_reaction.tmpl | 4 +- .../repo/issue/view_content/attachments.tmpl | 2 +- .../repo/issue/view_content/comments.tmpl | 64 +- templates/repo/issue/view_content/pull.tmpl | 46 +- .../repo/issue/view_content/sidebar.tmpl | 30 +- templates/repo/issue/view_title.tmpl | 10 +- templates/repo/pulls/tab_menu.tmpl | 6 +- templates/repo/release/list.tmpl | 10 +- templates/repo/release/new.tmpl | 2 +- templates/repo/settings/collaboration.tmpl | 4 +- templates/repo/settings/deploy_keys.tmpl | 4 +- templates/repo/settings/githooks.tmpl | 2 +- templates/repo/settings/lfs.tmpl | 6 +- templates/repo/settings/lfs_file_find.tmpl | 4 +- templates/repo/settings/lfs_locks.tmpl | 8 +- templates/repo/settings/protected_branch.tmpl | 6 +- templates/repo/settings/webhook/history.tmpl | 4 +- templates/repo/settings/webhook/list.tmpl | 6 +- templates/repo/sub_menu.tmpl | 6 +- templates/repo/user_cards.tmpl | 6 +- templates/repo/view_file.tmpl | 8 +- templates/repo/view_list.tmpl | 8 +- templates/repo/wiki/pages.tmpl | 2 +- templates/repo/wiki/revision.tmpl | 2 +- templates/repo/wiki/start.tmpl | 2 +- templates/repo/wiki/view.tmpl | 2 +- templates/user/dashboard/dashboard.tmpl | 6 +- templates/user/dashboard/feeds.tmpl | 2 +- templates/user/dashboard/issues.tmpl | 16 +- templates/user/dashboard/milestones.tmpl | 24 +- templates/user/dashboard/navbar.tmpl | 10 +- templates/user/meta/header.tmpl | 4 +- templates/user/notification/notification.tmpl | 20 +- templates/user/profile.tmpl | 22 +- templates/user/settings/account.tmpl | 2 +- templates/user/settings/applications.tmpl | 2 +- templates/user/settings/keys_gpg.tmpl | 2 +- templates/user/settings/keys_ssh.tmpl | 4 +- templates/user/settings/repos.tmpl | 106 +-- web_src/less/_base.less | 8 +- web_src/less/_home.less | 3 +- web_src/less/{_svg.less => _octicons.less} | 18 +- web_src/less/index.less | 2 +- 98 files changed, 1249 insertions(+), 1266 deletions(-) delete mode 100644 public/vendor/assets/octicons/LICENSE delete mode 100644 public/vendor/assets/octicons/octicons.eot delete mode 100644 public/vendor/assets/octicons/octicons.min.css delete mode 100644 public/vendor/assets/octicons/octicons.svg delete mode 100644 public/vendor/assets/octicons/octicons.ttf delete mode 100644 public/vendor/assets/octicons/octicons.woff delete mode 100644 public/vendor/assets/octicons/octicons.woff2 delete mode 100644 scripts/generate-octicons.go rename web_src/less/{_svg.less => _octicons.less} (51%) diff --git a/Makefile b/Makefile index 39afc0c0071d..f6e522a7f37e 100644 --- a/Makefile +++ b/Makefile @@ -505,6 +505,10 @@ css: @echo "'make css' is deprecated, please use 'make webpack'" $(MAKE) webpack +.PHONY: svg +svg: + npx svg-sprite --symbol --symbol-dest=public/img/svg --symbol-sprite=octicons.svg node_modules/@primer/octicons/build/svg/*.svg + .PHONY: fomantic fomantic: node-check $(FOMANTIC_EVIDENCE) diff --git a/modules/base/tool.go b/modules/base/tool.go index 60d96d57e32b..ba053b1fedf8 100644 --- a/modules/base/tool.go +++ b/modules/base/tool.go @@ -414,7 +414,7 @@ func EntryIcon(entry *git.TreeEntry) string { return "file-submodule" } - return "file-text" + return "file" } // SetupGiteaRoot Sets GITEA_ROOT if it is not already set and returns the value diff --git a/modules/templates/helper.go b/modules/templates/helper.go index 1e5fa0108974..5f8ba19ff38c 100644 --- a/modules/templates/helper.go +++ b/modules/templates/helper.go @@ -285,6 +285,13 @@ func NewFuncMap() []template.FuncMap { } return false }, + "octicon": func(mega bool, icon string) template.HTML { + size := "" + if mega { + size = "mega-" + } + return template.HTML(fmt.Sprintf(``, size, setting.StaticURLPrefix, icon)) + }, }} } diff --git a/package-lock.json b/package-lock.json index 2fcc08904dd8..4094e2b1020c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -988,6 +988,14 @@ "@types/node": ">= 8" } }, + "@primer/octicons": { + "version": "9.4.0", + "resolved": "https://registry.npmjs.org/@primer/octicons/-/octicons-9.4.0.tgz", + "integrity": "sha512-7tAWOTt3Ay3Vkf9XwietC40TV1pxk5PS2DAODsOPnMfMd9Yzm2tfvHu0Q3dcffxGZxu7n5ZM6MFWbr/+4dqSdA==", + "requires": { + "object-assign": "^4.1.1" + } + }, "@types/color-name": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", @@ -1031,8 +1039,7 @@ "@types/q": { "version": "1.5.2", "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.2.tgz", - "integrity": "sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==", - "dev": true + "integrity": "sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==" }, "@types/react": { "version": "16.4.6", @@ -1666,7 +1673,6 @@ "version": "0.2.4", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", - "optional": true, "requires": { "safer-buffer": "~2.1.0" } @@ -1712,8 +1718,7 @@ "assert-plus": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "optional": true + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" }, "assign-symbols": { "version": "1.0.0", @@ -1761,8 +1766,7 @@ "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", - "optional": true + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" }, "atob": { "version": "2.1.2", @@ -1799,14 +1803,12 @@ "aws-sign2": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", - "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", - "optional": true + "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=" }, "aws4": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.0.tgz", - "integrity": "sha512-Uvq6hVe90D0B2WEnUqtdgY1bATGz3mw33nH9Y+dmA+w5DHvUmBgkr5rM/KCHpCsiFNRUfokW/szpPPgMK2hm4A==", - "optional": true + "integrity": "sha512-Uvq6hVe90D0B2WEnUqtdgY1bATGz3mw33nH9Y+dmA+w5DHvUmBgkr5rM/KCHpCsiFNRUfokW/szpPPgMK2hm4A==" }, "babel-loader": { "version": "8.0.6", @@ -1936,7 +1938,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", - "optional": true, "requires": { "tweetnacl": "^0.14.3" } @@ -2032,8 +2033,7 @@ "boolbase": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", - "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=", - "dev": true + "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" }, "brace-expansion": { "version": "1.1.11", @@ -2059,6 +2059,11 @@ "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=", "dev": true }, + "browser-stdout": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", + "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==" + }, "browserify-aes": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", @@ -2269,8 +2274,7 @@ "camelcase": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" }, "camelcase-keys": { "version": "4.2.0", @@ -2311,8 +2315,7 @@ "caseless": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", - "optional": true + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" }, "ccount": { "version": "1.0.4", @@ -2462,6 +2465,45 @@ "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz", "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=" }, + "cliui": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", + "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", + "requires": { + "string-width": "^2.1.1", + "strip-ansi": "^4.0.0", + "wrap-ansi": "^2.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "requires": { + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "requires": { + "ansi-regex": "^3.0.0" + } + } + } + }, "clone": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", @@ -2524,7 +2566,6 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz", "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==", - "dev": true, "requires": { "@types/q": "^1.5.1", "chalk": "^2.4.1", @@ -2588,7 +2629,6 @@ "version": "1.5.3", "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz", "integrity": "sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==", - "dev": true, "requires": { "color-name": "^1.0.0", "simple-swizzle": "^0.2.2" @@ -2599,11 +2639,36 @@ "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==" }, + "colornames": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/colornames/-/colornames-1.1.1.tgz", + "integrity": "sha1-+IiQMGhcfE/54qVZ9Qd+t2qBb5Y=" + }, "colors": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz", "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=" }, + "colorspace": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.2.tgz", + "integrity": "sha512-vt+OoIP2d76xLhjwbBaucYlNSpPsrJWPlBTtwCpQKIu6/CSMutyzX93O/Do0qzpH3YoHEes8YEFXyZ797rEhzQ==", + "requires": { + "color": "3.0.x", + "text-hex": "1.0.x" + }, + "dependencies": { + "color": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/color/-/color-3.0.0.tgz", + "integrity": "sha512-jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w==", + "requires": { + "color-convert": "^1.9.1", + "color-string": "^1.5.2" + } + } + } + }, "combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", @@ -3005,7 +3070,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz", "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==", - "dev": true, "requires": { "boolbase": "^1.0.0", "css-what": "^3.2.1", @@ -3016,14 +3080,17 @@ "css-select-base-adapter": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz", - "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==", - "dev": true + "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==" + }, + "css-selector-parser": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/css-selector-parser/-/css-selector-parser-1.3.0.tgz", + "integrity": "sha1-XxrUPi2O77/cME/NOaUhZklD4+s=" }, "css-tree": { "version": "1.0.0-alpha.37", "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz", "integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==", - "dev": true, "requires": { "mdn-data": "2.0.4", "source-map": "^0.6.1" @@ -3032,8 +3099,7 @@ "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" } } }, @@ -3046,8 +3112,7 @@ "css-what": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.2.1.tgz", - "integrity": "sha512-WwOrosiQTvyms+Ti5ZC5vGEK0Vod3FTt1ca+payZqvKuGJF+dq7bG63DstxtN0dpm6FxY27a/zS3Wten+gEtGw==", - "dev": true + "integrity": "sha512-WwOrosiQTvyms+Ti5ZC5vGEK0Vod3FTt1ca+payZqvKuGJF+dq7bG63DstxtN0dpm6FxY27a/zS3Wten+gEtGw==" }, "css.escape": { "version": "1.5.1", @@ -3066,6 +3131,11 @@ "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", "dev": true }, + "cssmin": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/cssmin/-/cssmin-0.4.3.tgz", + "integrity": "sha1-yRlAd+Dr2s1pHV9ZAVudgZ840BU=" + }, "cssnano": { "version": "4.1.10", "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.10.tgz", @@ -3147,11 +3217,15 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/csso/-/csso-4.0.2.tgz", "integrity": "sha512-kS7/oeNVXkHWxby5tHVxlhjizRCSv8QdU7hB2FpdAibDU8FjTAolhNjKNTiLzXtUrKT6HwClE81yXwEk1309wg==", - "dev": true, "requires": { "css-tree": "1.0.0-alpha.37" } }, + "cssom": { + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", + "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==" + }, "csstype": { "version": "2.6.8", "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.8.tgz", @@ -3186,7 +3260,6 @@ "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", - "optional": true, "requires": { "assert-plus": "^1.0.0" } @@ -3423,6 +3496,16 @@ "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.0.0.tgz", "integrity": "sha512-oSyFlqaTHCItVRGK5RmrmjB+CmaMOW7IaNA/kdxqhoa6d17j/5ce9O9eWXmV/KEdRwqpQA+Vqe8a8Bsybu4YnA==" }, + "diagnostics": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/diagnostics/-/diagnostics-1.1.1.tgz", + "integrity": "sha512-8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ==", + "requires": { + "colorspace": "1.1.x", + "enabled": "1.0.x", + "kuler": "1.0.x" + } + }, "diff": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/diff/-/diff-1.0.8.tgz", @@ -3452,7 +3535,6 @@ "version": "0.2.2", "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz", "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==", - "dev": true, "requires": { "domelementtype": "^2.0.1", "entities": "^2.0.0" @@ -3461,8 +3543,7 @@ "domelementtype": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz", - "integrity": "sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==", - "dev": true + "integrity": "sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==" } } }, @@ -3475,8 +3556,7 @@ "domelementtype": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz", - "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==", - "dev": true + "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==" }, "domhandler": { "version": "2.4.2", @@ -3496,7 +3576,6 @@ "version": "1.7.0", "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz", "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==", - "dev": true, "requires": { "dom-serializer": "0", "domelementtype": "1" @@ -3590,7 +3669,6 @@ "version": "0.1.2", "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", - "optional": true, "requires": { "jsbn": "~0.1.0", "safer-buffer": "^2.1.0" @@ -3665,6 +3743,14 @@ "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=", "dev": true }, + "enabled": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/enabled/-/enabled-1.0.2.tgz", + "integrity": "sha1-ll9lE9LC0cX0ZStkouM5ZGf8L5M=", + "requires": { + "env-variable": "0.0.x" + } + }, "encode-3986": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/encode-3986/-/encode-3986-1.0.0.tgz", @@ -3736,8 +3822,12 @@ "entities": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.0.tgz", - "integrity": "sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==", - "dev": true + "integrity": "sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==" + }, + "env-variable": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/env-variable/-/env-variable-0.0.6.tgz", + "integrity": "sha512-bHz59NlBbtS0NhftmR8+ExBEekE7br0e01jw+kk0NDro7TtZzBYZ5ScGPs3OmwnpyfHTHOtr1Y6uedCdrIldtg==" }, "err-code": { "version": "1.1.2", @@ -3812,8 +3902,7 @@ "es6-promise": { "version": "4.2.8", "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz", - "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==", - "dev": true + "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==" }, "es6-promisify": { "version": "5.0.0", @@ -4371,11 +4460,36 @@ } } }, + "extract-zip": { + "version": "1.6.7", + "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.7.tgz", + "integrity": "sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k=", + "requires": { + "concat-stream": "1.6.2", + "debug": "2.6.9", + "mkdirp": "0.5.1", + "yauzl": "2.4.1" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + } + } + }, "extsprintf": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", - "optional": true + "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" }, "fancy-log": { "version": "1.3.3", @@ -4425,6 +4539,11 @@ "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", "dev": true }, + "fast-safe-stringify": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz", + "integrity": "sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==" + }, "fastq": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.6.0.tgz", @@ -4455,6 +4574,19 @@ } } }, + "fd-slicer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz", + "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=", + "requires": { + "pend": "~1.2.0" + } + }, + "fecha": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz", + "integrity": "sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg==" + }, "figgy-pudding": { "version": "3.5.1", "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz", @@ -4509,7 +4641,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "dev": true, "requires": { "locate-path": "^3.0.0" } @@ -4928,8 +5059,7 @@ "forever-agent": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", - "optional": true + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" }, "fork-stream": { "version": "0.0.4", @@ -4940,7 +5070,6 @@ "version": "2.3.3", "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", - "optional": true, "requires": { "asynckit": "^0.4.0", "combined-stream": "^1.0.6", @@ -4991,6 +5120,16 @@ } } }, + "fs-extra": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz", + "integrity": "sha1-zTzl9+fLYUWIP8rjGR6Yd/hYeVA=", + "requires": { + "graceful-fs": "^4.1.2", + "jsonfile": "^2.1.0", + "klaw": "^1.0.0" + } + }, "fs-minipass": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.0.0.tgz", @@ -5106,7 +5245,6 @@ "version": "0.1.7", "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", - "optional": true, "requires": { "assert-plus": "^1.0.0" } @@ -6033,6 +6171,11 @@ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==" }, + "growl": { + "version": "1.10.5", + "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", + "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==" + }, "growly": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz", @@ -7202,14 +7345,12 @@ "har-schema": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", - "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", - "optional": true + "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=" }, "har-validator": { "version": "5.1.3", "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz", "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==", - "optional": true, "requires": { "ajv": "^6.5.5", "har-schema": "^2.0.0" @@ -7329,6 +7470,15 @@ "minimalistic-assert": "^1.0.1" } }, + "hasha": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz", + "integrity": "sha1-eNfL/B5tZjA/55g3NlmEUXsvbuE=", + "requires": { + "is-stream": "^1.0.1", + "pinkie-promise": "^2.0.0" + } + }, "he": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", @@ -7461,7 +7611,6 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", - "optional": true, "requires": { "assert-plus": "^1.0.0", "jsprim": "^1.2.2", @@ -7683,8 +7832,7 @@ "invert-kv": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz", - "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==", - "dev": true + "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==" }, "ip": { "version": "1.1.5", @@ -8101,8 +8249,7 @@ "isstream": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", - "optional": true + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" }, "istextorbinary": { "version": "2.2.1", @@ -8193,8 +8340,7 @@ "jsbn": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", - "optional": true + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=" }, "jsesc": { "version": "2.5.2", @@ -8211,8 +8357,7 @@ "json-schema": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", - "optional": true + "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" }, "json-schema-traverse": { "version": "0.4.1", @@ -8227,8 +8372,7 @@ "json-stringify-safe": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", - "optional": true + "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" }, "json5": { "version": "2.1.1", @@ -8239,11 +8383,18 @@ "minimist": "^1.2.0" } }, + "jsonfile": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", + "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=", + "requires": { + "graceful-fs": "^4.1.6" + } + }, "jsprim": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", - "optional": true, "requires": { "assert-plus": "1.0.0", "extsprintf": "1.3.0", @@ -8256,17 +8407,38 @@ "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.0.0.tgz", "integrity": "sha1-h/zPrv/AtozRnVX2cilD+SnqNeo=" }, + "kew": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz", + "integrity": "sha1-edk9LTM2PW/dKXCzNdkUGtWR15s=" + }, "kind-of": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" }, + "klaw": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz", + "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=", + "requires": { + "graceful-fs": "^4.1.9" + } + }, "known-css-properties": { "version": "0.17.0", "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.17.0.tgz", "integrity": "sha512-Vi3nxDGMm/z+lAaCjvAR1u+7fiv+sG6gU/iYDj5QOF8h76ytK9EW/EKfF0NeTyiGBi8Jy6Hklty/vxISrLox3w==", "dev": true }, + "kuler": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/kuler/-/kuler-1.0.1.tgz", + "integrity": "sha512-J9nVUucG1p/skKul6DU3PUZrhs0LPulNaeUOox0IyXDi8S4CztTHs1gQphhuZmzXG7VOQSf6NJfKuzteQLv9gQ==", + "requires": { + "colornames": "^1.1.1" + } + }, "last-call-webpack-plugin": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/last-call-webpack-plugin/-/last-call-webpack-plugin-3.0.0.tgz", @@ -8327,7 +8499,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz", "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==", - "dev": true, "requires": { "invert-kv": "^2.0.0" } @@ -8473,7 +8644,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "dev": true, "requires": { "p-locate": "^3.0.0", "path-exists": "^3.0.0" @@ -8489,6 +8659,11 @@ "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.15.tgz", "integrity": "sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ==" }, + "lodash._arraymap": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._arraymap/-/lodash._arraymap-3.0.0.tgz", + "integrity": "sha1-Go/Q9MDfS2HeoHbXF83Jfwo8PmY=" + }, "lodash._baseassign": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz", @@ -8498,11 +8673,45 @@ "lodash.keys": "^3.0.0" } }, + "lodash._basecallback": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/lodash._basecallback/-/lodash._basecallback-3.3.1.tgz", + "integrity": "sha1-t7K7Q9whYEJKIczybFfkQ3cqjic=", + "requires": { + "lodash._baseisequal": "^3.0.0", + "lodash._bindcallback": "^3.0.0", + "lodash.isarray": "^3.0.0", + "lodash.pairs": "^3.0.0" + } + }, "lodash._basecopy": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=" }, + "lodash._baseeach": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/lodash._baseeach/-/lodash._baseeach-3.0.4.tgz", + "integrity": "sha1-z4cGVyyhROjZ11InyZDamC+TKvM=", + "requires": { + "lodash.keys": "^3.0.0" + } + }, + "lodash._baseget": { + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/lodash._baseget/-/lodash._baseget-3.7.2.tgz", + "integrity": "sha1-G2rh1frPPCVTI1ChPBGXy4u2dPQ=" + }, + "lodash._baseisequal": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/lodash._baseisequal/-/lodash._baseisequal-3.0.7.tgz", + "integrity": "sha1-2AJfdjOdKTQnZ9zIh85cuVpbUfE=", + "requires": { + "lodash.isarray": "^3.0.0", + "lodash.istypedarray": "^3.0.0", + "lodash.keys": "^3.0.0" + } + }, "lodash._basetostring": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz", @@ -8576,6 +8785,14 @@ "lodash._objecttypes": "~2.4.1" } }, + "lodash._topath": { + "version": "3.8.1", + "resolved": "https://registry.npmjs.org/lodash._topath/-/lodash._topath-3.8.1.tgz", + "integrity": "sha1-PsXiYGAU9MuX91X+aRTt2L/ADqw=", + "requires": { + "lodash.isarray": "^3.0.0" + } + }, "lodash.assign": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz", @@ -8641,6 +8858,11 @@ "lodash._objecttypes": "~2.4.1" } }, + "lodash.istypedarray": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/lodash.istypedarray/-/lodash.istypedarray-3.0.6.tgz", + "integrity": "sha1-yaR3SYYHUB2OhJTSg7h8OSgc72I=" + }, "lodash.keys": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", @@ -8651,6 +8873,18 @@ "lodash.isarray": "^3.0.0" } }, + "lodash.map": { + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/lodash.map/-/lodash.map-3.1.4.tgz", + "integrity": "sha1-tIOs0beGxce0ksSV97UmYim8AMI=", + "requires": { + "lodash._arraymap": "^3.0.0", + "lodash._basecallback": "^3.0.0", + "lodash._baseeach": "^3.0.0", + "lodash.isarray": "^3.0.0", + "lodash.keys": "^3.0.0" + } + }, "lodash.memoize": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", @@ -8662,6 +8896,14 @@ "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" }, + "lodash.pairs": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash.pairs/-/lodash.pairs-3.0.1.tgz", + "integrity": "sha1-u+CNV4bu6qCaFckevw3LfSvjJqk=", + "requires": { + "lodash.keys": "^3.0.0" + } + }, "lodash.partialright": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/lodash.partialright/-/lodash.partialright-4.2.1.tgz", @@ -8672,6 +8914,17 @@ "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz", "integrity": "sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=" }, + "lodash.pluck": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/lodash.pluck/-/lodash.pluck-3.1.2.tgz", + "integrity": "sha1-s0fwN0wBafDusE1nLYnOyGMsIjE=", + "requires": { + "lodash._baseget": "^3.0.0", + "lodash._topath": "^3.0.0", + "lodash.isarray": "^3.0.0", + "lodash.map": "^3.0.0" + } + }, "lodash.restparam": { "version": "3.6.1", "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz", @@ -8713,6 +8966,25 @@ "chalk": "^2.0.1" } }, + "logform": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/logform/-/logform-2.1.2.tgz", + "integrity": "sha512-+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ==", + "requires": { + "colors": "^1.2.1", + "fast-safe-stringify": "^2.0.4", + "fecha": "^2.3.3", + "ms": "^2.1.1", + "triple-beam": "^1.3.0" + }, + "dependencies": { + "colors": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", + "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==" + } + } + }, "longest": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", @@ -8835,7 +9107,6 @@ "version": "0.1.3", "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz", "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==", - "dev": true, "requires": { "p-defer": "^1.0.0" } @@ -9032,14 +9303,12 @@ "mdn-data": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz", - "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==", - "dev": true + "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==" }, "mem": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz", "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==", - "dev": true, "requires": { "map-age-cleaner": "^0.1.1", "mimic-fn": "^2.0.0", @@ -9292,8 +9561,7 @@ "mimic-fn": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==" }, "mini-css-extract-plugin": { "version": "0.9.0", @@ -9487,6 +9755,75 @@ } } }, + "mocha": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz", + "integrity": "sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==", + "requires": { + "browser-stdout": "1.3.1", + "commander": "2.15.1", + "debug": "3.1.0", + "diff": "3.5.0", + "escape-string-regexp": "1.0.5", + "glob": "7.1.2", + "growl": "1.10.5", + "he": "1.1.1", + "minimatch": "3.0.4", + "mkdirp": "0.5.1", + "supports-color": "5.4.0" + }, + "dependencies": { + "commander": { + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz", + "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==" + }, + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "requires": { + "ms": "2.0.0" + } + }, + "diff": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", + "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==" + }, + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "he": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz", + "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=" + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "supports-color": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", + "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "move-concurrently": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz", @@ -9504,8 +9841,7 @@ "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "multipipe": { "version": "0.1.2", @@ -9515,6 +9851,11 @@ "duplexer2": "0.0.2" } }, + "mustache": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/mustache/-/mustache-3.2.1.tgz", + "integrity": "sha512-RERvMFdLpaFfSRIEe632yDm5nsd0SDKn8hGmcUwswnyiE5mtdZLDybtHAz6hjJhawokF0hXvGLtx9mrQfm6FkA==" + }, "mute-stdout": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz", @@ -9744,7 +10085,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz", "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==", - "dev": true, "requires": { "boolbase": "~1.0.0" } @@ -9762,8 +10102,7 @@ "oauth-sign": { "version": "0.9.0", "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", - "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", - "optional": true + "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==" }, "object-assign": { "version": "4.1.1", @@ -9859,7 +10198,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz", "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==", - "dev": true, "requires": { "define-properties": "^1.1.3", "es-abstract": "^1.17.0-next.1" @@ -9895,7 +10233,6 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz", "integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==", - "dev": true, "requires": { "define-properties": "^1.1.3", "es-abstract": "^1.17.0-next.1", @@ -9916,6 +10253,11 @@ "wrappy": "1" } }, + "one-time": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/one-time/-/one-time-0.0.4.tgz", + "integrity": "sha1-+M33eISCb+Tf+T46nMN7HkSAdC4=" + }, "onetime": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz", @@ -9996,7 +10338,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz", "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==", - "dev": true, "requires": { "execa": "^1.0.0", "lcid": "^2.0.0", @@ -10029,8 +10370,7 @@ "p-defer": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz", - "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=", - "dev": true + "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=" }, "p-finally": { "version": "1.0.0", @@ -10040,14 +10380,12 @@ "p-is-promise": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz", - "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==", - "dev": true + "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==" }, "p-limit": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz", "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==", - "dev": true, "requires": { "p-try": "^2.0.0" } @@ -10056,7 +10394,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "dev": true, "requires": { "p-limit": "^2.0.0" } @@ -10073,8 +10410,7 @@ "p-try": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" }, "pako": { "version": "1.0.10", @@ -10221,8 +10557,7 @@ "path-exists": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", - "dev": true + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=" }, "path-is-absolute": { "version": "1.0.1", @@ -10287,11 +10622,39 @@ "sha.js": "^2.4.8" } }, + "pend": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", + "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=" + }, "performance-now": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" }, + "phantomjs-prebuilt": { + "version": "2.1.16", + "resolved": "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.16.tgz", + "integrity": "sha1-79ISpKOWbTZHaE6ouniFSb4q7+8=", + "requires": { + "es6-promise": "^4.0.3", + "extract-zip": "^1.6.5", + "fs-extra": "^1.0.0", + "hasha": "^2.2.0", + "kew": "^0.7.0", + "progress": "^1.1.8", + "request": "^2.81.0", + "request-progress": "^2.0.1", + "which": "^1.2.10" + }, + "dependencies": { + "progress": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz", + "integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=" + } + } + }, "picomatch": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.1.tgz", @@ -11488,6 +11851,11 @@ "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz", "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=" }, + "prettysize": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/prettysize/-/prettysize-1.1.0.tgz", + "integrity": "sha512-U5Noa+FYV1dGkICyLJz8IWlDUehPF4Bk9tZRO8YqPhLA9EoiHuFqtnpWY2mvMjHh5eOLo82HipeLn4RIiSsGqQ==" + }, "private": { "version": "0.1.8", "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz", @@ -11563,8 +11931,7 @@ "psl": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz", - "integrity": "sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ==", - "optional": true + "integrity": "sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ==" }, "public-encrypt": { "version": "4.0.3", @@ -11618,8 +11985,7 @@ "q": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", - "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=", - "dev": true + "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=" }, "qs": { "version": "6.5.2", @@ -12164,7 +12530,6 @@ "version": "2.88.0", "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz", "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==", - "optional": true, "requires": { "aws-sign2": "~0.7.0", "aws4": "^1.8.0", @@ -12188,6 +12553,14 @@ "uuid": "^3.3.2" } }, + "request-progress": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz", + "integrity": "sha1-XTa7V5YcZzqlt4jbyBQf3yO0Tgg=", + "requires": { + "throttleit": "^1.0.0" + } + }, "require-dir": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/require-dir/-/require-dir-1.2.0.tgz", @@ -12530,8 +12903,7 @@ "sax": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", - "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", - "dev": true + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" }, "schema-utils": { "version": "2.6.1", @@ -12625,6 +12997,54 @@ "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz", "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==" }, + "should": { + "version": "13.2.3", + "resolved": "https://registry.npmjs.org/should/-/should-13.2.3.tgz", + "integrity": "sha512-ggLesLtu2xp+ZxI+ysJTmNjh2U0TsC+rQ/pfED9bUZZ4DKefP27D+7YJVVTvKsmjLpIi9jAa7itwDGkDDmt1GQ==", + "requires": { + "should-equal": "^2.0.0", + "should-format": "^3.0.3", + "should-type": "^1.4.0", + "should-type-adaptors": "^1.0.1", + "should-util": "^1.0.0" + } + }, + "should-equal": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/should-equal/-/should-equal-2.0.0.tgz", + "integrity": "sha512-ZP36TMrK9euEuWQYBig9W55WPC7uo37qzAEmbjHz4gfyuXrEUgF8cUvQVO+w+d3OMfPvSRQJ22lSm8MQJ43LTA==", + "requires": { + "should-type": "^1.4.0" + } + }, + "should-format": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/should-format/-/should-format-3.0.3.tgz", + "integrity": "sha1-m/yPdPo5IFxT04w01xcwPidxJPE=", + "requires": { + "should-type": "^1.3.0", + "should-type-adaptors": "^1.0.1" + } + }, + "should-type": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/should-type/-/should-type-1.4.0.tgz", + "integrity": "sha1-B1bYzoRt/QmEOmlHcZ36DUz/XPM=" + }, + "should-type-adaptors": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/should-type-adaptors/-/should-type-adaptors-1.1.0.tgz", + "integrity": "sha512-JA4hdoLnN+kebEp2Vs8eBe9g7uy0zbRo+RMcU0EsNy+R+k049Ki+N5tT5Jagst2g7EAja+euFuoXFCa8vIklfA==", + "requires": { + "should-type": "^1.3.0", + "should-util": "^1.0.0" + } + }, + "should-util": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/should-util/-/should-util-1.0.1.tgz", + "integrity": "sha512-oXF8tfxx5cDk8r2kYqlkUJzZpDBqVY/II2WhvU0n9Y3XYvAYRmeaf1PvvIvTgPnv4KJ+ES5M0PyDq5Jp+Ygy2g==" + }, "sigmund": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz", @@ -12639,7 +13059,6 @@ "version": "0.2.2", "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=", - "dev": true, "requires": { "is-arrayish": "^0.3.1" }, @@ -12647,8 +13066,7 @@ "is-arrayish": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", - "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==", - "dev": true + "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==" } } }, @@ -12935,7 +13353,6 @@ "version": "1.16.1", "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", - "optional": true, "requires": { "asn1": "~0.2.3", "assert-plus": "^1.0.0", @@ -12961,8 +13378,7 @@ "stable": { "version": "0.1.8", "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz", - "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==", - "dev": true + "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==" }, "stack-trace": { "version": "0.0.10", @@ -13779,6 +14195,41 @@ "es6-symbol": "^3.1.1" } }, + "svg-sprite": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/svg-sprite/-/svg-sprite-1.5.0.tgz", + "integrity": "sha512-0mE5BLY3K8wg3+HrYfzpiKbIM44IGcg8uINED8ri22EdQbLvGecOHjRtkrNAlphbiU5kyGyqoBlIaukL45fs2Q==", + "requires": { + "async": "^2.6.1", + "css-selector-parser": "^1.3.0", + "cssmin": "^0.4.3", + "cssom": "^0.3.4", + "dateformat": "^3.0.3", + "glob": "^7.1.3", + "js-yaml": "^3.12.0", + "lodash": "^4.17.11", + "lodash.pluck": "^3.1.2", + "mkdirp": "^0.5.1", + "mocha": "^5.2.0", + "mustache": "^3.0.0", + "phantomjs-prebuilt": "^2.1.16", + "prettysize": "^1.1.0", + "should": "^13.2.3", + "svgo": "^1.1.1", + "vinyl": "^2.2.0", + "winston": "^3.1.0", + "xmldom": "0.1.27", + "xpath": "^0.0.27", + "yargs": "^12.0.2" + }, + "dependencies": { + "dateformat": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz", + "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==" + } + } + }, "svg-tags": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz", @@ -13789,7 +14240,6 @@ "version": "1.3.2", "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz", "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==", - "dev": true, "requires": { "chalk": "^2.4.1", "coa": "^2.0.2", @@ -14100,6 +14550,11 @@ } } }, + "text-hex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz", + "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==" + }, "text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", @@ -14111,6 +14566,11 @@ "resolved": "https://registry.npmjs.org/textextensions/-/textextensions-2.6.0.tgz", "integrity": "sha512-49WtAWS+tcsy93dRt6P0P3AMD2m5PvXRhuEA0kaXos5ZLlujtYmpmFsB+QvWUSxE1ZsstmYXfQ7L40+EcQgpAQ==" }, + "throttleit": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz", + "integrity": "sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw=" + }, "through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", @@ -14274,7 +14734,6 @@ "version": "2.4.3", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==", - "optional": true, "requires": { "psl": "^1.1.24", "punycode": "^1.4.1" @@ -14283,8 +14742,7 @@ "punycode": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", - "optional": true + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" } } }, @@ -14311,6 +14769,11 @@ "integrity": "sha512-MUjYItdrqqj2zpcHFTkMa9WAv4JHTI6gnRQGPFLrt5L9a6tRMiDnIqYl8JBvu2d2Tc3lWJKQwlGCp0K8AvCM+Q==", "dev": true }, + "triple-beam": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz", + "integrity": "sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==" + }, "trough": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.4.tgz", @@ -14332,7 +14795,6 @@ "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", - "optional": true, "requires": { "safe-buffer": "^5.0.1" } @@ -14340,8 +14802,7 @@ "tweetnacl": { "version": "0.14.5", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", - "optional": true + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" }, "type": { "version": "1.2.0", @@ -14618,8 +15079,7 @@ "unquote": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz", - "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=", - "dev": true + "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=" }, "unset-value": { "version": "1.0.0", @@ -14868,7 +15328,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz", "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==", - "dev": true, "requires": { "define-properties": "^1.1.2", "object.getownpropertydescriptors": "^2.0.3" @@ -14877,8 +15336,7 @@ "uuid": { "version": "3.3.3", "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz", - "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==", - "optional": true + "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==" }, "v8-compile-cache": { "version": "2.1.0", @@ -14918,7 +15376,6 @@ "version": "1.10.0", "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", - "optional": true, "requires": { "assert-plus": "^1.0.0", "core-util-is": "1.0.2", @@ -16372,8 +16829,7 @@ "which-module": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", - "dev": true + "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=" }, "window-size": { "version": "0.1.0", @@ -16388,6 +16844,55 @@ "execa": "^1.0.0" } }, + "winston": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/winston/-/winston-3.2.1.tgz", + "integrity": "sha512-zU6vgnS9dAWCEKg/QYigd6cgMVVNwyTzKs81XZtTFuRwJOcDdBg7AU0mXVyNbs7O5RH2zdv+BdNZUlx7mXPuOw==", + "requires": { + "async": "^2.6.1", + "diagnostics": "^1.1.1", + "is-stream": "^1.1.0", + "logform": "^2.1.1", + "one-time": "0.0.4", + "readable-stream": "^3.1.1", + "stack-trace": "0.0.x", + "triple-beam": "^1.3.0", + "winston-transport": "^4.3.0" + } + }, + "winston-transport": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.3.0.tgz", + "integrity": "sha512-B2wPuwUi3vhzn/51Uukcao4dIduEiPOcOt9HJ3QeaXgkJ5Z7UwpBzxS4ZGNHtrxrUvTwemsQiSys0ihOf8Mp1A==", + "requires": { + "readable-stream": "^2.3.6", + "triple-beam": "^1.2.0" + }, + "dependencies": { + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "word-wrap": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", @@ -16408,6 +16913,48 @@ "errno": "~0.1.7" } }, + "wrap-ansi": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", + "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", + "requires": { + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1" + }, + "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "requires": { + "number-is-nan": "^1.0.0" + } + }, + "string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "requires": { + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "requires": { + "ansi-regex": "^2.0.0" + } + } + } + }, "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", @@ -16453,6 +17000,16 @@ "repeat-string": "^1.5.2" } }, + "xmldom": { + "version": "0.1.27", + "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz", + "integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk=" + }, + "xpath": { + "version": "0.0.27", + "resolved": "https://registry.npmjs.org/xpath/-/xpath-0.0.27.tgz", + "integrity": "sha512-fg03WRxtkCV6ohClePNAECYsmpKKTv5L8y/X3Dn1hQrec3POx2jHZ/0P2qQ6HvsrU1BmeqXcof3NGGueG6LxwQ==" + }, "xtend": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", @@ -16461,8 +17018,7 @@ "y18n": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", - "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==", - "dev": true + "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==" }, "yallist": { "version": "4.0.0", @@ -16488,6 +17044,81 @@ "glob": "^7.0.5" } }, + "yargs": { + "version": "12.0.5", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz", + "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==", + "requires": { + "cliui": "^4.0.0", + "decamelize": "^1.2.0", + "find-up": "^3.0.0", + "get-caller-file": "^1.0.1", + "os-locale": "^3.0.0", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^2.0.0", + "which-module": "^2.0.0", + "y18n": "^3.2.1 || ^4.0.0", + "yargs-parser": "^11.1.1" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" + }, + "get-caller-file": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", + "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==" + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" + }, + "require-main-filename": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", + "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=" + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "requires": { + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "requires": { + "ansi-regex": "^3.0.0" + } + } + } + }, + "yargs-parser": { + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz", + "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==", + "requires": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } + }, + "yauzl": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz", + "integrity": "sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=", + "requires": { + "fd-slicer": "~1.0.1" + } + }, "zenscroll": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/zenscroll/-/zenscroll-4.0.2.tgz", diff --git a/package.json b/package.json index 5158d1e27f08..dc71a6dbd9ec 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "@babel/plugin-transform-runtime": "7.7.6", "@babel/preset-env": "7.7.7", "@babel/runtime": "7.7.7", + "@primer/octicons": "9.4.0", "babel-loader": "8.0.6", "core-js": "3.6.2", "css-loader": "3.4.1", @@ -35,6 +36,7 @@ "postcss-safe-parser": "4.0.1", "stylelint": "12.0.1", "stylelint-config-standard": "19.0.0", + "svg-sprite": "1.5.0", "terser-webpack-plugin": "2.3.2", "updates": "9.3.3", "vue-loader": "15.8.3", diff --git a/public/img/svg/octicons.svg b/public/img/svg/octicons.svg index e2ea394c9995..df026b2b164b 100755 --- a/public/img/svg/octicons.svg +++ b/public/img/svg/octicons.svg @@ -1,204 +1 @@ - -alert -archive -arrow-both -arrow-down -arrow-left -arrow-right -arrow-small-down -arrow-small-left -arrow-small-right -arrow-small-up -arrow-up -beaker -bell -bold -book -bookmark -briefcase -broadcast -browser -bug -calendar -check -checklist -chevron-down -chevron-left -chevron-right -chevron-up -circle-slash -circuit-board -clippy -clock -cloud-download -cloud-upload -code -comment -comment-discussion -credit-card -dash -dashboard -database -dependent -desktop-download -device-camera -device-camera-video -device-desktop -device-mobile -diff -diff-added -diff-ignored -diff-modified -diff-removed -diff-renamed -ellipsis -eye -eye-closed -file -file-binary -file-code -file-directory -file-media -file-pdf -file-submodule -file-symlink-directory -file-symlink-file -file-zip -flame -fold -fold-down -fold-up -gear -gift -gist -gist-secret -git-branch -git-commit -git-compare -git-merge -git-pull-request -github-action -globe -grabber -graph -heart -heart-outline -history -home -horizontal-rule -hubot -inbox -infinity -info -issue-closed -issue-opened -issue-reopened -italic -jersey -kebab-horizontal -kebab-vertical -key -keyboard -law -light-bulb -line-arrow-down -line-arrow-left -line-arrow-right -line-arrow-up -link -link-external -list-ordered -list-unordered -location -lock -logo-gist -logo-github -mail -mail-read -mark-github -markdown -megaphone -mention -milestone -mirror -mortar-board -mute -no-newline -note -octoface -organization -package -paintcan -pencil -person -pin -play -plug -plus -plus-small -primitive-dot -primitive-dot-stroke -primitive-square -project -pulse -question -quote -radio-tower -reply -repo -repo-clone -repo-force-push -repo-forked -repo-pull -repo-push -repo-template -repo-template-private -report -request-changes -rocket -rss -ruby -saved -screen-full -screen-normal -search -server -settings -shield -shield-check -shield-lock -shield-x -sign-in -sign-out -skip -smiley -squirrel -star -stop -sync -tag -tasklist -telescope -terminal -text-size -three-bars -thumbsdown -thumbsup -tools -trashcan -triangle-down -triangle-left -triangle-right -triangle-up -unfold -unmute -unsaved -unverified -verified -versions -watch -workflow -workflow-all -x -zap - \ No newline at end of file + \ No newline at end of file diff --git a/public/vendor/assets/octicons/LICENSE b/public/vendor/assets/octicons/LICENSE deleted file mode 100644 index 4cf2020ce774..000000000000 --- a/public/vendor/assets/octicons/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2012-2016 GitHub, Inc. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/public/vendor/assets/octicons/octicons.eot b/public/vendor/assets/octicons/octicons.eot deleted file mode 100644 index b4c7a989ae645fe4dcab1dea34cfffa8487b28c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 44098 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 - - - -Created by FontForge 20150913 at Mon Jul 11 12:02:11 2016 - By Aaron Shekey - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/vendor/assets/octicons/octicons.ttf b/public/vendor/assets/octicons/octicons.ttf deleted file mode 100644 index ff0dda18470bed62d7090c8dd6762dba05e098c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 43920 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 diff --git a/public/vendor/assets/octicons/octicons.woff2 b/public/vendor/assets/octicons/octicons.woff2 deleted file mode 100644 index 69e7b2a4044aab1229fb72eee8379df10f82e4cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20248 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 diff --git a/scripts/generate-octicons.go b/scripts/generate-octicons.go deleted file mode 100644 index ecb51885ee03..000000000000 --- a/scripts/generate-octicons.go +++ /dev/null @@ -1,60 +0,0 @@ -// Copyright 2020 The Gitea Authors. All rights reserved. -// Use of this source code is governed by a MIT-style -// license that can be found in the LICENSE file. - -// +build ignore - -package main - -import ( - "bytes" - "fmt" - "io/ioutil" - "os" - "strings" - - "gitea.com/jolheiser/octicon" - - "golang.org/x/net/html" -) - -const outFile = "public/img/svg/octicons.svg" - -func main() { - if err := generateOcticons(); err != nil { - fmt.Printf("could not generate Octicons: %v\n", err) - } -} - -func generateOcticons() error { - sprite := `` - for _, name := range octicon.Icons { - icon := octicon.Icon(name) - - page, err := html.Parse(bytes.NewBufferString(icon.XML)) - if err != nil { - return err - } - node := page.FirstChild.LastChild.FirstChild - - var viewBox html.Attribute - for _, attr := range node.Attr { - if attr.Key == "viewBox" { - viewBox = attr - } - } - node.Attr = []html.Attribute{viewBox} - xml := &strings.Builder{} - if err := html.Render(xml, node); err != nil { - return err - } - - sprite += fmt.Sprintf("\n"+``, icon.Name, xml.String()[4:len(xml.String())-4]) - } - sprite += "\n" - - if err := ioutil.WriteFile(outFile, []byte(sprite), os.ModePerm); err != nil { - return err - } - return nil -} diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl index 26f91faa7430..7d1e2a8f54ae 100644 --- a/templates/admin/org/list.tmpl +++ b/templates/admin/org/list.tmpl @@ -32,7 +32,7 @@ {{.Name}} {{if .Visibility.IsPrivate}} - + {{octicon false "lock"}} {{end}} {{.NumTeams}} diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl index 793d9c620eb0..f31532981f1d 100644 --- a/templates/admin/repo/list.tmpl +++ b/templates/admin/repo/list.tmpl @@ -33,7 +33,7 @@ {{.Owner.Name}} {{if .Owner.Visibility.IsPrivate}} - + {{octicon false "lock"}} {{end}} {{.Name}} diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl index 440dd3e5e28b..61e011354815 100644 --- a/templates/base/head.tmpl +++ b/templates/base/head.tmpl @@ -98,10 +98,8 @@ - - {{if .RequireSimpleMDE}} {{end}} diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index 4219e33775f8..bf3ce2e776cc 100644 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -44,7 +44,7 @@
- + {{octicon false "bell"}} {{.i18n.Tr "notifications"}} {{if .NotificationUnreadCount}} @@ -57,20 +57,20 @@
- + {{octicon false "plus"}} {{.i18n.Tr "create_new"}} - + {{octicon false "triangle-down"}}
- {{.i18n.Tr "new_repo"}} + {{octicon false "plus"}} {{.i18n.Tr "new_repo"}} - {{.i18n.Tr "new_migrate"}} + {{octicon false "repo-clone"}} {{.i18n.Tr "new_migrate"}} {{if .SignedUser.CanCreateOrganization}} - {{.i18n.Tr "new_org"}} + {{octicon false "organization"}} {{.i18n.Tr "new_org"}} {{end}}
@@ -81,7 +81,7 @@ {{.i18n.Tr "user_profile_and_more"}} {{.SignedUser.Name}} - + {{octicon false "triangle-down"}}
@@ -90,19 +90,19 @@
- + {{octicon false "person"}} {{.i18n.Tr "your_profile"}} - + {{octicon false "star"}} {{.i18n.Tr "your_starred"}} - + {{octicon false "settings"}} {{.i18n.Tr "your_settings"}} - + {{octicon false "question"}} {{.i18n.Tr "help"}} {{if .IsAdmin}} @@ -116,7 +116,7 @@
- + {{octicon false "sign-out"}} {{.i18n.Tr "sign_out"}}
@@ -129,11 +129,11 @@
{{if .ShowRegistrationButton}} - {{.i18n.Tr "register"}} + {{octicon false "person"}} {{.i18n.Tr "register"}} {{end}} - {{.i18n.Tr "sign_in"}} + {{octicon false "sign-in"}} {{.i18n.Tr "sign_in"}}
diff --git a/templates/explore/navbar.tmpl b/templates/explore/navbar.tmpl index 3bd52645e216..a66d1f4fcf56 100644 --- a/templates/explore/navbar.tmpl +++ b/templates/explore/navbar.tmpl @@ -1,16 +1,16 @@
- {{.i18n.Tr "explore.repos"}} + {{octicon false "repo"}} {{.i18n.Tr "explore.repos"}} - {{.i18n.Tr "explore.users"}} + {{octicon false "person"}} {{.i18n.Tr "explore.users"}} - {{.i18n.Tr "explore.organizations"}} + {{octicon false "organization"}} {{.i18n.Tr "explore.organizations"}} {{if .IsRepoIndexerEnabled}} - {{.i18n.Tr "explore.code"}} + {{octicon false "code"}} {{.i18n.Tr "explore.code"}} {{end}}
diff --git a/templates/explore/organizations.tmpl b/templates/explore/organizations.tmpl index 4e2bfc9fd9a9..8be0fd26a6d9 100644 --- a/templates/explore/organizations.tmpl +++ b/templates/explore/organizations.tmpl @@ -12,18 +12,18 @@ {{.Name}} {{.FullName}} {{if .Visibility.IsPrivate}} - + {{octicon false "lock"}} {{end}}
- {{if .Location}} - {{.Location}} - {{end}} - {{if and .Website}} - - {{.Website}} - {{end}} - {{$.i18n.Tr "user.join_on"}} {{.CreatedUnix.FormatShort}} + {{if .Location}} + {{octicon false "location"}} {{.Location}} + {{end}} + {{if and .Website}} + {{octicon false "link"}} + {{.Website}} + {{end}} + {{octicon false "clock"}} {{$.i18n.Tr "user.join_on"}} {{.CreatedUnix.FormatShort}}
diff --git a/templates/explore/repo_list.tmpl b/templates/explore/repo_list.tmpl index 8c7ba51a5400..0082d43301a8 100644 --- a/templates/explore/repo_list.tmpl +++ b/templates/explore/repo_list.tmpl @@ -10,19 +10,19 @@ {{if .IsArchived}}{{end}} {{if .IsPrivate}} - + {{octicon false "lock"}} {{else if .IsFork}} - + {{octicon false "repo-forked"}} {{else if .IsMirror}} - + {{octicon false "repo-clone"}} {{else if .Owner}} {{if .Owner.Visibility.IsPrivate}} - + {{octicon false "lock"}} {{end}} {{end}}
- {{.NumStars}} - {{.NumForks}} + {{octicon false "repo"}} {{.NumStars}} + {{octicon false "git-branch"}} {{.NumForks}}
diff --git a/templates/explore/users.tmpl b/templates/explore/users.tmpl index 32a36931c70b..5262009d2473 100644 --- a/templates/explore/users.tmpl +++ b/templates/explore/users.tmpl @@ -11,14 +11,14 @@
{{.Name}} {{.FullName}}
- {{if .Location}} - {{.Location}} - {{end}} - {{if and $.ShowUserEmail .Email $.IsSigned (not .KeepEmailPrivate)}} - - {{.Email}} - {{end}} - {{$.i18n.Tr "user.join_on"}} {{.CreatedUnix.FormatShort}} + {{if .Location}} + {{octicon false "location"}} {{.Location}} + {{end}} + {{if and $.ShowUserEmail .Email $.IsSigned (not .KeepEmailPrivate)}} + {{octicon false "mail"}} + {{.Email}} + {{end}} + {{octicon false "clock"}} {{$.i18n.Tr "user.join_on"}} {{.CreatedUnix.FormatShort}}
diff --git a/templates/home.tmpl b/templates/home.tmpl index 6616e3c870bd..c50ab34bbecd 100644 --- a/templates/home.tmpl +++ b/templates/home.tmpl @@ -16,7 +16,7 @@

- {{.i18n.Tr "startpage.install"}} + {{octicon false "flame"}} {{.i18n.Tr "startpage.install"}}

{{.i18n.Tr "startpage.install_desc" | Str2html}} @@ -24,7 +24,7 @@

- {{.i18n.Tr "startpage.platform"}} + {{octicon false "device-desktop"}} {{.i18n.Tr "startpage.platform"}}

{{.i18n.Tr "startpage.platform_desc" | Str2html}} @@ -34,7 +34,7 @@

- {{.i18n.Tr "startpage.lightweight"}} + {{octicon false "rocket"}} {{.i18n.Tr "startpage.lightweight"}}

{{.i18n.Tr "startpage.lightweight_desc" | Str2html}} @@ -42,7 +42,7 @@

- {{.i18n.Tr "startpage.license"}} + {{octicon false "code"}} {{.i18n.Tr "startpage.license"}}

{{.i18n.Tr "startpage.license_desc" | Str2html}} diff --git a/templates/org/header.tmpl b/templates/org/header.tmpl index 806682aca90e..e668ae973d3d 100644 --- a/templates/org/header.tmpl +++ b/templates/org/header.tmpl @@ -9,11 +9,11 @@

-  {{$.i18n.Tr "org.people"}} + {{octicon false "organization"}} {{$.i18n.Tr "org.people"}}
{{.NumMembers}}
 -  {{$.i18n.Tr "org.teams"}} + {{octicon false "jersey"}} {{$.i18n.Tr "org.teams"}}
{{.NumTeams}}
diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl index 0aa575707ab3..4a0b18c8d671 100644 --- a/templates/org/home.tmpl +++ b/templates/org/home.tmpl @@ -7,12 +7,12 @@
{{.Org.DisplayName}} - {{if .IsOrganizationOwner}}{{end}} + {{if .IsOrganizationOwner}}{{octicon false "gear"}}{{end}}
{{if .Org.Description}}

{{.Org.Description}}

{{end}}
- {{if .Org.Location}}
{{.Org.Location}}
{{end}} - {{if .Org.Website}}
{{.Org.Website}}
{{end}} + {{if .Org.Location}}
{{octicon false "location"}} {{.Org.Location}}
{{end}} + {{if .Org.Website}}
{{octicon false "link"}} {{.Org.Website}}
{{end}}
@@ -24,7 +24,7 @@
{{if .CanCreateOrgRepo}}
- {{.i18n.Tr "new_repo"}} + {{octicon false "repo-create"}} {{.i18n.Tr "new_repo"}}
{{end}} @@ -38,7 +38,7 @@ {{.i18n.Tr "org.people"}} {{if .IsOrganizationMember}}
- {{.Org.NumMembers}} + {{.Org.NumMembers}} {{octicon false "chevron-right"}}
{{end}} @@ -55,7 +55,7 @@
{{.i18n.Tr "org.teams"}}
- {{.Org.NumTeams}} + {{.Org.NumTeams}} {{octicon false "chevron-right"}}
diff --git a/templates/org/member/members.tmpl b/templates/org/member/members.tmpl index 03aadf97b831..8479c14f7ecb 100644 --- a/templates/org/member/members.tmpl +++ b/templates/org/member/members.tmpl @@ -34,7 +34,7 @@ {{$.i18n.Tr "org.members.member_role"}}
- {{if index $.MembersIsUserOrgOwner .ID}} {{$.i18n.Tr "org.members.owner"}}{{else}}{{$.i18n.Tr "org.members.member"}}{{end}} + {{if index $.MembersIsUserOrgOwner .ID}}{{octicon false "shield-lock"}} {{$.i18n.Tr "org.members.owner"}}{{else}}{{$.i18n.Tr "org.members.member"}}{{end}}
@@ -42,7 +42,13 @@ 2FA
- + + {{if index $.MembersTwoFaStatus .ID}} + {{octicon false "check"}} + {{else}} + {{octicon false "x"}} + {{end}} +
diff --git a/templates/org/settings/delete.tmpl b/templates/org/settings/delete.tmpl index 3b0ee09b17ec..c5ced3090c6b 100644 --- a/templates/org/settings/delete.tmpl +++ b/templates/org/settings/delete.tmpl @@ -11,7 +11,7 @@
-

{{.i18n.Tr "org.settings.delete_prompt" | Str2html}}

+

{{octicon false "alert"}} {{.i18n.Tr "org.settings.delete_prompt" | Str2html}}

{{.CsrfTokenHtml}} diff --git a/templates/org/team/navbar.tmpl b/templates/org/team/navbar.tmpl index 1a8f1083319b..2f8493aef38b 100644 --- a/templates/org/team/navbar.tmpl +++ b/templates/org/team/navbar.tmpl @@ -1,4 +1,4 @@
- {{.Team.NumMembers}}  {{$.i18n.Tr "org.lower_members"}} - {{.Team.NumRepos}}  {{$.i18n.Tr "org.lower_repositories"}} -
\ No newline at end of file + {{octicon false "person"}} {{.Team.NumMembers}}  {{$.i18n.Tr "org.lower_members"}} + {{octicon false "repo"}} {{.Team.NumRepos}}  {{$.i18n.Tr "org.lower_repositories"}} +
diff --git a/templates/org/team/repositories.tmpl b/templates/org/team/repositories.tmpl index 66af5195b003..aebfa3334409 100644 --- a/templates/org/team/repositories.tmpl +++ b/templates/org/team/repositories.tmpl @@ -38,7 +38,15 @@ {{$.i18n.Tr "remove"}} {{end}} - + {{if .IsPrivate}} + {{octicon false "lock"}} + {{else if .IsFork}} + {{octicon false "repo-forked"}} + {{else if .IsMirror}} + {{octicon false "repo-clone"}} + {{else}} + {{octicon false "repo"}} + {{end}} {{$.Org.Name}}/{{.Name}}
diff --git a/templates/org/team/sidebar.tmpl b/templates/org/team/sidebar.tmpl index 75c5ce756d44..f063c27a68bc 100644 --- a/templates/org/team/sidebar.tmpl +++ b/templates/org/team/sidebar.tmpl @@ -47,7 +47,7 @@
{{if .IsOrganizationOwner}}
- {{$.i18n.Tr "org.teams.settings"}} + {{octicon false "gear"}} {{$.i18n.Tr "org.teams.settings"}}
{{end}}
diff --git a/templates/org/team/teams.tmpl b/templates/org/team/teams.tmpl index 87141811407a..19cc19f025af 100644 --- a/templates/org/team/teams.tmpl +++ b/templates/org/team/teams.tmpl @@ -5,7 +5,7 @@ {{template "base/alert" .}} {{if .IsOrganizationOwner}}
- {{.i18n.Tr "org.create_new_team"}} + {{octicon false "plus"}} {{.i18n.Tr "org.create_new_team"}}
{{end}} diff --git a/templates/repo/activity.tmpl b/templates/repo/activity.tmpl index 8c3167bca7f9..0e8d1aa92734 100644 --- a/templates/repo/activity.tmpl +++ b/templates/repo/activity.tmpl @@ -63,21 +63,21 @@
{{if .Permission.CanRead $.UnitTypePullRequests}} - {{.Activity.MergedPRCount}}
+ {{octicon false "git-pull-request"}} {{.Activity.MergedPRCount}}
{{.i18n.Tr (TrN .i18n.Lang .Activity.MergedPRCount "repo.activity.merged_prs_count_1" "repo.activity.merged_prs_count_n") }} - {{.Activity.OpenedPRCount}}
+ {{octicon false "git-branch"}} {{.Activity.OpenedPRCount}}
{{.i18n.Tr (TrN .i18n.Lang .Activity.OpenedPRCount "repo.activity.opened_prs_count_1" "repo.activity.opened_prs_count_n") }} {{end}} {{if .Permission.CanRead $.UnitTypeIssues}} - {{.Activity.ClosedIssueCount}}
+ {{octicon false "issue-closed"}} {{.Activity.ClosedIssueCount}}
{{.i18n.Tr (TrN .i18n.Lang .Activity.ClosedIssueCount "repo.activity.closed_issues_count_1" "repo.activity.closed_issues_count_n") }} - {{.Activity.OpenedIssueCount}}
+ {{octicon false "issue-opened"}} {{.Activity.OpenedIssueCount}}
{{.i18n.Tr (TrN .i18n.Lang .Activity.OpenedIssueCount "repo.activity.new_issues_count_1" "repo.activity.new_issues_count_n") }} {{end}} @@ -120,7 +120,7 @@ {{if gt .Activity.PublishedReleaseCount 0}}

- + {{octicon false "tag"}} {{.i18n.Tr "repo.activity.title.releases_published_by" (.i18n.Tr (TrN .i18n.Lang .Activity.PublishedReleaseCount "repo.activity.title.releases_1" "repo.activity.title.releases_n") .Activity.PublishedReleaseCount) (.i18n.Tr (TrN .i18n.Lang .Activity.PublishedReleaseAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n") .Activity.PublishedReleaseAuthorCount) }}

@@ -139,7 +139,7 @@ {{if gt .Activity.MergedPRCount 0}}

- + {{octicon false "git-pull-request"}} {{.i18n.Tr "repo.activity.title.prs_merged_by" (.i18n.Tr (TrN .i18n.Lang .Activity.MergedPRCount "repo.activity.title.prs_1" "repo.activity.title.prs_n") .Activity.MergedPRCount) (.i18n.Tr (TrN .i18n.Lang .Activity.MergedPRAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n") .Activity.MergedPRAuthorCount) }}

@@ -155,7 +155,7 @@ {{if gt .Activity.OpenedPRCount 0}}

- + {{octicon false "git-branch"}} {{.i18n.Tr "repo.activity.title.prs_opened_by" (.i18n.Tr (TrN .i18n.Lang .Activity.OpenedPRCount "repo.activity.title.prs_1" "repo.activity.title.prs_n") .Activity.OpenedPRCount) (.i18n.Tr (TrN .i18n.Lang .Activity.OpenedPRAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n") .Activity.OpenedPRAuthorCount) }}

@@ -171,7 +171,7 @@ {{if gt .Activity.ClosedIssueCount 0}}

- + {{octicon false "issue-closed"}} {{.i18n.Tr "repo.activity.title.issues_closed_by" (.i18n.Tr (TrN .i18n.Lang .Activity.ClosedIssueCount "repo.activity.title.issues_1" "repo.activity.title.issues_n") .Activity.ClosedIssueCount) (.i18n.Tr (TrN .i18n.Lang .Activity.ClosedIssueAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n") .Activity.ClosedIssueAuthorCount) }}

@@ -187,7 +187,7 @@ {{if gt .Activity.OpenedIssueCount 0}}

- + {{octicon false "issue-opened"}} {{.i18n.Tr "repo.activity.title.issues_created_by" (.i18n.Tr (TrN .i18n.Lang .Activity.OpenedIssueCount "repo.activity.title.issues_1" "repo.activity.title.issues_n") .Activity.OpenedIssueCount) (.i18n.Tr (TrN .i18n.Lang .Activity.OpenedIssueAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n") .Activity.OpenedIssueAuthorCount) }}

@@ -203,7 +203,7 @@ {{if gt .Activity.UnresolvedIssueCount 0}}

- + {{octicon false "comment-discussion"}} {{.i18n.Tr (TrN .i18n.Lang .Activity.UnresolvedIssueCount "repo.activity.title.unresolved_conv_1" "repo.activity.title.unresolved_conv_n") .Activity.UnresolvedIssueCount }}

diff --git a/templates/repo/blame.tmpl b/templates/repo/blame.tmpl index 483f8d38eb8f..9c37bb8772db 100644 --- a/templates/repo/blame.tmpl +++ b/templates/repo/blame.tmpl @@ -18,14 +18,14 @@
{{if .Repository.CanEnableEditor}} {{if .CanEditFile}} - + {{octicon false "pencil"}} {{else}} - + {{octicon false "pencil"}} {{end}} {{if .CanDeleteFile}} - + {{octicon false "trashcan"}} {{else}} - + {{octicon false "trashcan"}} {{end}} {{end}}
diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index a24360795eb5..7cd03487336b 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -16,10 +16,10 @@ {{range .Branches}} {{if eq .Name $.DefaultBranch}} {{if .IsProtected}} - + {{octicon false "shield-lock"}} {{end}} {{$.DefaultBranch}} -

{{ShortSha .Commit.ID.String}} · {{RenderCommitMessage .Commit.CommitMessage $.RepoLink $.Repository.ComposeMetas}} · {{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Commit.Committer.When $.i18n.Lang}}

+

{{octicon false "git-commit"}}{{ShortSha .Commit.ID.String}} · {{RenderCommitMessage .Commit.CommitMessage $.RepoLink $.Repository.ComposeMetas}} · {{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Commit.Committer.When $.i18n.Lang}}

{{end}} {{end}} @@ -27,8 +27,8 @@
- ZIP - TAR.GZ + {{octicon false "file-zip"}} ZIP + {{octicon false "file-zip"}} TAR.GZ
@@ -53,10 +53,10 @@

{{$.i18n.Tr "repo.branch.deleted_by" .DeletedBranch.DeletedBy.Name}} {{TimeSinceUnix .DeletedBranch.DeletedUnix $.i18n.Lang}}

{{else}} {{if .IsProtected}} - + {{octicon false "shield-lock"}} {{end}} {{.Name}} -

{{ShortSha .Commit.ID.String}} · {{RenderCommitMessage .Commit.CommitMessage $.RepoLink $.Repository.ComposeMetas}} · {{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Commit.Committer.When $.i18n.Lang}}

+

{{octicon false "git-commit"}}{{ShortSha .Commit.ID.String}} · {{RenderCommitMessage .Commit.CommitMessage $.RepoLink $.Repository.ComposeMetas}} · {{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Commit.Committer.When $.i18n.Lang}}

{{end}} @@ -77,7 +77,7 @@ {{if not .LatestPullRequest}} {{if .IsIncluded}} - {{$.i18n.Tr "repo.branch.included"}} + {{octicon false "git-pull-request"}} {{$.i18n.Tr "repo.branch.included"}} {{else if and (not .IsDeleted) $.AllowsPulls (gt .CommitsAhead 0)}} @@ -93,11 +93,11 @@ {{else}} {{if not .LatestPullRequest.IsSameRepo}}{{.LatestPullRequest.BaseRepo.FullName}}{{end}}#{{.LatestPullRequest.Issue.Index}} {{if .LatestPullRequest.HasMerged}} - {{$.i18n.Tr "repo.pulls.merged"}} + {{octicon false "git-pull-request"}} {{$.i18n.Tr "repo.pulls.merged"}} {{else if .LatestPullRequest.Issue.IsClosed}} - {{$.i18n.Tr "repo.issues.closed_title"}} + {{octicon false "issue-closed"}} {{$.i18n.Tr "repo.issues.closed_title"}} {{else}} - {{$.i18n.Tr "repo.issues.open_title"}} + {{octicon false "issue-opened"}} {{$.i18n.Tr "repo.issues.open_title"}} {{end}} {{end}} @@ -106,14 +106,14 @@
- ZIP - TAR.GZ + {{octicon false "file-zip"}} ZIP + {{octicon false "file-zip"}} TAR.GZ
{{end}} {{if and $.IsWriter (not $.IsMirror) (not $.Repository.IsArchived) (not .IsProtected)}} {{if .IsDeleted}} - + {{octicon false "reply"}} {{else}} {{end}} diff --git a/templates/repo/branch_dropdown.tmpl b/templates/repo/branch_dropdown.tmpl index b7f4c9121282..31b50d650d16 100644 --- a/templates/repo/branch_dropdown.tmpl +++ b/templates/repo/branch_dropdown.tmpl @@ -2,7 +2,7 @@
- + {{octicon false "git-branch"}} {{if .IsViewBranch}}{{.i18n.Tr "repo.branch"}}{{else}}{{.i18n.Tr "repo.tree"}}{{end}}: {{if .IsViewBranch}}{{.BranchName}}{{else}}{{ShortSha .BranchName}}{{end}} @@ -26,7 +26,7 @@
- {{.i18n.Tr "repo.branches"}} + {{octicon false "git-branch"}} {{.i18n.Tr "repo.branches"}} @@ -42,7 +42,7 @@
- + {{octicon false "git-branch"}} {{.i18n.Tr "repo.branch.create_branch" `${ searchTerm }` | Safe}}
diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl index 5b19523cf2a6..c09be6605714 100644 --- a/templates/repo/commit_page.tmpl +++ b/templates/repo/commit_page.tmpl @@ -10,7 +10,7 @@ {{if IsMultilineCommitMessage .Commit.Message}} 
{{RenderCommitBody .Commit.Message $.RepoLink $.Repository.ComposeMetas}}
{{end}} - {{.BranchName}} + {{octicon false "git-branch"}}{{.BranchName}}
diff --git a/templates/repo/commits.tmpl b/templates/repo/commits.tmpl index 32301a038a3a..2505f6b4f255 100644 --- a/templates/repo/commits.tmpl +++ b/templates/repo/commits.tmpl @@ -8,7 +8,7 @@
- + {{octicon false "git-branch"}} {{.i18n.Tr "repo.commit_graph"}} diff --git a/templates/repo/commits_table.tmpl b/templates/repo/commits_table.tmpl index 0e53936f0aef..d463bd64438c 100644 --- a/templates/repo/commits_table.tmpl +++ b/templates/repo/commits_table.tmpl @@ -21,9 +21,9 @@ {{else if .IsDiffCompare}} - {{if not .BaseIsCommit}}{{if .BaseIsBranch}}{{else if .BaseIsTag}}{{end}}{{.BaseBranch}}{{else}}{{ShortSha .BaseBranch}}{{end}} + {{if not .BaseIsCommit}}{{if .BaseIsBranch}}{{octicon false "git-branch"}}{{else if .BaseIsTag}}{{end}}{{.BaseBranch}}{{else}}{{ShortSha .BaseBranch}}{{end}} ... - {{if not .HeadIsCommit}}{{if .HeadIsBranch}}{{else if .HeadIsTag}}{{end}}{{.HeadBranch}}{{else}}{{ShortSha .HeadBranch}}{{end}} + {{if not .HeadIsCommit}}{{if .HeadIsBranch}}{{octicon false "git-branch"}}{{else if .HeadIsTag}}{{end}}{{.HeadBranch}}{{else}}{{ShortSha .HeadBranch}}{{end}} {{end}}
diff --git a/templates/repo/diff/blob_excerpt.tmpl b/templates/repo/diff/blob_excerpt.tmpl index 5f0cd30bb7b1..3336a2f22e69 100644 --- a/templates/repo/diff/blob_excerpt.tmpl +++ b/templates/repo/diff/blob_excerpt.tmpl @@ -10,7 +10,7 @@ {{end}} {{if or (eq $line.GetExpandDirection 2)}} - + {{octicon false "fold"}} {{end}} {{$.section.GetComputedInlineDiffFor $line}} @@ -36,7 +36,7 @@ {{end}} {{if or (eq $line.GetExpandDirection 2)}} - + {{octicon false "fold"}} {{end}} {{else}} @@ -47,4 +47,4 @@ {{$.section.GetComputedInlineDiffFor $line}} {{end}} -{{end}} \ No newline at end of file +{{end}} diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl index 15ba387dca0a..b3c81a7547f2 100644 --- a/templates/repo/diff/box.tmpl +++ b/templates/repo/diff/box.tmpl @@ -133,7 +133,7 @@ {{end}} {{if or (eq $line.GetExpandDirection 2)}} - + {{octicon false "fold"}} {{end}} {{$section.GetComputedInlineDiffFor $line}} diff --git a/templates/repo/diff/comment_form.tmpl b/templates/repo/diff/comment_form.tmpl index 822b1e54f675..4749d64b00af 100644 --- a/templates/repo/diff/comment_form.tmpl +++ b/templates/repo/diff/comment_form.tmpl @@ -24,7 +24,7 @@ {{.i18n.Tr "loading"}}
- {{$.root.i18n.Tr "repo.diff.comment.markdown_info"}} + {{octicon false "markdown"}} {{$.root.i18n.Tr "repo.diff.comment.markdown_info"}}
{{if $.reply}} diff --git a/templates/repo/diff/compare.tmpl b/templates/repo/diff/compare.tmpl index 50a51c44acc2..897608e18e09 100644 --- a/templates/repo/diff/compare.tmpl +++ b/templates/repo/diff/compare.tmpl @@ -13,7 +13,7 @@ {{ end }}
- + {{octicon false "git-compare"}}
{{.i18n.Tr "repo.pulls.compare_base"}}: {{$.BaseName}}:{{$.BaseBranch}} diff --git a/templates/repo/diff/section_unified.tmpl b/templates/repo/diff/section_unified.tmpl index fcc511af75eb..39d8b2f12f6f 100644 --- a/templates/repo/diff/section_unified.tmpl +++ b/templates/repo/diff/section_unified.tmpl @@ -12,7 +12,7 @@ {{end}} {{if or (eq $line.GetExpandDirection 2)}} - + {{octicon false "fold"}} {{end}} {{else}} diff --git a/templates/repo/editor/commit_form.tmpl b/templates/repo/editor/commit_form.tmpl index 1915e9be21b9..8d45eb5b892d 100644 --- a/templates/repo/editor/commit_form.tmpl +++ b/templates/repo/editor/commit_form.tmpl @@ -17,7 +17,7 @@